X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-core%2Fsrc%2Ftest%2Fjava%2Forg%2Fopenecomp%2Faai%2Fquery%2Fbuilder%2FSimplePathTest.java;h=e57fb0e5acfd45e720e40c1d714b82f06f447724;hb=f94c995d4d2b5ffd7f7fa7cf6ec10cdcbf4932a7;hp=e6e510c6fffa5286bf901d893fa934bc8f71100f;hpb=45dfa2e1c5a61a35c53214b3c29f8ba510c2e5e6;p=aai%2Faai-common.git

diff --git a/aai-core/src/test/java/org/openecomp/aai/query/builder/SimplePathTest.java b/aai-core/src/test/java/org/openecomp/aai/query/builder/SimplePathTest.java
index e6e510c6..e57fb0e5 100644
--- a/aai-core/src/test/java/org/openecomp/aai/query/builder/SimplePathTest.java
+++ b/aai-core/src/test/java/org/openecomp/aai/query/builder/SimplePathTest.java
@@ -1,17 +1,33 @@
-package org.openecomp.aai.query.builder;
-
-import static org.junit.Assert.*;
+/*-
+ * ============LICENSE_START=======================================================
+ * org.openecomp.aai
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
 
-import java.util.List;
+package org.openecomp.aai.query.builder;
 
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
 import org.junit.Before;
 import org.junit.Test;
+import org.openecomp.aai.AAISetup;
 import org.openecomp.aai.exceptions.AAIException;
 import org.openecomp.aai.introspection.Loader;
 import org.openecomp.aai.introspection.LoaderFactory;
@@ -19,15 +35,17 @@ import org.openecomp.aai.introspection.ModelType;
 import org.openecomp.aai.introspection.Version;
 import org.openecomp.aai.serialization.db.EdgeRules;
 import org.openecomp.aai.serialization.db.EdgeType;
-import org.openecomp.aai.serialization.db.exceptions.NoEdgeRuleFoundException;
 
-public class SimplePathTest {
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+
+public class SimplePathTest extends AAISetup {
+
 	public Loader loader;
 	
 	@Before
-	public void setup() {
-		System.setProperty("AJSC_HOME", ".");
-		System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
+	public void setup() throws Exception {
 		loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.getLatest());
 	}