From 0b1adf675ddbc433baffe855af667794f53aeba1 Mon Sep 17 00:00:00 2001 From: frankknoll Date: Thu, 12 Dec 2024 10:22:39 +0100 Subject: [PATCH] reactivating some ignored tests --- .../RouteResultPreparationNativeTest.java | 3 -- .../router/RouteResultPreparationTest.java | 34 +++++++++---------- .../osmand/router/RouteTestingNativeTest.java | 3 -- .../net/osmand/router/RouteTestingTest.java | 30 ++++++++-------- 4 files changed, 30 insertions(+), 40 deletions(-) diff --git a/OsmAnd-java/src/test/java/net/osmand/router/RouteResultPreparationNativeTest.java b/OsmAnd-java/src/test/java/net/osmand/router/RouteResultPreparationNativeTest.java index b7051944707..07b3a748890 100644 --- a/OsmAnd-java/src/test/java/net/osmand/router/RouteResultPreparationNativeTest.java +++ b/OsmAnd-java/src/test/java/net/osmand/router/RouteResultPreparationNativeTest.java @@ -1,8 +1,5 @@ package net.osmand.router; -import org.junit.Ignore; - -@Ignore public class RouteResultPreparationNativeTest extends RouteResultPreparationTest { public RouteResultPreparationNativeTest(String name, TestEntry te) { diff --git a/OsmAnd-java/src/test/java/net/osmand/router/RouteResultPreparationTest.java b/OsmAnd-java/src/test/java/net/osmand/router/RouteResultPreparationTest.java index c29df60b7ef..3709a34bb65 100644 --- a/OsmAnd-java/src/test/java/net/osmand/router/RouteResultPreparationTest.java +++ b/OsmAnd-java/src/test/java/net/osmand/router/RouteResultPreparationTest.java @@ -5,6 +5,22 @@ import static net.osmand.util.RouterUtilTest.getRoadId; import static net.osmand.util.RouterUtilTest.getRoadStartPoint; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import net.osmand.NativeLibrary; +import net.osmand.PlatformUtil; +import net.osmand.binary.BinaryMapIndexReader; +import net.osmand.router.RoutingConfiguration.RoutingMemoryLimits; +import net.osmand.util.Algorithms; + +import org.apache.commons.logging.Log; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import java.io.File; import java.io.IOException; import java.io.InputStreamReader; @@ -20,28 +36,10 @@ import java.util.Set; import java.util.TreeSet; -import org.apache.commons.logging.Log; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -import net.osmand.NativeLibrary; -import net.osmand.PlatformUtil; -import net.osmand.binary.BinaryMapIndexReader; -import net.osmand.router.RoutingConfiguration.RoutingMemoryLimits; -import net.osmand.util.Algorithms; - /** * Created by yurkiss on 04.03.16. */ -@Ignore @RunWith(Parameterized.class) public class RouteResultPreparationTest { diff --git a/OsmAnd-java/src/test/java/net/osmand/router/RouteTestingNativeTest.java b/OsmAnd-java/src/test/java/net/osmand/router/RouteTestingNativeTest.java index 49ae6fe04e8..8459770be17 100644 --- a/OsmAnd-java/src/test/java/net/osmand/router/RouteTestingNativeTest.java +++ b/OsmAnd-java/src/test/java/net/osmand/router/RouteTestingNativeTest.java @@ -1,8 +1,5 @@ package net.osmand.router; -import org.junit.Ignore; - -@Ignore public class RouteTestingNativeTest extends RouteTestingTest { public RouteTestingNativeTest(String name, TestEntry te) { diff --git a/OsmAnd-java/src/test/java/net/osmand/router/RouteTestingTest.java b/OsmAnd-java/src/test/java/net/osmand/router/RouteTestingTest.java index fbe75d598fa..0255727ff52 100644 --- a/OsmAnd-java/src/test/java/net/osmand/router/RouteTestingTest.java +++ b/OsmAnd-java/src/test/java/net/osmand/router/RouteTestingTest.java @@ -2,6 +2,20 @@ import static net.osmand.util.RouterUtilTest.getNativeLibPath; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import net.osmand.NativeLibrary; +import net.osmand.binary.BinaryMapIndexReader; +import net.osmand.router.RoutingConfiguration.RoutingMemoryLimits; +import net.osmand.util.RouterUtilTest; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import java.io.File; import java.io.IOException; import java.io.InputStreamReader; @@ -15,22 +29,6 @@ import java.util.Set; import java.util.TreeSet; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -import net.osmand.NativeLibrary; -import net.osmand.binary.BinaryMapIndexReader; -import net.osmand.router.RoutingConfiguration.RoutingMemoryLimits; -import net.osmand.util.RouterUtilTest; - -@Ignore @RunWith(Parameterized.class) public class RouteTestingTest { private final TestEntry te;