Upgrade to JUnit 6

Author: scordio

.github/workflows/main.yml

@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        junit-framework: [5.14.1-SNAPSHOT, 6.0.0, 6.1.0-SNAPSHOT]
+        junit-framework: [6.1.0-SNAPSHOT]
     runs-on: ubuntu-latest
 
     steps:

docs/index.md

@@ -11,7 +11,7 @@ clear test cases without clutter.
 
 ## Compatibility
 
-JUnit Converters is based on the JUnit Framework 5 and requires Java 8 or higher.
+JUnit Converters is based on the JUnit Framework 6 and requires Java 17 or higher.
 
 ## Getting Started
 

pom.xml

@@ -32,15 +32,20 @@
   </scm>
 
   <properties>
-    <maven.compiler.release>8</maven.compiler.release>
+    <maven.compiler.release>17</maven.compiler.release>
     <maven.compiler.testRelease>25</maven.compiler.testRelease>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- Dependency versions -->
-    <junit-framework.version>5.14.0</junit-framework.version>
+    <junit-framework.version>6.0.0</junit-framework.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.assertj</groupId>
+        <artifactId>assertj-core</artifactId>
+        <version>4.0.0-M1</version>
+      </dependency>
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
@@ -67,7 +72,6 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>4.0.0-M1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -138,7 +142,6 @@
               <link>https://docs.junit.org/${junit-framework.version}/api/</link>
               <link>https://jspecify.dev/docs/api/</link>
             </links>
-            <release>9</release>
           </configuration>
         </plugin>
         <plugin>
@@ -203,30 +206,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-compile</id>
-            <configuration>
-              <release>9</release>
-            </configuration>
-          </execution>
-          <execution>
-            <id>java-8</id>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <excludes>
-                <exclude>module-info.java</exclude>
-              </excludes>
-              <failOnWarning>false</failOnWarning> <!-- https://github.com/jspecify/jspecify/issues/302 -->
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>

src/main/java/io/github/scordio/junit/converters/Base64ArgumentConverter.java

@@ -36,28 +36,23 @@ protected Object convert(@Nullable Object source, Class<?> targetType, Base64 an
 
 		Decoder decoder = getDecoder(annotation.encoding());
 
-		if (source instanceof byte[]) {
-			return decoder.decode((byte[]) source);
+		if (source instanceof byte[] bytes) {
+			return decoder.decode(bytes);
 		}
-		if (source instanceof String) {
-			return decoder.decode((String) source);
+		if (source instanceof String string) {
+			return decoder.decode(string);
 		}
 
 		throw new ArgumentConversionException(
 				String.format("Source type %s is not supported", source.getClass().getTypeName()));
 	}
 
 	private static Decoder getDecoder(Encoding encoding) {
-		switch (encoding) {
-			case BASIC:
-				return java.util.Base64.getDecoder();
-			case URL:
-				return java.util.Base64.getUrlDecoder();
-			case MIME:
-				return java.util.Base64.getMimeDecoder();
-			default:
-				throw new IllegalArgumentException("Unsupported encoding " + encoding);
-		}
+		return switch (encoding) {
+			case BASIC -> java.util.Base64.getDecoder();
+			case URL -> java.util.Base64.getUrlDecoder();
+			case MIME -> java.util.Base64.getMimeDecoder();
+		};
 	}
 
 }

src/main/java/io/github/scordio/junit/converters/BytesArgumentConverter.java

@@ -35,8 +35,8 @@ protected Object convert(@Nullable Object source, Class<?> targetType, Bytes ann
 					String.format("Target type %s is not supported", targetType.getTypeName()));
 		}
 
-		if (source instanceof String) {
-			return ((String) source).getBytes(forName(annotation.charset()));
+		if (source instanceof String string) {
+			return string.getBytes(forName(annotation.charset()));
 		}
 		if (source instanceof Byte) {
 			return ByteBuffer.allocate(Byte.BYTES).order(getOrder(annotation)).put((byte) source).array();

src/test/java/io/github/scordio/tests/junit/converters/HexIntegrationTests.java

@@ -89,10 +89,7 @@ void should_fail_with_unsupported_values() {
 					cause(instanceOf(NullPointerException.class), message("'null' is not supported"))))
 			.haveExactly(1, finishedWithFailure( // https://github.com/junit-team/junit-framework/issues/4801
 					instanceOf(ParameterResolutionException.class),
-					// https://github.com/junit-team/junit-framework/issues/4806
-					message(message -> message.startsWith(
-							"Error converting parameter at index 0: HexArgumentConverter cannot convert objects of type")
-							&& message.endsWith("Only source objects of type [java.lang.String] are supported."))))
+					message("Error converting parameter at index 0: HexArgumentConverter cannot convert objects of type [byte[]]. Only source objects of type [java.lang.String] are supported.")))
 			.haveExactly(3, finishedWithFailure( //
 					instanceOf(ParameterResolutionException.class),
 					cause(instanceOf(ArgumentConversionException.class), message("Hex string must have even length"))))