From 1196463dbf4c6ef051dd7f68580fc7d77c5d054c Mon Sep 17 00:00:00 2001 From: Wojciech Sliwka Date: Fri, 1 Feb 2019 07:23:42 +0100 Subject: First part of Tests Issue-ID: VID-385 add first part of new tests for AAI, move some files to proper directory Change-Id: I6600c48d26387faf9e6cd6dbe7107e10428f4b52 Signed-off-by: Wojciech Sliwka --- .../src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java') diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java index 702a9e0a8..43fb5a3bb 100644 --- a/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java @@ -21,24 +21,23 @@ package org.onap.vid.aai; import com.google.common.collect.ImmutableMap; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; + import org.onap.vid.aai.model.ResourceType; import org.onap.vid.client.SyncRestClient; import org.onap.vid.model.SubscriberList; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; import java.util.Collections; import java.util.Map; import static org.mockito.ArgumentMatchers.contains; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.MockitoAnnotations.initMocks; -@RunWith(MockitoJUnitRunner.class) public class AaiOverTLSClientTest { private static final String SEARCH_NODES_QUERY_SEARCH_NODE_TYPE = "nodes/generic-vnfs?vnf-name=name"; @@ -50,8 +49,9 @@ public class AaiOverTLSClientTest { @Mock private AaiOverTLSPropertySupplier propertySupplier; - @Before + @BeforeMethod public void setUp() { + initMocks(this); aaiRestClient = new AaiOverTLSClient(syncRestClient, propertySupplier); } -- cgit 1.2.3-korg