Fix sonar issues

[dcaegen2/platform.git] / mod / bpgenerator / onap / src / test / java / org / onap / blueprintgenerator / service / common / PropertiesServiceTest.java

diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/PropertiesServiceTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/PropertiesServiceTest.java
index 520d2d2..468a402 100644 (file)
--- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/PropertiesServiceTest.java
+++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/PropertiesServiceTest.java
@@ -103,7 +103,7 @@ public class PropertiesServiceTest {
     @Test
     public void shouldReturnInputsAndPropertiesForOnap() {
         //given
-        when(appConfigService.createAppconfig(any(), eq(getOnapComponentSpec()), eq(""), eq(false)))
+        when(appConfigService.createAppconfig(any(), eq(getOnapComponentSpec()), eq(false)))
             .thenReturn((Map<String, Object>) resourceConfigResponse);
 
         //when
@@ -128,7 +128,7 @@ public class PropertiesServiceTest {
         OnapComponentSpec onapComponentSpec = getOnapComponentSpecWithStreamsPublishes();
         Publishes publishes = onapComponentSpec.getStreams().getPublishes()[0];
         when(blueprintHelperService.isMessageRouterType(eq(publishes.getType()))).thenReturn(true);
-        when(streamsService.createStreams(any(), eq(publishes.getConfig_key() + Constants._TOPIC),
+        when(streamsService.createStreams(any(), eq(publishes.getConfig_key() + Constants.A_TOPIC),
             eq(publishes.getType()),
             eq(publishes.getConfig_key()),
             eq(publishes.getRoute()),
@@ -153,7 +153,7 @@ public class PropertiesServiceTest {
         OnapComponentSpec onapComponentSpec = getOnapComponentSpecWithStreamsPublishes();
         Publishes publishes = onapComponentSpec.getStreams().getPublishes()[0];
         when(blueprintHelperService.isDataRouterType(eq(publishes.getType()))).thenReturn(true);
-        when(streamsService.createStreams(any(), eq(publishes.getConfig_key() + Constants._FEED),
+        when(streamsService.createStreams(any(), eq(publishes.getConfig_key() + Constants.A_FEED),
             eq(publishes.getType()),
             eq(publishes.getConfig_key()),
             eq(publishes.getRoute()),
@@ -178,7 +178,7 @@ public class PropertiesServiceTest {
         OnapComponentSpec onapComponentSpec = getOnapComponentSpecWithStreamsSubscribes();
         Subscribes subscribes = onapComponentSpec.getStreams().getSubscribes()[0];
         when(blueprintHelperService.isMessageRouterType(eq(subscribes.getType()))).thenReturn(true);
-        when(streamsService.createStreams(any(), eq(subscribes.getConfig_key() + Constants._TOPIC),
+        when(streamsService.createStreams(any(), eq(subscribes.getConfig_key() + Constants.A_TOPIC),
             eq(subscribes.getType()),
             eq(subscribes.getConfig_key()),
             eq(subscribes.getRoute()),
@@ -203,7 +203,7 @@ public class PropertiesServiceTest {
         OnapComponentSpec onapComponentSpec = getOnapComponentSpecWithStreamsSubscribes();
         Subscribes subscribes = onapComponentSpec.getStreams().getSubscribes()[0];
         when(blueprintHelperService.isDataRouterType(eq(subscribes.getType()))).thenReturn(true);
-        when(streamsService.createStreams(any(), eq(subscribes.getConfig_key() + Constants._FEED),
+        when(streamsService.createStreams(any(), eq(subscribes.getConfig_key() + Constants.A_FEED),
             eq(subscribes.getType()),
             eq(subscribes.getConfig_key()),
             eq(subscribes.getRoute()),
@@ -278,6 +278,7 @@ public class PropertiesServiceTest {
         expectedProperties.setImage(getGetInput(image));
         expectedProperties.setLocation_id(getGetInput("location_id"));
         expectedProperties.setService_component_type("test-Name");
+        expectedProperties.setService_component_name_override(getGetInput("service_component_name_override"));
         expectedProperties.setLog_info(Collections.emptyMap());
         expectedProperties.setReplicas(getGetInput("replicas"));
         expectedProperties.setTls_info(getTlsInfo());