Location and LocationType belong together

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@247 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-08 17:59:55 +00:00
parent 875bd1d651
commit 19c9c269e2
27 changed files with 177 additions and 143 deletions

View file

@ -22,9 +22,9 @@ import java.util.List;
import org.junit.Test;
import de.schildbach.pte.GvhProvider;
import de.schildbach.pte.NetworkProvider.LocationType;
import de.schildbach.pte.NetworkProvider.WalkSpeed;
import de.schildbach.pte.dto.Autocomplete;
import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.NearbyStationsResult;
import de.schildbach.pte.dto.QueryConnectionsResult;
@ -39,7 +39,7 @@ public class GvhProviderLiveTest
@Test
public void autocompleteIncomplete() throws Exception
{
final List<Autocomplete> autocompletes = provider.autocompleteStations("Kur");
final List<Location> autocompletes = provider.autocompleteStations("Kur");
list(autocompletes);
}
@ -47,7 +47,7 @@ public class GvhProviderLiveTest
@Test
public void autocompleteIdentified() throws Exception
{
final List<Autocomplete> autocompletes = provider.autocompleteStations("Hannover, Hannoversche Straße");
final List<Location> autocompletes = provider.autocompleteStations("Hannover, Hannoversche Straße");
list(autocompletes);
}
@ -55,15 +55,15 @@ public class GvhProviderLiveTest
@Test
public void autocompleteCity() throws Exception
{
final List<Autocomplete> autocompletes = provider.autocompleteStations("Hannover");
final List<Location> autocompletes = provider.autocompleteStations("Hannover");
list(autocompletes);
}
private void list(final List<Autocomplete> autocompletes)
private void list(final List<Location> autocompletes)
{
System.out.print(autocompletes.size() + " ");
for (final Autocomplete autocomplete : autocompletes)
for (final Location autocomplete : autocompletes)
System.out.print(autocomplete.toDebugString() + " ");
System.out.println();
}
@ -71,7 +71,7 @@ public class GvhProviderLiveTest
@Test
public void autocomplete() throws Exception
{
final List<Autocomplete> results = provider.autocompleteStations("Hannover");
final List<Location> results = provider.autocompleteStations("Hannover");
System.out.println(results.size() + " " + results);
}