Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test_lanes' into test_lanes

Browse source
This commit is contained in:
y.ridkous@gmail.com 2016-03-12 20:41:47 +02:00
commit 7b08992fd0
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/test/java/net/osmand/router/RouteResultPreparationTest.java
View file

@ -68,7 +68,6 @@ public class RouteResultPreparationTest {
public static Collection<Object[]> data() throws IOException { public static Collection<Object[]> data() throws IOException {
InputStream inputStream = RouteResultPreparationTest.class.getResourceAsStream("test_routes.json"); InputStream inputStream = RouteResultPreparationTest.class.getResourceAsStream("test_routes.json");
//InputStream inputStream = new FileInputStream("test_routes.json");
Reader reader = new InputStreamReader(inputStream); Reader reader = new InputStreamReader(inputStream);
Gson gson = new GsonBuilder().setPrettyPrinting().create(); Gson gson = new GsonBuilder().setPrettyPrinting().create();
TestEntry[] testEntries = gson.fromJson(reader, TestEntry[].class); TestEntry[] testEntries = gson.fromJson(reader, TestEntry[].class);
@ -107,7 +106,6 @@ public class RouteResultPreparationTest {
//TODO: action if needed when expectedResults is null //TODO: action if needed when expectedResults is null
} }
//Assert.fail("FAILED!");
System.out.println("segmentId: " + segmentId + " description: " + name); System.out.println("segmentId: " + segmentId + " description: " + name);
} }

4
OsmAnd-java/test/java/net/osmand/router/test_routes.json
View file

@ -10,7 +10,7 @@
"latitude": 45.6952846638807 "latitude": 45.6952846638807
}, },
"expectedResults": { "expectedResults": {
"-94307": "+TL, +TL, +TL, C, TR, TR", "-94361": "TL, TL, TL, C, TR, TR",
"-96062": "+TL, +TL, +TL, +C, TR, TR", "-96062": "+TL, +TL, +TL, +C, TR, TR",
"-96063": "+TL, +TL, +TL, C, TR, TR" "-96063": "+TL, +TL, +TL, C, TR, TR"
} }
@ -31,4 +31,4 @@
"-96063": "+TL, +TL, +TL, +C, TR, TR" "-96063": "+TL, +TL, +TL, +C, TR, TR"
} }
} }
] ]