Changeset 17677 in josm for trunk/test/unit/org/openstreetmap/josm/gui/preferences

Timestamp:

2021-03-27T15:38:17+01:00 (3 years ago)

Author:

simon04

Message:

see #16567 - JUnit 5: use org.junit.jupiter.api.Assumptions

Location:

trunk/test/unit/org/openstreetmap/josm/gui/preferences

Files:

• map/MapPaintPreferenceTestIT.java (modified) (2 diffs)
• map/TaggingPresetPreferenceTestIT.java (modified) (2 diffs)
• validator/ValidatorTagCheckerRulesPreferenceTestIT.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences.map;
 
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.IOException;
@@ -105 +105 @@
         // See https://github.com/apache/ant/pull/121
         assertTrue(errors.isEmpty() && warnings.isEmpty(), displayName + " => " + errors + '\n' + warnings);
-        assumeTrue(ignoredErrors.toString(), ignoredErrors.isEmpty());
+        assumeTrue(ignoredErrors.isEmpty(), ignoredErrors.toString());
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences.map;
 
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.IOException;
@@ -104 +104 @@
         // See https://github.com/apache/ant/pull/121
         assertTrue(errors.isEmpty(), displayName + " => " + errors);
-        assumeTrue(ignoredErrors.toString(), ignoredErrors.isEmpty());
+        assumeTrue(ignoredErrors.isEmpty(), ignoredErrors.toString());
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreferenceTestIT.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences.validator;
 
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.IOException;
@@ -89 +89 @@
         // See https://github.com/apache/ant/pull/121
         assertTrue(errors.isEmpty(), displayName + " => " + errors);
-        assumeTrue(ignoredErrors.toString(), ignoredErrors.isEmpty());
+        assumeTrue(ignoredErrors.isEmpty(), ignoredErrors.toString());
     }
 }