AAI-1523 Batch reformat aai-core

[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / parsers / query / LegacyQueryTest.java

diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/LegacyQueryTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/LegacyQueryTest.java
index 8272f77..4cdc55f 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/query/LegacyQueryTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/query/LegacyQueryTest.java
@@ -17,42 +17,39 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai.parsers.query;
 
+import static org.junit.Assert.assertEquals;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+
+import javax.ws.rs.core.UriBuilder;
+import javax.xml.bind.JAXBException;
+
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.onap.aai.AAISetup;
 import org.onap.aai.exceptions.AAIException;
-
 import org.onap.aai.introspection.ModelType;
-import org.onap.aai.serialization.engines.QueryStyle;
 import org.onap.aai.serialization.engines.JanusGraphDBEngine;
+import org.onap.aai.serialization.engines.QueryStyle;
 import org.onap.aai.serialization.engines.TransactionalGraphEngine;
 import org.onap.aai.setup.SchemaVersion;
 
-import javax.ws.rs.core.UriBuilder;
-import javax.xml.bind.JAXBException;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-
-import static org.junit.Assert.assertEquals;
-
-
 @Ignore
 public class LegacyQueryTest extends AAISetup {
 
-
     private TransactionalGraphEngine dbEngine;
     private SchemaVersion version;
     private DynamicJAXBContext context = nodeIngestor.getContextForVersion(version);
 
-    public void setup(){
+    public void setup() {
         version = new SchemaVersion("v10");
-        dbEngine =
-            new JanusGraphDBEngine(QueryStyle.GREMLIN_TRAVERSAL,
-                loaderFactory.createLoaderForVersion(ModelType.MOXY, version),
-                false);
+        dbEngine = new JanusGraphDBEngine(QueryStyle.GREMLIN_TRAVERSAL,
+                loaderFactory.createLoaderForVersion(ModelType.MOXY, version), false);
     }
 
     /**
@@ -64,26 +61,17 @@ public class LegacyQueryTest extends AAISetup {
      */
     @Test
     public void parentQuery() throws JAXBException, UnsupportedEncodingException, AAIException {
-        
+
         URI uri = UriBuilder.fromPath("cloud-infrastructure/pservers/pserver/key1").build();
 
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri);
 
-        String expected = 
-                ".has('hostname', 'key1').has('aai-node-type', 'pserver')";
-        assertEquals(
-                "gremlin query should be " + expected,
-                expected,
-                query.getQueryBuilder().getQuery());
-        assertEquals(
-                "parent gremlin query should be equal to normal query",
-                expected,
+        String expected = ".has('hostname', 'key1').has('aai-node-type', 'pserver')";
+        assertEquals("gremlin query should be " + expected, expected, query.getQueryBuilder().getQuery());
+        assertEquals("parent gremlin query should be equal to normal query", expected,
                 query.getQueryBuilder().getParentQuery().getQuery());
-        assertEquals(
-                "result type should be pserver",
-                "pserver",
-                query.getResultType());
-        
+        assertEquals("result type should be pserver", "pserver", query.getResultType());
+
     }
 
     /**
@@ -95,29 +83,19 @@ public class LegacyQueryTest extends AAISetup {
      */
     @Test
     public void childQuery() throws JAXBException, UnsupportedEncodingException, AAIException {
-        URI uri = UriBuilder.fromPath("cloud-infrastructure/pservers/pserver/key1/lag-interfaces/lag-interface/key2").build();
+        URI uri = UriBuilder.fromPath("cloud-infrastructure/pservers/pserver/key1/lag-interfaces/lag-interface/key2")
+                .build();
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri);
 
-        String expected =
-                ".has('hostname', 'key1').has('aai-node-type', 'pserver')"
-                + ".out('hasLAGInterface').has('aai-node-type', 'lag-interface')"
-                + ".has('interface-name', 'key2')";
-        String parentExpected = 
-                ".has('hostname', 'key1').has('aai-node-type', 'pserver')";
-        assertEquals(
-                "gremlin query should be for node",
-                expected,
-                query.getQueryBuilder().getQuery());
-        assertEquals(
-                "parent gremlin query should be for parent",
-                parentExpected,
+        String expected = ".has('hostname', 'key1').has('aai-node-type', 'pserver')"
+                + ".out('hasLAGInterface').has('aai-node-type', 'lag-interface')" + ".has('interface-name', 'key2')";
+        String parentExpected = ".has('hostname', 'key1').has('aai-node-type', 'pserver')";
+        assertEquals("gremlin query should be for node", expected, query.getQueryBuilder().getQuery());
+        assertEquals("parent gremlin query should be for parent", parentExpected,
                 query.getQueryBuilder().getParentQuery().getQuery());
-        assertEquals(
-                "result type should be lag-interface",
-                "lag-interface",
-                query.getResultType());
+        assertEquals("result type should be lag-interface", "lag-interface", query.getResultType());
     }
-    
+
     /**
      * Naming exceptions.
      *
@@ -127,32 +105,23 @@ public class LegacyQueryTest extends AAISetup {
      */
     @Test
     public void namingExceptions() throws JAXBException, UnsupportedEncodingException, AAIException {
-        URI uri = UriBuilder.fromPath("network/vces/vce/key1/port-groups/port-group/key2/cvlan-tags/cvlan-tag/655").build();
-    
+        URI uri = UriBuilder.fromPath("network/vces/vce/key1/port-groups/port-group/key2/cvlan-tags/cvlan-tag/655")
+                .build();
+
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri);
-        String expected = 
-                ".has('vnf-id', 'key1').has('aai-node-type', 'vce')"
+        String expected = ".has('vnf-id', 'key1').has('aai-node-type', 'vce')"
                 + ".in('org.onap.relationships.inventory.BelongsTo').has('aai-node-type', 'port-group')"
                 + ".has('interface-id', 'key2')"
                 + ".in('org.onap.relationships.inventory.BelongsTo').has('aai-node-type', 'cvlan-tag')"
                 + ".has('cvlan-tag', 655)";
-        String expectedParent = 
-                        ".has('vnf-id', 'key1').has('aai-node-type', 'vce')"
-                        + ".in('org.onap.relationships.inventory.BelongsTo').has('aai-node-type', 'port-group')"
-                        + ".has('interface-id', 'key2')";
-        assertEquals(
-                "gremlin query should be " + expected,
-                expected,
-                query.getQueryBuilder().getQuery());
-        assertEquals(
-                "parent gremlin query should be equal the query for port group",
-                expectedParent,
+        String expectedParent = ".has('vnf-id', 'key1').has('aai-node-type', 'vce')"
+                + ".in('org.onap.relationships.inventory.BelongsTo').has('aai-node-type', 'port-group')"
+                + ".has('interface-id', 'key2')";
+        assertEquals("gremlin query should be " + expected, expected, query.getQueryBuilder().getQuery());
+        assertEquals("parent gremlin query should be equal the query for port group", expectedParent,
                 query.getQueryBuilder().getParentQuery().getQuery());
-        assertEquals(
-                "result type should be cvlan-tag",
-                "cvlan-tag",
-                query.getResultType());
-        
+        assertEquals("result type should be cvlan-tag", "cvlan-tag", query.getResultType());
+
     }
-    
+
 }