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 8CD6296D3 for ; Sun, 25 Sep 2011 19:30:58 +0000 (UTC) Received: (qmail 13995 invoked by uid 500); 25 Sep 2011 19:30:58 -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 13988 invoked by uid 99); 25 Sep 2011 19:30:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Sep 2011 19:30:58 +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; Sun, 25 Sep 2011 19:30:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 900CC2388900; Sun, 25 Sep 2011 19:30:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1175532 [2/2] - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/backwards/src/test/ solr/ solr/contrib/clustering/src/test-files/clustering/solr/conf/ solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/conf/ solr/cont... Date: Sun, 25 Sep 2011 19:30:35 -0000 To: commits@lucene.apache.org From: rmuir@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110925193036.900CC2388900@eris.apache.org> Modified: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java?rev=1175532&r1=1175531&r2=1175532&view=diff ============================================================================== --- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java (original) +++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java Sun Sep 25 19:30:34 2011 @@ -17,6 +17,7 @@ package org.apache.solr.handler; +import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.KeywordTokenizer; import org.apache.lucene.analysis.WhitespaceTokenizer; import org.apache.solr.common.params.AnalysisParams; @@ -261,10 +262,10 @@ public class FieldAnalysisRequestHandler indexPart = whitetok.get("index"); assertNotNull("expecting an index token analysis for field 'whitetok'", indexPart); - assertEquals("expecting only WhitespaceTokenizer to be applied", 1, indexPart.size()); - tokenList = indexPart.get(WhitespaceTokenizer.class.getName()); - assertNotNull("expecting only WhitespaceTokenizer to be applied", tokenList); - assertEquals("expecting WhitespaceTokenizer to produce 10 tokens", 10, tokenList.size()); + assertEquals("expecting only MockTokenizer to be applied", 1, indexPart.size()); + tokenList = indexPart.get(MockTokenizer.class.getName()); + assertNotNull("expecting only MockTokenizer to be applied", tokenList); + assertEquals("expecting MockTokenizer to produce 10 tokens", 10, tokenList.size()); assertToken(tokenList.get(0), new TokenInfo("the", null, "word", 0, 3, 1, new int[]{1}, null, false)); assertToken(tokenList.get(1), new TokenInfo("quick", null, "word", 4, 9, 2, new int[]{2}, null, false)); assertToken(tokenList.get(2), new TokenInfo("red", null, "word", 10, 13, 3, new int[]{3}, null, false)); @@ -278,10 +279,10 @@ public class FieldAnalysisRequestHandler queryPart = whitetok.get("query"); assertNotNull("expecting a query token analysis for field 'whitetok'", queryPart); - assertEquals("expecting only WhitespaceTokenizer to be applied", 1, queryPart.size()); - tokenList = queryPart.get(WhitespaceTokenizer.class.getName()); - assertNotNull("expecting only WhitespaceTokenizer to be applied", tokenList); - assertEquals("expecting WhitespaceTokenizer to produce 2 tokens", 2, tokenList.size()); + assertEquals("expecting only MockTokenizer to be applied", 1, queryPart.size()); + tokenList = queryPart.get(MockTokenizer.class.getName()); + assertNotNull("expecting only MockTokenizer to be applied", tokenList); + assertEquals("expecting MockTokenizer to produce 2 tokens", 2, tokenList.size()); assertToken(tokenList.get(0), new TokenInfo("fox", null, "word", 0, 3, 1, new int[]{1}, null, false)); assertToken(tokenList.get(1), new TokenInfo("brown", null, "word", 4, 9, 2, new int[]{2}, null, false)); @@ -328,8 +329,8 @@ public class FieldAnalysisRequestHandler assertEquals(" whátëvêr ", indexPart.get("org.apache.solr.analysis.HTMLStripCharFilter")); assertEquals(" whatever ", indexPart.get("org.apache.lucene.analysis.MappingCharFilter")); - List tokenList = (List)indexPart.get("org.apache.lucene.analysis.WhitespaceTokenizer"); - assertNotNull("Expecting WhitespaceTokenizer analysis breakdown", tokenList); + List tokenList = (List)indexPart.get(MockTokenizer.class.getName()); + assertNotNull("Expecting MockTokenizer analysis breakdown", tokenList); assertEquals(tokenList.size(), 1); assertToken(tokenList.get(0), new TokenInfo("whatever", null, "word", 12, 20, 1, new int[]{1}, null, false)); } @@ -353,8 +354,8 @@ public class FieldAnalysisRequestHandler NamedList> indexPart = textType.get("index"); assertNotNull("expecting an index token analysis for field type 'skutype1'", indexPart); - List tokenList = indexPart.get("org.apache.lucene.analysis.WhitespaceTokenizer"); - assertNotNull("Expcting WhitespaceTokenizer analysis breakdown", tokenList); + List tokenList = indexPart.get(MockTokenizer.class.getName()); + assertNotNull("Expcting MockTokenizer analysis breakdown", tokenList); assertEquals(4, tokenList.size()); assertToken(tokenList.get(0), new TokenInfo("hi,", null, "word", 0, 3, 1, new int[]{1}, null, false)); assertToken(tokenList.get(1), new TokenInfo("3456-12", null, "word", 4, 11, 2, new int[]{2}, null, false)); Modified: lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/conf/schema.xml URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/conf/schema.xml?rev=1175532&r1=1175531&r2=1175532&view=diff ============================================================================== --- lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/conf/schema.xml (original) +++ lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/conf/schema.xml Sun Sep 25 19:30:34 2011 @@ -86,7 +86,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -187,19 +187,19 @@ - + - + - + @@ -223,43 +223,43 @@ - + - + - + - + - + - + @@ -267,20 +267,20 @@ - + - + - + @@ -290,14 +290,14 @@ - + - + @@ -307,12 +307,12 @@ - + - + @@ -321,12 +321,12 @@ - + - + @@ -335,12 +335,12 @@ - + - + @@ -349,7 +349,7 @@ - + @@ -359,7 +359,7 @@ --> - + @@ -372,7 +372,7 @@ - + @@ -394,7 +394,7 @@ - + Copied: lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java (from r1175529, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java) URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java?p2=lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java&p1=lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java&r1=1175529&r2=1175532&rev=1175532&view=diff ============================================================================== --- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java (original) +++ lucene/dev/branches/branch_3x/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java Sun Sep 25 19:30:34 2011 @@ -22,13 +22,12 @@ import java.util.Map; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.util.automaton.CharacterRunAutomaton; /** * Factory for {@link MockTokenizer} for testing purposes. */ public class MockTokenizerFactory extends BaseTokenizerFactory { - CharacterRunAutomaton pattern; + int pattern; boolean enableChecks; @Override