Merge pull request #9 from varyvol/JENKINS-42437v2

[JENKINS-42437] Remove use of deprecated constructors in tests
jenkinsci · Apr 13, 2017 · da51ba8 · da51ba8
2 parents aa86361 + 1f721a2
commit da51ba8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/test/java/org/jenkinsci/plugins/plaincredentials/BaseTest.java b/src/test/java/org/jenkinsci/plugins/plaincredentials/BaseTest.java
@@ -7,6 +7,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import com.cloudbees.plugins.credentials.SecretBytes;
 import org.apache.commons.fileupload.disk.DiskFileItem;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.jenkinsci.plugins.plaincredentials.impl.FileCredentialsImpl;
@@ -54,9 +55,25 @@ public void secretTextBaseTest() throws IOException {
 
     @Test
     public void secretFileBaseTest() throws IOException, URISyntaxException {
+        secretFileTest(false);
+    }
+
+    @Test
+    public void secretFileBaseTestWithDeprecatedCtor() throws IOException, URISyntaxException {
+        secretFileTest(true);
+    }
+
+    private void secretFileTest(boolean useDeprecatedConstructor) throws IOException, URISyntaxException {
         DiskFileItem fileItem = createEmptyFileItem();
-
-        FileCredentialsImpl credential = new FileCredentialsImpl(CredentialsScope.GLOBAL, CRED_ID, "Test Secret file", fileItem, "keys.txt", Base64.encode(fileItem.get()).toString());
+
+        FileCredentialsImpl credential;
+
+        if (useDeprecatedConstructor) {
+            credential = new FileCredentialsImpl(CredentialsScope.GLOBAL, CRED_ID, "Test Secret file", fileItem, "keys.txt", Base64.encode(fileItem.get()).toString());
+        } else {
+            credential = new FileCredentialsImpl(CredentialsScope.GLOBAL, CRED_ID, "Test Secret file", fileItem, "keys.txt", SecretBytes.fromBytes(fileItem.get()));
+        }
+
         FileCredentialsImpl updatedCredential = new FileCredentialsImpl(credential.getScope(), UPDATED_CRED_ID, credential.getDescription(), fileItem, credential.getFileName(), credential.getSecretBytes());
         testCreateUpdateDelete(credential, updatedCredential);
     }

diff --git a/src/test/java/org/jenkinsci/plugins/plaincredentials/FileCredentialsTest.java b/src/test/java/org/jenkinsci/plugins/plaincredentials/FileCredentialsTest.java
@@ -24,6 +24,7 @@
 package org.jenkinsci.plugins.plaincredentials;
 
 import com.cloudbees.plugins.credentials.CredentialsScope;
+import com.cloudbees.plugins.credentials.SecretBytes;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemHeaders;
 import org.jenkinsci.plugins.plaincredentials.impl.FileCredentialsImpl;
@@ -46,7 +47,7 @@ public class FileCredentialsTest {
     @Test(expected = IllegalArgumentException.class)
     @Issue("JENKINS-30926")
     public void shouldThrowAnExceptionIfFileNameIsBlank() throws IOException {
-        new FileCredentialsImpl(CredentialsScope.GLOBAL, "1", "", new StubFileItem(), "", "");
+        new FileCredentialsImpl(CredentialsScope.GLOBAL, "1", "", new StubFileItem(), "", SecretBytes.fromString(""));
     }
 
     private class StubFileItem implements FileItem {