From 79cbbf2a65a65ae63fe7ea647dbb4e1dafaa4fd1 Mon Sep 17 00:00:00 2001 From: przemekwrona Date: Thu, 12 Jun 2025 18:39:46 +0200 Subject: [PATCH] fix: hide the note if the expiration date is equal to the expected date. --- .../validator/FeedExpirationDateValidator.java | 2 +- .../FeedExpirationDateValidatorTest.java | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/FeedExpirationDateValidator.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/FeedExpirationDateValidator.java index dea9ae4766..14d9ca7681 100644 --- a/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/FeedExpirationDateValidator.java +++ b/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/FeedExpirationDateValidator.java @@ -69,7 +69,7 @@ public void validate(GtfsFeedInfo entity, NoticeContainer noticeContainer) { currentDatePlusSevenDays)); return; } - if (entity.feedEndDate().compareTo(currentDatePlusThirtyDays) <= 0) { + if (entity.feedEndDate().compareTo(currentDatePlusThirtyDays) < 0) { noticeContainer.addValidationNotice( new FeedExpirationDate30DaysNotice( entity.csvRowNumber(), diff --git a/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/FeedExpirationDateValidatorTest.java b/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/FeedExpirationDateValidatorTest.java index 8eaee1f1a4..5b20ee98c2 100644 --- a/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/FeedExpirationDateValidatorTest.java +++ b/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/FeedExpirationDateValidatorTest.java @@ -83,16 +83,28 @@ public void feedExpiring7to30DaysFromNowShouldGenerateNotice() { } @Test - public void feedExpiring30DaysFromNowShouldGenerateNotice() { - assertThat(validateFeedInfo(createFeedInfo(GtfsDate.fromLocalDate(TEST_NOW.plusDays(30))))) + public void feedExpiring29DaysFromNowShouldGenerateNotice() { + assertThat(validateFeedInfo(createFeedInfo(GtfsDate.fromLocalDate(TEST_NOW.plusDays(29))))) .containsExactly( new FeedExpirationDate30DaysNotice( 1, GtfsDate.fromLocalDate(TEST_NOW), - GtfsDate.fromLocalDate(TEST_NOW.plusDays(30)), + GtfsDate.fromLocalDate(TEST_NOW.plusDays(29)), GtfsDate.fromLocalDate(TEST_NOW.plusDays(30)))); } + @Test + public void feedExpiring30DaysFromNowShouldGenerateNotice() { + assertThat(validateFeedInfo(createFeedInfo(GtfsDate.fromLocalDate(TEST_NOW.plusDays(30))))) + .isEmpty(); + } + + @Test + public void feedExpiring31DaysFromNowShouldGenerateNotice() { + assertThat(validateFeedInfo(createFeedInfo(GtfsDate.fromLocalDate(TEST_NOW.plusDays(31))))) + .isEmpty(); + } + @Test public void feedExpiringInMoreThan30DaysFromNowShouldNotGenerateNotice() { assertThat(validateFeedInfo(createFeedInfo(GtfsDate.fromLocalDate(TEST_NOW.plusDays(45)))))