1 files changed, 29 insertions, 4 deletions

diff --git a/src/test/java/org/onap/aai/graphgraph/SchemaResourceTest.java b/src/test/java/org/onap/aai/graphgraph/SchemaResourceTest.java
index 84bcf2f..a857d83 100644
--- a/src/test/java/org/onap/aai/graphgraph/SchemaResourceTest.java
+++ b/src/test/java/org/onap/aai/graphgraph/SchemaResourceTest.java
@@ -23,7 +23,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.aai.edges.EdgeIngestor;
 import org.onap.aai.graphgraph.dto.Graph;
 import org.onap.aai.graphgraph.dto.NodeName;
 import org.onap.aai.graphgraph.dto.NodeProperty;
@@ -52,9 +51,6 @@ public class SchemaResourceTest {
     private NodeIngestor nodeIngestor;
 
     @Autowired
-    private EdgeIngestor edgeIngestor;
-
-    @Autowired
     private MoxyLoaderRepository moxyLoaderRepository;
 
     @Before
@@ -80,6 +76,20 @@ public class SchemaResourceTest {
     }
 
     @Test
+    public void loadCloudRegionGraphTest() {
+        Graph graph = schemaResource.loadGraph("v10", "cloud-region", 1, 1, 1, "Edgerules");
+
+        Assert.assertNotNull(graph.getEdges());
+        Assert.assertEquals(14, graph.getEdges().size());
+        Assert.assertEquals(15, graph.getNodeNames().size());
+        Assert.assertTrue(containsNodeName(graph.getNodeNames(), "image"));
+        Assert.assertTrue(containsNodeName(graph.getNodeNames(), "volume-group"));
+        Assert.assertTrue(containsNodeName(graph.getNodeNames(), "zone"));
+        Assert.assertTrue(containsNodeName(graph.getNodeNames(), "dvs-switch"));
+        Assert.assertTrue(containsNodeName(graph.getNodeNames(), "tenant"));
+    }
+
+    @Test
     public void loadGraphPathsTest() {
         Graph graph = schemaResource.loadGraphWithPaths("v10", "cloud-region", "image", "Edgerules");
 
@@ -110,6 +120,21 @@ public class SchemaResourceTest {
         Assert.assertEquals(844919, schemaExport.length());
     }
 
+    @Test
+    public void allVertexNamesTest() {
+        List<NodeName> nodeNames = schemaResource.loadVertexNames("v10", "Edgerules");
+        Assert.assertNotNull(nodeNames);
+        Assert.assertEquals(74, nodeNames.size());
+        Assert.assertTrue(containsNodeName(nodeNames, "connector"));
+        Assert.assertTrue(containsNodeName(nodeNames, "cvlan-tag"));
+        Assert.assertTrue(containsNodeName(nodeNames, "element-choice-set"));
+        Assert.assertTrue(containsNodeName(nodeNames, "image"));
+        Assert.assertTrue(containsNodeName(nodeNames, "model-constraint"));
+        Assert.assertTrue(containsNodeName(nodeNames, "pnf"));
+        Assert.assertTrue(containsNodeName(nodeNames, "service-capability"));
+        Assert.assertTrue(containsNodeName(nodeNames, "vlan"));
+    }
+
     private boolean containsNodeProperty(List<NodeProperty> nodeProperties, String propertyName) {
 
         for (NodeProperty nodeProperty : nodeProperties) {