Merge pull request #110 from Venafi/contacts-support

Fixed Policy test cases

Author: rvelaVenafi

src/test/java/com/venafi/vcert/sdk/connectors/cloud/CloudConnectorPolicyAT.java

@@ -1,7 +1,5 @@
 package com.venafi.vcert.sdk.connectors.cloud;
 
-import static org.junit.Assert.assertEquals;
-
 import com.venafi.vcert.sdk.Config;
 import com.venafi.vcert.sdk.connectors.cloud.domain.User;
 import com.venafi.vcert.sdk.connectors.cloud.domain.UserResponse;
@@ -38,13 +36,18 @@ public void createAndGetPolicy() throws VCertException {
 
 	    PolicySpecification policySpecificationReturned = connector.getPolicy(policyName);
 
-	    //The returned policySpecification will have the policy's name so it will copied to the source policySpecification
-	    //due it doesn't contain it
+	    //The returned policySpecification will contain the policy's name, which is not part of the source policy spec
+		//Adding the name to the source policy spec in order to assert both objects.
 	    policySpecification.name(policySpecificationReturned.name());
-	    //The returned policySpecification will contains the default cloud CA, then it will needed
-	    //to set it to the policySpecification source
+
+	    // The returned policySpecification will contain the default cloud CA, which is omitted in the source policy spec
+		// Adding the default CA to the source policy spec in order to assert both objects.
 	    policySpecification.policy().certificateAuthority(VCertConstants.CLOUD_DEFAULT_CA);
-	
+
+	    //The returned policy specification will contain a single user, which is the one who created the policy
+		//on the first place. Adding this user to the source policy spec in order to assert both objects.
+		policySpecification.users(new String[]{"jenkins@opensource.qa.venafi.io"});
+
 	    Assertions.assertEquals(policySpecification, policySpecificationReturned);
 	}
 
@@ -62,11 +65,15 @@ public void createAndGetPolicyForDigicert() throws VCertException {
 	    connector.setPolicy(policyName, policySpecification);
 
 	    PolicySpecification policySpecificationReturned = connector.getPolicy(policyName);
-	    
-	    //The returned policySpecification will have the policy's name so it will copied to the source policySpecification
-	    //due it doesn't contain it
+
+		//The returned policySpecification will contain the policy's name, which is not part of the source policy spec
+		//Adding the name to the source policy spec in order to assert both objects.
 	    policySpecification.name(policySpecificationReturned.name());
-	
+
+		//The returned policy specification will contain a single user, which is the one who created the policy
+		//on the first place. Adding this user to the source policy spec in order to assert both objects.
+		policySpecification.users(new String[]{"jenkins@opensource.qa.venafi.io"});
+
 	    Assertions.assertEquals(policySpecification, policySpecificationReturned);
 	}
 
@@ -84,17 +91,21 @@ public void createAndGetPolicyForEntrust() throws VCertException {
 	    connector.setPolicy(policyName, policySpecification);
 
 	    PolicySpecification policySpecificationReturned = connector.getPolicy(policyName);
-	
-	    //The returned policySpecification will have the policy's name so it will copied to the source policySpecification
-	    //due it doesn't contain it
+
+		//The returned policySpecification will contain the policy's name, which is not part of the source policy spec
+		//Adding the name to the source policy spec in order to assert both objects.
 	    policySpecification.name(policySpecificationReturned.name());
-	
-	    assertEquals(policySpecification, policySpecificationReturned);
+
+		//The returned policy specification will contain a single user, which is the one who created the policy
+		//on the first place. Adding this user to the source policy spec in order to assert both objects.
+		policySpecification.users(new String[]{"jenkins@opensource.qa.venafi.io"});
+
+	    Assertions.assertEquals(policySpecification, policySpecificationReturned);
 	}
 
 	@Test
 	@DisplayName("Cloud - Testing the userByName endpoint")
-	public void getUserByName() throws VCertException{
+	public void getUserByName() {
 		Config config = null;
 		Cloud cloud = Cloud.connect(config);
 

src/test/java/com/venafi/vcert/sdk/connectors/cloud/CloudTestUtils.java

@@ -6,10 +6,14 @@
 
 public class CloudTestUtils {
 
-    public static final String APP_NAME = String.format("VCert-Java-%d-%s", System.currentTimeMillis(), RandomStringUtils.randomAlphabetic(4));
+//    public static final String APP_NAME = String.format("VCert-Java-%d-%s", System.currentTimeMillis(), RandomStringUtils.randomAlphabetic(4));
 
     public static String getRandomZone() {
-        return APP_NAME+"\\"+TestUtils.randomCITName();
+        return getRandomAppName()+"\\"+TestUtils.randomCITName();
+    }
+
+    public static String getRandomAppName(){
+        return String.format("VCert-Java-%d-%s", System.currentTimeMillis(), RandomStringUtils.randomAlphabetic(4));
     }
 
     public static PolicySpecification getPolicySpecification() {