Changeset 18690 in josm for trunk/test/unit/org/openstreetmap/josm/gui/mappaint/AllMappaintTests.java

Timestamp:

2023-03-13T21:59:27+01:00 (20 months 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/gui/mappaint/AllMappaintTests.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/AllMappaintTests.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 import org.openstreetmap.josm.gui.mappaint.mapcss.AllMapCSSTests;
 
@@ -9 +9 @@
  * All mappaint tests.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
     LabelCompositionStrategyTest.class,
     MapCSSWithExtendedTextDirectivesTest.class,