[JENKINS-54313] add extra unit test

jenkinsci · Jan 29, 2019 · 5f445a4 · 5f445a4
1 parent e5255e1
commit 5f445a4
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/.../kubernetes_credentials_provider/convertors/UsernamePasswordCredentialsConvertorTest.java b/.../kubernetes_credentials_provider/convertors/UsernamePasswordCredentialsConvertorTest.java
@@ -27,13 +27,17 @@
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
+
 import com.cloudbees.jenkins.plugins.kubernetes_credentials_provider.CredentialsConvertionException;
 import com.cloudbees.jenkins.plugins.kubernetes_credentials_provider.convertors.UsernamePasswordCredentialsConvertor;
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.Matchers.emptyString;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
@@ -84,6 +88,24 @@ public void canConvertAValidMappedSecret() throws Exception {
         }
     }
 
+    @Issue("JENKINS-54313")
+    @Test
+    public void canConvertAValidSecretWithNoDescription() throws Exception {
+        UsernamePasswordCredentialsConvertor convertor = new UsernamePasswordCredentialsConvertor();
+
+        try (InputStream is = get("valid-no-desc.yaml")) {
+            Secret secret = Serialization.unmarshal(is, Secret.class);
+            assertThat("The Secret was loaded correctly from disk", notNullValue());
+            UsernamePasswordCredentialsImpl credential = convertor.convert(secret);
+            assertThat(credential, notNullValue());
+            assertThat("credential id is mapped correctly", credential.getId(), is("a-test-usernamepass"));
+            assertThat("credential description is mapped correctly", credential.getDescription(), is(emptyString()));
+            assertThat("credential scope is mapped correctly", credential.getScope(), is(CredentialsScope.GLOBAL));
+            assertThat("credential username is mapped correctly", credential.getUsername(), is("myUsername"));
+            assertThat("credential password is mapped correctly", credential.getPassword().getPlainText(), is("Pa$$word"));
+        }
+    }
+
 
     @Test
     public void failsToConvertWhenUsernameMissing() throws Exception {
@@ -153,6 +175,7 @@ public void failsToConvertWhenDataEmpty() throws Exception {
         }
     }
 
+
     private static final InputStream get(String resource) {
         InputStream is = UsernamePasswordCredentialsConvertorTest.class.getResourceAsStream("UsernamePasswordCredentialsConvertorTest/" + resource);
         if (is == null) {

diff --git a/...edentials_provider/convertors/UsernamePasswordCredentialsConvertorTest/valid-no-desc.yaml b/...edentials_provider/convertors/UsernamePasswordCredentialsConvertorTest/valid-no-desc.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Secret
+metadata:
+# this is the jenkins id.
+  name: "a-test-usernamepass"
+  labels:
+# so we know what type it is.
+    "jenkins.io/credentials-type": "usernamePassword"
+type: Opaque
+data:
+# UTF-8 base64 encoded
+  username: bXlVc2VybmFtZQ==     #myUsername
+  password: UGEkJHdvcmQ=         #Pa$$word
+