EdgeRules throws descriptive error on invalid rule

[aai/aai-common.git] / aai-core / src / test / java / org / openecomp / aai / introspection / sideeffect / DataCopyTest.java

diff --git a/aai-core/src/test/java/org/openecomp/aai/introspection/sideeffect/DataCopyTest.java b/aai-core/src/test/java/org/openecomp/aai/introspection/sideeffect/DataCopyTest.java
index 80b2c77..8e37fe0 100644 (file)
--- a/aai-core/src/test/java/org/openecomp/aai/introspection/sideeffect/DataCopyTest.java
+++ b/aai-core/src/test/java/org/openecomp/aai/introspection/sideeffect/DataCopyTest.java
@@ -20,51 +20,44 @@
 
 package org.openecomp.aai.introspection.sideeffect;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-
+import com.thinkaurelius.titan.core.TitanFactory;
+import com.thinkaurelius.titan.core.TitanGraph;
 import org.apache.commons.io.IOUtils;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.junit.*;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-
 import org.openecomp.aai.db.props.AAIProperties;
 import org.openecomp.aai.dbmap.DBConnectionType;
 import org.openecomp.aai.exceptions.AAIException;
-import org.openecomp.aai.introspection.Introspector;
-import org.openecomp.aai.introspection.Loader;
-import org.openecomp.aai.introspection.LoaderFactory;
-import org.openecomp.aai.introspection.ModelType;
-import org.openecomp.aai.introspection.Version;
+import org.openecomp.aai.introspection.*;
 import org.openecomp.aai.introspection.sideeffect.exceptions.AAIMissingRequiredPropertyException;
 import org.openecomp.aai.parsers.query.QueryParser;
 import org.openecomp.aai.serialization.db.DBSerializer;
+import org.openecomp.aai.serialization.db.EdgeProperty;
 import org.openecomp.aai.serialization.engines.QueryStyle;
 import org.openecomp.aai.serialization.engines.TitanDBEngine;
 import org.openecomp.aai.serialization.engines.TransactionalGraphEngine;
-import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper;
-import org.openecomp.aai.util.AAIConstants;
-import com.thinkaurelius.titan.core.TitanFactory;
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanTransaction;
 
-@Ignore
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
 public class DataCopyTest {
 
        private static TitanGraph graph;
-       private final static Version version = Version.v10;
+       private final static Version version = Version.getLatest();
        private final static ModelType introspectorFactoryType = ModelType.MOXY;
        private final static QueryStyle queryStyle = QueryStyle.TRAVERSAL;
        private final static DBConnectionType type = DBConnectionType.REALTIME;
@@ -82,7 +75,6 @@ public class DataCopyTest {
                graph = TitanFactory.build().set("storage.backend","inmemory").open();
                System.setProperty("AJSC_HOME", ".");
                System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
-               QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/org/openecomp/aai/introspection/");
                loader = LoaderFactory.createLoaderForVersion(introspectorFactoryType, version);
                dbEngine = new TitanDBEngine(
                                queryStyle,
@@ -90,9 +82,9 @@ public class DataCopyTest {
                                loader);
                
                graph.traversal().addV("aai-node-type", "model", "model-invariant-id", "key1").as("v1")
-               .addV("aai-node-type", "model-ver", "model-ver", "myValue", "model-version-id", "key2", "model-version", "testValue").addInE("has", "v1", "isParent", true)
+               .addV("aai-node-type", "model-ver", "model-ver", "myValue", "model-version-id", "key2", "model-version", "testValue").addInE("has", "v1", EdgeProperty.CONTAINS.toString(), true)
                .addV("aai-node-type", "model", "model-invariant-id", "key3").as("v2")
-               .addV("aai-node-type", "model-ver", "model-ver", "myValue", "model-version-id", "key4").addInE("has", "v2", "isParent", true)
+               .addV("aai-node-type", "model-ver", "model-ver", "myValue", "model-version-id", "key4").addInE("has", "v2", EdgeProperty.CONTAINS.toString(), true)
                .next();
                graph.tx().commit();
        }
@@ -111,14 +103,14 @@ public class DataCopyTest {
        @Test
        public void runPopulatePersonaModelVer() throws URISyntaxException, AAIException, UnsupportedEncodingException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, MalformedURLException {
                
-               final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v10);
+               final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.getLatest());
                final Introspector obj = loader.introspectorFromName("test-object");
                obj.setValue("vnf-id", "myId");
                obj.setValue("model-invariant-id", "key1");
                obj.setValue("model-version-id", "key2");
                TransactionalGraphEngine spy = spy(dbEngine);
                TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
-               TitanTransaction g = graph.newTransaction();
+               Graph g = graph.newTransaction();
                GraphTraversalSource traversal = g.traversal();
                when(spy.asAdmin()).thenReturn(adminSpy);
                when(adminSpy.getTraversalSource()).thenReturn(traversal);
@@ -132,7 +124,7 @@ public class DataCopyTest {
 
                assertEquals("value populated", "testValue", obj.getValue("persona-model-ver"));
                
-               g.rollback();
+               g.tx().rollback();
                
                
        }
@@ -147,7 +139,7 @@ public class DataCopyTest {
                obj.setValue("persona-model-version", "testValue");
                TransactionalGraphEngine spy = spy(dbEngine);
                TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
-               TitanTransaction g = graph.newTransaction();
+               Graph g = graph.newTransaction();
                GraphTraversalSource traversal = g.traversal();
                when(spy.asAdmin()).thenReturn(adminSpy);
                when(adminSpy.getTraversalSource()).thenReturn(traversal);
@@ -161,18 +153,18 @@ public class DataCopyTest {
                
                assertEquals("value populated", "key2", obj.getValue("model-version-id"));
                
-               g.rollback();
+               g.tx().rollback();
        }
        
        @Test
        public void verifyNestedSideEffect() throws URISyntaxException, AAIException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, IOException {
                
-               final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v10);
+               final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.getLatest());
                final Introspector obj = loader.unmarshal("customer", this.getJsonString("nested-case.json"));
                System.out.println(obj.marshal(true));
                TransactionalGraphEngine spy = spy(dbEngine);
                TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
-               TitanTransaction g = graph.newTransaction();
+               Graph g = graph.newTransaction();
                GraphTraversalSource traversal = g.traversal();
                when(spy.tx()).thenReturn(g);
                when(spy.asAdmin()).thenReturn(adminSpy);
@@ -186,21 +178,21 @@ public class DataCopyTest {
                
                assertEquals("nested value populated", "testValue", g.traversal().V().has("service-instance-id", "nested-instance-key").next().property("persona-model-version").orElse(""));
 
-               g.rollback();
+               g.tx().rollback();
 
        }
        
        @Test
        public void expectedMissingPropertyExceptionInURI() throws AAIException, UnsupportedEncodingException {
                
-               final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v10);
+               final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.getLatest());
                final Introspector obj = loader.introspectorFromName("test-object");
                obj.setValue("vnf-id", "myId");
                obj.setValue("model-invariant-id", "key1");
 
                TransactionalGraphEngine spy = spy(dbEngine);
                TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
-               TitanTransaction g = graph.newTransaction();
+               Graph g = graph.newTransaction();
                GraphTraversalSource traversal = g.traversal();
                when(spy.asAdmin()).thenReturn(adminSpy);
                when(adminSpy.getTraversalSource()).thenReturn(traversal);
@@ -216,7 +208,7 @@ public class DataCopyTest {
        
        @Test
        public void expectedMissingPropertyExceptionForResultingObject() throws AAIException, UnsupportedEncodingException {
-               final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v10);
+               final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.getLatest());
                final Introspector obj = loader.introspectorFromName("test-object");
                obj.setValue("vnf-id", "myId");
                obj.setValue("model-invariant-id", "key3");
@@ -224,7 +216,7 @@ public class DataCopyTest {
 
                TransactionalGraphEngine spy = spy(dbEngine);
                TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
-               TitanTransaction g = graph.newTransaction();
+               Graph g = graph.newTransaction();
                GraphTraversalSource traversal = g.traversal();
                when(spy.asAdmin()).thenReturn(adminSpy);
                when(adminSpy.getTraversalSource()).thenReturn(traversal);
@@ -240,13 +232,13 @@ public class DataCopyTest {
        
        @Test
        public void expectNoProcessingWithNoProperties() throws AAIException, UnsupportedEncodingException {
-               final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v10);
+               final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.getLatest());
                final Introspector obj = loader.introspectorFromName("test-object");
                obj.setValue("vnf-id", "myId");
 
                TransactionalGraphEngine spy = spy(dbEngine);
                TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
-               TitanTransaction g = graph.newTransaction();
+               Graph g = graph.newTransaction();
                GraphTraversalSource traversal = g.traversal();
                when(spy.asAdmin()).thenReturn(adminSpy);
                when(adminSpy.getTraversalSource()).thenReturn(traversal);
@@ -266,7 +258,7 @@ public class DataCopyTest {
        private String getJsonString(String filename) throws IOException {
                
                
-               FileInputStream is = new FileInputStream("src/test/resources/org/openecomp/aai/introspection/sideeffect/" + filename);
+               FileInputStream is = new FileInputStream("src/test/resources/bundleconfig-local/etc/oxm/sideeffect/" + filename);
                String s =  IOUtils.toString(is, "UTF-8"); 
                IOUtils.closeQuietly(is);