Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9DA9A9D31 for ; Tue, 21 May 2013 17:44:56 +0000 (UTC) Received: (qmail 8659 invoked by uid 500); 21 May 2013 17:44:56 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 8642 invoked by uid 99); 21 May 2013 17:44:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 May 2013 17:44:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 May 2013 17:44:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 74D5023889F7; Tue, 21 May 2013 17:44:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1484889 - in /lucene/dev/trunk: ./ dev-tools/ lucene/ lucene/analysis/ lucene/analysis/common/ lucene/backwards/ lucene/benchmark/ lucene/classification/ lucene/codecs/ lucene/core/ lucene/demo/ lucene/facet/ lucene/grouping/ lucene/highli... Date: Tue, 21 May 2013 17:44:35 -0000 To: commits@lucene.apache.org From: ehatcher@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130521174435.74D5023889F7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ehatcher Date: Tue May 21 17:44:34 2013 New Revision: 1484889 URL: http://svn.apache.org/r1484889 Log: SOLR-4842: merge an additional test case from branch_4x Modified: lucene/dev/trunk/ (props changed) lucene/dev/trunk/dev-tools/ (props changed) lucene/dev/trunk/lucene/ (props changed) lucene/dev/trunk/lucene/BUILD.txt (props changed) lucene/dev/trunk/lucene/CHANGES.txt (props changed) lucene/dev/trunk/lucene/JRE_VERSION_MIGRATION.txt (props changed) lucene/dev/trunk/lucene/LICENSE.txt (props changed) lucene/dev/trunk/lucene/MIGRATE.txt (props changed) lucene/dev/trunk/lucene/NOTICE.txt (props changed) lucene/dev/trunk/lucene/README.txt (props changed) lucene/dev/trunk/lucene/SYSTEM_REQUIREMENTS.txt (props changed) lucene/dev/trunk/lucene/analysis/ (props changed) lucene/dev/trunk/lucene/analysis/common/ (props changed) lucene/dev/trunk/lucene/backwards/ (props changed) lucene/dev/trunk/lucene/benchmark/ (props changed) lucene/dev/trunk/lucene/build.xml (props changed) lucene/dev/trunk/lucene/classification/ (props changed) lucene/dev/trunk/lucene/codecs/ (props changed) lucene/dev/trunk/lucene/common-build.xml (props changed) lucene/dev/trunk/lucene/core/ (props changed) lucene/dev/trunk/lucene/demo/ (props changed) lucene/dev/trunk/lucene/facet/ (props changed) lucene/dev/trunk/lucene/grouping/ (props changed) lucene/dev/trunk/lucene/highlighter/ (props changed) lucene/dev/trunk/lucene/ivy-settings.xml (props changed) lucene/dev/trunk/lucene/join/ (props changed) lucene/dev/trunk/lucene/licenses/ (props changed) lucene/dev/trunk/lucene/memory/ (props changed) lucene/dev/trunk/lucene/misc/ (props changed) lucene/dev/trunk/lucene/module-build.xml (props changed) lucene/dev/trunk/lucene/queries/ (props changed) lucene/dev/trunk/lucene/queryparser/ (props changed) lucene/dev/trunk/lucene/replicator/ (props changed) lucene/dev/trunk/lucene/sandbox/ (props changed) lucene/dev/trunk/lucene/site/ (props changed) lucene/dev/trunk/lucene/spatial/ (props changed) lucene/dev/trunk/lucene/suggest/ (props changed) lucene/dev/trunk/lucene/test-framework/ (props changed) lucene/dev/trunk/lucene/tools/ (props changed) lucene/dev/trunk/solr/ (props changed) lucene/dev/trunk/solr/CHANGES.txt (props changed) lucene/dev/trunk/solr/LICENSE.txt (props changed) lucene/dev/trunk/solr/NOTICE.txt (props changed) lucene/dev/trunk/solr/README.txt (props changed) lucene/dev/trunk/solr/SYSTEM_REQUIREMENTS.txt (props changed) lucene/dev/trunk/solr/build.xml (props changed) lucene/dev/trunk/solr/cloud-dev/ (props changed) lucene/dev/trunk/solr/common-build.xml (props changed) lucene/dev/trunk/solr/contrib/ (props changed) lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/numFound.vm (props changed) lucene/dev/trunk/solr/core/ (props changed) lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java lucene/dev/trunk/solr/example/ (props changed) lucene/dev/trunk/solr/licenses/ (props changed) lucene/dev/trunk/solr/scripts/ (props changed) lucene/dev/trunk/solr/site/ (props changed) lucene/dev/trunk/solr/solrj/ (props changed) lucene/dev/trunk/solr/test-framework/ (props changed) lucene/dev/trunk/solr/webapp/ (props changed) Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java?rev=1484889&r1=1484888&r2=1484889&view=diff ============================================================================== --- lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java (original) +++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java Tue May 21 17:44:34 2013 @@ -592,6 +592,24 @@ public class TestFaceting extends SolrTe ,"//lst[@name='foo']/int[@name='Tool'][.='2']" ); + final String foo_range_facet = "{!key=foo facet.range.gap=2}val_i"; + final String val_range_facet = "val_i"; + for (boolean toggle : new boolean[] { true, false }) { + assertQ("local gap param mixed w/raw range faceting: " + toggle, + req("q", "*:*" + ,"facet", "true" + ,"rows", "0" + ,"facet.range.start", "0" + ,"facet.range.end", "10" + ,"facet.range.gap", "1" + ,"facet.range", (toggle ? foo_range_facet : val_range_facet) + ,"facet.range", (toggle ? val_range_facet : foo_range_facet) + ) + ,"*[count(//lst[@name='val_i']/lst[@name='counts']/int)=10]" + ,"*[count(//lst[@name='foo']/lst[@name='counts']/int)=5]" + ); + } + clearIndex(); assertU(commit()); }