Skip to content
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

Fix race in execution of tests #6177

Merged
merged 2 commits into from
Oct 25, 2024
Merged

Fix race in execution of tests #6177

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
d34f27f
Make the test itinerary instance non-static as it's modified in some …
jtorin Oct 18, 2024
48399cc
Avoid making a copy of the underlying collection when checking if the…
jtorin Oct 24, 2024
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 application/src/main/java/org/opentripplanner/model/plan/Itinerary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public void removeDeletionFlags(Set<String> removeTags) {
}

public boolean isFlaggedForDeletion() {
return !getSystemNotices().isEmpty();
return !systemNotices.isEmpty();
}

/**
Expand Down
14 changes: 7 additions & 7 deletions .../java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,12 @@ void testPostProcessorWithMaxItinerariesFilterSetToOneArriveBy() {
@Nested
class FlexSearchWindow {

private static final Itinerary FLEX = newItinerary(A, T11_00)
private final Itinerary flex = newItinerary(A, T11_00)
.flex(T11_00, T11_30, B)
.withIsSearchWindowAware(false)
.build();
private static final Instant EARLIEST_DEPARTURE = FLEX.startTime().plusMinutes(10).toInstant();
private static final Duration SEARCH_WINDOW = Duration.ofHours(7);
private final Instant earliestDeparture = flex.startTime().plusMinutes(10).toInstant();
private final Duration searchWindow = Duration.ofHours(7);

/**
* When the filtering of direct flex by the transit search window is deactivated, the direct
Expand All @@ -320,18 +320,18 @@ class FlexSearchWindow {
void keepDirectFlexWhenFilteringByEarliestDepartureIsDisabled() {
ItineraryListFilterChain chain = createBuilder(true, false, 10)
.withFilterDirectFlexBySearchWindow(false)
.withSearchWindow(EARLIEST_DEPARTURE, SEARCH_WINDOW)
.withSearchWindow(earliestDeparture, searchWindow)
.build();
assertEquals(toStr(List.of(FLEX)), toStr(chain.filter(List.of(FLEX))));
assertEquals(toStr(List.of(flex)), toStr(chain.filter(List.of(flex))));
}

@Test
void removeDirectFlexWhenFilteringByEarliestDepartureIsEnabled() {
ItineraryListFilterChain chain = createBuilder(true, false, 10)
.withFilterDirectFlexBySearchWindow(true)
.withSearchWindow(EARLIEST_DEPARTURE, SEARCH_WINDOW)
.withSearchWindow(earliestDeparture, searchWindow)
.build();
assertEquals(toStr(List.of()), toStr(chain.filter(List.of(FLEX))));
assertEquals(toStr(List.of()), toStr(chain.filter(List.of(flex))));
}
}

Expand Down
Loading