From a43ebd687051c14349e0d8b84f1b9d1e6c68015b Mon Sep 17 00:00:00 2001 From: Shalin Shekhar Mangar Date: Mon, 23 Feb 2015 14:39:09 +0000 Subject: [PATCH] SOLR-7142: Fix TestFaceting.testFacets git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1661685 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 2 ++ .../org/apache/solr/request/TestFaceting.java | 27 +++++++------------ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index e81c2e4214b..cd674946458 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -182,6 +182,8 @@ Other Changes * SOLR-7032: Clean up test remnants of old-style solr.xml (Erick Erickson) +* SOLR-7142: Fix TestFaceting.testFacets. (Michal Kroliczek via shalin) + ================== 5.0.0 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/core/src/test/org/apache/solr/request/TestFaceting.java b/solr/core/src/test/org/apache/solr/request/TestFaceting.java index 30e0ea8a54f..46494a99929 100644 --- a/solr/core/src/test/org/apache/solr/request/TestFaceting.java +++ b/solr/core/src/test/org/apache/solr/request/TestFaceting.java @@ -160,7 +160,7 @@ public class TestFaceting extends SolrTestCaseJ4 { assertU(commit()); assertQ("check many tokens", - req("q", "id:1","indent","true" + req("q", "*:*","indent","true" ,"facet", "true", "facet.method","fc" ,"facet.field", "many_ws" ,"facet.limit", "-1" @@ -183,34 +183,25 @@ public class TestFaceting extends SolrTestCaseJ4 { ,"//lst[@name='many_ws']/int[@name='" + t(4999) + "'][.='1']" ); - // test gaps that take more than one byte + // add second document, check facets for items with count =2 sb = new StringBuilder(); sb.append(t(0)).append(' '); sb.append(t(150)).append(' '); - sb.append(t(301)).append(' '); - sb.append(t(453)).append(' '); - sb.append(t(606)).append(' '); - sb.append(t(1000)).append(' '); - sb.append(t(2010)).append(' '); - sb.append(t(3050)).append(' '); sb.append(t(4999)).append(' '); assertU(adoc("id", "2", "many_ws", sb.toString())); + assertU(commit()); assertQ("check many tokens", - req("q", "id:1","indent","true" + req("q", "*:*","indent","true" ,"facet", "true", "facet.method","fc" ,"facet.field", "many_ws" ,"facet.limit", "-1" ) ,"*[count(//lst[@name='many_ws']/int)=5000]" - ,"//lst[@name='many_ws']/int[@name='" + t(0) + "'][.='1']" - ,"//lst[@name='many_ws']/int[@name='" + t(150) + "'][.='1']" - ,"//lst[@name='many_ws']/int[@name='" + t(301) + "'][.='1']" - ,"//lst[@name='many_ws']/int[@name='" + t(453) + "'][.='1']" - ,"//lst[@name='many_ws']/int[@name='" + t(606) + "'][.='1']" - ,"//lst[@name='many_ws']/int[@name='" + t(1000) + "'][.='1']" - ,"//lst[@name='many_ws']/int[@name='" + t(2010) + "'][.='1']" - ,"//lst[@name='many_ws']/int[@name='" + t(3050) + "'][.='1']" - ,"//lst[@name='many_ws']/int[@name='" + t(4999) + "'][.='1']" + ,"//lst[@name='many_ws']/int[@name='" + t(0) + "'][.='2']" + ,"//lst[@name='many_ws']/int[@name='" + t(1) + "'][.='1']" + ,"//lst[@name='many_ws']/int[@name='" + t(150) + "'][.='2']" + ,"//lst[@name='many_ws']/int[@name='" + t(4998) + "'][.='1']" + ,"//lst[@name='many_ws']/int[@name='" + t(4999) + "'][.='2']" ); }