refactor: JUnit Jupiter migration from JUnit 4.x

Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.java.testing.junit5.JUnit4to5Migration?organizationId=U0FQ Co-authored-by: Moderne <[email protected]>
SAP · Nov 25, 2024 · e1ca755 · e1ca755
1 parent 64dac8f
commit e1ca755
Show file tree

Hide file tree

Showing 84 changed files with 601 additions and 518 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -114,6 +114,20 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-junit</artifactId>
+            <version>2.0.0.0</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
     <profiles>
         <profile>
             <id>release</id>

diff --git a/env/pom.xml b/env/pom.xml
@@ -53,18 +53,6 @@
             <artifactId>spotbugs-annotations</artifactId>
             <optional>true</optional>
         </dependency>
-
-        <!-- test utilities -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
@@ -80,6 +68,12 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-junit</artifactId>
+            <version>2.0.0.0</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

diff --git a/env/src/test/java/com/sap/cloud/security/config/OAuth2ServiceConfigurationBuilderTest.java b/env/src/test/java/com/sap/cloud/security/config/OAuth2ServiceConfigurationBuilderTest.java
@@ -5,8 +5,8 @@
  */
 package com.sap.cloud.security.config;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.util.Collections;
@@ -19,7 +19,7 @@ public class OAuth2ServiceConfigurationBuilderTest {
 
 	private OAuth2ServiceConfigurationBuilder cut;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		cut = OAuth2ServiceConfigurationBuilder.forService(Service.XSUAA);
 	}
@@ -221,4 +221,4 @@ public void x509IntegrationTest() {
 		assertThat(configuration.getCertUrl()).isEqualTo(URI.create(url));
 		assertThat(configuration.getCredentialType()).isEqualTo(CredentialType.X509);
 	}
-}
+}
diff --git a/env/src/test/java/com/sap/cloud/security/json/DefaultJsonObjectTest.java b/env/src/test/java/com/sap/cloud/security/json/DefaultJsonObjectTest.java
@@ -5,9 +5,9 @@
  */
 package com.sap.cloud.security.json;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.time.LocalDate;
@@ -31,7 +31,7 @@ public class DefaultJsonObjectTest {
 
 	private DefaultJsonObject cut;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		cut = createJsonParser(KEY_1, STRING_VALUE);
 	}
@@ -227,7 +227,7 @@ public void notVulnerableToStackOverflowException() {
 		try {
 			new DefaultJsonObject(deeplyNestedJsonObject);
 		} catch (StackOverflowError e) {
-			Assert.fail("Encountered StackoverflowError.");
+			Assertions.fail("Encountered StackoverflowError.");
 		} catch (Exception ignored) {
 		}
 	}
@@ -251,4 +251,4 @@ private DefaultJsonObject createJsonParser(String key, Object value) {
 	private String createJsonObjectString(String key, Object value) {
 		return String.format("{%s : %s}", key, value);
 	}
-}
+}
diff --git a/java-api/pom.xml b/java-api/pom.xml
@@ -33,18 +33,6 @@
 			<artifactId>jakarta.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
-		<!-- test utilities -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
@@ -65,6 +53,12 @@
 			<artifactId>assertj-core</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-junit</artifactId>
+			<version>2.0.0.0</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>

diff --git a/java-api/src/test/java/com/sap/cloud/security/config/ClientCredentialsTest.java b/java-api/src/test/java/com/sap/cloud/security/config/ClientCredentialsTest.java
@@ -5,12 +5,12 @@
  */
 package com.sap.cloud.security.config;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ClientCredentialsTest {
 	ClientIdentity cut = new ClientCredentials("clientId", "clientSecret");

diff --git a/java-api/src/test/java/com/sap/cloud/security/config/CredentialTypeTest.java b/java-api/src/test/java/com/sap/cloud/security/config/CredentialTypeTest.java
@@ -5,19 +5,19 @@
  */
 package com.sap.cloud.security.config;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class CredentialTypeTest {
 
 	@Test
 	public void from() {
-		Assert.assertEquals(CredentialType.X509, CredentialType.from("x509"));
-		Assert.assertEquals(CredentialType.X509_GENERATED, CredentialType.from("X509_GENERATED"));
-		Assert.assertEquals(CredentialType.X509_PROVIDED, CredentialType.from("X509_PROVIDED"));
-		Assert.assertEquals(CredentialType.X509_ATTESTED, CredentialType.from("X509_ATTESTED"));
-		Assert.assertEquals(CredentialType.X509_ATTESTED, CredentialType.from("x509_attested"));
-		Assert.assertEquals(CredentialType.INSTANCE_SECRET, CredentialType.from("instance-secret"));
-		Assert.assertEquals(CredentialType.BINDING_SECRET, CredentialType.from("binding-secret"));
+		Assertions.assertEquals(CredentialType.X509, CredentialType.from("x509"));
+		Assertions.assertEquals(CredentialType.X509_GENERATED, CredentialType.from("X509_GENERATED"));
+		Assertions.assertEquals(CredentialType.X509_PROVIDED, CredentialType.from("X509_PROVIDED"));
+		Assertions.assertEquals(CredentialType.X509_ATTESTED, CredentialType.from("X509_ATTESTED"));
+		Assertions.assertEquals(CredentialType.X509_ATTESTED, CredentialType.from("x509_attested"));
+		Assertions.assertEquals(CredentialType.INSTANCE_SECRET, CredentialType.from("instance-secret"));
+		Assertions.assertEquals(CredentialType.BINDING_SECRET, CredentialType.from("binding-secret"));
 	}
 }
diff --git a/java-api/src/test/java/com/sap/cloud/security/config/ServiceTest.java b/java-api/src/test/java/com/sap/cloud/security/config/ServiceTest.java
@@ -5,7 +5,7 @@
  */
 package com.sap.cloud.security.config;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,4 +21,4 @@ public void getCFNameOfXsuaa_shouldReturnCorrectName() {
 		assertThat(Service.XSUAA.getCFName()).isEqualTo("xsuaa");
 	}
 
-}
+}
diff --git a/java-api/src/test/java/com/sap/cloud/security/token/TokenTest.java b/java-api/src/test/java/com/sap/cloud/security/token/TokenTest.java
@@ -5,10 +5,10 @@
  */
 package com.sap.cloud.security.token;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class TokenTest {
 

diff --git a/java-security-test/pom.xml b/java-security-test/pom.xml
@@ -22,10 +22,6 @@
             <groupId>com.sap.cloud.security</groupId>
             <artifactId>java-security</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
@@ -76,6 +72,18 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-junit</artifactId>
+			<version>2.0.0.0</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
     </dependencies>
 
 	<build>

diff --git a/java-security-test/src/test/java/com/sap/cloud/security/test/JwtGeneratorTest.java b/java-security-test/src/test/java/com/sap/cloud/security/test/JwtGeneratorTest.java
@@ -12,11 +12,10 @@
 import com.sap.cloud.security.token.Token;
 import com.sap.cloud.security.token.TokenClaims;
 import com.sap.cloud.security.token.TokenHeader;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
 
 import java.io.File;
@@ -52,15 +51,15 @@ public class JwtGeneratorTest {
 
 	private static final Path RESOURCES_PATH = Paths.get(JwtGeneratorTest.class.getResource("/").getPath());
 
-	@ClassRule
-	public static TemporaryFolder temporaryFolder = new TemporaryFolder(RESOURCES_PATH.toFile());
+	@TempDir
+	public static File temporaryFolder;
 
-	@BeforeClass
+	@BeforeAll
 	public static void setUpClass() throws Exception {
 		keys = RSAKeys.fromKeyFiles("/publicKey.txt", "/privateKey.txt");
 	}
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		cut = JwtGenerator.getInstance(XSUAA, DEFAULT_CLIENT_ID)
 				.withPrivateKey(keys.getPrivate());
@@ -293,7 +292,7 @@ public void withClaimValue_asJsonObjectContainingList() {
 
 	@Test
 	public void loadClaimsFromFile_doesNotContainValidJson_throwsException() throws IOException {
-		File emptyFile = temporaryFolder.newFile("empty");
+		File emptyFile = File.createTempFile("empty", null, temporaryFolder);
 		String temporaryFolderName = emptyFile.getParentFile().getName();
 		String resourcePath = "/" + temporaryFolderName + "/empty";
 

diff --git a/java-security-test/src/test/java/com/sap/cloud/security/test/RSAKeysTest.java b/java-security-test/src/test/java/com/sap/cloud/security/test/RSAKeysTest.java
@@ -5,7 +5,7 @@
  */
 package com.sap.cloud.security.test;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
@@ -31,4 +31,4 @@ public void fromKeyFiles() throws IOException, InvalidKeySpecException,
 		assertThat(keys.getPrivate()).isNotNull();
 		assertThat(keys.getPublic()).isNotNull();
 	}
-}
+}
diff --git a/java-security-test/src/test/java/com/sap/cloud/security/test/SecurityTestRuleTest.java b/java-security-test/src/test/java/com/sap/cloud/security/test/SecurityTestRuleTest.java
@@ -24,7 +24,8 @@
 import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.io.IOException;
@@ -152,7 +153,8 @@ public void getContext() {
 		assertThat(cut.getContext()).isNotNull();
 	}
 
-	public static class SecurityTestRuleWithMockServlet {
+	@Nested
+	public class SecurityTestRuleWithMockServlet {
 
 		private HttpServlet mockServlet = Mockito.mock(HttpServlet.class);
 
@@ -172,7 +174,8 @@ public void testThatServletMethodIsNotCalled() throws ServletException, IOExcept
 
 	}
 
-	public static class SecurityTestRuleWithoutApplicationServer {
+	@Nested
+	public class SecurityTestRuleWithoutApplicationServer {
 
 		@Rule
 		public SecurityTestRule rule = SecurityTestRule.getInstance(XSUAA);
@@ -184,7 +187,8 @@ public void testRuleIsInitializedCorrectly() {
 		}
 	}
 
-	public static class SecurityTestRuleApplicationServer_IAS {
+	@Nested
+	public class SecurityTestRuleApplicationServer_IAS {
 
 		@Rule
 		public SecurityTestRule rule = SecurityTestRule.getInstance(IAS);

diff --git a/java-security-test/src/test/java/com/sap/cloud/security/test/SecurityTestTest.java b/java-security-test/src/test/java/com/sap/cloud/security/test/SecurityTestTest.java
@@ -6,7 +6,7 @@
 package com.sap.cloud.security.test;
 
 import com.sap.cloud.security.config.Service;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,4 +21,4 @@ public void wireMockServerIsNotRunningAfterTearDown() throws Exception {
 		assertThat(cut.wireMockServer.isRunning()).isFalse();
 	}
 
-}
+}