X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fsa%2Fsearchdbabstraction%2Futil%2FElasticSearchPayloadTranslatorTest.java;h=877b64f792e22848b56524c8d68ed574e174c188;hb=15af66b115f3e8046b2d0f2634fb77b3d835f730;hp=11b2acb1b71d55a56fe622ae9907de157f5e047f;hpb=3f6ec6495e671d0736ed175d5e2915b7ead214c7;p=aai%2Fsearch-data-service.git

diff --git a/src/test/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslatorTest.java b/src/test/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslatorTest.java
index 11b2acb..877b64f 100644
--- a/src/test/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslatorTest.java
+++ b/src/test/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslatorTest.java
@@ -20,31 +20,36 @@
  */
 package org.onap.aai.sa.searchdbabstraction.util;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
-
+import java.io.FileInputStream;
+import org.apache.commons.io.IOUtils;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.aai.sa.rest.TestUtils;
 
 public class ElasticSearchPayloadTranslatorTest {
-	
-	private final String SIMPLE_DOC_SCHEMA_JSON = "src/test/resources/json/simpleDocument.json";
 
-	@Before
-	public void setup() throws Exception {
-		System.setProperty("CONFIG_HOME", System.getProperty("user.dir")+ File.separator + "src/test/resources/json");
-	}
-	
-	@Test
-	public void testPayloadTranslation_FromStringToText() throws Exception {
-		File schemaFile = new File(SIMPLE_DOC_SCHEMA_JSON);
-	    String documentJson = TestUtils.readFileToString(schemaFile);
-	    assertTrue(documentJson.contains("\"data-type\":\"string\""));
-		assertTrue(documentJson.contains("\"searchable\":true"));
-		String translatedPayload = ElasticSearchPayloadTranslator.translateESPayload(documentJson);
-		assertTrue(translatedPayload.contains("\"data-type\":\"text\""));
-		assertTrue(translatedPayload.contains("\"index\":true"));
-	}
+    private final String SIMPLE_DOC_SCHEMA_JSON = "src/test/resources/json/index-mapping.json";
+
+    @Before
+    public void setup() throws Exception {
+        System.setProperty("CONFIG_HOME", System.getProperty("user.dir") + File.separator + "src/test/resources/json");
+    }
+
+    @Test
+    public void testPayloadTranslation() throws Exception {
+        String expectedErrMsg = "Sample error message for whitespace check";
+        File schemaFile = new File(SIMPLE_DOC_SCHEMA_JSON);
+        String documentJson = IOUtils.toString(new FileInputStream(schemaFile), "UTF-8");
+        assertTrue(documentJson.contains("\"type\": \"string\""));
+        assertTrue(documentJson.contains("\"index\": \"analyzed\""));
+        String translatedPayload = ElasticSearchPayloadTranslator.translateESPayload(documentJson);
+        assertTrue(translatedPayload.contains("\"type\":\"text\""));
+        assertTrue(translatedPayload.contains("\"index\":true"));
+        assertTrue(translatedPayload.contains("\"fielddata\":true"));
+        assertFalse(documentJson.contains("\"index\":\"analyzed\""));
+        assertTrue(translatedPayload.contains("\"errMsg\":\"" + expectedErrMsg + "\""));
+    }
 }