1 files changed, 7 insertions, 22 deletions

diff --git a/src/test/java/org/onap/dcaegen2/services/sonhms/ConfigurationTest.java b/src/test/java/org/onap/dcaegen2/services/sonhms/ConfigurationTest.java
index 02a4f07..851920d 100644
--- a/src/test/java/org/onap/dcaegen2/services/sonhms/ConfigurationTest.java
+++ b/src/test/java/org/onap/dcaegen2/services/sonhms/ConfigurationTest.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Test;
-import org.onap.dcaegen2.services.sonhms.Configuration;
 
 
 public class ConfigurationTest {
@@ -37,53 +36,39 @@ public class ConfigurationTest {
     public void configurationTest() {
         configuration.setBufferTime(60);
         configuration.setCallbackUrl("/callbackUrl");
-        configuration.setConfigName("configName");
 
         List<String> list = new ArrayList<String>();
         list.add("server");
-        configuration.setServers(list);
+        configuration.setDmaapServers(list);
         configuration.setCg("cg");
         configuration.setCid("cid");
-        configuration.setManagerApiKey("managerApiKey");
-        configuration.setManagerSecretKey("managerSecretKey");
+
         configuration.setMaximumClusters(5);
         configuration.setMinCollision(5);
         configuration.setMinConfusion(5);
         configuration.setNumSolutions(1);
         configuration.setOofService("oofService");
         configuration.setOptimizers(list);
-        configuration.setPcimsApiKey("pcimsApiKey");
-        configuration.setPcimsSecretKey("pcimsSecretKey");
-        configuration.setPolicyName("policyName");
-        configuration.setPolicyService("policyService");
-        configuration.setPolicyTopic("policyTopic");
         configuration.setPollingInterval(30);
         configuration.setPollingTimeout(100);
-        configuration.setSdnrService("sdnrService");
-        configuration.setSdnrTopic("sdnrTopic");
+        configuration.setConfigDbService("sdnrService");
         configuration.setSourceId("sourceId");
         assertEquals(60, configuration.getBufferTime());
         assertEquals("/callbackUrl", configuration.getCallbackUrl());
         assertEquals("cg", configuration.getCg());
         assertEquals("cid", configuration.getCid());
-        assertEquals("managerApiKey", configuration.getManagerApiKey());
-        assertEquals("managerSecretKey", configuration.getManagerSecretKey());
+
         assertEquals(5, configuration.getMaximumClusters());
         assertEquals(5, configuration.getMinCollision());
         assertEquals(5, configuration.getMinConfusion());
         assertEquals(1, configuration.getNumSolutions());
         assertEquals("oofService", configuration.getOofService());
         assertEquals(list, configuration.getOptimizers());
-        assertEquals("pcimsApiKey", configuration.getPcimsApiKey());
-        assertEquals("pcimsSecretKey", configuration.getPcimsSecretKey());
-        assertEquals("policyName", configuration.getPolicyName());
-        assertEquals("policyService", configuration.getPolicyService());
-        assertEquals("policyTopic", configuration.getPolicyTopic());
+
         assertEquals(30, configuration.getPollingInterval());
         assertEquals(100, configuration.getPollingTimeout());
-        assertEquals("sdnrService", configuration.getSdnrService());
-        assertEquals("sdnrTopic", configuration.getSdnrTopic());
-        assertEquals(list, configuration.getServers());
+        assertEquals("sdnrService", configuration.getConfigDbService());
+        assertEquals(list, configuration.getDmaapServers());
         assertEquals("sourceId", configuration.getSourceId());
     }
 }