From 6de0cd3dcca27caa4ab53359e72a5e92c311bbe9 Mon Sep 17 00:00:00 2001
From: "y.ridkous@gmail.com" <y.ridkous@gmail.com>
Date: Sat, 12 Mar 2016 21:22:53 +0200
Subject: [PATCH] Add test libs

---
 OsmAnd-java/build.xml                         |  22 ++++++++++++++----
 .../{libs => test-libs}/gson-2.6.2.jar        | Bin
 .../{libs => test-libs}/hamcrest-core-1.3.jar | Bin
 .../{libs => test-libs}/junit-4.12.jar        | Bin
 4 files changed, 18 insertions(+), 4 deletions(-)
 rename OsmAnd-java/{libs => test-libs}/gson-2.6.2.jar (100%)
 rename OsmAnd-java/{libs => test-libs}/hamcrest-core-1.3.jar (100%)
 rename OsmAnd-java/{libs => test-libs}/junit-4.12.jar (100%)

diff --git a/OsmAnd-java/build.xml b/OsmAnd-java/build.xml
index 8e50b2386f..3851c79f4c 100644
--- a/OsmAnd-java/build.xml
+++ b/OsmAnd-java/build.xml
@@ -9,9 +9,12 @@
 	<property name="bin.dir" value="bin" />
 	<property name="bin.absolute.dir" location="${bin.dir}" />
 	<property name="lib.dir" value="libs" />
+	<property name="lib.absolute.dir" location="${lib.dir}" />
 	<property name="unit.dir" value="test/java" />
 	<property name="unit.absolute.dir" location="${unit.dir}" />
-	<property name="lib.absolute.dir" location="${lib.dir}" />
+	<property name="test.lib.dir" value="test-libs" />
+	<property name="test.lib.absolute.dir" location="${test.lib.dir}" />
+
 	<property name="java.encoding" value="UTF-8" />
 
 	<path id="build.path">
@@ -20,6 +23,13 @@
 		</fileset>
 	</path>
 
+	<path id="test-lib.path">
+		<fileset dir="${test.lib.absolute.dir}">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+
+
 	<path id="unit.test.path">
 		<path refid="build.path"/>
 		<pathelement path="test/java"/>
@@ -36,7 +46,10 @@
 
 	<target name="compileUnitTests" depends="compile">
 		<javac srcdir="test/" destdir="${bin.absolute.dir}">
-			<classpath refid="unit.test.path"/>
+			<classpath>
+				<path refid="build.path"/>
+				<path refid="test-lib.path" />
+			</classpath>
 		</javac>
 		<copy todir="${bin.absolute.dir}">
 			<fileset dir="test/java">
@@ -50,6 +63,7 @@
 			<classpath>
 				<pathelement path="bin"/>
 				<path refid="build.path"/>
+				<path refid="test-lib.path" />
 			</classpath>
 			<test name="net.osmand.router.RouteResultPreparationTest" haltonfailure="no" outfile="result">
 				<formatter type="plain"/>
@@ -92,7 +106,7 @@
 	    </copy>
 	    <copy todir="${src.absolute.dir}">
 			<fileset dir="${protobuf.src}"/>
-		</copy> 
+		</copy>
 		<patch patchfile="protobuf.patch" dir=".."/>
 	</target>
 	<target name="compile" depends="-dirs,copy_resources">
@@ -113,7 +127,7 @@
 		</exec>
 		<antcall target="jar" />
 	</target>
-	
+
 	<target name="native-legacy-libs-jar" depends="compile">
 		<exec command="bash collect_legacy_libs.sh" failonerror="true">
 		</exec>
diff --git a/OsmAnd-java/libs/gson-2.6.2.jar b/OsmAnd-java/test-libs/gson-2.6.2.jar
similarity index 100%
rename from OsmAnd-java/libs/gson-2.6.2.jar
rename to OsmAnd-java/test-libs/gson-2.6.2.jar
diff --git a/OsmAnd-java/libs/hamcrest-core-1.3.jar b/OsmAnd-java/test-libs/hamcrest-core-1.3.jar
similarity index 100%
rename from OsmAnd-java/libs/hamcrest-core-1.3.jar
rename to OsmAnd-java/test-libs/hamcrest-core-1.3.jar
diff --git a/OsmAnd-java/libs/junit-4.12.jar b/OsmAnd-java/test-libs/junit-4.12.jar
similarity index 100%
rename from OsmAnd-java/libs/junit-4.12.jar
rename to OsmAnd-java/test-libs/junit-4.12.jar