X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fsa%2Frest%2FDocumentSchemaTest.java;h=c2d50217becda5b1af36713d94b8d2e312791915;hb=f637a36c9df966c341727910e30241b63cc49c06;hp=ab1d293ef14612c4762b8da15cc6fcfdf3d8e4f3;hpb=ce701746049abfd94a87b46e43f296faf32d6213;p=aai%2Fsearch-data-service.git

diff --git a/src/test/java/org/onap/aai/sa/rest/DocumentSchemaTest.java b/src/test/java/org/onap/aai/sa/rest/DocumentSchemaTest.java
index ab1d293..c2d5021 100644
--- a/src/test/java/org/onap/aai/sa/rest/DocumentSchemaTest.java
+++ b/src/test/java/org/onap/aai/sa/rest/DocumentSchemaTest.java
@@ -20,84 +20,80 @@
  */
 package org.onap.aai.sa.rest;
 
+import static org.junit.Assert.assertTrue;
+
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
-import org.onap.aai.sa.rest.DocumentSchema;
-
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
-
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Test;
 
 public class DocumentSchemaTest {
 
-  private final String SIMPLE_DOC_SCHEMA_JSON = "src/test/resources/json/simpleDocument.json";
-  private final String NESTED_DOC_SCHEMA_JSON = "src/test/resources/json/nested-document.json";
-
-
-  /**
-   * This test validates that we convert document definitions back and
-   * forth between json strings and POJOs without any loss of data.
-   *
-   * @throws com.fasterxml.jackson.core.JsonParseException
-   * @throws com.fasterxml.jackson.databind.JsonMappingException
-   * @throws IOException
-   */
-  @Test
-  public void simpleDocSchemaFromJsonFileTest() throws com.fasterxml.jackson.core.JsonParseException, com.fasterxml.jackson.databind.JsonMappingException, IOException {
-
-    // Import our json format document schema from a file.
-    File schemaFile = new File(SIMPLE_DOC_SCHEMA_JSON);
-    String fileString = TestUtils.readFileToString(schemaFile);
-
-    // Unmarshall that to a Java POJO
-    ObjectMapper mapper = new ObjectMapper();
-    DocumentSchema docSchema = mapper.readValue(schemaFile, DocumentSchema.class);
-
-    // Now, for the purposes of comparison, produce a JSON string from
-    // our Java object.
-    String jsonString = mapper.writeValueAsString(docSchema);
-
-    // Assert that the raw JSON that we read from the file matches the marshalled
-    // JSON we generated from our Java object (ie: validate that we didn't lose
-    // anything going in either direction).
-    assertTrue("Marshalled object does not match the original json source that produced it",
-        fileString.equals(jsonString));
-  }
-
-//
-//  /**
-//   * This test validates that we convert document definitions back and
-//   * forth between json strings and POJOs without any loss of data in
-//   * the case of document schemas which contain nested fields.
-//   *
-//   * @throws com.fasterxml.jackson.core.JsonParseException
-//   * @throws com.fasterxml.jackson.databind.JsonMappingException
-//   * @throws IOException
-//   */
-
-  @Test
-  public void nestedDocSchemaFromJsonFileTest() throws JsonParseException, JsonMappingException, IOException {
-
-    // Import our json format document schema from a file.
-    File schemaFile = new File(NESTED_DOC_SCHEMA_JSON);
-    String fileString = TestUtils.readFileToString(schemaFile);
-
-    // Unmarshall that to a Java POJO
-    ObjectMapper mapper = new ObjectMapper();
-    DocumentSchema docSchema = mapper.readValue(schemaFile, DocumentSchema.class);
-
-    String jsonString = mapper.writeValueAsString(docSchema);
-
-    // Assert that the raw JSON that we read from the file matches the marshalled
-    // JSON we generated from our Java object (ie: validate that we didn't lose
-    // anything going in either direction).
-    assertTrue("Marshalled object does not match the original json source that produced it",
-        fileString.equals(jsonString));
-  }
-}
\ No newline at end of file
+    private final String SIMPLE_DOC_SCHEMA_JSON = "src/test/resources/json/simpleDocument.json";
+    private final String NESTED_DOC_SCHEMA_JSON = "src/test/resources/json/nested-document.json";
+
+
+    /**
+     * This test validates that we convert document definitions back and forth between json strings and POJOs without
+     * any loss of data.
+     *
+     * @throws com.fasterxml.jackson.core.JsonParseException
+     * @throws com.fasterxml.jackson.databind.JsonMappingException
+     * @throws IOException
+     */
+    @Test
+    public void simpleDocSchemaFromJsonFileTest() throws com.fasterxml.jackson.core.JsonParseException,
+            com.fasterxml.jackson.databind.JsonMappingException, IOException {
+
+        // Import our json format document schema from a file.
+        File schemaFile = new File(SIMPLE_DOC_SCHEMA_JSON);
+        String fileString = TestUtils.readFileToString(schemaFile);
+
+        // Unmarshall that to a Java POJO
+        ObjectMapper mapper = new ObjectMapper();
+        DocumentSchema docSchema = mapper.readValue(schemaFile, DocumentSchema.class);
+
+        // Now, for the purposes of comparison, produce a JSON string from
+        // our Java object.
+        String jsonString = mapper.writeValueAsString(docSchema);
+
+        // Assert that the raw JSON that we read from the file matches the marshalled
+        // JSON we generated from our Java object (ie: validate that we didn't lose
+        // anything going in either direction).
+        assertTrue("Marshalled object does not match the original json source that produced it",
+                fileString.equals(jsonString));
+    }
+
+    //
+    // /**
+    // * This test validates that we convert document definitions back and
+    // * forth between json strings and POJOs without any loss of data in
+    // * the case of document schemas which contain nested fields.
+    // *
+    // * @throws com.fasterxml.jackson.core.JsonParseException
+    // * @throws com.fasterxml.jackson.databind.JsonMappingException
+    // * @throws IOException
+    // */
+
+    @Test
+    public void nestedDocSchemaFromJsonFileTest() throws JsonParseException, JsonMappingException, IOException {
+
+        // Import our json format document schema from a file.
+        File schemaFile = new File(NESTED_DOC_SCHEMA_JSON);
+        String fileString = TestUtils.readFileToString(schemaFile);
+
+        // Unmarshall that to a Java POJO
+        ObjectMapper mapper = new ObjectMapper();
+        DocumentSchema docSchema = mapper.readValue(schemaFile, DocumentSchema.class);
+
+        String jsonString = mapper.writeValueAsString(docSchema);
+
+        // Assert that the raw JSON that we read from the file matches the marshalled
+        // JSON we generated from our Java object (ie: validate that we didn't lose
+        // anything going in either direction).
+        assertTrue("Marshalled object does not match the original json source that produced it",
+                fileString.equals(jsonString));
+    }
+}