Skip to content

Commit cafc4aa

Browse files
Allow setting of from/to stop in test leg builder
1 parent ac74b7c commit cafc4aa

File tree

4 files changed

+4
-15
lines changed

4 files changed

+4
-15
lines changed

application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/SameGroupIdPriorityTest.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
import java.util.List;
1010
import java.util.Set;
1111
import java.util.function.Function;
12-
import java.util.stream.Stream;
1312
import org.junit.jupiter.api.Named;
1413
import org.junit.jupiter.params.ParameterizedTest;
15-
import org.junit.jupiter.params.provider.Arguments;
1614
import org.junit.jupiter.params.provider.MethodSource;
1715
import org.opentripplanner.core.model.id.FeedScopedId;
1816
import org.opentripplanner.ext.fares.model.FareLegRule;
@@ -135,10 +133,6 @@ private static FareLegRuleBuilder rule2() {
135133
}
136134

137135
private TransitLeg leg() {
138-
return TestTransitLeg.of()
139-
.withFrom(STOP1_ID)
140-
.withTo(STOP2_ID)
141-
.withRoute(ROUTE)
142-
.build();
136+
return TestTransitLeg.of().withFrom(STOP1_ID).withTo(STOP2_ID).withRoute(ROUTE).build();
143137
}
144138
}

application/src/test-fixtures/java/org/opentripplanner/model/plan/TestStopLocation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ public int getIndex() {
2828

2929
@Override
3030
@Nullable
31-
public I18NString getName() {
31+
public I18NString getName() {
3232
return I18NString.of(id.toString());
3333
}
3434

3535
@Override
3636
@Nullable
37-
public I18NString getDescription() {
37+
public I18NString getDescription() {
3838
return null;
3939
}
4040

application/src/test-fixtures/java/org/opentripplanner/model/plan/TestTransitLeg.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,5 +140,4 @@ public List<FareOffer> fareOffers() {
140140
public static TestTransitLegBuilder of() {
141141
return new TestTransitLegBuilder();
142142
}
143-
144143
}

application/src/test-fixtures/java/org/opentripplanner/model/plan/TestTransitLegBuilder.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
import java.time.ZonedDateTime;
88
import org.opentripplanner._support.time.ZoneIds;
99
import org.opentripplanner.core.model.id.FeedScopedId;
10-
import org.opentripplanner.transit.model._data.TimetableRepositoryForTest;
1110
import org.opentripplanner.transit.model.basic.TransitMode;
1211
import org.opentripplanner.transit.model.network.Route;
13-
import org.opentripplanner.transit.model.network.TripPatternBuilder;
1412
import org.opentripplanner.transit.model.organization.Agency;
1513
import org.opentripplanner.transit.model.site.StopLocation;
1614
import org.opentripplanner.transit.model.timetable.Trip;
@@ -62,6 +60,7 @@ public TestTransitLegBuilder withTo(FeedScopedId id) {
6260
this.to = new TestStopLocation(id);
6361
return this;
6462
}
63+
6564
public TestTransitLegBuilder withRoute(Route route) {
6665
this.trip = this.trip.copy().withRoute(route).build();
6766
return this;
@@ -70,7 +69,4 @@ public TestTransitLegBuilder withRoute(Route route) {
7069
public TestTransitLeg build() {
7170
return new TestTransitLeg(this);
7271
}
73-
74-
75-
7672
}

0 commit comments

Comments
 (0)