summaryrefslogtreecommitdiffstats
path: root/dcaedt_tools/src/test
diff options
context:
space:
mode:
authorEran (ev672n), Vosk <ev672n@att.com>2018-10-29 18:10:13 +0200
committerEran (ev672n), Vosk <ev672n@att.com>2018-10-29 18:15:30 +0200
commitf94a95f9db9e843671f480efd6227f7c72d47532 (patch)
treee7a9043a0bff3c0da258cec4f9fe299c7c83b1fd /dcaedt_tools/src/test
parentb4b7410445f359ad265c5e912d092bd275ba19e7 (diff)
Sync the code between repositories Change-Id: I3e570c9c8b090adc5520381019a22e8a46d66beb Issue-ID: SDC-1874 Signed-off-by: Eran (ev672n), Vosk <ev672n@att.com>
Diffstat (limited to 'dcaedt_tools/src/test')
-rw-r--r--dcaedt_tools/src/test/java/BaseTest.java3
-rw-r--r--dcaedt_tools/src/test/java/DeployTemplateTest.java3
-rw-r--r--dcaedt_tools/src/test/java/TemplateContainerTest.java2
3 files changed, 4 insertions, 4 deletions
diff --git a/dcaedt_tools/src/test/java/BaseTest.java b/dcaedt_tools/src/test/java/BaseTest.java
index 16372e0..8d163a4 100644
--- a/dcaedt_tools/src/test/java/BaseTest.java
+++ b/dcaedt_tools/src/test/java/BaseTest.java
@@ -11,7 +11,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when;
abstract class BaseTest {
@@ -42,7 +42,6 @@ abstract class BaseTest {
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
-
mockGetCatalog();
}
diff --git a/dcaedt_tools/src/test/java/DeployTemplateTest.java b/dcaedt_tools/src/test/java/DeployTemplateTest.java
index 0dc35f9..78d27c7 100644
--- a/dcaedt_tools/src/test/java/DeployTemplateTest.java
+++ b/dcaedt_tools/src/test/java/DeployTemplateTest.java
@@ -7,7 +7,7 @@ import tools.DeployTemplate;
import java.util.*;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -28,6 +28,7 @@ public class DeployTemplateTest extends BaseTest {
super.mockCheckoutVfcmtAndCreateResource();
when(dcaeRestClient.getUserId()).thenReturn(USER_ID);
when(dcaeRestClient.saveComposition(any(), any())).thenReturn("Composition Created");
+
templateInfoToJsonObjectMap = new HashMap<>();
TemplateInfo templateInfo = new TemplateInfo();
templateInfo.setName(VFCMT_NAME1);
diff --git a/dcaedt_tools/src/test/java/TemplateContainerTest.java b/dcaedt_tools/src/test/java/TemplateContainerTest.java
index 906d32e..a68323a 100644
--- a/dcaedt_tools/src/test/java/TemplateContainerTest.java
+++ b/dcaedt_tools/src/test/java/TemplateContainerTest.java
@@ -11,7 +11,7 @@ import tools.TemplateContainer;
import java.util.*;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;