Changeset 18690 in josm for trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

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.

File:

• trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -117 +117 @@
         I18n.init();
         // initialize the platform hook, and
-        // call the really early hook before we anything else
+        // call the really early hook before anything else
         PlatformManager.getPlatform().preStartupHook();
 
@@ -150 +150 @@
 
         if (createGui) {
-            GuiHelper.runInEDTAndWaitWithException(() -> setupGUI());
+            GuiHelper.runInEDTAndWaitWithException(this::setupGUI);
         }
     }