From 3756637a3f3a53537724a385d149d4171b24953a Mon Sep 17 00:00:00 2001
From: Michal Kabaj <michal.kabaj@nokia.com>
Date: Tue, 19 Dec 2017 14:36:59 +0100
Subject: Fix Compilation issue in TestServiceCatalog

Remove duplicate mockito-core test dependency in appc-iaas-adapter-bundle
pom.xml and remove unused imports.

Issue-ID: APPC-359
Change-Id: I119460f36ee0cedae0129419e55c134a105a8cd7
Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>
---
 .../appc-iaas-adapter-bundle/pom.xml               | 18 +++++-----------
 .../appc/adapter/iaas/impl/TestServiceCatalog.java | 25 ++++++++++------------
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
index 0459bc2cc..6fdf2ba52 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
@@ -32,12 +32,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-common</artifactId>
@@ -45,11 +39,6 @@
             <scope>compile</scope>
         </dependency>
 
-<dependency>
-<groupId>org.mockito</groupId>
-<artifactId>mockito-core</artifactId>
-<scope>test</scope>
-</dependency>
 
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
@@ -165,8 +154,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-
-
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!-- <dependency> -->
         <!-- <groupId>equinoxSDK381</groupId> -->
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/impl/TestServiceCatalog.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/impl/TestServiceCatalog.java
index c1a41f209..53b4c7851 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/impl/TestServiceCatalog.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/impl/TestServiceCatalog.java
@@ -26,23 +26,20 @@
 
 package org.onap.appc.adapter.iaas.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
+import com.att.cdp.exceptions.ZoneException;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.mockito.Mockito;
 import org.onap.appc.configuration.ConfigurationFactory;
-import com.att.cdp.exceptions.ZoneException;
-import com.woorea.openstack.keystone.model.Access.Service;
+
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.CALLS_REAL_METHODS;
+import static org.mockito.Mockito.mock;
 
 /**
  * This class tests the service catalog against a known provider.
@@ -87,7 +84,7 @@ public class TestServiceCatalog {
     @Before
     public void setup() throws ZoneException {
         properties = new Properties();
-        catalog = Mockito.mock(ServiceCatalog.class, Mockito.CALLS_REAL_METHODS);
+        catalog = mock(ServiceCatalog.class, CALLS_REAL_METHODS);
         catalog.rwLock = new ReentrantReadWriteLock();
 
         Set<String> testdata = new HashSet<>();
-- 
cgit 1.2.3-korg