From 46a8ce682eb562934030307b3cae410501209480 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 30 Mar 2016 15:08:32 +0200
Subject: [PATCH] Update tests

---
 OsmAnd-java/.classpath                              |   6 +++---
 OsmAnd-java/build.xml                               |   2 +-
 .../{run_turn_lanes_test.sh => run_tests.sh}        |   2 +-
 .../osmand/router/RouteResultPreparationTest.java   |   6 +-----
 OsmAnd-java/{test-libs => test/libs}/gson-2.6.2.jar | Bin
 .../{test-libs => test/libs}/hamcrest-core-1.3.jar  | Bin
 OsmAnd-java/{test-libs => test/libs}/junit-4.12.jar | Bin
 .../{ => test/resources}/test_turn_lanes.json       |   0
 8 files changed, 6 insertions(+), 10 deletions(-)
 rename OsmAnd-java/{run_turn_lanes_test.sh => run_tests.sh} (87%)
 rename OsmAnd-java/{test-libs => test/libs}/gson-2.6.2.jar (100%)
 rename OsmAnd-java/{test-libs => test/libs}/hamcrest-core-1.3.jar (100%)
 rename OsmAnd-java/{test-libs => test/libs}/junit-4.12.jar (100%)
 rename OsmAnd-java/{ => test/resources}/test_turn_lanes.json (100%)

diff --git a/OsmAnd-java/.classpath b/OsmAnd-java/.classpath
index ad207c04e2..67ed15d9d9 100644
--- a/OsmAnd-java/.classpath
+++ b/OsmAnd-java/.classpath
@@ -12,8 +12,8 @@
 	<classpathentry kind="lib" path="libs/tuprolog.jar"/>
 	<classpathentry kind="lib" path="libs/icu4j-49_1_patched.jar"/>
 	<classpathentry kind="lib" path="libs/gnu-trove-osmand.jar"/>
-	<classpathentry kind="lib" path="test-libs/gson-2.6.2.jar"/>
-	<classpathentry kind="lib" path="test-libs/hamcrest-core-1.3.jar"/>
-	<classpathentry kind="lib" path="test-libs/junit-4.12.jar"/>
+	<classpathentry kind="lib" path="test/libs/gson-2.6.2.jar"/>
+	<classpathentry kind="lib" path="test/libs/hamcrest-core-1.3.jar"/>
+	<classpathentry kind="lib" path="test/libs/junit-4.12.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/OsmAnd-java/build.xml b/OsmAnd-java/build.xml
index 3e86df35d9..e318fad91b 100644
--- a/OsmAnd-java/build.xml
+++ b/OsmAnd-java/build.xml
@@ -15,7 +15,7 @@
 	<property name="test.lib.dir" value="test-libs" />
 	<property name="test.lib.absolute.dir" location="${test.lib.dir}" />
 	<property name="reports.tests" value="${basedir}/test-results" />
-
+	<property name="srctests.dir" value="test/java"/>
 	<property name="java.encoding" value="UTF-8" />
 
 	<path id="build.path">
diff --git a/OsmAnd-java/run_turn_lanes_test.sh b/OsmAnd-java/run_tests.sh
similarity index 87%
rename from OsmAnd-java/run_turn_lanes_test.sh
rename to OsmAnd-java/run_tests.sh
index 9561a74452..2b2eec9feb 100755
--- a/OsmAnd-java/run_turn_lanes_test.sh
+++ b/OsmAnd-java/run_tests.sh
@@ -6,5 +6,5 @@ if [ ! -d bin ];
     ant build
 fi
 echo "Starting tests..."
-ant run-turn-lanes-test
+ant junits
 echo "Results can be found in result.txt file."
\ No newline at end of file
diff --git a/OsmAnd-java/test/java/net/osmand/router/RouteResultPreparationTest.java b/OsmAnd-java/test/java/net/osmand/router/RouteResultPreparationTest.java
index f5124db307..a7638b5694 100644
--- a/OsmAnd-java/test/java/net/osmand/router/RouteResultPreparationTest.java
+++ b/OsmAnd-java/test/java/net/osmand/router/RouteResultPreparationTest.java
@@ -64,7 +64,7 @@ public class RouteResultPreparationTest {
     @Parameterized.Parameters(name = "{index}: {0}")
     public static Collection<Object[]> data() throws IOException {
 
-        String fileName = "test_turn_lanes.json";
+        String fileName = "test/resources/test_turn_lanes.json";
 
         Reader reader = new FileReader(fileName);
         Gson gson = new GsonBuilder().setPrettyPrinting().create();
@@ -101,8 +101,6 @@ public class RouteResultPreparationTest {
                     String expectedResult = expectedResults.get(segmentId);
                     if (expectedResult != null) {
                         Assert.assertEquals("Segment " + segmentId, expectedResult, lanes);
-                    } else {
-                        //TODO: action if needed when expectedResults is null
                     }
 
                     System.out.println("segmentId: " + segmentId + " description: " + name);
@@ -125,7 +123,6 @@ public class RouteResultPreparationTest {
 
 
     private String getLanesString(RouteSegmentResult segment) {
-        String turn = segment.getTurnType().toString();
         final int[] lns = segment.getTurnType().getLanes();
         if (lns != null) {
             String s = "";
@@ -152,7 +149,6 @@ public class RouteResultPreparationTest {
 
             }
             s += "";
-            turn += s;
             return s;
         }
         return null;
diff --git a/OsmAnd-java/test-libs/gson-2.6.2.jar b/OsmAnd-java/test/libs/gson-2.6.2.jar
similarity index 100%
rename from OsmAnd-java/test-libs/gson-2.6.2.jar
rename to OsmAnd-java/test/libs/gson-2.6.2.jar
diff --git a/OsmAnd-java/test-libs/hamcrest-core-1.3.jar b/OsmAnd-java/test/libs/hamcrest-core-1.3.jar
similarity index 100%
rename from OsmAnd-java/test-libs/hamcrest-core-1.3.jar
rename to OsmAnd-java/test/libs/hamcrest-core-1.3.jar
diff --git a/OsmAnd-java/test-libs/junit-4.12.jar b/OsmAnd-java/test/libs/junit-4.12.jar
similarity index 100%
rename from OsmAnd-java/test-libs/junit-4.12.jar
rename to OsmAnd-java/test/libs/junit-4.12.jar
diff --git a/OsmAnd-java/test_turn_lanes.json b/OsmAnd-java/test/resources/test_turn_lanes.json
similarity index 100%
rename from OsmAnd-java/test_turn_lanes.json
rename to OsmAnd-java/test/resources/test_turn_lanes.json