Merge "Create VF Module Error"

1 files changed, 12 insertions, 4 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java
index e737f5da16..ec093bebbd 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java
@@ -21,6 +21,7 @@
 package org.openecomp.mso.client.appc;

 

 import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

 

 import java.util.Properties;

 import java.util.UUID;

@@ -28,7 +29,6 @@ import java.util.UUID;
 import org.junit.BeforeClass;

 import org.junit.Ignore;

 import org.junit.Test;

-

 import org.onap.appc.client.lcm.model.Action;

 import org.onap.appc.client.lcm.model.ActionIdentifiers;

 import org.onap.appc.client.lcm.model.CheckLockInput;

@@ -42,6 +42,13 @@ public class ApplicationControllerClientTest {
 	}

 

 	@Test

+	public void testClientCreation() {

+		ApplicationControllerClient client = new ApplicationControllerClient("appc");

+		assertEquals(client.getControllerType(), "appc");

+		assertNotNull(client.getAppCClient());

+	}

+

+	@Test

 	public void createRequest_CheckLock_RequestBuilt() {

 		ApplicationControllerClient client = new ApplicationControllerClient("appc");

 		ActionIdentifiers actionIdentifiers = new ActionIdentifiers();

@@ -89,14 +96,15 @@ public class ApplicationControllerClientTest {
 	@Test

 	public void test_getLCMPropertiesHelper() {

 		ApplicationControllerClient client = new ApplicationControllerClient("appc");

-		Properties properties = client.getLCMProperties("appc");

+		Properties properties = client.getLCMProperties();

+		assertEquals(properties.get("topic.read"), "APPC-TEST-AMDOCS2");

 		assertEquals(properties.get("topic.write"), "APPC-TEST-AMDOCS1-DEV3");

+		assertEquals(properties.get("topic.sdnc.read"), "SDNC-LCM-READ");

+		assertEquals(properties.get("topic.sdnc.write"), "SDNC-LCM-WRITE");

 		assertEquals(properties.get("topic.read.timeout"), "120000");

 		assertEquals(properties.get("client.response.timeout"), "120000");

-		assertEquals(properties.get("topic.read"), "APPC-TEST-AMDOCS2");

 		assertEquals(properties.get("poolMembers"),

 				"uebsb93kcdc.it.att.com:3904,uebsb92kcdc.it.att.com:3904,uebsb91kcdc.it.att.com:3904");

-		assertEquals(properties.get("client.controllerType"), "appc");

 		assertEquals(properties.get("client.key"), "iaEMAfjsVsZnraBP");

 		assertEquals(properties.get("client.secret"), "wcivUjsjXzmGFBfxMmyJu9dz");

 	}