+ * This must not be called before the locale has been set up for the test: the provider only covers the locales + * listed in {@link JosmDecimalFormatSymbolsProvider#getAvailableLocales}, so on a machine whose default locale + * is not one of them (say {@code hu_HU}) it would answer with the platform separator instead. + * @param s the expected message, using {@code U+202F} as the digit group separator + * @return {@code s} with the digit group separator in effect substituted + */ private static String u202f(String s) { return s.replace('\u202F', DecimalFormatSymbols.getInstance().getGroupingSeparator()); } diff --git a/test/unit/org/openstreetmap/josm/testutils/ExpectedRootException.java b/test/unit/org/openstreetmap/josm/testutils/ExpectedRootException.java deleted file mode 100644 index 21516d6787..0000000000 --- a/test/unit/org/openstreetmap/josm/testutils/ExpectedRootException.java +++ /dev/null @@ -1,119 +0,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.testutils; - -import static org.openstreetmap.josm.testutils.ThrowableRootCauseMatcher.hasRootCause; - -import org.hamcrest.Matcher; -import org.junit.rules.ExpectedException; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - -/** - * The {@code ExpectedRootException} behaves exactly as JUnit's {@link ExpectedException} rule. - * This class is needed to add {@link #expectRootCause} method, which has been rejected by JUnit developers, - * and {@code ExpectedException} cannot be extended because it has a private constructor. - * @see Github pull request - * @deprecated Use matchers instead with the return from {@link org.junit.jupiter.api.Assertions#assertThrows} - */ -@Deprecated -public final class ExpectedRootException implements TestRule { - - private final ExpectedException rule = ExpectedException.none(); - - /** - * Returns a {@linkplain TestRule rule} that expects no exception to be thrown (identical to behavior without this rule). - * @return {@code ExpectedRootException} instance - */ - @SuppressFBWarnings("NM_CLASS_NOT_EXCEPTION") - public static ExpectedRootException none() { - return new ExpectedRootException(); - } - - private ExpectedRootException() { - } - - /** - * Specifies the failure message for tests that are expected to throw an exception but do not throw any. - * You can use a {@code %s} placeholder for the description of the expected exception. - * E.g. "Test doesn't throw %s." will fail with the error message "Test doesn't throw an instance of foo.". - * - * @param message exception detail message - * @return the rule itself - */ - public ExpectedRootException reportMissingExceptionWithMessage(String message) { - rule.reportMissingExceptionWithMessage(message); - return this; - } - - @Override - public Statement apply(Statement base, Description description) { - return rule.apply(base, description); - } - - /** - * Verify that your code throws an exception that is an instance of specific {@code type}. - *
@Test
- * public void throwsExceptionWithSpecificType() {
- * thrown.expect(NullPointerException.class);
- * throw new NullPointerException();
- * }
- * @param type Throwable type
- * @return {@code this}
- */
- public ExpectedRootException expect(Class type) {
- rule.expect(type);
- return this;
- }
-
- /**
- * Verify that your code throws an exception whose message contains a specific text.
- * @Test
- * public void throwsExceptionWhoseMessageContainsSpecificText() {
- * thrown.expectMessage("happened");
- * throw new NullPointerException("What happened?");
- * }
- * @param substring substring to expect in error message
- * @return {@code this}
- */
- public ExpectedRootException expectMessage(String substring) {
- rule.expectMessage(substring);
- return this;
- }
-
- /**
- * Verify that your code throws an exception whose immediate cause is matched by the given Hamcrest matcher.
- * @Test
- * public void throwsExceptionWhoseCauseCompliesWithMatcher() {
- * NullPointerException rootCause = new NullPointerException();
- * IllegalStateException immediateCause = new IllegalStateException(rootCause);
- * thrown.expectCause(isA(NullPointerException.class));
- * throw new IllegalArgumentException(immediateCause);
- * }
- * @param expectedCause expected cause
- * @return {@code this}
- */
- public ExpectedRootException expectCause(Matcher expectedCause) {
- rule.expectCause(expectedCause);
- return this;
- }
-
- /**
- * Verify that you code throws an exception whose root cause is matched by the given Hamcrest matcher.
- * @Test
- * public void throwsExceptionWhoseRootCauseCompliesWithMatcher() {
- * NullPointerException rootCause = new NullPointerException();
- * IllegalStateException immediateCause = new IllegalStateException(rootCause);
- * thrown.expectRootCause(isA(NullPointerException.class));
- * throw new IllegalArgumentException(immediateCause);
- * }
- * @param expectedRootCause expected root cause
- * @return {@code this}
- */
- public ExpectedRootException expectRootCause(Matcher expectedRootCause) {
- rule.expect(hasRootCause(expectedRootCause));
- return this;
- }
-}
diff --git a/test/unit/org/openstreetmap/josm/testutils/ImagePatternMatching.java b/test/unit/org/openstreetmap/josm/testutils/ImagePatternMatching.java
index 8d4f589744..cdc0263346 100644
--- a/test/unit/org/openstreetmap/josm/testutils/ImagePatternMatching.java
+++ b/test/unit/org/openstreetmap/josm/testutils/ImagePatternMatching.java
@@ -13,7 +13,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
/**
* Utilities to aid in making assertions about images using regular expressions.
diff --git a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
index f33894ff38..76b2b4f521 100644
--- a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
+++ b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
@@ -7,16 +7,14 @@ import java.awt.event.WindowEvent;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.security.GeneralSecurityException;
-import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Map;
import java.util.TimeZone;
@@ -30,11 +28,6 @@ import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.InitializationError;
-import org.junit.runners.model.Statement;
import org.openstreetmap.josm.JOSMFixture;
import org.openstreetmap.josm.TestUtils;
import org.openstreetmap.josm.actions.DeleteAction;
@@ -44,14 +37,12 @@ import org.openstreetmap.josm.data.SystemOfMeasurement;
import org.openstreetmap.josm.data.UserIdentityManager;
import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.data.osm.User;
-import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
import org.openstreetmap.josm.data.preferences.JosmUrls;
import org.openstreetmap.josm.data.projection.ProjectionRegistry;
import org.openstreetmap.josm.data.projection.Projections;
import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard;
-import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreferenceTestIT;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.io.OsmApiInitializationException;
@@ -73,11 +64,10 @@ import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.MemoryManagerTest;
-import org.openstreetmap.josm.tools.bugreport.ReportedException;
+import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.date.DateUtils;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import mockit.internal.state.SavePoint;
/**
* This class runs a test in an environment that resembles the one used by the JOSM main application.
@@ -86,16 +76,22 @@ import mockit.internal.state.SavePoint;
* For example, invoking {@link #preferences()} gives you access to the (default) preferences.
*
* @author Michael Zangl
+ * @deprecated use the JUnit 5 annotations in {@link org.openstreetmap.josm.testutils.annotations} instead,
+ * e.g. {@link org.openstreetmap.josm.testutils.annotations.BasicPreferences} instead of {@link #preferences()}
*/
-public class JOSMTestRules implements TestRule, AfterEachCallback, BeforeEachCallback, AfterAllCallback, BeforeAllCallback {
- private int timeout = isDebugMode() ? -1 : 10 * 1000;
- private TemporaryFolder josmHome;
+@Deprecated
+public class JOSMTestRules implements AfterEachCallback, BeforeEachCallback, AfterAllCallback, BeforeAllCallback {
+ private boolean useJosmHome;
+ private File josmHome;
+ private String originalJosmHome;
private boolean usePreferences = false;
private APIType useAPI = APIType.NONE;
private String i18n = null;
private TileSourceRule tileSourceRule;
private String assumeRevisionString;
private Version originalVersion;
+ private boolean revisionOverridden;
+ private String revisionBeforeOverride;
private Runnable mapViewStateMockingRunnable;
private Runnable navigableComponentMockingRunnable;
private Runnable edtAssertionMockingRunnable;
@@ -109,19 +105,14 @@ public class JOSMTestRules implements TestRule, AfterEachCallback, BeforeEachCal
private boolean territories;
private boolean metric;
private boolean main;
- /**
- * This boolean is only used to indicate if JUnit5 is used in a test. If it is,
- * we must not call after in {@link JOSMTestRules.CreateJosmEnvironment#evaluate}.
- * TODO: Remove JUnit4 as a whole sometime after 2021-01-01 (~6 month lead time for plugins)
- */
- private boolean junit5;
/**
* Disable the default timeout for this test. Use with care.
* @return this instance, for easy chaining
+ * @deprecated no-op, timeouts are handled by {@link org.junit.jupiter.api.Timeout}
*/
+ @Deprecated
public JOSMTestRules noTimeout() {
- timeout = -1;
return this;
}
@@ -129,10 +120,10 @@ public class JOSMTestRules implements TestRule, AfterEachCallback, BeforeEachCal
* Set a timeout for all tests in this class. Local method timeouts may only reduce this timeout.
* @param millis The timeout duration in milliseconds.
* @return this instance, for easy chaining
- * @see org.junit.jupiter.api.Timeout
+ * @deprecated no-op, use {@link org.junit.jupiter.api.Timeout} instead
*/
+ @Deprecated
public JOSMTestRules timeout(int millis) {
- timeout = isDebugMode() ? -1 : millis;
return this;
}
@@ -153,7 +144,7 @@ public class JOSMTestRules implements TestRule, AfterEachCallback, BeforeEachCal
* @return this instance, for easy chaining
*/
private JOSMTestRules josmHome() {
- josmHome = new TemporaryFolder();
+ useJosmHome = true;
return this;
}
@@ -410,15 +401,17 @@ public class JOSMTestRules implements TestRule, AfterEachCallback, BeforeEachCal
* @return this instance, for easy chaining
*/
public JOSMTestRules parameters() {
+ // Set up and tear down the environment immediately, as parameters are computed before anything else
try {
- apply(new Statement() {
- @Override
- public void evaluate() throws Throwable {
- // Do nothing. Hack needed because @Parameters are computed before anything else
- }
- }, Description.createSuiteDescription(ImageryPreferenceTestIT.class)).evaluate();
- } catch (Throwable e) {
+ setUp();
+ } catch (ReflectiveOperationException e) {
Logging.error(e);
+ } finally {
+ try {
+ tearDown();
+ } catch (ReflectiveOperationException e) {
+ Logging.error(e);
+ }
}
return this;
}
@@ -431,65 +424,64 @@ public class JOSMTestRules implements TestRule, AfterEachCallback, BeforeEachCal
}
}
- @Override
- public Statement apply(Statement base, Description description) {
- // First process any Override* annotations for per-test overrides.
- // The following only work because "option" methods modify JOSMTestRules in-place
- final OverrideAssumeRevision overrideAssumeRevision = description.getAnnotation(OverrideAssumeRevision.class);
- if (overrideAssumeRevision != null) {
- this.assumeRevision(overrideAssumeRevision.value());
- }
- final OverrideTimeout overrideTimeout = description.getAnnotation(OverrideTimeout.class);
- if (overrideTimeout != null) {
- this.timeout(overrideTimeout.value());
- }
- Statement statement = base;
- // counter-intuitively, Statements which need to have their setup routines performed *after* another one need to
- // be added into the chain *before* that one, so that it ends up on the "inside".
- if (timeout > 0) {
- // TODO: new DisableOnDebug(timeout)
- statement = new FailOnTimeoutStatement(statement, timeout);
- }
-
- // this half of TileSourceRule's initialization must happen after josm is set up
+ /**
+ * Build the test environment. The mock tile server, if any, is started first so that it can be initializing in
+ * parallel with the rest of the setup; registering its layers has to wait until josm itself has been set up.
+ * @throws ReflectiveOperationException if a reflective access error occurs
+ */
+ private void setUp() throws ReflectiveOperationException {
if (this.tileSourceRule != null) {
- statement = this.tileSourceRule.applyRegisterLayers(statement, description);
+ this.tileSourceRule.startServer();
}
-
- statement = new CreateJosmEnvironment(statement);
- if (josmHome != null) {
- statement = josmHome.apply(statement, description);
+ before();
+ if (this.tileSourceRule != null) {
+ this.tileSourceRule.registerLayers();
}
+ }
- // run mock tile server as the outermost Statement (started first) so it can hopefully be initializing in
- // parallel with other setup
- if (this.tileSourceRule != null) {
- statement = this.tileSourceRule.applyRunServer(statement, description);
+ /**
+ * Tear the test environment down again, in the reverse order of {@link #setUp}.
+ * @throws ReflectiveOperationException if a reflective access error occurs
+ */
+ private void tearDown() throws ReflectiveOperationException {
+ try {
+ if (this.tileSourceRule != null) {
+ this.tileSourceRule.unregisterLayers();
+ }
+ after();
+ } finally {
+ restoreJosmHome();
+ if (this.tileSourceRule != null) {
+ this.tileSourceRule.stopServer();
+ }
}
- return statement;
}
@Override
public void beforeEach(ExtensionContext context) throws Exception {
- this.junit5 = true;
- Statement temporaryStatement = new Statement() {
- @Override
- public void evaluate() throws Throwable {
- // do nothing
- }
- };
- try {
- this.apply(temporaryStatement,
- Description.createTestDescription(this.getClass(), "JOSMTestRules JUnit5 Compatibility"))
- .evaluate();
- } catch (Throwable e) {
- throw new Exception(e);
- }
+ // First process any Override* annotations for per-test overrides.
+ // The following only works because "option" methods modify JOSMTestRules in-place
+ context.getTestMethod()
+ .map(method -> method.getAnnotation(OverrideAssumeRevision.class))
+ .ifPresent(annotation -> {
+ this.revisionOverridden = true;
+ this.revisionBeforeOverride = this.assumeRevisionString;
+ this.assumeRevision(annotation.value());
+ });
+ setUp();
}
@Override
public void afterEach(ExtensionContext context) throws Exception {
- after();
+ try {
+ tearDown();
+ } finally {
+ // the override only applies to the annotated test, not to the ones run after it with the same instance
+ if (this.revisionOverridden) {
+ this.assumeRevisionString = this.revisionBeforeOverride;
+ this.revisionOverridden = false;
+ }
+ }
}
@Override
@@ -504,26 +496,29 @@ public class JOSMTestRules implements TestRule, AfterEachCallback, BeforeEachCal
/**
* Set up before running a test
- * @throws InitializationError If an error occurred while creating the required environment.
* @throws ReflectiveOperationException if a reflective access error occurs
*/
- protected void before() throws InitializationError, ReflectiveOperationException {
+ protected void before() throws ReflectiveOperationException {
cleanUpFromJosmFixture();
if (this.assumeRevisionString != null) {
- this.originalVersion = Version.getInstance();
+ // as a static extension, before() runs again for each test without after() in between
+ if (this.originalVersion == null) {
+ this.originalVersion = Version.getInstance();
+ }
final Version replacementVersion = new MockVersion(this.assumeRevisionString);
TestUtils.setPrivateStaticField(Version.class, "instance", replacementVersion);
}
// Add JOSM home
- if (josmHome != null) {
+ if (useJosmHome && josmHome == null) {
try {
- File home = josmHome.newFolder();
- System.setProperty("josm.home", home.getAbsolutePath());
+ originalJosmHome = System.getProperty("josm.home");
+ josmHome = Files.createTempDirectory("josm-test-home").toFile();
+ System.setProperty("josm.home", josmHome.getAbsolutePath());
JosmBaseDirectories.getInstance().clearMemos();
} catch (IOException e) {
- throw new InitializationError(e);
+ throw new JosmRuntimeException(e);
}
}
@@ -603,7 +598,7 @@ public class JOSMTestRules implements TestRule, AfterEachCallback, BeforeEachCal
try {
OsmApi.getOsmApi().initialize(null);
} catch (OsmTransferCanceledException | OsmApiInitializationException e) {
- throw new InitializationError(e);
+ throw new JosmRuntimeException(e);
}
}
@@ -663,16 +658,11 @@ public class JOSMTestRules implements TestRule, AfterEachCallback, BeforeEachCal
* Cleans the Layer manager and the SelectionEventManager.
* You don't need to call this during tests, the test environment will do it for you.
* @since 12070
+ * @deprecated use {@link JOSMFixture#cleanLayerEnvironment()} instead
*/
+ @Deprecated
public static void cleanLayerEnvironment() {
- // Get the instance before cleaning - this ensures that it is initialized.
- SelectionEventManager eventManager = SelectionEventManager.getInstance();
- MainApplication.getLayerManager().resetState();
- try {
- eventManager.resetState();
- } catch (IllegalArgumentException e) {
- Logging.trace(e);
- }
+ JOSMFixture.cleanLayerEnvironment();
}
/**
@@ -703,8 +693,9 @@ public class JOSMTestRules implements TestRule, AfterEachCallback, BeforeEachCal
ProjectionRegistry.clearProjectionChangeListeners();
Preferences.main().resetToInitialState();
- if (this.assumeRevisionString != null && this.originalVersion != null) {
+ if (this.originalVersion != null) {
TestUtils.setPrivateStaticField(Version.class, "instance", this.originalVersion);
+ this.originalVersion = null;
}
Window[] windows = Window.getWindows();
@@ -726,99 +717,26 @@ public class JOSMTestRules implements TestRule, AfterEachCallback, BeforeEachCal
JosmDefaults.DefaultsExtension.memoryCleanup();
}
- private final class CreateJosmEnvironment extends Statement {
- private final Statement base;
-
- private CreateJosmEnvironment(Statement base) {
- this.base = base;
- }
-
- @Override
- public void evaluate() throws Throwable {
- // Needed since JMockit doesn't clean up JUnit4 vintage tests. We really shouldn't have to touch JMockit internal classes. :(
- SavePoint savePoint = new SavePoint();
- before();
- try {
- base.evaluate();
- } finally {
- if (!junit5) {
- after();
- savePoint.rollback();
- }
- }
- }
- }
-
- enum APIType {
- NONE, FAKE, DEV
- }
-
/**
- * The junit timeout statement has problems when switching timezones. This one does not.
- * @author Michael Zangl
+ * Delete the temporary josm home created by {@link #before}, if any, and switch {@code josm.home} back.
+ * Called by {@link #tearDown} even when {@link #after} fails part way, so that the next test does not inherit
+ * this one's home.
*/
- private static class FailOnTimeoutStatement extends Statement {
-
- private final int timeout;
- private final Statement original;
-
- FailOnTimeoutStatement(Statement original, int timeout) {
- this.original = original;
- this.timeout = timeout;
- }
-
- @Override
- public void evaluate() throws Throwable {
- TimeoutThread thread = new TimeoutThread(original);
- thread.setDaemon(true);
- thread.start();
- thread.join(timeout);
- thread.interrupt();
- if (!thread.isDone) {
- Throwable exception = thread.getExecutionException();
- if (exception != null) {
- throw exception;
- } else {
- if (Logging.isLoggingEnabled(Logging.LEVEL_DEBUG)) {
- // i.e. skip expensive formatting of stack trace if it won't be shown
- final StringWriter sw = new StringWriter();
- new ReportedException(exception).printReportThreadsTo(new PrintWriter(sw));
- Logging.debug("Thread state at timeout: {0}", sw);
- }
- throw new Exception(MessageFormat.format("Test timed out after {0}ms", timeout));
- }
- }
- }
- }
-
- private static final class TimeoutThread extends Thread {
- public boolean isDone;
- private final Statement original;
- private Throwable exceptionCaught;
-
- private TimeoutThread(Statement original) {
- super("Timeout runner");
- this.original = original;
- }
-
- public Throwable getExecutionException() {
- return exceptionCaught;
- }
-
- @Override
- public void run() {
- try {
- original.evaluate();
- isDone = true;
- } catch (Throwable e) {
- exceptionCaught = e;
+ private void restoreJosmHome() {
+ if (josmHome != null) {
+ Utils.deleteDirectory(josmHome);
+ josmHome = null;
+ if (originalJosmHome != null) {
+ System.setProperty("josm.home", originalJosmHome);
+ } else {
+ System.clearProperty("josm.home");
}
+ JosmBaseDirectories.getInstance().clearMemos();
}
}
- private boolean isDebugMode() {
- return java.lang.management.ManagementFactory.getRuntimeMXBean().
- getInputArguments().toString().indexOf("-agentlib:jdwp") > 0;
+ enum APIType {
+ NONE, FAKE, DEV
}
/**
@@ -838,8 +756,9 @@ public class JOSMTestRules implements TestRule, AfterEachCallback, BeforeEachCal
/**
* Override this test's timeout.
- * @see JOSMTestRules#timeout(int)
+ * @deprecated no-op, use {@link org.junit.jupiter.api.Timeout} instead
*/
+ @Deprecated
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
diff --git a/test/unit/org/openstreetmap/josm/testutils/TileSourceRule.java b/test/unit/org/openstreetmap/josm/testutils/TileSourceRule.java
index c55dc43906..bccd887b21 100644
--- a/test/unit/org/openstreetmap/josm/testutils/TileSourceRule.java
+++ b/test/unit/org/openstreetmap/josm/testutils/TileSourceRule.java
@@ -17,23 +17,20 @@ import java.util.Objects;
import javax.imageio.ImageIO;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
import org.openstreetmap.josm.tools.Logging;
+import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.MappingBuilder;
import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
/**
- * A JUnit rule, based on {@link WireMockRule} to provide a test with a simple mock tile server serving multiple tile
- * sources.
+ * A {@link WireMockServer} providing a test with a simple mock tile server serving multiple tile sources.
*/
-public class TileSourceRule extends WireMockRule {
+public class TileSourceRule extends WireMockServer {
private static class ByteArrayWrapper {
public final byte[] byteArray;
@@ -61,7 +58,7 @@ public class TileSourceRule extends WireMockRule {
/**
* @return a {@link MappingBuilder} representing the request matching properties of this tile source, suitable
- * for passing to {@link WireMockRule#stubFor}.
+ * for passing to {@link WireMockServer#stubFor}.
*/
public abstract MappingBuilder getMappingBuilder();
@@ -167,6 +164,11 @@ public class TileSourceRule extends WireMockRule {
protected final boolean clearSlippyMapSources;
protected final boolean registerInLayerList;
+ private List- * This is hidden for now, since all internal used {@link JOSMTestRules#fakeImagery()} instead of - * {@link JOSMTestRules#fakeImagery(TileSourceRule)}. Before making this public, we'll probably want to move - * {@link TileSourceRule.ConstSource} and it's subclasses around. + * This is hidden for now. Before making this public, we'll probably want to move + * {@link TileSourceRule.ConstSource} and its subclasses around. *
* The three boolean parameters control whether to perform various steps registering the tile sources with parts
* of JOSM's internals as part of the setup process. It is advised to only enable any of these if it can be ensured
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/FullPreferences.java b/test/unit/org/openstreetmap/josm/testutils/annotations/FullPreferences.java
index 384befe9cd..7791ca0439 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/FullPreferences.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/FullPreferences.java
@@ -14,11 +14,10 @@ import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.testutils.annotations.BasicPreferences.BasicPreferencesExtension;
/**
- * Allow tests to use JOSM preferences with default values (see {@link JOSMTestRules#preferences()})
+ * Allow tests to use JOSM preferences with default values
* @author Taylor Smock
* @see BasicPreferences (often enough for simple tests).
* @since 18037
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/HTTPS.java b/test/unit/org/openstreetmap/josm/testutils/annotations/HTTPS.java
index 579e1fa861..9e9bddf8db 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/HTTPS.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/HTTPS.java
@@ -15,13 +15,11 @@ import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.openstreetmap.josm.io.CertificateAmendment;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
/**
* Set up the HTTPS certificates
* @author Taylor Smock
* @since 18893
- * @see JOSMTestRules#https()
*/
@Inherited
@Documented
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/I18n.java b/test/unit/org/openstreetmap/josm/testutils/annotations/I18n.java
index ae515470e5..9fdeef0c56 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/I18n.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/I18n.java
@@ -18,7 +18,6 @@ import org.openstreetmap.josm.tools.LanguageInfo;
/**
* Enables the i18n module for this test.
* @author Taylor Smock
- * @see org.openstreetmap.josm.testutils.JOSMTestRules#i18n(String)
* @since 17914
*/
@Documented
@@ -37,7 +36,6 @@ public @interface I18n {
/**
* Enables the i18n module for this test.
* @author Taylor Smock
- * @see org.openstreetmap.josm.testutils.JOSMTestRules#i18n(String)
*/
class I18nExtension implements AfterEachCallback, BeforeEachCallback {
@Override
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/JosmDefaults.java b/test/unit/org/openstreetmap/josm/testutils/annotations/JosmDefaults.java
index 4146eb450f..18e5eaf88a 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/JosmDefaults.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/JosmDefaults.java
@@ -15,6 +15,7 @@ import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
+import org.openstreetmap.josm.JOSMFixture;
import org.openstreetmap.josm.actions.DeleteAction;
import org.openstreetmap.josm.command.DeleteCommand;
import org.openstreetmap.josm.data.Preferences;
@@ -23,13 +24,12 @@ import org.openstreetmap.josm.data.osm.User;
import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.OsmConnection;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.MemoryManagerTest;
import org.openstreetmap.josm.tools.Utils;
/**
- * Default actions taken by {@link JOSMTestRules}. Automatically registered.
+ * Default actions taken for every test. Automatically registered.
* Functionality that this provides may be moved to other classes.
*/
@Target({ElementType.TYPE, ElementType.METHOD})
@@ -37,7 +37,7 @@ import org.openstreetmap.josm.tools.Utils;
@ExtendWith(JosmDefaults.DefaultsExtension.class)
public @interface JosmDefaults {
/**
- * Default actions taken by {@link JOSMTestRules}. Automatically registered.
+ * Default actions taken for every test. Automatically registered.
* Functionality that this provides may be moved to other classes.
*/
class DefaultsExtension implements BeforeAllCallback, BeforeEachCallback, AfterAllCallback, AfterEachCallback {
@@ -94,7 +94,7 @@ public @interface JosmDefaults {
*/
private static void cleanUpFromJosmFixture() {
MemoryManagerTest.resetState(true);
- JOSMTestRules.cleanLayerEnvironment();
+ JOSMFixture.cleanLayerEnvironment();
Preferences.main().resetToInitialState();
Preferences.main().enableSaveOnPut(false);
memoryCleanup();
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/JosmHome.java b/test/unit/org/openstreetmap/josm/testutils/annotations/JosmHome.java
index 36493a6368..c065ffbbe7 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/JosmHome.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/JosmHome.java
@@ -21,10 +21,9 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
/**
- * Use the JOSM home directory. See {@link JOSMTestRules}.
+ * Use the JOSM home directory.
* Typically only used by {@link FullPreferences}.
*
* @author Taylor Smock
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/LayerManager.java b/test/unit/org/openstreetmap/josm/testutils/annotations/LayerManager.java
index ea208fc022..c44c5b392a 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/LayerManager.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/LayerManager.java
@@ -10,7 +10,7 @@ import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.JOSMFixture;
/**
* Clear the main {@link org.openstreetmap.josm.gui.layer.LayerManager} between tests.
@@ -30,7 +30,7 @@ public @interface LayerManager {
class LayerManagerExtension implements BeforeEachCallback, AfterEachCallback {
@Override
public void afterEach(ExtensionContext context) {
- JOSMTestRules.cleanLayerEnvironment();
+ JOSMFixture.cleanLayerEnvironment();
}
@Override
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/MapPaintStyles.java b/test/unit/org/openstreetmap/josm/testutils/annotations/MapPaintStyles.java
index 7d696d29c5..70d2d14be8 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/MapPaintStyles.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/MapPaintStyles.java
@@ -11,13 +11,11 @@ import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.openstreetmap.josm.gui.mappaint.ElemStyles;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
/**
* Use map styles in tests.
*
* @author Taylor Smock
- * @see JOSMTestRules#mapStyles()
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/MeasurementSystem.java b/test/unit/org/openstreetmap/josm/testutils/annotations/MeasurementSystem.java
index 563545f7c7..e6171f8f0a 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/MeasurementSystem.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/MeasurementSystem.java
@@ -13,13 +13,11 @@ import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.openstreetmap.josm.data.SystemOfMeasurement;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
/**
* Set up the system of measurement
* @author Taylor Smock
* @since 18893
- * @see JOSMTestRules#metricSystem()
*/
@Inherited
@Documented
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/MemoryManagerLeaks.java b/test/unit/org/openstreetmap/josm/testutils/annotations/MemoryManagerLeaks.java
index cddda690b0..a837ed3303 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/MemoryManagerLeaks.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/MemoryManagerLeaks.java
@@ -10,13 +10,11 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
/**
* Allow the memory manager to contain items after execution of the test cases.
* @author Taylor Smock
* @since 18893
- * @see JOSMTestRules#memoryManagerLeaks()
*/
@Inherited
@Documented
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/OsmApi.java b/test/unit/org/openstreetmap/josm/testutils/annotations/OsmApi.java
index b2df8a0e16..dd85bda419 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/OsmApi.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/OsmApi.java
@@ -13,11 +13,11 @@ import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.platform.commons.support.ReflectionSupport;
-import org.junit.runners.model.InitializationError;
import org.openstreetmap.josm.io.OsmApiInitializationException;
import org.openstreetmap.josm.io.OsmTransferCanceledException;
import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.testutils.FakeOsmApi;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
/**
* Used for setting the desired OsmApi type
@@ -79,7 +79,7 @@ public @interface OsmApi {
try {
org.openstreetmap.josm.io.OsmApi.getOsmApi().initialize(null);
} catch (OsmTransferCanceledException | OsmApiInitializationException e) {
- throw new InitializationError(e);
+ throw new JosmRuntimeException(e);
}
}
}
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/Projection.java b/test/unit/org/openstreetmap/josm/testutils/annotations/Projection.java
index 20c24cfc92..587a792a74 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/Projection.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/Projection.java
@@ -16,13 +16,11 @@ import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.platform.commons.support.AnnotationSupport;
import org.openstreetmap.josm.data.projection.ProjectionRegistry;
import org.openstreetmap.josm.data.projection.Projections;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
/**
* Use projections in tests (Mercator).
*
* @author Taylor Smock
- * @see JOSMTestRules#projection()
*
*/
@Documented
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/ProjectionNadGrids.java b/test/unit/org/openstreetmap/josm/testutils/annotations/ProjectionNadGrids.java
index 2722e0fa82..f06e0b6362 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/ProjectionNadGrids.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/ProjectionNadGrids.java
@@ -12,14 +12,12 @@ import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.Utils;
/**
* Use NAD projections in tests.
*
* @author Taylor Smock
- * @see JOSMTestRules#projectionNadGrids()
*
*/
@Documented
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/TaggingPresets.java b/test/unit/org/openstreetmap/josm/testutils/annotations/TaggingPresets.java
index 4407cd69dd..7a89f31d60 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/TaggingPresets.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/TaggingPresets.java
@@ -15,13 +15,11 @@ import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
/**
* Use presets in tests.
*
* @author Taylor Smock
- * @see JOSMTestRules#presets()
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/Territories.java b/test/unit/org/openstreetmap/josm/testutils/annotations/Territories.java
index 7e6e93f912..642dd6d55a 100644
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/Territories.java
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/Territories.java
@@ -14,12 +14,10 @@ import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.platform.commons.support.AnnotationSupport;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
/**
* Use boundaries dataset in this test.
*
- * @see JOSMTestRules#territories()
* @author Taylor Smock
* @since 18798
*/
diff --git a/test/unit/org/openstreetmap/josm/testutils/mockers/JOptionPaneSimpleMocker.java b/test/unit/org/openstreetmap/josm/testutils/mockers/JOptionPaneSimpleMocker.java
index 929c6a02f3..730b59b4e5 100644
--- a/test/unit/org/openstreetmap/josm/testutils/mockers/JOptionPaneSimpleMocker.java
+++ b/test/unit/org/openstreetmap/josm/testutils/mockers/JOptionPaneSimpleMocker.java
@@ -42,7 +42,7 @@ import mockit.MockUp;
* only the parts necessary for a particular case.
*
* The default {@link #getMockResultForMessage(Object)} will raise an
- * {@link junit.framework.AssertionFailedError} on an activation without a matching mapping entry or if
+ * {@link AssertionError} on an activation without a matching mapping entry or if
* the mapped result value is invalid for the call.
*
* The public {@link #getMockResultMap()} method returns the modifiable result map to allow for situations
diff --git a/tools/ivy.xml b/tools/ivy.xml
index 8a5e203cdb..e23b561aa7 100644
--- a/tools/ivy.xml
+++ b/tools/ivy.xml
@@ -9,7 +9,6 @@