From 9b81c692515f97fc9280bce3ce4c557c4a888995 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 27 Oct 2018 18:31:15 +0200 Subject: [PATCH] BVG, VBB: Adapt to new BVG station IDs in test cases. --- .../pte/live/BvgProviderLiveTest.java | 48 +++++++------------ .../pte/live/VbbProviderLiveTest.java | 18 +++---- 2 files changed, 26 insertions(+), 40 deletions(-) diff --git a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java index 8aee84fa..af7c7901 100644 --- a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java @@ -46,7 +46,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest { @Test public void nearbyStations() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "9220302")); + final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "900220302")); assertEquals(NearbyLocationsResult.Status.OK, result.status); print(result); } @@ -65,30 +65,15 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest { @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result1 = queryDepartures("9016254", false); + final QueryDeparturesResult result1 = queryDepartures("900016254", false); assertEquals(QueryDeparturesResult.Status.OK, result1.status); print(result1); - final QueryDeparturesResult result2 = queryDepartures("9100003", false); + final QueryDeparturesResult result2 = queryDepartures("900100003", false); assertEquals(QueryDeparturesResult.Status.OK, result2.status); print(result2); } - @Test - public void queryDeparturesMast() throws Exception { - final QueryDeparturesResult result1 = queryDepartures("~308864", false); - assertEquals(QueryDeparturesResult.Status.OK, result1.status); - print(result1); - - final QueryDeparturesResult result2 = queryDepartures("~309306", false); - assertEquals(QueryDeparturesResult.Status.OK, result2.status); - print(result2); - - final QueryDeparturesResult result3 = queryDepartures("~105837", false); - assertEquals(QueryDeparturesResult.Status.OK, result3.status); - print(result3); - } - @Test public void queryDeparturesInvalidStation() throws Exception { final QueryDeparturesResult result = queryDepartures("999999", false); @@ -100,7 +85,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest { final SuggestLocationsResult result = suggestLocations("Güntzelstr."); print(result); assertThat(result.getLocations(), - hasItem(new Location(LocationType.STATION, "9043201", "Berlin", "U Güntzelstr."))); + hasItem(new Location(LocationType.STATION, "900043201", "Berlin", "U Güntzelstr."))); } @Test @@ -115,7 +100,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest { final SuggestLocationsResult result = suggestLocations("schwules museum"); print(result); assertThat(result.getLocations(), hasItem(new Location(LocationType.POI, - "A=4@O=Berlin, Schwules Museum@X=13357979@Y=52504519@U=104@L=9980141@B=1@p=1417107246@"))); + "A=4@O=Berlin, Schwules Museum@X=13357979@Y=52504519@U=104@L=900980141@B=1@p=1540465509@"))); } @Test @@ -134,9 +119,9 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest { @Test public void shortTrip() throws Exception { final QueryTripsResult result = queryTrips( - new Location(LocationType.STATION, "9056102", "Berlin", "Nollendorfplatz"), null, - new Location(LocationType.STATION, "9013103", "Berlin", "Prinzenstraße"), new Date(), true, Product.ALL, - WalkSpeed.NORMAL, Accessibility.NEUTRAL); + new Location(LocationType.STATION, "900056102", "Berlin", "Nollendorfplatz"), null, + new Location(LocationType.STATION, "900013103", "Berlin", "Prinzenstraße"), new Date(), true, + Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); print(laterResult); @@ -151,19 +136,19 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest { @Test public void tripBetweenStations() throws Exception { final QueryTripsResult result = queryTrips( - new Location(LocationType.STATION, "9055101", 52496176, 13343273, null, "U Viktoria-Luise-Platz"), null, - new Location(LocationType.STATION, "9089303", 52588810, 13288699, null, "S Tegel"), new Date(), true, - Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + new Location(LocationType.STATION, "900055101", 52496176, 13343273, null, "U Viktoria-Luise-Platz"), + null, new Location(LocationType.STATION, "900089303", 52588810, 13288699, null, "S Tegel"), new Date(), + true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); } @Test public void shortViaTrip() throws Exception { final QueryTripsResult result = queryTrips( - new Location(LocationType.STATION, "9056102", "Berlin", "Nollendorfplatz"), - new Location(LocationType.STATION, "9044202", "Berlin", "Bundesplatz"), - new Location(LocationType.STATION, "9013103", "Berlin", "Prinzenstraße"), new Date(), true, Product.ALL, - WalkSpeed.NORMAL, Accessibility.NEUTRAL); + new Location(LocationType.STATION, "900056102", "Berlin", "Nollendorfplatz"), + new Location(LocationType.STATION, "900044202", "Berlin", "Bundesplatz"), + new Location(LocationType.STATION, "900013103", "Berlin", "Prinzenstraße"), new Date(), true, + Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); print(laterResult); @@ -235,7 +220,8 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest { final QueryTripsResult result = queryTrips( new Location(LocationType.ADDRESS, null, 52481922, 13388383, null, "Bayernring, 12101 Berlin, Deutschland"), - null, new Location(LocationType.STATION, "9064301", 52429099, 13328081, null, "S Lichterfelde Ost Bhf"), + null, + new Location(LocationType.STATION, "900064301", 52429099, 13328081, null, "S Lichterfelde Ost Bhf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); } diff --git a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java index 740f67a4..fc6d8bae 100644 --- a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java @@ -66,7 +66,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest { @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = queryDepartures("9007102", false); + final QueryDeparturesResult result = queryDepartures("900007102", false); print(result); } @@ -97,7 +97,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest { public void suggestLocationsPOI() throws Exception { final SuggestLocationsResult result = suggestLocations("schwules museum"); print(result); - Assert.assertThat(result.getLocations(), hasItem(new Location(LocationType.POI, "9980141"))); + Assert.assertThat(result.getLocations(), hasItem(new Location(LocationType.POI, "900980141"))); } @Test @@ -116,9 +116,9 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest { @Test public void shortTrip() throws Exception { final QueryTripsResult result = queryTrips( - new Location(LocationType.STATION, "9056102", "Berlin", "Nollendorfplatz"), null, - new Location(LocationType.STATION, "9013103", "Berlin", "Prinzenstraße"), new Date(), true, Product.ALL, - WalkSpeed.NORMAL, Accessibility.NEUTRAL); + new Location(LocationType.STATION, "900056102", "Berlin", "Nollendorfplatz"), null, + new Location(LocationType.STATION, "900013103", "Berlin", "Prinzenstraße"), new Date(), true, + Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); final QueryTripsResult laterResult = queryMoreTrips(result.context, true); @@ -147,10 +147,10 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest { @Test public void shortViaTrip() throws Exception { final QueryTripsResult result = queryTrips( - new Location(LocationType.STATION, "9056102", "Berlin", "Nollendorfplatz"), - new Location(LocationType.STATION, "9044202", "Berlin", "Bundesplatz"), - new Location(LocationType.STATION, "9013103", "Berlin", "Prinzenstraße"), new Date(), true, Product.ALL, - WalkSpeed.NORMAL, Accessibility.NEUTRAL); + new Location(LocationType.STATION, "900056102", "Berlin", "Nollendorfplatz"), + new Location(LocationType.STATION, "900044202", "Berlin", "Bundesplatz"), + new Location(LocationType.STATION, "900013103", "Berlin", "Prinzenstraße"), new Date(), true, + Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); print(result); if (!result.context.canQueryLater())