From 7411276fc21ac3868bb915345518ec1ccac29f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Tim=C3=A1r?=
<23311361+gabortim@users.noreply.github.com>
Date: Wed, 11 Nov 2026 13:52:40 +0100
Subject: [PATCH 1/2] see #24924 - migrate the tests from JUnit 4 to JUnit 5
JOSM core drops JUnit 4 support from JOSMTestRules, so the @Rule fields in
MarkSeenRootTest and QuadTreeMetaAutoOptimizeTest would fail with "must
implement MethodRule or TestRule".
- @RunWith(Parameterized.class) -> @ParameterizedClass with constructor injection
- @Rule JOSMTestRules -> @Main, @FullPreferences, @Projection, @FakeImagery, @Timeout
- @Ignore, @Before/@After, @Test(expected/timeout) and assertion argument order
migrated with the OpenRewrite JUnit4to5Migration recipe
- drop junit-vintage-engine
---
pom.xml | 5 --
.../markseen/BaseQuadTreeMetaTest.java | 19 ++---
.../markseen/BaseQuadTreeNodeTest.java | 18 ++---
.../josm/plugins/markseen/BaseRectTest.java | 4 +-
.../josm/plugins/markseen/BaseTest.java | 4 +-
.../MarkSeenRegulaFalsiFailureTest.java | 74 ++++++++++---------
...arkSeenRegulaFalsiGeometricSearchTest.java | 15 ++--
.../markseen/MarkSeenRegulaFalsiTest.java | 15 ++--
.../plugins/markseen/MarkSeenRootTest.java | 32 ++++----
.../QuadTreeMetaAutoOptimizeTest.java | 29 ++++----
.../markseen/QuadTreeMetaClearOrderTest.java | 19 ++---
.../QuadTreeMetaReferenceTileOrderTest.java | 19 ++---
.../QuadTreeMetaSeenRectOrderTest.java | 15 ++--
.../markseen/QuadTreeNodeClearOrderTest.java | 11 ++-
.../QuadTreeNodeClearOtherScenarioTest.java | 11 ++-
.../QuadTreeNodeExtremeAspectRatioTest.java | 33 +++++----
.../markseen/QuadTreeNodeOptimizeTest.java | 19 +++--
.../QuadTreeNodeReferenceTileOrderTest.java | 11 ++-
.../QuadTreeNodeSeenRectOrderTest.java | 11 ++-
19 files changed, 186 insertions(+), 178 deletions(-)
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..62facd9 100644
--- a/test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeMetaTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeMetaTest.java
@@ -29,12 +29,13 @@
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.jupiter.api.Disabled;
-import org.junit.After;
-import org.junit.Ignore;
import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.ReflectionUtils;
@@ -42,7 +43,7 @@
import mockit.MockUp;
import mockit.Invocation;
-@Ignore
+@Disabled
public class BaseQuadTreeMetaTest extends BaseRectTest {
/* change to true to get debug output in commandline */
Boolean debug = false;
@@ -148,7 +149,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 +247,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..e087c23 100644
--- a/test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeNodeTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeNodeTest.java
@@ -8,13 +8,13 @@
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;
+import org.junit.jupiter.api.Disabled;
-@Ignore
+@Disabled
public class BaseQuadTreeNodeTest extends BaseRectTest {
/* change to true to get debug output in commandline */
Boolean debug = false;
@@ -136,8 +136,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 +153,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..27d9bc3 100644
--- a/test/unit/org/openstreetmap/josm/plugins/markseen/BaseRectTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/markseen/BaseRectTest.java
@@ -12,9 +12,9 @@
import org.openstreetmap.josm.data.Bounds;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-@Ignore
+@Disabled
public class BaseRectTest extends BaseTest {
// parametrized variables
protected final int scenarioIndex;
diff --git a/test/unit/org/openstreetmap/josm/plugins/markseen/BaseTest.java b/test/unit/org/openstreetmap/josm/plugins/markseen/BaseTest.java
index c7fdb7c..efa4868 100644
--- a/test/unit/org/openstreetmap/josm/plugins/markseen/BaseTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/markseen/BaseTest.java
@@ -5,9 +5,9 @@
import java.io.InputStream;
import java.io.IOException;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-@Ignore
+@Disabled
public class BaseTest {
protected static byte[] byteArrayFromResource(String resourcePath) throws IOException {
InputStream resourceStream = BaseTest.class.getClassLoader().getResourceAsStream(resourcePath);
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