X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=openecomp-be%2Flib%2Fopenecomp-sdc-translator-lib%2Fopenecomp-sdc-translator-core%2Fsrc%2Ftest%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Ftranslator%2Fservices%2Fheattotosca%2FUnifiedCompositionServiceTest.java;h=30fc214177abc6d1da638d30a1873233fc659a21;hb=5b1a92cea1fb437c236a77468f3e8e351e25a990;hp=24293fda444a5db3ecef601d48f5683285a096ff;hpb=5357edd8fb443613f4be4e8a30b03f2a7134e61d;p=sdc.git

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
index 24293fda44..30fc214177 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
@@ -17,8 +17,8 @@
 package org.openecomp.sdc.translator.services.heattotosca;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
@@ -647,7 +647,7 @@ public class UnifiedCompositionServiceTest {
         unifiedCompositionDataList.add(unifiedCompositionData);
         Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
                 (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
         unifiedCompositionService
                 .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
@@ -682,7 +682,7 @@ public class UnifiedCompositionServiceTest {
 
         Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
                 (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
 
         unifiedCompositionService
@@ -710,7 +710,7 @@ public class UnifiedCompositionServiceTest {
         unifiedCompositionDataList.add(unifiedCompositionData);
         Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
                 (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
         unifiedCompositionService
                 .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
@@ -746,7 +746,7 @@ public class UnifiedCompositionServiceTest {
 
         Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
                 (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
 
         unifiedCompositionService
@@ -774,7 +774,7 @@ public class UnifiedCompositionServiceTest {
         List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
         unifiedCompositionDataList.add(unifiedCompositionData);
 
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
 
         Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
@@ -846,7 +846,7 @@ public class UnifiedCompositionServiceTest {
         inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML).getTopology_template().getNode_templates()
                 .put(FSB1, abstractNodeTemplate);
 
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
 
         unifiedCompositionService.
@@ -886,7 +886,7 @@ public class UnifiedCompositionServiceTest {
         inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML).getTopology_template().getNode_templates()
                 .put(FSB1, abstractNodeTemplate);
 
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
 
         unifiedCompositionService.