mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-07 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Location and LocationType belong together

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
test/de/schildbach/pte/live/BahnProviderLiveTest.java
View file

@ -22,9 +22,9 @@ import java.util.Date;
import org.junit.Test;
import de.schildbach.pte.BahnProvider;
import de.schildbach.pte.NetworkProvider.LocationType;
import de.schildbach.pte.NetworkProvider.WalkSpeed;
import de.schildbach.pte.dto.Connection;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.QueryConnectionsResult;
import de.schildbach.pte.dto.QueryDeparturesResult;

16
test/de/schildbach/pte/live/GvhProviderLiveTest.java
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);
}

14
test/de/schildbach/pte/live/LinzProviderLiveTest.java
View file

@ -23,9 +23,9 @@ import java.util.List;
import org.junit.Test;
import de.schildbach.pte.LinzProvider;
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.QueryConnectionsResult;
import de.schildbach.pte.dto.QueryDeparturesResult;
@ -40,7 +40,7 @@ public class LinzProviderLiveTest
@Test
public void autocompleteIncomplete() throws Exception
{
final List<Autocomplete> autocompletes = provider.autocompleteStations("Linz, H");
final List<Location> autocompletes = provider.autocompleteStations("Linz, H");
list(autocompletes);
}
@ -48,7 +48,7 @@ public class LinzProviderLiveTest
@Test
public void autocompleteIdentified() throws Exception
{
final List<Autocomplete> autocompletes = provider.autocompleteStations("Leonding, Haag");
final List<Location> autocompletes = provider.autocompleteStations("Leonding, Haag");
list(autocompletes);
}
@ -56,15 +56,15 @@ public class LinzProviderLiveTest
@Test
public void autocompleteCity() throws Exception
{
final List<Autocomplete> autocompletes = provider.autocompleteStations("Linz");
final List<Location> autocompletes = provider.autocompleteStations("Linz");
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();
}

2
test/de/schildbach/pte/live/MvvProviderLiveTest.java
View file

@ -22,8 +22,8 @@ import java.util.Date;
import org.junit.Test;
import de.schildbach.pte.MvvProvider;
import de.schildbach.pte.NetworkProvider.LocationType;
import de.schildbach.pte.NetworkProvider.WalkSpeed;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.QueryConnectionsResult;
/**

2
test/de/schildbach/pte/live/OebbProviderLiveTest.java
View file

@ -22,8 +22,8 @@ import java.util.Date;
import org.junit.Test;
import de.schildbach.pte.OebbProvider;
import de.schildbach.pte.NetworkProvider.LocationType;
import de.schildbach.pte.NetworkProvider.WalkSpeed;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.NearbyStationsResult;
import de.schildbach.pte.dto.QueryConnectionsResult;

6
test/de/schildbach/pte/live/SbbProviderLiveTest.java
View file

@ -23,9 +23,9 @@ import java.util.List;
import org.junit.Test;
import de.schildbach.pte.SbbProvider;
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;
@ -78,7 +78,7 @@ public class SbbProviderLiveTest
@Test
public void autoComplete() throws Exception
{
final List<Autocomplete> result = provider.autocompleteStations("haupt");
final List<Location> result = provider.autocompleteStations("haupt");
System.out.println(result);
}
}

14
test/de/schildbach/pte/live/VrnProviderLiveTest.java
View file

@ -21,7 +21,7 @@ import java.util.List;
import org.junit.Test;
import de.schildbach.pte.VrnProvider;
import de.schildbach.pte.dto.Autocomplete;
import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.NearbyStationsResult;
import de.schildbach.pte.dto.QueryDeparturesResult;
@ -35,7 +35,7 @@ public class VrnProviderLiveTest
@Test
public void autocompleteIncomplete() throws Exception
{
final List<Autocomplete> autocompletes = provider.autocompleteStations("Kur");
final List<Location> autocompletes = provider.autocompleteStations("Kur");
list(autocompletes);
}
@ -43,7 +43,7 @@ public class VrnProviderLiveTest
@Test
public void autocompleteIdentified() throws Exception
{
final List<Autocomplete> autocompletes = provider.autocompleteStations("Bremen, KUR");
final List<Location> autocompletes = provider.autocompleteStations("Bremen, KUR");
list(autocompletes);
}
@ -51,7 +51,7 @@ public class VrnProviderLiveTest
@Test
public void autocompleteLocality() throws Exception
{
final List<Autocomplete> autocompletes = provider.autocompleteStations("Bremen");
final List<Location> autocompletes = provider.autocompleteStations("Bremen");
list(autocompletes);
}
@ -59,15 +59,15 @@ public class VrnProviderLiveTest
@Test
public void autocompleteCity() throws Exception
{
final List<Autocomplete> autocompletes = provider.autocompleteStations("Mannheim");
final List<Location> autocompletes = provider.autocompleteStations("Mannheim");
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();
}

12
test/de/schildbach/pte/live/VrrProviderLiveTest.java
View file

@ -21,7 +21,7 @@ import java.util.List;
import org.junit.Test;
import de.schildbach.pte.VrrProvider;
import de.schildbach.pte.dto.Autocomplete;
import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.NearbyStationsResult;
import de.schildbach.pte.dto.QueryDeparturesResult;
@ -35,7 +35,7 @@ public class VrrProviderLiveTest
@Test
public void autocompleteIncomplete() throws Exception
{
final List<Autocomplete> autocompletes = provider.autocompleteStations("Kur");
final List<Location> autocompletes = provider.autocompleteStations("Kur");
list(autocompletes);
}
@ -43,7 +43,7 @@ public class VrrProviderLiveTest
@Test
public void autocompleteIdentified() throws Exception
{
final List<Autocomplete> autocompletes = provider.autocompleteStations("Düsseldorf, Am Frohnhof");
final List<Location> autocompletes = provider.autocompleteStations("Düsseldorf, Am Frohnhof");
list(autocompletes);
}
@ -51,15 +51,15 @@ public class VrrProviderLiveTest
@Test
public void autocompleteCity() throws Exception
{
final List<Autocomplete> autocompletes = provider.autocompleteStations("Düsseldorf");
final List<Location> autocompletes = provider.autocompleteStations("Düsseldorf");
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();
}