Upgrade to Junit5 (#1050)

* chore: Update to junit5 for servlet package

* chore: Update to junit5 for contrib package

* chore: Update to junit5 for common-image package

* chore: Update to junit5 for common-lang package

* chore: Update to junit5 for entire project files

* fix: test case for JPEGImageReaderTest failed for java 8 and 11

assertEquals was using old signature of junit4.

* Update common/common-io/src/test/java/com/twelvemonkeys/io/InputStreamAbstractTest.java

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

* Update common/common-io/src/test/java/com/twelvemonkeys/io/InputStreamAbstractTest.java

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

* Update imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

* Update imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

* Update imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageMetadataTest.java

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

* Update imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

* Update imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriterTest.java

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

* Update imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/BufferedChannelImageInputStreamTest.java

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

* Update imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/BufferedChannelImageInputStreamTest.java

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

* refactor: few indentation changes and missed test case

- review change related to missing test annotation
- unwanted new lines inside test case
- duplicate assertions

* refactor: moved the lambda expression to method reference

* review: testNotNullWithParameterNull catch block was never executed.

Added the suggested change

* Apply suggestions from code review

chore: adjust suggested indentation

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

* Update imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

* Update imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

* Update imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTest.java

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

* refactor: using assertTimeout doesnot kill the execution, even if the timeout happens.

It is better to use assertTimeoutPreemptively in cases, where we really want to kill the execution after timeout.
https://stackoverflow.com/questions/57116801/how-to-fail-a-test-after-a-timeout-is-exceeded-in-junit-5/57116959#57116959

---------

Co-authored-by: Harald Kuhr <harald.kuhr@gmail.com>

imageio/imageio-clippath/src/test/java/com/twelvemonkeys/imageio/path/AdobePathBuilderTest.java

@@ -30,8 +30,6 @@
 
 package com.twelvemonkeys.imageio.path;
 
-import org.junit.Test;
-
 import javax.imageio.IIOException;
 import javax.imageio.stream.ImageInputStream;
 import java.awt.geom.Path2D;
@@ -39,36 +37,39 @@ import java.io.DataInput;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
 import static com.twelvemonkeys.imageio.path.PathsTest.assertPathEquals;
 import static com.twelvemonkeys.imageio.path.PathsTest.readExpectedPath;
-import static org.junit.Assert.assertNotNull;
 
 @SuppressWarnings("deprecation")
 public class AdobePathBuilderTest {
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateNullBytes() {
-        new AdobePathBuilder((byte[]) null);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathBuilder((byte[]) null));
+
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateNull() {
-        new AdobePathBuilder((DataInput) null);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathBuilder((DataInput) null));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateEmpty() {
-        new AdobePathBuilder(new byte[0]);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathBuilder(new byte[0]));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateShortPath() {
-        new AdobePathBuilder(new byte[3]);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathBuilder(new byte[3]));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateImpossiblePath() {
-        new AdobePathBuilder(new byte[7]);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathBuilder(new byte[7]));
     }
 
     @Test
@@ -82,18 +83,20 @@ public class AdobePathBuilderTest {
         assertNotNull(path);
     }
 
-    @Test(expected = IIOException.class)
+    @Test
     public void testShortPath() throws IOException {
         byte[] data = new byte[26];
         ByteBuffer buffer = ByteBuffer.wrap(data);
         buffer.putShort((short) AdobePathSegment.CLOSED_SUBPATH_LENGTH_RECORD);
         buffer.putShort((short) 1);
 
-        Path2D path = new AdobePathBuilder(data).path();
-        assertNotNull(path);
+        assertThrows(IIOException.class, () -> {
+            Path2D path = new AdobePathBuilder(data).path();
+            assertNotNull(path);
+        });
     }
 
-    @Test(expected = IIOException.class)
+    @Test
     public void testShortPathToo() throws IOException {
         byte[] data = new byte[52];
         ByteBuffer buffer = ByteBuffer.wrap(data);
@@ -102,11 +105,13 @@ public class AdobePathBuilderTest {
         buffer.position(buffer.position() + 22);
         buffer.putShort((short) AdobePathSegment.CLOSED_SUBPATH_BEZIER_LINKED);
 
-        Path2D path = new AdobePathBuilder(data).path();
-        assertNotNull(path);
+        assertThrows(IIOException.class, () -> {
+            Path2D path = new AdobePathBuilder(data).path();
+            assertNotNull(path);
+        });
     }
 
-    @Test(expected = IIOException.class)
+    @Test
     public void testLongPath() throws IOException {
         byte[] data = new byte[78];
         ByteBuffer buffer = ByteBuffer.wrap(data);
@@ -117,18 +122,22 @@ public class AdobePathBuilderTest {
         buffer.position(buffer.position() + 24);
         buffer.putShort((short) AdobePathSegment.CLOSED_SUBPATH_BEZIER_LINKED);
 
-        Path2D path = new AdobePathBuilder(data).path();
-        assertNotNull(path);
+        assertThrows(IIOException.class, () -> {
+            Path2D path = new AdobePathBuilder(data).path();
+            assertNotNull(path);
+        });
     }
 
-    @Test(expected = IIOException.class)
+    @Test
     public void testPathMissingLength() throws IOException {
         byte[] data = new byte[26];
         ByteBuffer buffer = ByteBuffer.wrap(data);
         buffer.putShort((short) AdobePathSegment.CLOSED_SUBPATH_BEZIER_LINKED);
 
-        Path2D path = new AdobePathBuilder(data).path();
-        assertNotNull(path);
+        assertThrows(IIOException.class, () -> {
+            Path2D path = new AdobePathBuilder(data).path();
+            assertNotNull(path);
+        });
     }
 
     @Test

imageio/imageio-clippath/src/test/java/com/twelvemonkeys/imageio/path/AdobePathReaderTest.java

@@ -31,7 +31,6 @@
 
 package com.twelvemonkeys.imageio.path;
 
-import org.junit.Test;
 
 import javax.imageio.IIOException;
 import javax.imageio.stream.ImageInputStream;
@@ -39,36 +38,37 @@ import java.awt.geom.Path2D;
 import java.io.DataInput;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.*;
 import static com.twelvemonkeys.imageio.path.PathsTest.assertPathEquals;
 import static com.twelvemonkeys.imageio.path.PathsTest.readExpectedPath;
-import static org.junit.Assert.assertNotNull;
 
 public class AdobePathReaderTest {
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateNullBytes() {
-        new AdobePathReader((byte[]) null);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathReader((byte[]) null));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateNull() {
-        new AdobePathReader((DataInput) null);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathReader((DataInput) null));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateEmpty() {
-        new AdobePathReader(new byte[0]);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathReader(new byte[0]));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateShortPath() {
-        new AdobePathReader(new byte[3]);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathReader(new byte[3]));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateImpossiblePath() {
-        new AdobePathReader(new byte[7]);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathReader(new byte[7]));
     }
 
     @Test
@@ -82,18 +82,20 @@ public class AdobePathReaderTest {
         assertNotNull(path);
     }
 
-    @Test(expected = IIOException.class)
+    @Test
     public void testShortPath() throws IOException {
         byte[] data = new byte[26];
         ByteBuffer buffer = ByteBuffer.wrap(data);
         buffer.putShort((short) AdobePathSegment.CLOSED_SUBPATH_LENGTH_RECORD);
         buffer.putShort((short) 1);
 
-        Path2D path = new AdobePathReader(data).readPath();
-        assertNotNull(path);
+        assertThrows(IIOException.class, () -> {
+            Path2D path = new AdobePathReader(data).readPath();
+            assertNotNull(path);
+        });
     }
 
-    @Test(expected = IIOException.class)
+    @Test
     public void testShortPathToo() throws IOException {
         byte[] data = new byte[52];
         ByteBuffer buffer = ByteBuffer.wrap(data);
@@ -102,11 +104,13 @@ public class AdobePathReaderTest {
         buffer.position(buffer.position() + 22);
         buffer.putShort((short) AdobePathSegment.CLOSED_SUBPATH_BEZIER_LINKED);
 
-        Path2D path = new AdobePathReader(data).readPath();
-        assertNotNull(path);
+        assertThrows(IIOException.class, () -> {
+            Path2D path = new AdobePathReader(data).readPath();
+            assertNotNull(path);
+        });
     }
 
-    @Test(expected = IIOException.class)
+    @Test
     public void testLongPath() throws IOException {
         byte[] data = new byte[78];
         ByteBuffer buffer = ByteBuffer.wrap(data);
@@ -117,18 +121,22 @@ public class AdobePathReaderTest {
         buffer.position(buffer.position() + 24);
         buffer.putShort((short) AdobePathSegment.CLOSED_SUBPATH_BEZIER_LINKED);
 
-        Path2D path = new AdobePathReader(data).readPath();
-        assertNotNull(path);
+        assertThrows(IIOException.class, () -> {
+            Path2D path = new AdobePathReader(data).readPath();
+            assertNotNull(path);
+        });
     }
 
-    @Test(expected = IIOException.class)
+    @Test
     public void testPathMissingLength() throws IOException {
         byte[] data = new byte[26];
         ByteBuffer buffer = ByteBuffer.wrap(data);
         buffer.putShort((short) AdobePathSegment.CLOSED_SUBPATH_BEZIER_LINKED);
 
-        Path2D path = new AdobePathReader(data).readPath();
-        assertNotNull(path);
+        assertThrows(IIOException.class, () -> {
+            Path2D path = new AdobePathReader(data).readPath();
+            assertNotNull(path);
+        });
     }
 
     @Test

imageio/imageio-clippath/src/test/java/com/twelvemonkeys/imageio/path/AdobePathSegmentTest.java

@@ -30,9 +30,9 @@
 
 package com.twelvemonkeys.imageio.path;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * AdobePathSegmentTest.
@@ -42,20 +42,19 @@ import static org.junit.Assert.*;
  * @version $Id: AdobePathSegmentTest.java,v 1.0 13/12/14 harald.kuhr Exp$
  */
 public class AdobePathSegmentTest {
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateBadSelectorNegative() {
-        new AdobePathSegment(-1, 1);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(-1, 1));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateBadSelector() {
-        new AdobePathSegment(9, 2);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(9, 2));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateOpenLengthRecordNegative() {
-        new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_LENGTH_RECORD, -1);
-
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_LENGTH_RECORD, -1));
     }
 
     @Test
@@ -72,9 +71,9 @@ public class AdobePathSegmentTest {
         assertEquals(-1, segment.cply, 0);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateClosedLengthRecordNegative() {
-        new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_LENGTH_RECORD, -42);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_LENGTH_RECORD, -42));
     }
 
     @Test
@@ -107,19 +106,19 @@ public class AdobePathSegmentTest {
         assertEquals(1, segment.cply, 0);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateOpenLinkedRecordBad() {
-        new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_BEZIER_LINKED, 44);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_BEZIER_LINKED, 44));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateOpenLinkedRecordOutOfRangeNegative() {
-        new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_BEZIER_LINKED, -16.1, -16.1, 0, 0, 1, 1);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_BEZIER_LINKED, -16.1, -16.1, 0, 0, 1, 1));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateOpenLinkedRecordOutOfRangePositive() {
-        new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_BEZIER_LINKED, 16.1, 16.1, 0, 0, 1, 1);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_BEZIER_LINKED, 16.1, 16.1, 0, 0, 1, 1));
     }
 
     @Test
@@ -136,20 +135,20 @@ public class AdobePathSegmentTest {
         assertEquals(1, segment.cply, 0);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateOpenUnlinkedRecordBad() {
-        new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_BEZIER_UNLINKED, 44);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_BEZIER_UNLINKED, 44));
     }
 
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateOpenUnlinkedRecordOutOfRangeNegative() {
-        new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_BEZIER_UNLINKED, -16.5, 0, 0, 0, 1, 1);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_BEZIER_UNLINKED, -16.5, 0, 0, 0, 1, 1));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateOpenUnlinkedRecorOutOfRangePositive() {
-        new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_BEZIER_UNLINKED, 0, -17, 0, 0, 16.5, 1);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_BEZIER_UNLINKED, 0, -17, 0, 0, 16.5, 1));
     }
 
     /// Closed subpath
@@ -168,19 +167,19 @@ public class AdobePathSegmentTest {
         assertEquals(1, segment.cply, 0);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateClosedLinkedRecordBad() {
-        new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_BEZIER_LINKED, 44);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_BEZIER_LINKED, 44));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateClosedLinkedRecordOutOfRangeNegative() {
-        new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_BEZIER_LINKED, -16.5, -.5, 0, 0, 1, 1);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_BEZIER_LINKED, -16.5, -.5, 0, 0, 1, 1));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateClosedLinkedRecordOutOfRangePositive() {
-        new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_BEZIER_LINKED, .5, 16.5, 0, 0, 1, 1);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_BEZIER_LINKED, .5, 16.5, 0, 0, 1, 1));
     }
 
     @Test
@@ -197,59 +196,59 @@ public class AdobePathSegmentTest {
         assertEquals(1, segment.cply, 0);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateClosedUnlinkedRecordBad() {
-        new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_BEZIER_UNLINKED, 44);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_BEZIER_UNLINKED, 44));
     }
 
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateClosedUnlinkedRecordOutOfRangeNegative() {
-        new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_BEZIER_UNLINKED, -.5, -16.5, 0, 0, 1, 1);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_BEZIER_UNLINKED, -.5, -16.5, 0, 0, 1, 1));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateClosedUnlinkedRecordOutOfRangePositive() {
-        new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_BEZIER_UNLINKED, 16.5, .5, 0, 0, 1, 1);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_BEZIER_UNLINKED, 16.5, .5, 0, 0, 1, 1));
     }
 
     @Test
     public void testToStringRule() {
         String string = new AdobePathSegment(AdobePathSegment.INITIAL_FILL_RULE_RECORD, 0).toString();
-        assertTrue(string, string.startsWith("Rule"));
-        assertTrue(string, string.contains("Initial"));
-        assertTrue(string, string.contains("fill"));
-        assertTrue(string, string.contains("rule=0"));
+        assertTrue(string.startsWith("Rule"), string);
+        assertTrue(string.contains("Initial"), string);
+        assertTrue(string.contains("fill"), string);
+        assertTrue(string.contains("rule=0"), string);
     }
 
     @Test
     public void testToStringLength() {
         String string = new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_LENGTH_RECORD, 2).toString();
-        assertTrue(string, string.startsWith("Len"));
-        assertTrue(string, string.contains("Closed"));
-        assertTrue(string, string.contains("subpath"));
-        assertTrue(string, string.contains("length=2"));
+        assertTrue(string.startsWith("Len"), string);
+        assertTrue(string.contains("Closed"), string);
+        assertTrue(string.contains("subpath"), string);
+        assertTrue(string.contains("length=2"), string);
 
         string = new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_LENGTH_RECORD, 42).toString();
-        assertTrue(string, string.startsWith("Len"));
-        assertTrue(string, string.contains("Open"));
-        assertTrue(string, string.contains("subpath"));
-        assertTrue(string, string.contains("length=42"));
+        assertTrue(string.startsWith("Len"), string);
+        assertTrue(string.contains("Open"), string);
+        assertTrue(string.contains("subpath"), string);
+        assertTrue(string.contains("length=42"), string);
     }
 
     @Test
     public void testToStringOther() {
         String string = new AdobePathSegment(AdobePathSegment.OPEN_SUBPATH_BEZIER_LINKED, 0, 0, 1, 1, 0, 0).toString();
-        assertTrue(string, string.startsWith("Pt"));
-        assertTrue(string, string.contains("Open"));
-        assertTrue(string, string.contains("Bezier"));
-        assertTrue(string, string.contains("linked"));
+        assertTrue(string.startsWith("Pt"), string);
+        assertTrue(string.contains("Open"), string);
+        assertTrue(string.contains("Bezier"), string);
+        assertTrue(string.contains("linked"), string);
 
         string = new AdobePathSegment(AdobePathSegment.CLOSED_SUBPATH_BEZIER_LINKED, 0, 0, 1, 1, 0, 0).toString();
-        assertTrue(string, string.startsWith("Pt"));
-        assertTrue(string, string.contains("Closed"));
-        assertTrue(string, string.contains("Bezier"));
-        assertTrue(string, string.contains("linked"));
+        assertTrue(string.startsWith("Pt"), string);
+        assertTrue(string.contains("Closed"), string);
+        assertTrue(string.contains("Bezier"), string);
+        assertTrue(string.contains("linked"), string);
     }
 
     @Test

imageio/imageio-clippath/src/test/java/com/twelvemonkeys/imageio/path/AdobePathWriterTest.java

@@ -31,7 +31,6 @@
 package com.twelvemonkeys.imageio.path;
 
 import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
-import org.junit.Test;
 
 import javax.imageio.ImageIO;
 import javax.imageio.stream.ImageInputStream;
@@ -41,11 +40,11 @@ import java.awt.geom.*;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
+import org.junit.jupiter.api.Test;
 
 import static com.twelvemonkeys.imageio.path.AdobePathSegment.*;
 import static com.twelvemonkeys.imageio.path.PathsTest.assertPathEquals;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * AdobePathWriterTest.
@@ -56,22 +55,22 @@ import static org.junit.Assert.assertEquals;
  */
 public class AdobePathWriterTest {
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateWriterNull() {
-        new AdobePathWriter(null);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathWriter(null));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateWriterInvalid() {
-        new AdobePathWriter(new Path2D.Double(Path2D.WIND_NON_ZERO));
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathWriter(new Path2D.Double(Path2D.WIND_NON_ZERO)));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateWriterOutOfBounds() {
         Path2D path = new Path2D.Float(Path2D.WIND_EVEN_ODD);
         path.append(new Ellipse2D.Double(.5, 0.5, 2, 2), false);
 
-        new AdobePathWriter(path);
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathWriter(path));
     }
 
     @Test
@@ -93,14 +92,14 @@ public class AdobePathWriterTest {
         new AdobePathWriter(path);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testCreateNotClosed() {
         GeneralPath path = new GeneralPath(Path2D.WIND_EVEN_ODD);
         path.moveTo(.5, .5);
         path.lineTo(1, .5);
         path.curveTo(1, 1, 1, 1, .5, 1);
 
-        new AdobePathWriter(path).writePath();
+        assertThrows(IllegalArgumentException.class, () -> new AdobePathWriter(path).writePath());
     }
 
     @Test

imageio/imageio-clippath/src/test/java/com/twelvemonkeys/imageio/path/PathsTest.java

@@ -33,7 +33,6 @@ package com.twelvemonkeys.imageio.path;
 import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
 import com.twelvemonkeys.imageio.stream.SubImageInputStream;
 import com.twelvemonkeys.imageio.stream.URLImageInputStreamSpi;
-import org.junit.Test;
 
 import javax.imageio.ImageIO;
 import javax.imageio.spi.IIORegistry;
@@ -48,8 +47,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 
-import static org.junit.Assert.*;
-import static org.junit.Assume.assumeTrue;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assumptions.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * PathsTest.
@@ -63,9 +63,9 @@ public class PathsTest {
         IIORegistry.getDefaultInstance().registerServiceProvider(new URLImageInputStreamSpi());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testReadPathNull() throws IOException {
-        Paths.readPath(null);
+        assertThrows(IllegalArgumentException.class, () -> Paths.readPath(null));
     }
 
     @Test
@@ -127,14 +127,14 @@ public class PathsTest {
         assertPathEquals(readExpectedPath("/ser/grape-path.ser"), path);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testApplyClippingPathNullPath() {
-        Paths.applyClippingPath(null, new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_GRAY));
+        assertThrows(IllegalArgumentException.class, () -> Paths.applyClippingPath(null, new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_GRAY)));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testApplyClippingPathNullSource() {
-        Paths.applyClippingPath(new GeneralPath(), null);
+        assertThrows(IllegalArgumentException.class, () -> Paths.applyClippingPath(new GeneralPath(), null));
     }
 
     @Test
@@ -165,9 +165,9 @@ public class PathsTest {
     }
 
     @SuppressWarnings("ConstantConditions")
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testApplyClippingPathNullDestination() {
-        Paths.applyClippingPath(new GeneralPath(), new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_GRAY), null);
+        assertThrows(IllegalArgumentException.class, () -> Paths.applyClippingPath(new GeneralPath(), new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_GRAY), null));
     }
 
     @Test
@@ -199,9 +199,9 @@ public class PathsTest {
         // TODO: Mor sophisticated test that tests all pixels outside path...
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testReadClippedNull() throws IOException {
-        Paths.readClipped(null);
+        assertThrows(IllegalArgumentException.class, () -> Paths.readClipped(null));
     }
 
     @Test
@@ -243,7 +243,7 @@ public class PathsTest {
     }
 
     static void assertPathEquals(final Path2D expectedPath, final Path2D actualPath) {
-        assertNotNull("Expected path is null, check your tests...", expectedPath);
+        assertNotNull(expectedPath, "Expected path is null, check your tests...");
         assertNotNull(actualPath);
 
         PathIterator expectedIterator = expectedPath.getPathIterator(null);
@@ -253,19 +253,19 @@ public class PathsTest {
         float[] actualCoords = new float[6];
 
         while(!expectedIterator.isDone()) {
-            assertFalse("Less points than expected", actualIterator.isDone());
+            assertFalse(actualIterator.isDone(), "Less points than expected");
 
             int expectedType = expectedIterator.currentSegment(expectedCoords);
             int actualType = actualIterator.currentSegment(actualCoords);
 
-            assertEquals("Unexpected segment type", expectedType, actualType);
-            assertArrayEquals("Unexpected coordinates", expectedCoords, actualCoords, 0);
+            assertEquals( expectedType, actualType, "Unexpected segment type");
+            assertArrayEquals(expectedCoords, actualCoords, 0, "Unexpected coordinates");
 
             actualIterator.next();
             expectedIterator.next();
         }
 
-        assertTrue("More points than expected", actualIterator.isDone());
+        assertTrue( actualIterator.isDone(), "More points than expected");
     }
 
     @Test