Changeset 18690 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java

Timestamp:

2023-03-13T21:59:27+01:00 (13 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/data/validation/tests/OpeningHourTestTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java

@@ -7 +7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -258 +259 @@
     private static void assertFixEquals(String value, TestError error) {
         assertNotNull(error.getFix(), "fix is not null");
-        assertTrue(error.getFix() instanceof ChangePropertyCommand, "fix is ChangePropertyCommand");
-        final ChangePropertyCommand command = (ChangePropertyCommand) error.getFix();
+        final ChangePropertyCommand command = assertInstanceOf(ChangePropertyCommand.class, error.getFix(), "fix is ChangePropertyCommand");
         assertEquals(1, command.getTags().size());
         assertEquals(value, command.getTags().values().iterator().next());