Organise imports to ONAP Java standards

[aai/search-data-service.git] / src / test / java / org / onap / aai / sa / rest / IndexApiTest.java

diff --git a/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java b/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java
index 8f3bfac..0f5932b 100644 (file)
--- a/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java
+++ b/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java
@@ -21,6 +21,15 @@
 package org.onap.aai.sa.rest;
 
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import org.junit.Before;
 // import org.glassfish.jersey.server.ResourceConfig;
 // import org.glassfish.jersey.test.JerseyTest;
 import org.junit.Test;
@@ -36,15 +45,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
-
 //import javax.ws.rs.core.Application;
 //import javax.ws.rs.core.Response;
 
@@ -75,6 +75,11 @@ public class IndexApiTest {
 //  }
 //
 //
+  
+  @Before
+  public void setup() throws Exception {
+         System.setProperty("CONFIG_HOME", System.getProperty("user.dir")+ File.separator + "src/test/resources/json");
+  }
 
   /**
    * Tests the dynamic shcema creation flow that send the request
@@ -177,7 +182,8 @@ public class IndexApiTest {
             + "\"tokenizer\": \"whitespace\","
             + "\"filter\": [\"lowercase\",\"asciifolding\"]}}}}";
     String EXPECTED_MAPPINGS =
-        "{\"properties\": {"
+        "{\"dynamic_templates\":[{\"strings\":{\"match_mapping_type\":\"string\",\"match\":\"*\",\"mapping\":{\"type\":\"text\",\"fielddata\":true}}}]"
+        + ",\"properties\": {"
             + "\"serverName\": {"
             + "\"type\": \"string\", "
             + "\"index\": \"analyzed\", "