diff --git a/pom.xml b/pom.xml index 4d617f0..3885512 100644 --- a/pom.xml +++ b/pom.xml @@ -40,11 +40,6 @@ junit-platform-suite test - - org.junit.vintage - junit-vintage-engine - test - org.junit.jupiter junit-jupiter-params diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeMetaTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeMetaTest.java index ce78f8e..5a760df 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeMetaTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeMetaTest.java @@ -29,12 +29,12 @@ import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.Bounds; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.AfterEach; -import org.junit.After; -import org.junit.Ignore; import org.openstreetmap.josm.tools.JosmRuntimeException; import org.openstreetmap.josm.tools.ReflectionUtils; @@ -42,8 +42,7 @@ import mockit.MockUp; import mockit.Invocation; -@Ignore -public class BaseQuadTreeMetaTest extends BaseRectTest { +public abstract class BaseQuadTreeMetaTest extends BaseRectTest { /* change to true to get debug output in commandline */ Boolean debug = false; @@ -148,7 +147,7 @@ public BaseQuadTreeMetaTest(int scenarioIndex_, Integer seenRectOrderSeed_, Inte this.quadTreeMeta = new QuadTreeMeta(this.tileSize, Color.PINK, 0.5, autoOptimize); } - @After + @AfterEach public void destroyQuadTreeMeta() throws Exception { final ThreadPoolExecutor quadTreeEditExecutor = ((ThreadPoolExecutor) TestUtils.getPrivateField(quadTreeMeta, "quadTreeEditExecutor")); @@ -246,8 +245,8 @@ protected void inspectReferenceTiles( } catch (InterruptedException e) { System.out.println(e); } - assertTrue("assertContents will not work reliably in non-default order", - orderSeed == null || constReferenceMask != null || !assertContents); + assertTrue(orderSeed == null || constReferenceMask != null || !assertContents, + "assertContents will not work reliably in non-default order"); assertEquals(dynamicReferences.length, referenceTiles_.length); List remapping = getRemapping(referenceTiles_.length, orderSeed); diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeNodeTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeNodeTest.java index 624cde7..1895285 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeNodeTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeNodeTest.java @@ -8,14 +8,12 @@ import org.openstreetmap.josm.data.Bounds; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Ignore; -@Ignore -public class BaseQuadTreeNodeTest extends BaseRectTest { +public abstract class BaseQuadTreeNodeTest extends BaseRectTest { /* change to true to get debug output in commandline */ Boolean debug = false; @@ -136,8 +134,8 @@ protected void inspectReferenceTiles( boolean write, InspectExtraAssertion extraAssertion ) { - assertTrue("assertContents will not work reliably in non-default order", - orderSeed == null || constReferenceMask != null || !assertContents); + assertTrue(orderSeed == null || constReferenceMask != null || !assertContents, + "assertContents will not work reliably in non-default order"); final List remapping = getRemapping(referenceTiles_.length, orderSeed); for (int i = 0; i < referenceTiles_.length; i++) { @@ -153,8 +151,8 @@ protected void inspectReferenceTiles( boolean refMaskOptAliasable = referenceTileInfo.length >= 5 ? (boolean) referenceTileInfo[4] : false; assertFalse( - "refMask must be boolean if refMaskOptAliasable is true", - refMaskOptAliasable && !Boolean.class.isInstance(refMask) + refMaskOptAliasable && !Boolean.class.isInstance(refMask), + "refMask must be boolean if refMaskOptAliasable is true" ); QuadTreeNode node = quadTreeMeta.quadTreeRoot.getNodeForTile( diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/BaseRectTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/BaseRectTest.java index f93707d..79a2d8d 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/BaseRectTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/BaseRectTest.java @@ -12,10 +12,8 @@ import org.openstreetmap.josm.data.Bounds; -import org.junit.Ignore; -@Ignore -public class BaseRectTest extends BaseTest { +public abstract class BaseRectTest extends BaseTest { // parametrized variables protected final int scenarioIndex; protected final Integer seenRectOrderSeed; diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/BaseTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/BaseTest.java index c7fdb7c..582a1bc 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/BaseTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/BaseTest.java @@ -5,10 +5,8 @@ import java.io.InputStream; import java.io.IOException; -import org.junit.Ignore; -@Ignore -public class BaseTest { +public abstract class BaseTest { protected static byte[] byteArrayFromResource(String resourcePath) throws IOException { InputStream resourceStream = BaseTest.class.getClassLoader().getResourceAsStream(resourcePath); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRegulaFalsiFailureTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRegulaFalsiFailureTest.java index 8dca45a..5b2abc5 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRegulaFalsiFailureTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRegulaFalsiFailureTest.java @@ -1,51 +1,57 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.markseen; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.junit.jupiter.api.Test; public class MarkSeenRegulaFalsiFailureTest { - @Test(expected = MarkSeenRegulaFalsi.ExceededIterationsException.class) + @Test public void testExceededIterations() throws Exception { - MarkSeenRegulaFalsi.regulaFalsi( - x -> Math.cos(x) + (0.1*x*x) - 2., - 0, - 10, - 0.0001, - 4 - ); + assertThrows(MarkSeenRegulaFalsi.ExceededIterationsException.class, () -> + MarkSeenRegulaFalsi.regulaFalsi( + x -> Math.cos(x) + (0.1 * x * x) - 2., + 0, + 10, + 0.0001, + 4 + )); } - @Test(expected = UnsupportedOperationException.class) + @Test public void testDoublePositive() throws Exception { - MarkSeenRegulaFalsi.regulaFalsi( - x -> Math.sin(x), - 3.2, - 3.3, - 0.001, - 8 - ); + assertThrows(UnsupportedOperationException.class, () -> + MarkSeenRegulaFalsi.regulaFalsi( + x -> Math.sin(x), + 3.2, + 3.3, + 0.001, + 8 + )); } - @Test(expected = UnsupportedOperationException.class) + @Test public void testDoubleNegative() throws Exception { - MarkSeenRegulaFalsi.regulaFalsi( - x -> Math.sin(x), - 2.9, - 3.0, - 0.001, - 8 - ); + assertThrows(UnsupportedOperationException.class, () -> + MarkSeenRegulaFalsi.regulaFalsi( + x -> Math.sin(x), + 2.9, + 3.0, + 0.001, + 8 + )); } - @Test(expected = MarkSeenRegulaFalsi.ExceededRangeDetermination.class) + @Test public void testGeometricSearchExceedRange() throws Exception { - // searching upwards, this will never change sign - MarkSeenRegulaFalsi.regulaFalsiGeometricSearch( - x -> x*x, - 9.9, - 2., - 0.001, - 8 - ); + assertThrows(MarkSeenRegulaFalsi.ExceededRangeDetermination.class, () -> + // searching upwards, this will never change sign + MarkSeenRegulaFalsi.regulaFalsiGeometricSearch( + x -> x * x, + 9.9, + 2., + 0.001, + 8 + )); } } diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRegulaFalsiGeometricSearchTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRegulaFalsiGeometricSearchTest.java index 78e5cf1..e21fcd1 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRegulaFalsiGeometricSearchTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRegulaFalsiGeometricSearchTest.java @@ -1,20 +1,19 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.markseen; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.ArrayList; import java.util.Collection; import java.util.function.DoubleUnaryOperator; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) +@ParameterizedClass(name = "{index}-fx-{0}-{1}-lbx-{5}") +@MethodSource("getParameters") public class MarkSeenRegulaFalsiGeometricSearchTest { - @Parameters(name = "{index}-fx-{0}-{1}-lbx-{5}") public static Collection getParameters() throws Exception { final Object[][] unexpanded = new Object[][] { { diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRegulaFalsiTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRegulaFalsiTest.java index 01c3f30..2029236 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRegulaFalsiTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRegulaFalsiTest.java @@ -1,20 +1,19 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.markseen; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.ArrayList; import java.util.Collection; import java.util.function.DoubleUnaryOperator; -import static org.junit.Assert.fail; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) +@ParameterizedClass(name = "{index}-fx-{0}-{1}-{2}-x0-{6}-x1-{7}") +@MethodSource("getParameters") public class MarkSeenRegulaFalsiTest { - @Parameters(name = "{index}-fx-{0}-{1}-{2}-x0-{6}-x1-{7}") public static Collection getParameters() throws Exception { final Object[][] unexpanded = new Object[][] { { diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRootTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRootTest.java index b37efc3..0c9470c 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRootTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRootTest.java @@ -27,31 +27,37 @@ import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.annotations.Main; +import org.openstreetmap.josm.testutils.annotations.FullPreferences; +import org.openstreetmap.josm.testutils.annotations.Projection; +import org.openstreetmap.josm.testutils.annotations.FakeImagery; import org.openstreetmap.josm.testutils.ImagePatternMatching; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import org.awaitility.Awaitility; import com.google.common.collect.ImmutableMap; +@Main +@FullPreferences +@Projection +@FakeImagery +@Timeout(value = 70, threadMode = Timeout.ThreadMode.SEPARATE_THREAD) public class MarkSeenRootTest { private static BufferedImage originalErrorImage; private static BufferedImage originalLoadingImage; - @Rule public JOSMTestRules test = new JOSMTestRules().main().preferences().projection().fakeImagery().timeout(70000); - - @Before + @BeforeEach public void setUp() { // Add a test layer to the layer manager to get the MapFrame & MapView MainApplication.getLayerManager().addLayer(new TestLayer()); diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaAutoOptimizeTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaAutoOptimizeTest.java index 4e70b4f..8520dc3 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaAutoOptimizeTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaAutoOptimizeTest.java @@ -10,20 +10,22 @@ import java.util.Collection; import java.util.concurrent.ThreadPoolExecutor; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.awaitility.Awaitility; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.spi.preferences.Config; -import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.annotations.BasicPreferences; -@RunWith(Parameterized.class) +@BasicPreferences +@Timeout(value = 20, threadMode = Timeout.ThreadMode.SEPARATE_THREAD) +@ParameterizedClass(name = "{index}-scenario-{0}-batchSize-{1}-pause-{2}ms") +@MethodSource("getParameters") public class QuadTreeMetaAutoOptimizeTest extends BaseQuadTreeMetaTest { private static final int variants = 2; @@ -31,7 +33,6 @@ public class QuadTreeMetaAutoOptimizeTest extends BaseQuadTreeMetaTest { protected final int batchSize; protected final int pauseMS; - @Parameters(name = "{index}-scenario-{0}-batchSize-{1}-pause-{2}ms") public static Collection getParameters() throws IOException { ArrayList paramSets = new ArrayList(); Object[][] scenarios = getTestScenarios(); @@ -51,8 +52,6 @@ public static Collection getParameters() throws IOException { return paramSets; } - @Rule public JOSMTestRules test = new JOSMTestRules().main().preferences().timeout(20000); - public QuadTreeMetaAutoOptimizeTest(int scenarioIndex_, int batchSize_, int pauseMS_) throws IOException { super(scenarioIndex_, null, null, true); @@ -99,10 +98,10 @@ public void test() throws Exception { (i, j, dynamicReference, refMask, resultMaskBytes, refMaskBytes, aliasable) -> { if (aliasable) { assertTrue( - "Failed asserting identity " + refMask.toString() + " of ref tile " + j, - dynamicReference.maskReadOperation( + dynamicReference.maskReadOperation( mask -> mask == ((boolean) refMask ? this.quadTreeMeta.FULL_MASK : this.quadTreeMeta.EMPTY_MASK) - ) + ), + "Failed asserting identity " + refMask.toString() + " of ref tile " + j ); } } diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaClearOrderTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaClearOrderTest.java index 82d9e1f..bec1b06 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaClearOrderTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaClearOrderTest.java @@ -1,6 +1,8 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.markseen; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; + import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -10,21 +12,19 @@ import java.util.concurrent.Executors; import java.util.concurrent.RejectedExecutionException; -import static org.junit.Assert.assertArrayEquals; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) +@ParameterizedClass(name = "{index}-scenario-{0}-seeds-{1}-{2}") +@MethodSource("getParameters") public class QuadTreeMetaClearOrderTest extends BaseQuadTreeMetaTest { /* change to true to get debug output in commandline */ Boolean debug = false; private static final int seenRectVariants = 8; private static final int referenceTileVariants = 2; - @Parameters(name = "{index}-scenario-{0}-seeds-{1}-{2}") public static Collection getParameters() throws IOException { ArrayList paramSets = new ArrayList(); Object[][] scenarios = getTestScenarios(); @@ -58,7 +58,8 @@ public QuadTreeMetaClearOrderTest(int scenarioIndex_, Integer seenRectOrderSeed_ super(scenarioIndex_, seenRectOrderSeed_, referenceTileOrderSeed_, false); } - @Test(timeout = 10000) + @Test + @Timeout(value = 10, threadMode = Timeout.ThreadMode.SEPARATE_THREAD) public void testClearUnseen() throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { QuadTreeNodeDynamicReference[] dynamicReferences = createDynamicReferences(this.quadTreeMeta, this.referenceTiles); diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaReferenceTileOrderTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaReferenceTileOrderTest.java index 6da5406..8f098e9 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaReferenceTileOrderTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaReferenceTileOrderTest.java @@ -1,6 +1,8 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.markseen; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; + import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -9,14 +11,13 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static org.junit.Assert.assertArrayEquals; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) +@ParameterizedClass(name = "{index}-scenario-{0}-seeds-{1}-{2}") +@MethodSource("getParameters") public class QuadTreeMetaReferenceTileOrderTest extends BaseQuadTreeMetaTest { /* change to true to get debug output in commandline */ Boolean debug = false; @@ -24,7 +25,6 @@ public class QuadTreeMetaReferenceTileOrderTest extends BaseQuadTreeMetaTest { private static final int seenRectVariants = 8; private static final int referenceTileVariants = 2; - @Parameters(name = "{index}-scenario-{0}-seeds-{1}-{2}") public static Collection getParameters() throws IOException { ArrayList paramSets = new ArrayList(); Object[][] scenarios = getTestScenarios(); @@ -58,7 +58,8 @@ public QuadTreeMetaReferenceTileOrderTest(int scenarioIndex_, Integer seenRectOr super(scenarioIndex_, seenRectOrderSeed_, referenceTileOrderSeed_, false); } - @Test(timeout = 10000) + @Test + @Timeout(value = 10, threadMode = Timeout.ThreadMode.SEPARATE_THREAD) public void test() throws java.lang.InterruptedException, java.util.concurrent.ExecutionException { QuadTreeNodeDynamicReference[] dynamicReferences = createDynamicReferences(this.quadTreeMeta, this.referenceTiles); diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaSeenRectOrderTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaSeenRectOrderTest.java index a742f59..4238aac 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaSeenRectOrderTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaSeenRectOrderTest.java @@ -5,16 +5,16 @@ import java.util.ArrayList; import java.util.Collection; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) +@ParameterizedClass(name = "{index}-scenario-{0}-seed-{1}") +@MethodSource("getParameters") public class QuadTreeMetaSeenRectOrderTest extends BaseQuadTreeMetaTest { private static final int variants = 16; - @Parameters(name = "{index}-scenario-{0}-seed-{1}") public static Collection getParameters() throws IOException { ArrayList paramSets = new ArrayList(); Object[][] scenarios = getTestScenarios(); @@ -39,7 +39,8 @@ public QuadTreeMetaSeenRectOrderTest(int scenarioIndex_, Integer seenRectOrderSe super(scenarioIndex_, seenRectOrderSeed_, referenceTileOrderSeed_, false); } - @Test(timeout = 10000) + @Test + @Timeout(value = 10, threadMode = Timeout.ThreadMode.SEPARATE_THREAD) public void test() { QuadTreeNodeDynamicReference[] dynamicReferences = createDynamicReferences(this.quadTreeMeta, this.referenceTiles); diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeClearOrderTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeClearOrderTest.java index 8d69e5a..9dac79c 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeClearOrderTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeClearOrderTest.java @@ -6,17 +6,16 @@ import java.util.ArrayList; import java.util.Collection; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) +@ParameterizedClass(name = "{index}-scenario-{0}-seeds-{1}-{2}") +@MethodSource("getParameters") public class QuadTreeNodeClearOrderTest extends BaseQuadTreeNodeTest { private static final int seenRectVariants = 8; private static final int referenceTileVariants = 2; - @Parameters(name = "{index}-scenario-{0}-seeds-{1}-{2}") public static Collection getParameters() throws IOException { ArrayList paramSets = new ArrayList(); Object[][] scenarios = getTestScenarios(); diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeClearOtherScenarioTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeClearOtherScenarioTest.java index 886608d..80b6f4e 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeClearOtherScenarioTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeClearOtherScenarioTest.java @@ -6,12 +6,12 @@ import java.util.ArrayList; import java.util.Collection; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) +@ParameterizedClass(name = "{index}-scenarios-{0}-{1}-seeds-{2}-{3}-{4}") +@MethodSource("getParameters") public class QuadTreeNodeClearOtherScenarioTest extends BaseQuadTreeNodeTest { private static final int preSeenRectVariants = 2; private static final int seenRectVariants = 2; @@ -25,7 +25,6 @@ public class QuadTreeNodeClearOtherScenarioTest extends BaseQuadTreeNodeTest { protected final Object[][] preSeenRects; protected final Object[][] preReferenceTiles; - @Parameters(name = "{index}-scenarios-{0}-{1}-seeds-{2}-{3}-{4}") public static Collection getParameters() throws IOException { ArrayList paramSets = new ArrayList(); Object[][] scenarios = getTestScenarios(); diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeExtremeAspectRatioTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeExtremeAspectRatioTest.java index d29523f..5270f2f 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeExtremeAspectRatioTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeExtremeAspectRatioTest.java @@ -1,6 +1,8 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.markseen; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.awt.Color; import java.io.IOException; import java.util.Arrays; @@ -8,14 +10,13 @@ import org.openstreetmap.josm.data.Bounds; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("getParameters") public class QuadTreeNodeExtremeAspectRatioTest extends BaseTest { - @Parameters public static Collection getParameters() throws IOException { return Arrays.asList(scenarios); } @@ -37,15 +38,17 @@ public QuadTreeNodeExtremeAspectRatioTest(int tileSize_, Bounds bounds_, double this.minTilesAcross = minTilesAcross_; } - @Test(expected = QuadTreeNode.ExtremeAspectRatioException.class) + @Test public void test() { - QuadTreeMeta quadTreeMeta = new QuadTreeMeta(this.tileSize, Color.PINK, 0.5, false); - quadTreeMeta.quadTreeRWLock.writeLock().lock(); - - try { - quadTreeMeta.quadTreeRoot.markBoundsSeen(this.bounds, this.minTilesAcross); - } finally { - quadTreeMeta.quadTreeRWLock.writeLock().unlock(); - } + assertThrows(QuadTreeNode.ExtremeAspectRatioException.class, () -> { + QuadTreeMeta quadTreeMeta = new QuadTreeMeta(this.tileSize, Color.PINK, 0.5, false); + quadTreeMeta.quadTreeRWLock.writeLock().lock(); + + try { + quadTreeMeta.quadTreeRoot.markBoundsSeen(this.bounds, this.minTilesAcross); + } finally { + quadTreeMeta.quadTreeRWLock.writeLock().unlock(); + } + }); } } diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeOptimizeTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeOptimizeTest.java index 340e88d..dc0ab72 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeOptimizeTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeOptimizeTest.java @@ -1,6 +1,8 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.markseen; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.awt.Color; import java.io.IOException; import java.util.ArrayList; @@ -9,21 +11,18 @@ import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.tools.Logging; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) +@ParameterizedClass(name = "{index}-scenario-{0}-seed-{1}-stride-{2}") +@MethodSource("getParameters") public class QuadTreeNodeOptimizeTest extends BaseQuadTreeNodeTest { private static final int variants = 6; // parametrized variables protected final Integer optimizeStride; - @Parameters(name = "{index}-scenario-{0}-seed-{1}-stride-{2}") public static Collection getParameters() throws IOException { ArrayList paramSets = new ArrayList(); Object[][] scenarios = getTestScenarios(); @@ -82,8 +81,8 @@ public void test() { if (aliasable) { assertTrue( - "Failed asserting identity " + refMask.toString() + " of ref tile " + j, - resultMask == ((boolean) refMask ? quadTreeMeta.FULL_MASK : quadTreeMeta.EMPTY_MASK) + resultMask == ((boolean) refMask ? quadTreeMeta.FULL_MASK : quadTreeMeta.EMPTY_MASK), + "Failed asserting identity " + refMask.toString() + " of ref tile " + j ); } else if (Boolean.class.isInstance(refMask)) { try { diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeReferenceTileOrderTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeReferenceTileOrderTest.java index 37167ac..b6f1a87 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeReferenceTileOrderTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeReferenceTileOrderTest.java @@ -6,17 +6,16 @@ import java.util.ArrayList; import java.util.Collection; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) +@ParameterizedClass(name = "{index}-scenario-{0}-seeds-{1}-{2}") +@MethodSource("getParameters") public class QuadTreeNodeReferenceTileOrderTest extends BaseQuadTreeNodeTest { private static final int seenRectVariants = 4; private static final int referenceTileVariants = 4; - @Parameters(name = "{index}-scenario-{0}-seeds-{1}-{2}") public static Collection getParameters() throws IOException { ArrayList paramSets = new ArrayList(); Object[][] scenarios = getTestScenarios(); diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeSeenRectOrderTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeSeenRectOrderTest.java index 3f11993..7f54657 100644 --- a/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeSeenRectOrderTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeSeenRectOrderTest.java @@ -7,16 +7,15 @@ import java.util.ArrayList; import java.util.Collection; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) +@ParameterizedClass(name = "{index}-scenario-{0}-seed-{1}") +@MethodSource("getParameters") public class QuadTreeNodeSeenRectOrderTest extends BaseQuadTreeNodeTest { private static final int variants = 16; - @Parameters(name = "{index}-scenario-{0}-seed-{1}") public static Collection getParameters() throws IOException { ArrayList paramSets = new ArrayList(); Object[][] scenarios = getTestScenarios();