Port champ-microservice project restructure

[aai/champ.git] / champ-lib / champ-core / src / test / java / org / onap / aai / champcore / core / ChampObjectIndexTest.java

diff --git a/src/test/java/org/onap/aai/champ/core/ChampObjectIndexTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampObjectIndexTest.java
similarity index 91%
rename from src/test/java/org/onap/aai/champ/core/ChampObjectIndexTest.java
rename to champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampObjectIndexTest.java
index a11b67b..bb2c65e 100644 (file)
--- a/src/test/java/org/onap/aai/champ/core/ChampObjectIndexTest.java
+++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampObjectIndexTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.onap.aai.champ.core;
+package org.onap.aai.champcore.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -29,35 +29,27 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.junit.Test;
-import org.onap.aai.champ.ChampAPI;
-import org.onap.aai.champ.ChampGraph;
-import org.onap.aai.champ.exceptions.ChampIndexNotExistsException;
-import org.onap.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champcore.ChampAPI;
+import org.onap.aai.champcore.ChampGraph;
+import org.onap.aai.champcore.exceptions.ChampIndexNotExistsException;
+import org.onap.aai.champcore.model.ChampObjectIndex;
 
 public class ChampObjectIndexTest extends BaseChampAPITest {
        @Test
-       public void runTest() {
-               for (ChampGraph.Type apiType : ChampGraph.Type.values()) {
+  public void runTestMemory() {
+    runTest("IN_MEMORY");
+  }
+
+       public void runTest(String apiType) {
                        final ChampAPI api = ChampAPI.Factory.newInstance(apiType);
                        final String graphName = api.getClass().getSimpleName();
 
-                       switch (apiType) {
-                       case IN_MEMORY:
-                       break;
-                       case TITAN:
-                               cleanUp(graphName);
-                       break;
-                       default:
-                       break;
-                       }
-
                        ChampObjectIndexTest.testChampObjectIndexCrud(api.getGraph(graphName));
 
                        api.shutdown();
-               }
        }
 
-       private static void testChampObjectIndexCrud(ChampGraph graph) {
+       public static void testChampObjectIndexCrud(ChampGraph graph) {
                
                final ChampObjectIndex objectIndex = ChampObjectIndex.create()
                                                                                                                                .ofName("fooObjectIndex")