Update test

This commit is contained in:
Victor Shcherb 2016-03-30 16:03:06 +02:00
parent 6a9b0cef37
commit 170ce67fcd
3 changed files with 7 additions and 6 deletions

View file

@ -2,6 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test/java"/>
<classpathentry kind="src" path="test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="libs/bsh-core-2.0b4.jar"/>
<classpathentry kind="lib" path="libs/bzip2-20090327.jar"/>

View file

@ -53,8 +53,8 @@
</classpath>
</javac>
<copy todir="${bin.absolute.dir}">
<fileset dir="test/java">
<include name="**/*.json" />
<fileset dir="test/resources">
<include name="**/*" />
</fileset>
</copy>
</target>

View file

@ -2,9 +2,11 @@ package net.osmand.router;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import net.osmand.PlatformUtil;
import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.data.LatLon;
import org.apache.commons.logging.Log;
import org.junit.Assert;
import org.junit.BeforeClass;
@ -63,10 +65,8 @@ public class RouteResultPreparationTest {
@Parameterized.Parameters(name = "{index}: {0}")
public static Collection<Object[]> data() throws IOException {
String fileName = "test/resources/test_turn_lanes.json";
Reader reader = new FileReader(fileName);
String fileName = "/test_turn_lanes.json";
Reader reader = new InputStreamReader(RouteResultPreparationTest.class.getResourceAsStream(fileName));
Gson gson = new GsonBuilder().setPrettyPrinting().create();
TestEntry[] testEntries = gson.fromJson(reader, TestEntry[].class);
ArrayList<Object[]> twoDArray = new ArrayList<Object[]>();