Changeset 18690 in josm for trunk/test/unit/org/openstreetmap/josm/plugins

Timestamp:

2023-03-13T21:59:27+01:00 (3 years ago)

Author:

taylor.smock

Message:

See #16567: Convert all assertion calls to JUnit 5 (patch by gaben, modified)

The modifications are as follows:

• Merge DomainValidatorTest.testIDN and DomainValidatorTest.testIDNJava6OrLater
• Update some tests to use @ParameterizedTest (DomainValidatorTest)
• Replace various exception blocks with assertThrows. These typically looked like

      try {
          // Something that should throw an exception here
          fail("An exception should have been thrown");
      } catch (Exception e) {
          // Verify the exception matches expectations here
      }
  

• Replace assertTrue(val instanceof Clazz) with assertInstanceOf
• Replace JUnit 4 @Suite with JUnit 5 @Suite

Both the original patch and the modified patch fix various lint issues.

Location:

trunk/test/unit/org/openstreetmap/josm/plugins

Files:

• PluginHandlerJOSMTooOldTest.java (modified) (1 diff)
• PluginHandlerMultiVersionTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerJOSMTooOldTest.java

@@ -3 +3 @@
 
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
+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 java.io.File;

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerMultiVersionTest.java

@@ -3 +3 @@
 
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
+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 java.io.File;