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=ba5cb489df2f4a9ae8830136426ea6979c67ead8;hb=82658daad05f982a8358581623f44a1554238a48;hp=11b2acb1b71d55a56fe622ae9907de157f5e047f;hpb=fe84ae3b8d01ac2634d389f6b9d579319ea39f7a;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..ba5cb48 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
@@ -21,16 +21,19 @@
 package org.onap.aai.sa.searchdbabstraction.util;
 
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 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";
+	private final String SIMPLE_DOC_SCHEMA_JSON = "src/test/resources/json/index-mapping.json";
 
 	@Before
 	public void setup() throws Exception {
@@ -38,13 +41,17 @@ public class ElasticSearchPayloadTranslatorTest {
 	}
 	
 	@Test
-	public void testPayloadTranslation_FromStringToText() throws Exception {
+	public void testPayloadTranslation() throws Exception {
+		String expectedErrMsg = "Sample error message for whitespace check";
 		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 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("\"data-type\":\"text\""));
+		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+"\""));
 	}
 }