12 files changed, 32 insertions, 44 deletions
diff --git a/src/test/java/DcaeServiceTypesApiServiceImplTests.java b/src/test/java/DcaeServiceTypesApiServiceImplTests.java
index c4ada1f..3882c53 100644
--- a/src/test/java/DcaeServiceTypesApiServiceImplTests.java
+++ b/src/test/java/DcaeServiceTypesApiServiceImplTests.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-import org.openecomp.dcae.inventory.daos.DCAEServiceTypesDAO;
-import org.openecomp.dcae.inventory.daos.DCAEServicesDAO;
-import org.openecomp.dcae.inventory.daos.InventoryDAOManager;
-import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject;
-import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceTypeObject;
+import org.onap.dcae.inventory.daos.DCAEServiceTypesDAO;
+import org.onap.dcae.inventory.daos.DCAEServicesDAO;
+import org.onap.dcae.inventory.daos.InventoryDAOManager;
+import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject;
+import org.onap.dcae.inventory.dbthings.models.DCAEServiceTypeObject;
 import io.swagger.api.impl.DcaeServiceTypesApiServiceImpl;
 import io.swagger.model.DCAEServiceType;
 import io.swagger.model.DCAEServiceTypeRequest;
diff --git a/src/test/java/DcaeServicesApiServiceImplTests.java b/src/test/java/DcaeServicesApiServiceImplTests.java
index 50d6e5b..75e3e00 100644
--- a/src/test/java/DcaeServicesApiServiceImplTests.java
+++ b/src/test/java/DcaeServicesApiServiceImplTests.java
@@ -21,22 +21,18 @@
 import io.swagger.api.NotFoundException;
 import io.swagger.api.impl.DcaeServicesApiServiceImpl;
 import io.swagger.model.DCAEService;
-import io.swagger.model.DCAEServiceComponent;
 import io.swagger.model.DCAEServiceRequest;
-import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.internal.runners.statements.Fail;
 import org.junit.runner.RunWith;
-import org.openecomp.dcae.inventory.clients.DCAEControllerClient;
-import org.openecomp.dcae.inventory.clients.DatabusControllerClient;
-import org.openecomp.dcae.inventory.daos.DCAEServiceComponentsDAO;
-import org.openecomp.dcae.inventory.daos.DCAEServiceTypesDAO;
-import org.openecomp.dcae.inventory.daos.DCAEServicesDAO;
-import org.openecomp.dcae.inventory.daos.InventoryDAOManager;
-import org.openecomp.dcae.inventory.dbthings.mappers.DCAEServiceObjectMapper;
-import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceComponentObject;
-import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject;
+import org.onap.dcae.inventory.clients.DCAEControllerClient;
+import org.onap.dcae.inventory.clients.DatabusControllerClient;
+import org.onap.dcae.inventory.daos.DCAEServiceComponentsDAO;
+import org.onap.dcae.inventory.daos.DCAEServiceTypesDAO;
+import org.onap.dcae.inventory.daos.DCAEServicesDAO;
+import org.onap.dcae.inventory.daos.InventoryDAOManager;
+import org.onap.dcae.inventory.dbthings.models.DCAEServiceComponentObject;
+import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -44,15 +40,10 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.*;
 
-import org.skife.jdbi.v2.Foreman;
-import org.skife.jdbi.v2.Handle;
-import org.skife.jdbi.v2.Query;
-import org.skife.jdbi.v2.tweak.Argument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.UriInfo;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/src/test/java/DcaeServicesGroupbyApiServiceImplTests.java b/src/test/java/DcaeServicesGroupbyApiServiceImplTests.java
index ffe7cb2..7ca8200 100644
--- a/src/test/java/DcaeServicesGroupbyApiServiceImplTests.java
+++ b/src/test/java/DcaeServicesGroupbyApiServiceImplTests.java
@@ -22,14 +22,10 @@ import io.swagger.api.impl.DcaeServicesGroupbyApiServiceImpl;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.stubbing.OngoingStubbing;
-import org.openecomp.dcae.inventory.daos.InventoryDAOManager;
-import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject;
+import org.onap.dcae.inventory.daos.InventoryDAOManager;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
-import org.skife.jdbi.v2.Handle;
-import org.skife.jdbi.v2.Query;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
diff --git a/src/test/java/org/openecomp/dcae/inventory/daos/InventoryDAOManagerTests.java b/src/test/java/org/onap/dcae/inventory/daos/InventoryDAOManagerTests.java
index 16e3688..8346372 100644
--- a/src/test/java/org/openecomp/dcae/inventory/daos/InventoryDAOManagerTests.java
+++ b/src/test/java/org/onap/dcae/inventory/daos/InventoryDAOManagerTests.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.inventory.daos;
+package org.onap.dcae.inventory.daos;
 
-import org.openecomp.dcae.inventory.InventoryConfiguration;
+import org.onap.dcae.inventory.InventoryConfiguration;
 import io.dropwizard.setup.Environment;
 import org.junit.Test;
 import static org.mockito.Mockito.mock;
diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java
index 2a909f4..c0ad9b8 100644
--- a/src/test/java/org/openecomp/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java
+++ b/src/test/java/org/onap/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.inventory.dbthings.daos;
+package org.onap.dcae.inventory.dbthings.daos;
 
 import org.joda.time.DateTime;
 import org.junit.Test;
-import org.openecomp.dcae.inventory.daos.DCAEServiceComponentsDAO;
-import org.openecomp.dcae.inventory.daos.DCAEServiceTransactionDAO;
-import org.openecomp.dcae.inventory.daos.DCAEServicesComponentsMapsDAO;
-import org.openecomp.dcae.inventory.daos.DCAEServicesDAO;
+import org.onap.dcae.inventory.daos.DCAEServiceComponentsDAO;
+import org.onap.dcae.inventory.daos.DCAEServiceTransactionDAO;
+import org.onap.dcae.inventory.daos.DCAEServicesComponentsMapsDAO;
+import org.onap.dcae.inventory.daos.DCAEServicesDAO;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java
index cb3c7f1..bb511e2 100644
--- a/src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java
+++ b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.inventory.dbthings.mappers;
+package org.onap.dcae.inventory.dbthings.mappers;
 
 import org.junit.Test;
 
diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java
index 1946343..ab150bb 100644
--- a/src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java
+++ b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.inventory.dbthings.mappers;
+package org.onap.dcae.inventory.dbthings.mappers;
 
 import org.junit.Test;
 
diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java
index f8c2428..c1caa29 100644
--- a/src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java
+++ b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java
@@ -18,8 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.inventory.dbthings.mappers;
+package org.onap.dcae.inventory.dbthings.mappers;
 
+import junit.framework.TestCase;
 import org.junit.Test;
 
 import java.sql.Array;
@@ -100,7 +101,7 @@ public class DCAEServiceTypeObjectMapperTests {
 
                 }
             });
-            assertNotNull(mapper.map(0, resultSet, null));
+            TestCase.assertNotNull(mapper.map(0, resultSet, null));
         } catch(Exception e) {
             fail("Unexpected exception");
         }
diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java
index 44f4f73..cb81131 100644
--- a/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java
+++ b/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.inventory.dbthings.models;
+package org.onap.dcae.inventory.dbthings.models;
 
 import io.swagger.model.DCAEServiceComponentRequest;
 import org.junit.Test;
diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java
index 9f7b6f8..7a39883 100644
--- a/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java
+++ b/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.inventory.dbthings.models;
+package org.onap.dcae.inventory.dbthings.models;
 
 import io.swagger.model.DCAEServiceRequest;
 import org.junit.Test;
diff --git a/src/test/java/org/openecomp/dcae/inventory/exception/mappers/DBIExceptionMapperTests.java b/src/test/java/org/onap/dcae/inventory/exception/mappers/DBIExceptionMapperTests.java
index 6e72182..7c04295 100644
--- a/src/test/java/org/openecomp/dcae/inventory/exception/mappers/DBIExceptionMapperTests.java
+++ b/src/test/java/org/onap/dcae/inventory/exception/mappers/DBIExceptionMapperTests.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.inventory.exception.mappers;
+package org.onap.dcae.inventory.exception.mappers;
 
-import org.openecomp.dcae.inventory.daos.InventoryDAOManager;
-import org.openecomp.dcae.inventory.exceptions.mappers.DBIExceptionMapper;
+import org.onap.dcae.inventory.daos.InventoryDAOManager;
+import org.onap.dcae.inventory.exceptions.mappers.DBIExceptionMapper;
 import io.swagger.api.ApiResponseMessage;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/org/openecomp/dcae/inventory/providers/NotFoundExceptionMapperTests.java b/src/test/java/org/onap/dcae/inventory/providers/NotFoundExceptionMapperTests.java
index 083b237..8e2b767 100644
--- a/src/test/java/org/openecomp/dcae/inventory/providers/NotFoundExceptionMapperTests.java
+++ b/src/test/java/org/onap/dcae/inventory/providers/NotFoundExceptionMapperTests.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.dcae.inventory.providers;
+package org.onap.dcae.inventory.providers;
 
 import io.swagger.api.NotFoundException;
 import org.junit.Test;