Fix and add tests for Berlin & Brandenburg.

Conflicts:
	enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
	enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
This commit is contained in:
Andreas Schildbach 2015-01-26 17:24:01 +01:00
parent 696498cbca
commit c1691a7e71
2 changed files with 24 additions and 21 deletions

View file

@ -17,11 +17,12 @@
package de.schildbach.pte.live;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import java.util.Date;
import org.junit.Assert;
import org.junit.Test;
import de.schildbach.pte.BvgProvider;
@ -91,37 +92,38 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
public void suggestLocationsUmlaut() throws Exception
{
final SuggestLocationsResult result = suggestLocations("Güntzelstr.");
print(result);
Assert.assertEquals("Güntzelstr. (U)", result.getLocations().get(0).name);
assertThat(result.getLocations(), hasItem(new Location(LocationType.STATION, "9043201", "Berlin", "U Güntzelstr.")));
}
@Test
public void suggestLocationsLocality() throws Exception
{
final SuggestLocationsResult result = suggestLocations("seeling");
print(result);
assertEquals(new Location(LocationType.STATION, null, "Berlin", "Seelingstr."), result.getLocations().get(0));
}
Assert.assertEquals(new Location(LocationType.STATION, null, "Berlin", "Seelingstr."), result.getLocations().get(0));
@Test
public void suggestLocationsPOI() throws Exception
{
final SuggestLocationsResult result = suggestLocations("schwules museum");
print(result);
assertThat(result.getLocations(), hasItem(new Location(LocationType.POI, "9980141")));
}
@Test
public void suggestLocationsAddress() throws Exception
{
final SuggestLocationsResult result = suggestLocations("Berlin, Sophienstr. 24");
print(result);
Assert.assertEquals("Sophienstr. 24", result.getLocations().get(0).name);
assertEquals("Sophienstr. 24", result.getLocations().get(0).name);
}
@Test
public void suggestLocationsIncomplete() throws Exception
{
final SuggestLocationsResult result = suggestLocations("nol");
print(result);
}

View file

@ -17,7 +17,9 @@
package de.schildbach.pte.live;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.Date;
@ -49,7 +51,6 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "9007102"));
print(result);
}
@ -63,16 +64,15 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStationsByCoordinate() throws Exception
{
final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52548505, 1338864));
final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52548505, 13388640));
print(result);
assertTrue(result.stations.size() > 0);
}
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = queryDepartures("9007102", false);
print(result);
}
@ -90,9 +90,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
public void suggestLocations() throws Exception
{
final SuggestLocationsResult result = suggestLocations("Haubachstr.");
print(result);
Assert.assertEquals("Haubachstr.", result.getLocations().get(0).name);
}
@ -100,19 +98,23 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
public void suggestLocationsUmlaut() throws Exception
{
final SuggestLocationsResult result = suggestLocations("Güntzelstr.");
print(result);
Assert.assertEquals("U Güntzelstr.", result.getLocations().get(0).name);
}
Assert.assertEquals("Güntzelstr. (U)", result.getLocations().get(0).name);
@Test
public void suggestLocationsPOI() throws Exception
{
final SuggestLocationsResult result = suggestLocations("schwules museum");
print(result);
Assert.assertThat(result.getLocations(), hasItem(new Location(LocationType.POI, "9980141")));
}
@Test
public void suggestLocationsAddress() throws Exception
{
final SuggestLocationsResult result = suggestLocations("Sophienstr. 24");
print(result);
Assert.assertEquals("Sophienstr. 24", result.getLocations().get(0).name);
}
@ -120,7 +122,6 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
public void suggestLocationsIncomplete() throws Exception
{
final SuggestLocationsResult result = suggestLocations("nol");
print(result);
}