diff options
Diffstat (limited to 'artifactbroker/plugins/reception-plugins/src/test')
3 files changed, 12 insertions, 50 deletions
diff --git a/artifactbroker/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java b/artifactbroker/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java index 8f16708..d4f029f 100644 --- a/artifactbroker/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java +++ b/artifactbroker/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java @@ -54,9 +54,8 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup { final GroupValidationResult validationResult = configParameters.validate(); assertTrue(validationResult.isValid()); final SdcConfiguration config = new SdcConfiguration(configParameters); - assertEquals(Arrays.asList("a.com", "b.com", "c.com"), config.getMsgBusAddress()); assertEquals(Arrays.asList("TOSCA_CSAR", "HEAT", "HELM"), config.getRelevantArtifactTypes()); - assertEquals("localhost", config.getAsdcAddress()); + assertEquals("localhost", config.getSdcAddress()); assertEquals("policy", config.getUser()); assertEquals("policy", config.getPassword()); assertEquals(20, config.getPollingInterval()); @@ -68,7 +67,6 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup { assertEquals("null", config.getKeyStorePassword()); assertEquals(false, config.activateServerTLSAuth()); assertEquals(true, config.isFilterInEmptyResources()); - assertEquals(false, config.isUseHttpsWithDmaap()); } @Test @@ -89,19 +87,18 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup { public void testSdcConfigurationBuilder() { final SdcReceptionHandlerConfigurationParameterBuilder builder = - new SdcReceptionHandlerConfigurationParameterBuilder().setAsdcAddress("localhost") + new SdcReceptionHandlerConfigurationParameterBuilder().setSdcAddress("localhost") .setConsumerGroup("policy-group").setConsumerId("policy-id").setEnvironmentName("TEST") .setKeystorePassword("password").setKeystorePath("dummyPath").setPassword("policy") .setPollingInterval(10).setPollingTimeout(20).setRetryDelay(30).setUser("policy") - .setUseHttpsWithDmaap(false).setActiveserverTlsAuth(false).setFilterinEmptyResources(true) - .setArtifactTypes(Arrays.asList("TOSCA_CSAR")).setMessageBusAddress(Arrays.asList("localhost")); + .setActiveserverTlsAuth(false).setFilterinEmptyResources(true) + .setArtifactTypes(Arrays.asList("TOSCA_CSAR")); final SdcReceptionHandlerConfigurationParameterGroup configParameters = new SdcReceptionHandlerConfigurationParameterGroup(builder); configParameters.setName("SDCConfiguration"); - assertEquals(Arrays.asList("localhost"), configParameters.getMessageBusAddress()); assertEquals(Arrays.asList("TOSCA_CSAR"), configParameters.getArtifactTypes()); - assertEquals("localhost", configParameters.getAsdcAddress()); + assertEquals("localhost", configParameters.getSdcAddress()); assertEquals("policy", configParameters.getUser()); assertEquals("policy", configParameters.getPassword()); assertEquals(10, configParameters.getPollingInterval()); @@ -114,41 +111,18 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup { assertEquals("password", configParameters.getKeyStorePassword()); assertEquals(false, configParameters.isActiveServerTlsAuth()); assertEquals(true, configParameters.isFilterInEmptyResources()); - assertEquals(false, configParameters.isUseHttpsWithDmaap()); - } - - @Test - public void testSdcConfigurationWithNullList() { - - final SdcReceptionHandlerConfigurationParameterBuilder builder = - new SdcReceptionHandlerConfigurationParameterBuilder().setAsdcAddress("localhost") - .setConsumerGroup("policy-group").setConsumerId("policy-id").setEnvironmentName("TEST") - .setKeystorePassword("password").setKeystorePath("dummyPath").setPassword("policy") - .setPollingInterval(10).setPollingTimeout(20).setUser("policy").setUseHttpsWithDmaap(false) - .setActiveserverTlsAuth(false).setFilterinEmptyResources(true) - .setArtifactTypes(Arrays.asList("TOSCA_CSAR")).setMessageBusAddress(null); - final SdcReceptionHandlerConfigurationParameterGroup configParameters = - new SdcReceptionHandlerConfigurationParameterGroup(builder); - configParameters.setName("SDCConfiguration"); - - try { - configParameters.validate(); - fail("Test must throw an exception"); - } catch (final Exception exp) { - assertTrue(exp.getMessage().contains("collection parameter \"messageBusAddress\" is null")); - } } @Test public void testSdcConfigurationWithEmptyStringList() { final SdcReceptionHandlerConfigurationParameterBuilder builder = - new SdcReceptionHandlerConfigurationParameterBuilder().setAsdcAddress("localhost") + new SdcReceptionHandlerConfigurationParameterBuilder().setSdcAddress("localhost") .setConsumerGroup("policy-group").setConsumerId("policy-id").setEnvironmentName("TEST") .setKeystorePassword("password").setKeystorePath("dummyPath").setPassword("policy") - .setPollingInterval(10).setPollingTimeout(20).setUser("policy").setUseHttpsWithDmaap(false) + .setPollingInterval(10).setPollingTimeout(20).setUser("policy") .setActiveserverTlsAuth(false).setFilterinEmptyResources(true) - .setArtifactTypes(Arrays.asList("")).setMessageBusAddress(Arrays.asList("localhost")); + .setArtifactTypes(Arrays.asList("")); final SdcReceptionHandlerConfigurationParameterGroup configParameters = new SdcReceptionHandlerConfigurationParameterGroup(builder); configParameters.setName("SDCConfiguration"); diff --git a/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdc.json b/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdc.json index aa548e4..6f0d050 100644 --- a/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdc.json +++ b/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdc.json @@ -1,11 +1,6 @@ { "name" : "parameterConfig1", - "asdcAddress": "localhost", - "messageBusAddress": [ - "a.com", - "b.com", - "c.com" - ], + "sdcAddress": "localhost", "user": "policy", "password": "policy", "pollingInterval":20, @@ -22,7 +17,6 @@ "keyStorePath": "null", "keyStorePassword": "null", "activeServerTlsAuth": false, - "isFilterInEmptyResources": true, - "isUseHttpsWithDmaap": false + "isFilterInEmptyResources": true } diff --git a/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json b/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json index 65201d1..2e41017 100644 --- a/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json +++ b/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json @@ -1,11 +1,6 @@ { "name" : "parameterConfig1", - "asdcAddress": "", - "messageBusAddress": [ - "a.com", - "b.com", - "c.com" - ], + "sdcAddress": "", "user": "tbdsdc-1480", "password": "tbdsdc-1480", "pollingInterval":-1, @@ -21,7 +16,6 @@ "keyStorePath": "null", "keyStorePassword": "null", "activeserverTlsAuth": false, - "isFilterInEmptyResources": true, - "isUseHttpsWithDmaap": false + "isFilterInEmptyResources": true } |