You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2010/08/26 23:50:04 UTC
svn commit: r989949 - in /lucene/dev/branches/branch_3x/solr/src/test:
org/apache/solr/request/SimpleFacetsLegacySortTest.java
org/apache/solr/request/SimpleFacetsTest.java
test-files/solr/conf/solrconfig-facet-sort.xml
Author: yonik
Date: Thu Aug 26 21:50:03 2010
New Revision: 989949
URL: http://svn.apache.org/viewvc?rev=989949&view=rev
Log:
tests: move test for legacy facet sort into SimpleFacetsTest and remove solrconfig for it
Removed:
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/SimpleFacetsLegacySortTest.java
lucene/dev/branches/branch_3x/solr/src/test/test-files/solr/conf/solrconfig-facet-sort.xml
Modified:
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java (contents, props changed)
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java?rev=989949&r1=989948&r2=989949&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java Thu Aug 26 21:50:03 2010
@@ -240,6 +240,7 @@ public class SimpleFacetsTest extends So
,"//lst[@name='trait_s']/int[@name='Pig'][.='0']"
);
+ // check that the default sort is by count
assertQ("check sorted paging",
req("q", "id:[42 TO 47]"
,"facet", "true"
@@ -250,11 +251,43 @@ public class SimpleFacetsTest extends So
,"facet.limit","3"
)
,"*[count(//lst[@name='trait_s']/int)=3]"
- ,"//lst[@name='trait_s']/int[@name='Tool'][.='2']"
- ,"//lst[@name='trait_s']/int[@name='Obnoxious'][.='1']"
- ,"//lst[@name='trait_s']/int[@name='Chauvinist'][.='1']"
+ ,"//int[1][@name='Tool'][.='2']"
+ ,"//int[2][@name='Chauvinist'][.='1']"
+ ,"//int[3][@name='Obnoxious'][.='1']"
);
+ //
+ // check that legacy facet.sort=true/false works
+ //
+ assertQ(req("q", "id:[42 TO 47]"
+ ,"facet", "true"
+ ,"fq", "id:[42 TO 45]"
+ ,"facet.field", "trait_s"
+ ,"facet.mincount","0"
+ ,"facet.offset","0"
+ ,"facet.limit","3"
+ ,"facet.sort","true" // true means sort-by-count
+ )
+ ,"*[count(//lst[@name='trait_s']/int)=3]"
+ ,"//int[1][@name='Tool'][.='2']"
+ ,"//int[2][@name='Chauvinist'][.='1']"
+ ,"//int[3][@name='Obnoxious'][.='1']"
+ );
+
+ assertQ(req("q", "id:[42 TO 47]"
+ ,"facet", "true"
+ ,"fq", "id:[42 TO 45]"
+ ,"facet.field", "trait_s"
+ ,"facet.mincount","1"
+ ,"facet.offset","0"
+ ,"facet.limit","3"
+ ,"facet.sort","false" // false means sort by index order
+ )
+ ,"*[count(//lst[@name='trait_s']/int)=3]"
+ ,"//int[1][@name='Chauvinist'][.='1']"
+ ,"//int[2][@name='Obnoxious'][.='1']"
+ ,"//int[3][@name='Tool'][.='2']"
+ );
}
public static void indexDateFacets() {
@@ -889,5 +922,19 @@ public class SimpleFacetsTest extends So
,"*[count(//lst[@name='facet_fields']/lst/int)=0]"
);
+ // test offset beyond what is collected internally in queue
+ assertQ(
+ req(params, "q", "id:[* TO *]"
+ ,"indent",indent
+ ,"facet","true"
+ ,"facet.field", lf
+ ,"facet.mincount","3"
+ ,"facet.offset","5"
+ ,"facet.limit","10"
+ ,"facet.sort","count"
+ ,"facet.prefix","CC"
+ )
+ ,"*[count(//lst[@name='facet_fields']/lst/int)=0]"
+ );
}
}
Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 26 21:50:03 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java:931183-980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986612,986773,987005,987009,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334
+/lucene/dev/trunk/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java:931183-980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986612,986773,987005,987009,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989941
/lucene/java/branches/lucene_2_4/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java:748824
/lucene/java/branches/lucene_2_9/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java:818601-821336