Merge commit '3252e75363828584d5aaf69be1a76335d7ee0858' into elastic2.0

eliranmoyal · eliranmoyal · commit 77de2bd97980 · 2016-03-18T18:52:39.000+02:00
diff --git a/src/test/java/org/nlpcn/es4sql/CSVResultsExtractorTests.java b/src/test/java/org/nlpcn/es4sql/CSVResultsExtractorTests.java
@@ -352,8 +352,8 @@ public void includeTypeAndNotScore() throws SqlParseException, SQLFeatureNotSupp
         Assert.assertTrue(headers.contains("_type"));
         List<String> lines = csvResult.getLines();
         System.out.println(lines.get(0));
-        Assert.assertTrue(lines.get(0).contains(",account"));
-        Assert.assertTrue(lines.get(1).contains(",account"));
+        Assert.assertTrue(lines.get(0).contains(",account") || lines.get(0).contains("account,"));
+        Assert.assertTrue(lines.get(1).contains(",account")|| lines.get(1).contains("account,"));
     }
 
     @Test
@@ -381,8 +381,8 @@ public void includeScoreAndType() throws SqlParseException, SQLFeatureNotSupport
         Assert.assertTrue(headers.contains("_score"));
         Assert.assertTrue(headers.contains("_type"));
         List<String> lines = csvResult.getLines();
-        Assert.assertTrue(lines.get(0).contains(",account,1.0") || lines.get(0).contains(",account,1"));
-        Assert.assertTrue(lines.get(1).contains(",account,1.0") || lines.get(1).contains(",account,1"));
+        Assert.assertTrue(lines.get(0).contains("account,1.0") || lines.get(0).contains("1.0,account"));
+        Assert.assertTrue(lines.get(1).contains("account,1.0") || lines.get(1).contains("1.0,account"));
     }
 
     /* todo: more tests:
