CredentialsInPipelineTest: modernize to JUnit 5

Signed-off-by: Jim Klimov <[email protected]>

Author: jimklimov

src/test/java/com/cloudbees/plugins/credentials/CredentialsInPipelineTest.java

@@ -41,24 +41,27 @@
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 
-import org.junit.Before;
-import org.junit.Ignore;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.nio.file.Path;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Files;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assume.assumeThat;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
+@WithJenkins
 public class CredentialsInPipelineTest {
     /**
      * The CredentialsInPipelineTest suite prepares pipeline scripts to
@@ -74,14 +77,13 @@ public class CredentialsInPipelineTest {
     //   mvn test -Dtest="CredentialsInPipelineTest"
     private boolean verbosePipelines = false;
 
-    @Rule
-    public JenkinsRule r = new JenkinsRule();
+    private JenkinsRule r;
 
     // Data for build agent setup
-    @Rule
-    public TemporaryFolder tmpAgent = new TemporaryFolder();
-    @Rule
-    public TemporaryFolder tmpWorker = new TemporaryFolder();
+    @TempDir
+    private File tmpAgent;
+    @TempDir
+    private File tmpWorker;
     // Where did we save that file?..
     private File agentJar = null;
     // Can this be reused for many test cases?
@@ -90,15 +92,20 @@ public class CredentialsInPipelineTest {
     private Boolean agentUsable = null;
 
     // From CertificateCredentialImplTest
-    @Rule
-    public TemporaryFolder tmp = new TemporaryFolder();
+    @TempDir
+    private File tmp;
     private File p12;
 
-    @Before
+    @BeforeEach
     public void setup() {
         r.jenkins.setCrumbIssuer(null);
     }
 
+    @BeforeEach
+    void setup(JenkinsRule r) throws IOException {
+        this.r = r;
+    }
+
     Boolean isAvailableAgent() {
         // Can be used to skip optional tests if we know we could not set up an agent
         if (agentJar == null)
@@ -108,7 +115,7 @@ Boolean isAvailableAgent() {
         return agentUsable;
     }
 
-    Boolean setupAgent() throws IOException, InterruptedException, OutOfMemoryError {
+    Boolean setupAgent() throws IOException, InterruptedException, OutOfMemoryError, FormException {
         // Note we anticipate this might fail; it should not block the whole test suite from running
         // Loosely inspired by
         // https://docs.cloudbees.com/docs/cloudbees-ci-kb/latest/client-and-managed-masters/create-agent-node-from-groovy
@@ -121,7 +128,7 @@ Boolean setupAgent() throws IOException, InterruptedException, OutOfMemoryError
         if (agentJar == null) {
             try {
                 URL url = new URL(r.jenkins.getRootUrl() + "jnlpJars/agent.jar");
-                agentJar = tmpAgent.newFile("agent.jar");
+                agentJar = new File(tmpAgent, "agent.jar");
                 FileOutputStream out = new FileOutputStream(agentJar);
                 out.write(url.openStream().readAllBytes());
                 out.close();
@@ -140,14 +147,14 @@ Boolean setupAgent() throws IOException, InterruptedException, OutOfMemoryError
         // (including spaces in directory names) and Unix/Linux
         ComputerLauncher launcher = new CommandLauncher(
                 "\"" + System.getProperty("java.home") + File.separator + "bin" +
-                File.separator + "java\" -jar \"" + agentJar.getAbsolutePath().toString() + "\""
+                File.separator + "java\" -jar \"" + agentJar.getAbsolutePath() + "\""
         );
 
         try {
             // Define a "Permanent Agent"
             agent = new DumbSlave(
                     "worker",
-                    tmpWorker.getRoot().getAbsolutePath().toString(),
+                    tmpWorker.getAbsolutePath(),
                     launcher);
             agent.setNodeDescription("Worker in another JVM, remoting used");
             agent.setNumExecutors(1);
@@ -209,7 +216,7 @@ private void prepareUploadedKeystore(String id, String password) throws IOExcept
         if (p12 == null) {
             // Contains a private key + openvpn certs,
             // as alias named "1" (according to keytool)
-            p12 = tmp.newFile("test.p12");
+            p12 = File.createTempFile("test.p12", null, tmp);
             FileUtils.copyURLToFile(CertificateCredentialsImplTest.class.getResource("test.p12"), p12);
         }
 
@@ -333,7 +340,7 @@ public void testCertKeyStoreReadableOnNodeRemote() throws Exception {
         // Check that credentials are usable with pipeline script
         // running on a remote node{} with separate JVM (check
         // that remoting/snapshot work properly)
-        assumeThat("This test needs a separate build agent", this.setupAgent(), is(true));
+        assumeTrue(this.setupAgent() == true, "This test needs a separate build agent");
 
         prepareUploadedKeystore();
 
@@ -402,7 +409,7 @@ String cpsScriptCertCredentialTestWithCredentials(String id, String password, St
     }
 
     @Test
-    @Ignore("Work with keystore file requires a node")
+    @Disabled("Work with keystore file requires a node")
     @Issue("JENKINS-70101")
     public void testCertWithCredentialsOnController() throws Exception {
         // Check that credentials are usable with pipeline script
@@ -458,7 +465,7 @@ public void testCertWithCredentialsOnNodeRemote() throws Exception {
         // Check that credentials are usable with pipeline script
         // running on a remote node{} with separate JVM (check
         // that remoting/snapshot work properly)
-        assumeThat("This test needs a separate build agent", this.setupAgent(), is(true));
+        assumeTrue(this.setupAgent() == true, "This test needs a separate build agent");
 
         prepareUploadedKeystore();
 
@@ -585,7 +592,7 @@ public void testCertHttpRequestOnNodeRemote() throws Exception {
         // Check that credentials are usable with pipeline script
         // running on a remote node{} with separate JVM (check
         // that remoting/snapshot work properly)
-        assumeThat("This test needs a separate build agent", this.setupAgent(), is(true));
+        assumeTrue(this.setupAgent() == true, "This test needs a separate build agent");
 
         prepareUploadedKeystore();
 
@@ -678,7 +685,7 @@ public void testUsernamePasswordHttpRequestOnNodeRemote() throws Exception {
         // Check that credentials are usable with pipeline script
         // running on a remote node{} with separate JVM (check
         // that remoting/snapshot work properly)
-        assumeThat("This test needs a separate build agent", this.setupAgent(), is(true));
+        assumeTrue(this.setupAgent() == true, "This test needs a separate build agent");
 
         prepareUsernamePassword();