[JENKINS-34825] Fixed tests: only GLOBAL credentials should be availa…

…ble from projects.
jenkinsci · Feb 19, 2017 · 70391d3 · 70391d3
1 parent d71495f
commit 70391d3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/test/java/org/jenkinsci/plugins/p4/DefaultEnvironment.java b/src/test/java/org/jenkinsci/plugins/p4/DefaultEnvironment.java
@@ -33,7 +33,7 @@ abstract public class DefaultEnvironment {
 
 	protected P4PasswordImpl createCredentials(String user, String password, SampleServerRule p4d) throws IOException {
 		String p4port = p4d.getRshPort();
-		CredentialsScope scope = CredentialsScope.SYSTEM;
+		CredentialsScope scope = CredentialsScope.GLOBAL;
 		P4PasswordImpl auth = new P4PasswordImpl(scope, CREDENTIAL, "desc", p4port, null, user, "0", "0", null, password);
 		SystemCredentialsProvider.getInstance().getCredentials().clear();
 		SystemCredentialsProvider.getInstance().getCredentials().add(auth);

diff --git a/src/test/java/org/jenkinsci/plugins/p4/client/ConnectionTest.java b/src/test/java/org/jenkinsci/plugins/p4/client/ConnectionTest.java
@@ -73,11 +73,18 @@ public void testCredentialsList() throws Exception {
 		SCMDescriptor<?> desc = project.getScm().getDescriptor();
 		assertNotNull(desc);
 
+		// Dropdown should show 2 credentials: none and "id"
 		PerforceScm.DescriptorImpl impl = (DescriptorImpl) desc;
 		ListBoxModel list = impl.doFillCredentialItems(project, null);
-		assertTrue(list.size() == 1);
+		assertTrue(list.size() == 2);
 
-		FormValidation form = impl.doCheckCredential(project, CREDENTIAL);
+		list = impl.doFillCredentialItems(project, CREDENTIAL);
+		assertTrue(list.size() == 2);
+
+		FormValidation form = impl.doCheckCredential(project, null);
+		assertEquals(FormValidation.Kind.OK, form.kind);
+
+		form = impl.doCheckCredential(project, CREDENTIAL);
 		assertEquals(FormValidation.Kind.OK, form.kind);
 	}