Changeset 18690 in josm for trunk/test/functional/org

Timestamp:

2023-03-13T21:59:27+01:00 (2 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/functional/org/openstreetmap/josm

Files:

• io/MultiFetchServerObjectReaderTest.java (modified) (3 diffs)
• tools/HttpClientTest.java (modified) (5 diffs)

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -16 +16 @@
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.security.SecureRandom;
 import java.text.MessageFormat;
@@ -52 +53 @@
  */
 @SuppressFBWarnings(value = "CRLF_INJECTION_LOGS")
-@Timeout(value = 60, unit = TimeUnit.SECONDS)
+@Timeout(value = 1, unit = TimeUnit.MINUTES)
 class MultiFetchServerObjectReaderTest {
     private static final Logger logger = Logger.getLogger(MultiFetchServerObjectReader.class.getName());
@@ -191 +192 @@
         try (
             PrintWriter pw = new PrintWriter(
-                    new OutputStreamWriter(new FileOutputStream(dataSetCacheOutputFile), StandardCharsets.UTF_8)
+                    new OutputStreamWriter(Files.newOutputStream(dataSetCacheOutputFile.toPath()), StandardCharsets.UTF_8)
         )) {
             logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));

trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java

@@ -240 +240 @@
     void testTooMuchRedirects() throws IOException {
         mockRedirects(false, 3);
-        assertThrows(IOException.class, () -> HttpClient.create(url("/relative-redirect/3")).setMaxRedirects(2).connect(progress));
+        final HttpClient client = HttpClient.create(url("/relative-redirect/3")).setMaxRedirects(2);
+        try {
+            assertThrows(IOException.class, () -> client.connect(progress));
+        } finally {
+            client.disconnect();
+        }
     }
 
@@ -370 +375 @@
     void testTakesTooLong() throws IOException {
         mockDelay(1);
-        assertThrows(IOException.class, () -> HttpClient.create(url("/delay/1")).setReadTimeout(500).connect(progress));
+        final HttpClient client = HttpClient.create(url("/delay/1")).setReadTimeout(500);
+        try {
+            assertThrows(IOException.class, () -> client.connect(progress));
+        } finally {
+            client.disconnect();
+        }
     }
 
@@ -387 +397 @@
 
     /**
-     * Test of {@link Response#uncompress} method with Gzip compression.
+     * Test of {@link Response#uncompress(boolean)} method with Gzip compression.
      * @throws IOException if any I/O error occurs
      */
@@ -407 +417 @@
 
     /**
-     * Test of {@link Response#uncompress} method with Bzip compression.
+     * Test of {@link Response#uncompress(boolean)} method with Bzip compression.
      * @throws IOException if any I/O error occurs
      */
@@ -427 +437 @@
 
     /**
-     * Test of {@link Response#uncompress} method with Bzip compression.
+     * Test of {@link Response#uncompress(boolean)} method with Bzip compression.
      * @throws IOException if any I/O error occurs
      */