Fix Sonar code smells

Reformat to ONAP Java standards.
Rename GizmoTranslatorTest.java to Test*.java to match the existing
naming conventions. Remove duplicated test scaffolding from this file.

Change-Id: Ie8d5f7ea113d3d60d6222f66cd6740df7f9afca0
Issue-ID: AAI-1957
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>

3 files changed, 75 insertions, 116 deletions

diff --git a/src/test/java/org/onap/aai/modelloader/util/ArtifactTestUtils.java b/src/test/java/org/onap/aai/modelloader/util/ArtifactTestUtils.java
index 752f389..50074f1 100644
--- a/src/test/java/org/onap/aai/modelloader/util/ArtifactTestUtils.java
+++ b/src/test/java/org/onap/aai/modelloader/util/ArtifactTestUtils.java
@@ -34,6 +34,15 @@ public class ArtifactTestUtils {
                 ArtifactTestUtils.loadResourceAsString(resource));
     }
 
+    /**
+     * Finds the resource with the given name and returns it as an array of bytes.
+     *
+     * @param resourceName
+     *        the /-separated path to the resource
+     * @return the requested resource contents as a byte array
+     * @throws IOException
+     *         if the resource could not be found (using current privileges)
+     */
     public byte[] loadResource(String resourceName) throws IOException {
         URL resource = getResource(resourceName);
         if (resource != null) {
diff --git a/src/test/java/org/onap/aai/modelloader/util/GizmoTranslatorTest.java b/src/test/java/org/onap/aai/modelloader/util/GizmoTranslatorTest.java
deleted file mode 100644
index 5891931..0000000
--- a/src/test/java/org/onap/aai/modelloader/util/GizmoTranslatorTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
- * ================================================================================
- * 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=========================================================
- */
-package org.onap.aai.modelloader.util;
-
-import static org.junit.Assert.assertTrue;
-
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.List;
-
-import org.junit.Test;
-import org.onap.aai.modelloader.gizmo.GizmoBulkPayload;
-import org.onap.aai.modelloader.gizmo.GizmoEdgeOperation;
-import org.onap.aai.modelloader.gizmo.GizmoVertexOperation;
-
-public class GizmoTranslatorTest {
-    
-    @Test
-    public void translateXmlModel1() throws Exception {
-        final String XML_MODEL_FILE = "src/test/resources/models/AAI-stellService-service-1.xml";
-
-        try {
-            byte[] encoded = Files.readAllBytes(Paths.get(XML_MODEL_FILE));
-            String originalXml = new String(encoded);
-            
-            String output = GizmoTranslator.translate(originalXml);
-            System.out.println("Test1 Outgoing:\n" + output);
-            
-            GizmoBulkPayload request = GizmoBulkPayload.fromJson(output);
-            
-            List<GizmoVertexOperation> ops = request.getVertexOperations(GizmoBulkPayload.ADD_OP);
-            assertTrue(ops.size() == 5);
-            
-            ops = request.getVertexOperations(GizmoBulkPayload.EXISTS_OP);
-            assertTrue(ops.size() == 3);
-            
-            List<GizmoEdgeOperation> edgeOps = request.getEdgeOperations(GizmoBulkPayload.ADD_OP);
-            assertTrue(edgeOps.size() == 7);                 
-        } catch (Exception e) {
-            e.printStackTrace();
-            assertTrue(false);
-        }     
-    }
-    
-    @Test
-    public void translateXmlModel2() throws Exception {
-        final String XML_MODEL_FILE2 = "src/test/resources/models/l3-network-widget.xml";
-
-        try {
-            byte[] encoded = Files.readAllBytes(Paths.get(XML_MODEL_FILE2));
-            String originalXml = new String(encoded);
-            
-            String output = GizmoTranslator.translate(originalXml);
-            System.out.println("Test2 Outgoing:\n" + output);
-            
-            GizmoBulkPayload request = GizmoBulkPayload.fromJson(output);
-            
-            List<GizmoVertexOperation> ops = request.getVertexOperations(GizmoBulkPayload.ADD_OP);
-            assertTrue(ops.size() == 2);
-            
-            ops = request.getVertexOperations(GizmoBulkPayload.EXISTS_OP);
-            assertTrue(ops.size() == 0);
-            
-            List<GizmoEdgeOperation> edgeOps = request.getEdgeOperations(GizmoBulkPayload.ADD_OP);
-            assertTrue(edgeOps.size() == 1);                     
-        } catch (Exception e) {
-            e.printStackTrace();
-            assertTrue(false);
-        }     
-    }
-    
-    @Test
-    public void translateXmlNamedQuery() throws Exception {
-        final String XML_MODEL_FILE3 = "src/test/resources/models/named-query-wan-connector.xml";
-
-        try {
-            byte[] encoded = Files.readAllBytes(Paths.get(XML_MODEL_FILE3));
-            String originalXml = new String(encoded);
-            
-            String output = GizmoTranslator.translate(originalXml);
-            System.out.println("Test3 Outgoing:\n" + output);
-            
-            GizmoBulkPayload request = GizmoBulkPayload.fromJson(output);
-            
-            List<GizmoVertexOperation> ops = request.getVertexOperations(GizmoBulkPayload.ADD_OP);
-            assertTrue(ops.size() == 5);
-            
-            ops = request.getVertexOperations(GizmoBulkPayload.EXISTS_OP);
-            assertTrue(ops.size() == 4);
-            
-            List<GizmoEdgeOperation> edgeOps = request.getEdgeOperations(GizmoBulkPayload.ADD_OP);
-            assertTrue(edgeOps.size() == 8);                     
-        } catch (Exception e) {
-            e.printStackTrace();
-            assertTrue(false);
-        }     
-    }
-}
diff --git a/src/test/java/org/onap/aai/modelloader/util/TestGizmoTranslator.java b/src/test/java/org/onap/aai/modelloader/util/TestGizmoTranslator.java
new file mode 100644
index 0000000..e82af47
--- /dev/null
+++ b/src/test/java/org/onap/aai/modelloader/util/TestGizmoTranslator.java
@@ -0,0 +1,66 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 European Software Marketing Ltd.
+ * ================================================================================
+ * 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=========================================================
+ */
+package org.onap.aai.modelloader.util;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import javax.xml.parsers.ParserConfigurationException;
+import org.junit.Test;
+import org.onap.aai.modelloader.gizmo.GizmoBulkPayload;
+import org.xml.sax.SAXException;
+
+public class TestGizmoTranslator {
+
+    @Test
+    public void translateXmlModel1() throws Exception {
+        GizmoBulkPayload request = createBulkRequest("src/test/resources/models/AAI-stellService-service-1.xml");
+        assertThat(request.getVertexOperations(GizmoBulkPayload.ADD_OP).size(), is(5));
+        assertThat(request.getVertexOperations(GizmoBulkPayload.EXISTS_OP).size(), is(3));
+        assertThat(request.getEdgeOperations(GizmoBulkPayload.ADD_OP).size(), is(7));
+    }
+
+    @Test
+    public void translateXmlModel2() throws Exception {
+        GizmoBulkPayload request = createBulkRequest("src/test/resources/models/l3-network-widget.xml");
+        assertThat(request.getVertexOperations(GizmoBulkPayload.ADD_OP).size(), is(2));
+        assertThat(request.getVertexOperations(GizmoBulkPayload.EXISTS_OP).size(), is(0));
+        assertThat(request.getEdgeOperations(GizmoBulkPayload.ADD_OP).size(), is(1));
+    }
+
+    @Test
+    public void translateXmlNamedQuery() throws Exception {
+        GizmoBulkPayload request = createBulkRequest("src/test/resources/models/named-query-wan-connector.xml");
+        assertThat(request.getVertexOperations(GizmoBulkPayload.ADD_OP).size(), is(5));
+        assertThat(request.getVertexOperations(GizmoBulkPayload.EXISTS_OP).size(), is(4));
+        assertThat(request.getEdgeOperations(GizmoBulkPayload.ADD_OP).size(), is(8));
+    }
+
+    private GizmoBulkPayload createBulkRequest(String filePath)
+            throws IOException, ParserConfigurationException, SAXException {
+        final String xmlPayload = new String(Files.readAllBytes(Paths.get(filePath)));
+        return GizmoBulkPayload.fromJson(GizmoTranslator.translate(xmlPayload));
+    }
+
+}