Skip to content

fix: hide the note if the expiration date is equal to the expected date. #2039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: hide the note if the expiration date is equal to the expected date. #2039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79cbbf2
fix: hide the note if the expiration date is equal to the expected date.
przemekwrona Jun 12, 2025
956cdc5
Merge branch 'master' into master
przemekwrona Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main/src/main/java/org/mobilitydata/gtfsvalidator/validator/FeedExpirationDateValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
18 changes: 15 additions & 3 deletions ...c/test/java/org/mobilitydata/gtfsvalidator/validator/FeedExpirationDateValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,28 @@ public void feedExpiring7to30DaysFromNowShouldGenerateNotice() {
}

@Test
public void feedExpiring30DaysFromNowShouldGenerateNotice() {
assertThat(validateFeedInfo(createFeedInfo(GtfsDate.fromLocalDate(TEST_NOW.plusDays(30)))))
public void feedExpiring29DaysFromNowShouldGenerateNotice() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion to modify to feedExpiringAfter30DaysFromNowShouldGenerateNotice instead to conform to the actual guidance from the spec: "If possible, the GTFS dataset should cover at least the next 30 days of service." https://gtfs.org/documentation/schedule/reference/#dataset-publishing-general-practices

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)))))
Expand Down
Loading