You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2012/03/27 23:50:41 UTC
svn commit: r1306025 - in /lucene/dev/trunk: ./ dev-tools/ lucene/
modules/analysis/common/ solr/
solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java
Author: janhoy
Date: Tue Mar 27 21:50:41 2012
New Revision: 1306025
URL: http://svn.apache.org/viewvc?rev=1306025&view=rev
Log:
SOLR-2970 and SOLR-3281: Fix tests for IBM VM
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/dev-tools/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/modules/analysis/common/ (props changed)
lucene/dev/trunk/solr/ (props changed)
lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java?rev=1306025&r1=1306024&r2=1306025&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java Tue Mar 27 21:50:41 2012
@@ -26,6 +26,7 @@ import org.apache.solr.search.ReturnFiel
import org.junit.*;
import java.io.StringWriter;
+import java.util.Arrays;
public class TestCSVResponseWriter extends SolrTestCaseJ4 {
@BeforeClass
@@ -98,9 +99,9 @@ public class TestCSVResponseWriter exten
assertEquals("1,,hi\n2,\"hi,there\",\n"
, h.query(req("q","id:[1 TO 2]", "wt","csv", "csv.header","false", "fl","id,v_ss,foo_s")));
- // test SOLR-2970 not returning non-stored fields by default
- assertEquals("id,foo_b,foo_d,foo_s,foo_f,foo_i,foo_dt,foo_l,v_ss,v2_ss\n"
- , h.query(req("q","id:3", "wt","csv", "csv.header","true", "fl","*", "rows","0")));
+ // test SOLR-2970 not returning non-stored fields by default. Compare sorted list
+ assertEquals(sortHeader("v_ss,foo_b,v2_ss,foo_f,foo_i,foo_d,foo_s,foo_dt,id,foo_l\n")
+ , sortHeader(h.query(req("q","id:3", "wt","csv", "csv.header","true", "fl","*", "rows","0"))));
// now test SolrDocumentList
@@ -166,4 +167,13 @@ public class TestCSVResponseWriter exten
req.close();
}
+ /*
+ * Utility method to sort a comma separated list of strings, for easier comparison regardless of platform
+ */
+ private String sortHeader(String input) {
+ String[] output = input.trim().split(",");
+ Arrays.sort(output);
+ return Arrays.toString(output);
+ }
+
}
\ No newline at end of file