Merge pull request #2331 from yurkiss/test_lanes

Test libs in separate folder

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"/>