Fixed tests that were failing by reverting the phrase index back to standard analyzed instead of not_analyzed. Also returned the input_time field back to phrases.json

Author: Jake Heimbouch

src/test/java/org/nlpcn/es4sql/MainTestSuite.java

@@ -51,12 +51,10 @@ public static void setUp() throws Exception {
 		deleteQuery(TEST_INDEX);
 		loadBulk("src/test/resources/accounts.json");
 		loadBulk("src/test/resources/online.json");
+        loadBulk("src/test/resources/phrases.json");
 
         prepareOdbcIndex();
         loadBulk("src/test/resources/odbc-date-formats.json");
-        preparePhraseIndex();
-        loadBulk("src/test/resources/phrases.json");
-
 
 		searchDao = new SearchDao(client);
 		System.out.println("Finished the setup process...");
@@ -137,25 +135,6 @@ public static void prepareOdbcIndex(){
         client.admin().indices().preparePutMapping(TEST_INDEX).setType("odbc").setSource(dataMapping).execute().actionGet();
     }
 
-    public static void preparePhraseIndex(){
-        String dataMapping = "{\n" +
-                "\t\"phrase\" :{\n" +
-                "\t\t\"properties\":{\n" +
-                "\t\t\t\"insert_time\":{\n" +
-                "\t\t\t\t\"type\":\"date\",\n" +
-                "\t\t\t\t\"format\": \"{'ts' ''yyyy-MM-dd HH:mm:ss.SSS''}\"\n" +
-                "\t\t\t},\n" +
-                "\t\"phrase\":{\n" +
-                "\t\"type\":\"string\",\n" +
-                "\t\"index\":\"not_analyzed\"\n" +
-                "\t}\n" +
-                "\t}\n" +
-                "\t}\n" +
-                "}";
-
-        client.admin().indices().preparePutMapping(TEST_INDEX).setType("phrase").setSource(dataMapping).execute().actionGet();
-    }
-
 	public static SearchDao getSearchDao() {
 		return searchDao;
 	}

src/test/resources/phrases.json

@@ -1,8 +1,8 @@
 {"index":{"_type": "phrase"}}
 {"phrase": "quick fox"}
 {"index":{"_type": "phrase"}}
-{"phrase": "quick fox here"}
+{"phrase": "quick fox here", "insert_time":"2014-08-19T07:09:13.434Z" }
 {"index":{"_type": "phrase"}}
 {"phrase": "brown fox"}
 {"index":{"_type": "phrase"}}
-{"phrase": "fox brown"}
+{"phrase": "fox brown", "insert_time":"2014-08-19T07:09:13.434Z"}