Add gremlin-based pagination to aai-common

[aai/aai-common.git] / aai-schema-ingest / src / test / java / org / onap / aai / nodes / NodeIngestorWiringTest.java

diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorWiringTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorWiringTest.java
index e62cc6a..7ae0a2c 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorWiringTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorWiringTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-18 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.
@@ -16,8 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 
 package org.onap.aai.nodes;
@@ -28,30 +26,32 @@ import org.eclipse.persistence.dynamic.DynamicEntity;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.aai.setup.SchemaLocationsBean;
-import org.onap.aai.setup.Version;
+import org.onap.aai.config.NodesConfiguration;
+import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.testutils.ConfigTranslatorForWiringTest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {SchemaLocationsBean.class, ConfigTranslatorForWiringTest.class, NodeIngestor.class})
-@TestPropertySource(properties = {"schemaIngestPropLoc = src/test/resources/forWiringTests/schemaIngestWiringTest.properties"})
+@ContextConfiguration(classes = {ConfigTranslatorForWiringTest.class, NodesConfiguration.class})
+@TestPropertySource(
+        properties = {
+                "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local-node.properties"})
 @SpringBootTest
 public class NodeIngestorWiringTest {
-       @Autowired
-       NodeIngestor ni;
-       
-       @Test
-       public void test() {
-               DynamicJAXBContext ctx10 = ni.getContextForVersion(Version.V10);
-               
-               //should work bc Bar is valid in test_business_v10 schema
-               DynamicEntity bar10 = ctx10.newDynamicEntity("Bar");
-               bar10.set("barId","bar2");
-               assertTrue("bar2".equals(bar10.get("barId")));
-       }
+    @Autowired
+    NodeIngestor ni;
+
+    @Test
+    public void test() {
+        DynamicJAXBContext ctx10 = ni.getContextForVersion(new SchemaVersion("v10"));
+
+        // should work bc Bar is valid in test_business_v10 schema
+        DynamicEntity bar10 = ctx10.newDynamicEntity("Bar");
+        bar10.set("barId", "bar2");
+        assertTrue("bar2".equals(bar10.get("barId")));
+    }
 }