summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Kabaj <michal.kabaj@nokia.com>2017-12-19 14:36:59 +0100
committerMichal Kabaj <michal.kabaj@nokia.com>2017-12-20 12:23:03 +0100
commit3756637a3f3a53537724a385d149d4171b24953a (patch)
treed26a2927053e6b1fb8734e4e3d23d5c58183ae35
parent373c018c57252de92bcd103eac4f9626bfb4cb40 (diff)
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>
-rw-r--r--appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml18
-rw-r--r--appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/impl/TestServiceCatalog.java25
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
@@ -33,23 +33,12 @@
</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>
<version>2.25.1</version>
<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<>();