Sync the latest code changes

[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / introspection / sideeffect / DataLinkTest.java

diff --git a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java
index b817cc6..684bb5b 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java
@@ -31,6 +31,7 @@ import org.junit.*;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.onap.aai.AAISetup;
 import org.onap.aai.db.props.AAIProperties;
 import org.onap.aai.dbmap.DBConnectionType;
 import org.onap.aai.exceptions.AAIException;
@@ -52,7 +53,7 @@ import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-public class DataLinkTest {
+public class DataLinkTest extends AAISetup {
 
        private static TitanGraph graph;
        private final static Version version = Version.getLatest();
@@ -71,8 +72,6 @@ public class DataLinkTest {
        @BeforeClass
        public static void setup() throws NoSuchFieldException, SecurityException, Exception {
                graph = TitanFactory.build().set("storage.backend","inmemory").open();
-               System.setProperty("AJSC_HOME", ".");
-               System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
                loader = LoaderFactory.createLoaderForVersion(introspectorFactoryType, version);
                dbEngine = new TitanDBEngine(
                                queryStyle,
@@ -81,13 +80,17 @@ public class DataLinkTest {
                
                graph.traversal().addV("aai-node-type", "vpn-binding", "vpn-id", "addKey").as("v1")
                .addV("aai-node-type", "vpn-binding", "vpn-id", "modifyKey").as("v2")
-               .addV("aai-node-type", "route-target", "global-route-target", "modifyTargetKey", "route-target-role", "modifyRoleKey", "linked", true).addInE("has", "v2", EdgeProperty.CONTAINS.toString(), true)
+               .addV("aai-node-type", "route-target", "global-route-target", "modifyTargetKey", "route-target-role", "modifyRoleKey", "linked", true)
+                               .addOutE("org.onap.relationships.inventory.BelongsTo", "v2", EdgeProperty.CONTAINS.toString(), true)
                .addV("aai-node-type", "vpn-binding", "vpn-id", "deleteKey").as("v3")
-               .addV("aai-node-type", "route-target", "global-route-target", "deleteTargetKey", "route-target-role", "deleteRoleKey", "linked", true).addInE("has", "v3", EdgeProperty.CONTAINS.toString(), true)
+               .addV("aai-node-type", "route-target", "global-route-target", "deleteTargetKey", "route-target-role", "deleteRoleKey", "linked", true)
+                               .addOutE("org.onap.relationships.inventory.BelongsTo", "v3", EdgeProperty.CONTAINS.toString(), true)
                .addV("aai-node-type", "vpn-binding", "vpn-id", "getKey").as("v4")
-               .addV("aai-node-type", "route-target", "global-route-target", "getTargetKey", "route-target-role", "getRoleKey", "linked", true).addInE("has", "v4", EdgeProperty.CONTAINS.toString(), true)
+               .addV("aai-node-type", "route-target", "global-route-target", "getTargetKey", "route-target-role", "getRoleKey", "linked", true)
+                               .addOutE("org.onap.relationships.inventory.BelongsTo", "v4", EdgeProperty.CONTAINS.toString(), true)
                .addV("aai-node-type", "vpn-binding", "vpn-id", "getKeyNoLink").as("v5")
-               .addV("aai-node-type", "route-target", "global-route-target", "getTargetKeyNoLink", "route-target-role", "getRoleKeyNoLink").addInE("has", "v5", EdgeProperty.CONTAINS.toString(), true)
+               .addV("aai-node-type", "route-target", "global-route-target", "getTargetKeyNoLink", "route-target-role", "getRoleKeyNoLink")
+                               .addOutE("org.onap.relationships.inventory.BelongsTo", "v5", EdgeProperty.CONTAINS.toString(), true)
                .next();
                graph.tx().commit();
        }
@@ -187,7 +190,12 @@ public class DataLinkTest {
                runner.execute(obj, self);
 
                assertEquals("route-target vertex not found", false, traversal.V()
-                               .has(AAIProperties.NODE_TYPE, "route-target").has("global-route-target", "deleteTargetKey").has("route-target-role", "deleteRoleKey").has("linked", true).hasNext());
+                               .has(AAIProperties.NODE_TYPE, "route-target")
+                               .has("global-route-target", "deleteTargetKey")
+                               .has("route-target-role", "deleteRoleKey")
+                               .has("linked", true)
+                               .hasNext()
+               );
                g.tx().rollback();
                
        }