You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2015/12/15 22:41:37 UTC
svn commit: r1720257 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
Author: cpoerschke
Date: Tue Dec 15 21:41:37 2015
New Revision: 1720257
URL: http://svn.apache.org/viewvc?rev=1720257&view=rev
Log:
SOLR-8388: ReturnFieldsTest.testToString() fix (don't assume ordering within sets' values) (merge in revision 1720253 from trunk)
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java?rev=1720257&r1=1720256&r2=1720257&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java Tue Dec 15 21:41:37 2015
@@ -100,13 +100,20 @@ public class ReturnFieldsTest extends So
assertEquals(rf1ToString, rf1.toString());
final ReturnFields rf2 = new SolrReturnFields(
- req("fl", "id "+SolrReturnFields.SCORE+" test"));
- final String rf2ToString = "SolrReturnFields=(globs=[]"
- +",fields=[score, test, id]"
- +",okFieldNames=[null, score, test, id]"
- +",reqFieldNames=[id, score, test]"
+ req("fl", SolrReturnFields.SCORE));
+ final String rf2ToStringA = "SolrReturnFields=(globs=[]"
+ +",fields=["+SolrReturnFields.SCORE+"]"
+ +",okFieldNames=[null, "+SolrReturnFields.SCORE+"]"
+ +",reqFieldNames=["+SolrReturnFields.SCORE+"]"
+",transformer=score,wantsScore=true,wantsAllFields=false)";
- assertEquals(rf2ToString, rf2.toString());
+ final String rf2ToStringB = "SolrReturnFields=(globs=[]"
+ +",fields=["+SolrReturnFields.SCORE+"]"
+ +",okFieldNames=["+SolrReturnFields.SCORE+", null]"
+ +",reqFieldNames=["+SolrReturnFields.SCORE+"]"
+ +",transformer=score,wantsScore=true,wantsAllFields=false)";
+ assertTrue(
+ rf2ToStringA.equals(rf2.toString()) ||
+ rf2ToStringB.equals(rf2.toString()));
}
@Test