You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2014/06/23 20:20:32 UTC
svn commit: r1604898 -
/lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestChildDocTransformer.java
Author: hossman
Date: Mon Jun 23 18:20:32 2014
New Revision: 1604898
URL: http://svn.apache.org/r1604898
Log:
fix false assumptions about doc index order in test
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestChildDocTransformer.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestChildDocTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestChildDocTransformer.java?rev=1604898&r1=1604897&r2=1604898&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestChildDocTransformer.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/response/TestChildDocTransformer.java Mon Jun 23 18:20:32 2014
@@ -191,22 +191,28 @@ public class TestChildDocTransformer ext
private void testParentFilterJSON() throws Exception {
String[] tests = new String[] {
- "/response/docs/[0]/_childDocuments_/[0]/id==3",
- "/response/docs/[0]/_childDocuments_/[1]/id==2",
- "/response/docs/[0]/_childDocuments_/[1]/cat/[0]/=='childDocument'",
- "/response/docs/[0]/_childDocuments_/[1]/title/[0]/=='" + titleVals[0] + "'",
- "/response/docs/[1]/_childDocuments_/[0]/id==6",
- "/response/docs/[1]/_childDocuments_/[1]/id==5",
- "/response/docs/[1]/_childDocuments_/[1]/cat/[0]/=='childDocument'",
- "/response/docs/[1]/_childDocuments_/[1]/title/[0]/=='" + titleVals[1] + "'"
+ "/response/docs/[0]/id==1",
+ "/response/docs/[0]/_childDocuments_/[0]/id==2",
+ "/response/docs/[0]/_childDocuments_/[0]/cat/[0]/=='childDocument'",
+ "/response/docs/[0]/_childDocuments_/[0]/title/[0]/=='" + titleVals[0] + "'",
+ "/response/docs/[1]/id==4",
+ "/response/docs/[1]/_childDocuments_/[0]/id==5",
+ "/response/docs/[1]/_childDocuments_/[0]/cat/[0]/=='childDocument'",
+ "/response/docs/[1]/_childDocuments_/[0]/title/[0]/=='" + titleVals[1] + "'"
};
- assertJQ(req("q", "*:*", "fq", "subject:\"parentDocument\" ",
- "fl", "*,[child parentFilter=\"subject:parentDocument\"]"), tests);
-
- assertJQ(req("q", "*:*", "fq", "subject:\"parentDocument\" ",
- "fl", "subject,[child parentFilter=\"subject:parentDocument\"]"), tests);
+ assertJQ(req("q", "*:*",
+ "sort", "id asc",
+ "fq", "subject:\"parentDocument\" ",
+ "fl", "*,[child childFilter='cat:childDocument' parentFilter=\"subject:parentDocument\"]"),
+ tests);
+
+ assertJQ(req("q", "*:*",
+ "sort", "id asc",
+ "fq", "subject:\"parentDocument\" ",
+ "fl", "id,[child childFilter='cat:childDocument' parentFilter=\"subject:parentDocument\"]"),
+ tests);
}
@@ -214,20 +220,26 @@ public class TestChildDocTransformer ext
String tests[] = new String[] {
"//*[@numFound='2']",
- "/response/result/doc[1]/doc[1]/int[@name='id']='3'" ,
- "/response/result/doc[1]/doc[2]/int[@name='id']='2'" ,
- "/response/result/doc[1]/doc/arr[@name='cat']/str[1]='childDocument'" ,
- "/response/result/doc[1]/doc/arr[@name='title']/str[1]='" + titleVals[0] + "'" ,
- "/response/result/doc[2]/doc[1]/int[@name='id']='6'",
- "/response/result/doc[2]/doc[2]/int[@name='id']='5'",
- "/response/result/doc[2]/doc/arr[@name='cat']/str[1]='childDocument'",
- "/response/result/doc[2]/doc/arr[@name='title']/str[1]='" + titleVals[1] + "'"};
-
- assertQ(req("q", "*:*", "fq", "subject:\"parentDocument\" ",
- "fl", "*,[child parentFilter=\"subject:parentDocument\"]"), tests);
-
- assertQ(req("q", "*:*", "fq", "subject:\"parentDocument\" ",
- "fl", "subject,[child parentFilter=\"subject:parentDocument\"]"), tests);
+ "/response/result/doc[1]/int[@name='id']='1'" ,
+ "/response/result/doc[1]/doc[1]/int[@name='id']='2'" ,
+ "/response/result/doc[1]/doc[1]/arr[@name='cat']/str[1]='childDocument'" ,
+ "/response/result/doc[1]/doc[1]/arr[@name='title']/str[1]='" + titleVals[0] + "'" ,
+ "/response/result/doc[2]/int[@name='id']='4'" ,
+ "/response/result/doc[2]/doc[1]/int[@name='id']='5'",
+ "/response/result/doc[2]/doc[1]/arr[@name='cat']/str[1]='childDocument'",
+ "/response/result/doc[2]/doc[1]/arr[@name='title']/str[1]='" + titleVals[1] + "'"};
+
+ assertQ(req("q", "*:*",
+ "sort", "id asc",
+ "fq", "subject:\"parentDocument\" ",
+ "fl", "*,[child childFilter='cat:childDocument' parentFilter=\"subject:parentDocument\"]"),
+ tests);
+
+ assertQ(req("q", "*:*",
+ "sort", "id asc",
+ "fq", "subject:\"parentDocument\" ",
+ "fl", "id,[child childFilter='cat:childDocument' parentFilter=\"subject:parentDocument\"]"),
+ tests);
}
}