Upgrade testing frameworks to latest not-vulnerable versions

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Ie68290a79d075132c73e6cc9e82b9dbda92fbe8c
Issue-ID: SDC-4313

3 files changed, 12 insertions, 12 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java
index 771d9abf3c..0e3bf64751 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java
@@ -37,8 +37,8 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.*;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
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.
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationResourceGroupImplTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationResourceGroupImplTest.java
index 1488edc16e..ec21bdb19c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationResourceGroupImplTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationResourceGroupImplTest.java
@@ -25,7 +25,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.io.IOException;