diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java index 487f09bb6b2..a6878585a86 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java @@ -168,7 +168,6 @@ public int hashCode() { /** * The natural key of a TripPatternForDate is the pair (routing trip pattern id, service date). - * TODO: align equals and hashcode to use only the pair (routing trip pattern id, service date) */ @Override public boolean equals(Object o) { @@ -180,12 +179,7 @@ public boolean equals(Object o) { } TripPatternForDate that = (TripPatternForDate) o; - return ( - tripPattern.equals(that.tripPattern) && - serviceDate.equals(that.serviceDate) && - Arrays.equals(tripTimes, that.tripTimes) && - Arrays.equals(frequencies, that.frequencies) - ); + return (tripPattern.equals(that.tripPattern) && serviceDate.equals(that.serviceDate)); } @Override diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java index 020a9d05135..812b80e4880 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java @@ -2,8 +2,6 @@ import static au.com.origin.snapshots.SnapshotMatcher.expect; import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; import au.com.origin.snapshots.serializers.SerializerType; import au.com.origin.snapshots.serializers.SnapshotSerializer;