jenkinsci · strangelookingnerd · Apr 7, 2025
diff --git a/pom.xml b/pom.xml
@@ -175,9 +175,25 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>1.20.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-compress</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
+      <artifactId>mockito-junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/src/test/java/com/datapipe/jenkins/vault/AwsHelperTest.java b/src/test/java/com/datapipe/jenkins/vault/AwsHelperTest.java
@@ -19,9 +19,7 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang.StringUtils;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -33,35 +31,32 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.verify;
 
-public class AwsHelperTest {
+class AwsHelperTest {
 
     private static final String awsAccessKey = "ASIAIOSFODNN7EXAMPLE";
     private static final String awsSecretKey = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY";
     private static final String sessionToken = "sometoken";
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     @Test
-    public void testGetTokenBasicDefaults() throws VaultException {
+    void testGetTokenBasicDefaults() throws VaultException {
         BasicAWSCredentials credentials = new BasicAWSCredentials(awsAccessKey, awsSecretKey);
         doTestGetToken(credentials, "", "", "");
     }
 
     @Test
-    public void testGetTokenBasicCustom() throws VaultException {
+    void testGetTokenBasicCustom() throws VaultException {
         BasicAWSCredentials credentials = new BasicAWSCredentials(awsAccessKey, awsSecretKey);
         doTestGetToken(credentials, "somerole", "someserverid", "somemount");
     }
 
     @Test
-    public void testGetTokenSessionDefaults() throws VaultException {
+    void testGetTokenSessionDefaults() throws VaultException {
         BasicSessionCredentials credentials = new BasicSessionCredentials(awsAccessKey, awsSecretKey, sessionToken);
         doTestGetToken(credentials, "", "", "");
     }
 
     @Test
-    public void testGetTokenSessionCustom() throws VaultException {
+    void testGetTokenSessionCustom() throws VaultException {
         BasicSessionCredentials credentials = new BasicSessionCredentials(awsAccessKey, awsSecretKey, sessionToken);
         doTestGetToken(credentials, "somerole", "someserverid", "somemount");
     }

diff --git a/src/test/java/com/datapipe/jenkins/vault/VaultAccessorTest.java b/src/test/java/com/datapipe/jenkins/vault/VaultAccessorTest.java
@@ -3,20 +3,20 @@
 import hudson.EnvVars;
 import java.util.Arrays;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class VaultAccessorTest {
+class VaultAccessorTest {
 
     private static final String POLICIES_STR =
         "\npol1\n\nbase_${job_base_name}\njob/${job_name}\n job_${job_name_us}\nfolder/${job_folder}\nfolder_${job_folder_us}\nnode_${node_name}\n";
 
     @Test
-    public void testGeneratePolicies() {
+    void testGeneratePolicies() {
         EnvVars envVars = mock(EnvVars.class);
         when(envVars.get("JOB_NAME")).thenReturn("job1");
         when(envVars.get("JOB_BASE_NAME")).thenReturn("job1");
@@ -29,7 +29,7 @@ public void testGeneratePolicies() {
     }
 
     @Test
-    public void testGeneratePoliciesWithFolder() {
+    void testGeneratePoliciesWithFolder() {
         EnvVars envVars = mock(EnvVars.class);
         when(envVars.get("JOB_NAME")).thenReturn("folder1/folder2/job1");
         when(envVars.get("JOB_BASE_NAME")).thenReturn("job1");

diff --git a/src/test/java/com/datapipe/jenkins/vault/VaultBindingStepWithMockAccessor.java b/src/test/java/com/datapipe/jenkins/vault/VaultBindingStepWithMockAccessor.java
@@ -30,7 +30,7 @@ public VaultBindingStepWithMockAccessor(List<VaultSecret> vaultSecrets) {
     }
 
     @Override
-    public StepExecution start(StepContext context) throws Exception {
+    public StepExecution start(StepContext context) {
         Execution execution = new Execution(this, context);
         execution.setVaultAccessor(new VaultAccessor() {
 

diff --git a/src/test/java/com/datapipe/jenkins/vault/VaultBuildWrapperTest.java b/src/test/java/com/datapipe/jenkins/vault/VaultBuildWrapperTest.java
@@ -10,16 +10,13 @@
 import io.github.jopenlibs.vault.response.LogicalResponse;
 import io.github.jopenlibs.vault.rest.RestResponse;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import jenkins.tasks.SimpleBuildWrapper;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
@@ -30,13 +27,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class VaultBuildWrapperTest {
-
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
+class VaultBuildWrapperTest {
 
     @Test
-    public void testWithNonExistingPath() throws IOException, InterruptedException {
+    void testWithNonExistingPath() {
         String path = "not/existing";
         VaultAccessor mockAccessor = mock(VaultAccessor.class);
         doReturn(mockAccessor).when(mockAccessor).init();
@@ -67,7 +61,7 @@ public void testWithNonExistingPath() throws IOException, InterruptedException {
     }
 
     @Test
-    public void testWithAccessDeniedPath() throws IOException, InterruptedException {
+    void testWithAccessDeniedPath() {
         String path = "not/allowed";
         VaultAccessor mockAccessor = mock(VaultAccessor.class);
         doReturn(mockAccessor).when(mockAccessor).init();
@@ -121,7 +115,7 @@ private LogicalResponse getAccessDeniedResponse() {
         return resp;
     }
 
-    class TestWrapper extends VaultBuildWrapper {
+    static class TestWrapper extends VaultBuildWrapper {
 
         VaultConfiguration vaultConfig = new VaultConfiguration();
 

diff --git a/src/test/java/com/datapipe/jenkins/vault/WindowsFilePermissionsTest.java b/src/test/java/com/datapipe/jenkins/vault/WindowsFilePermissionsTest.java
@@ -7,26 +7,26 @@
 import java.nio.file.attribute.AclEntryType;
 import java.nio.file.attribute.AclFileAttributeView;
 import java.nio.file.attribute.UserPrincipal;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static com.datapipe.jenkins.vault.WindowsFilePermissionHelper.ACL_ENTRY_PERMISSIONS;
 import static com.datapipe.jenkins.vault.WindowsFilePermissionHelper.fixSshKeyOnWindows;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class WindowsFilePermissionsTest {
+class WindowsFilePermissionsTest {
 
     private Path file;
     private AclFileAttributeView fileAttributeView;
     private UserPrincipal userPrincipal;
 
-    @Before
-    public void beforeEach() throws Exception {
+    @BeforeEach
+    void beforeEach() throws Exception {
         assumeTrue(isWindows());
         file = Files.createTempFile("permission-test-", "");
         fileAttributeView = Files.getFileAttributeView(file, AclFileAttributeView.class);
@@ -35,15 +35,15 @@ public void beforeEach() throws Exception {
         assertNotNull(userPrincipal);
     }
 
-    @After
-    public void afterEach() throws Exception {
+    @AfterEach
+    void afterEach() throws Exception {
         if (file != null) {
             Files.deleteIfExists(file);
         }
     }
 
     @Test
-    public void test_windows_file_permission_is_set_correctly() throws Exception {
+    void test_windows_file_permission_is_set_correctly() throws Exception {
         fixSshKeyOnWindows(file);
         assertEquals(1, fileAttributeView.getAcl().size());
         AclEntry aclEntry = fileAttributeView.getAcl().get(0);
@@ -54,7 +54,7 @@ public void test_windows_file_permission_is_set_correctly() throws Exception {
     }
 
     @Test
-    public void test_windows_file_permission_are_incorrect() throws Exception {
+    void test_windows_file_permission_are_incorrect() throws Exception {
         // By default files include System and builtin administrators
         assertNotSame(1, fileAttributeView.getAcl().size());
         for (AclEntry entry : fileAttributeView.getAcl()) {

diff --git a/src/test/java/com/datapipe/jenkins/vault/configuration/FolderVaultConfigurationSpec.java b/src/test/java/com/datapipe/jenkins/vault/configuration/FolderVaultConfigurationSpec.java
@@ -10,9 +10,9 @@
 import hudson.util.DescribableList;
 import java.util.SortedMap;
 import jenkins.model.Jenkins;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static com.datapipe.jenkins.vault.configuration.VaultConfigurationSpec.completeTestConfig;
 import static org.hamcrest.Matchers.nullValue;
@@ -21,8 +21,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
-public class FolderVaultConfigurationSpec {
+@ExtendWith(MockitoExtension.class)
+class FolderVaultConfigurationSpec {
 
     private FolderVaultConfiguration completeTestConfigFolder(String identifier) {
         return new FolderVaultConfiguration(completeTestConfig(identifier));
@@ -34,7 +34,7 @@ private FolderVaultConfiguration completeTestConfigFolder(String identifier,
     }
 
     @Test
-    public void resolverShouldNotFailIfNotInFolder() {
+    void resolverShouldNotFailIfNotInFolder() {
         VaultConfigResolver folderResolver = new FolderVaultConfiguration.ForJob();
         Job job = mock(Job.class);
         when(job.getParent()).thenReturn(mock(Jenkins.class));
@@ -45,7 +45,7 @@ public void resolverShouldNotFailIfNotInFolder() {
     }
 
     @Test
-    public void resolverShouldCorrectlyMerge() {
+    void resolverShouldCorrectlyMerge() {
         final DescribableList firstFolderProperties = mock(DescribableList.class);
         when(firstFolderProperties.get(FolderVaultConfiguration.class))
             .thenReturn(completeTestConfigFolder("firstParent", null));
@@ -72,8 +72,7 @@ public void resolverShouldCorrectlyMerge() {
 
 
     @Test
-    public void resolverShouldHandleAbsentConfigurationOnFolders() {
-
+    void resolverShouldHandleAbsentConfigurationOnFolders() {
         final DescribableList firstFolderProperties = mock(DescribableList.class);
         when(firstFolderProperties.get(FolderVaultConfiguration.class))
             .thenReturn(completeTestConfigFolder("firstParent"));

diff --git a/src/test/java/com/datapipe/jenkins/vault/configuration/VaultConfigurationSpec.java b/src/test/java/com/datapipe/jenkins/vault/configuration/VaultConfigurationSpec.java
@@ -1,11 +1,11 @@
 package com.datapipe.jenkins.vault.configuration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-public class VaultConfigurationSpec {
+class VaultConfigurationSpec {
 
     public static VaultConfiguration completeTestConfig(String identifier, Integer engineVersion) {
         VaultConfiguration result = new VaultConfiguration();
@@ -32,7 +32,7 @@ public static VaultConfiguration credentialOnlyConfig(String identifier) {
     }
 
     @Test
-    public void childShouldCompletlyOverwriteParent() {
+    void childShouldCompletelyOverwriteParent() {
         VaultConfiguration parent = completeTestConfig("parent");
         VaultConfiguration child = completeTestConfig("child");
         VaultConfiguration result = child.mergeWithParent(parent);
@@ -42,7 +42,7 @@ public void childShouldCompletlyOverwriteParent() {
     }
 
     @Test
-    public void childShouldPartlyOverwriteParent() {
+    void childShouldPartlyOverwriteParent() {
         VaultConfiguration parent = completeTestConfig("parent");
         VaultConfiguration child = urlOnlyConfig("child");
         VaultConfiguration result = child.mergeWithParent(parent);
@@ -59,7 +59,7 @@ public void childShouldPartlyOverwriteParent() {
     }
 
     @Test
-    public void emptyChildShouldBeOverriden() {
+    void emptyChildShouldBeOverridden() {
         VaultConfiguration parent = completeTestConfig("parent");
         VaultConfiguration child = new VaultConfiguration();
         VaultConfiguration result = child.mergeWithParent(parent);
@@ -69,7 +69,7 @@ public void emptyChildShouldBeOverriden() {
     }
 
     @Test
-    public void emptyParentShouldBeIgnored() {
+    void emptyParentShouldBeIgnored() {
         VaultConfiguration parent = new VaultConfiguration();
         VaultConfiguration child = completeTestConfig("child");
         VaultConfiguration result = child.mergeWithParent(parent);
@@ -79,7 +79,7 @@ public void emptyParentShouldBeIgnored() {
     }
 
     @Test
-    public void shouldHandleNull() {
+    void shouldHandleNull() {
         VaultConfiguration dummy = completeTestConfig("dummy");
         VaultConfiguration result = dummy.mergeWithParent(null);
 
@@ -88,7 +88,7 @@ public void shouldHandleNull() {
     }
 
     @Test
-    public void shouldNotStoreTrailingSlashesInUrl() {
+    void shouldNotStoreTrailingSlashesInUrl() {
         VaultConfiguration parent = new VaultConfiguration();
         parent.setVaultUrl("http://vault-url.com/");
         parent.setFailIfNotFound(false);
@@ -98,7 +98,7 @@ public void shouldNotStoreTrailingSlashesInUrl() {
     }
 
     @Test
-    public void shouldStoreFailureHandling() {
+    void shouldStoreFailureHandling() {
         VaultConfiguration parent = new VaultConfiguration();
         parent.setVaultUrl("http://vault-url.com/");
         parent.setFailIfNotFound(false);
@@ -108,7 +108,7 @@ public void shouldStoreFailureHandling() {
     }
 
     @Test
-    public void shouldStorePrefixPath() {
+    void shouldStorePrefixPath() {
         VaultConfiguration parent = new VaultConfiguration();
         parent.setVaultUrl("http://vault-url.com/");
         parent.setFailIfNotFound(false);