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 3B64DD84C for ; Wed, 11 Jul 2012 21:06:31 +0000 (UTC) Received: (qmail 24692 invoked by uid 500); 11 Jul 2012 21:06:31 -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 24685 invoked by uid 99); 11 Jul 2012 21:06:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jul 2012 21:06:31 +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; Wed, 11 Jul 2012 21:06:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 72DF02388847; Wed, 11 Jul 2012 21:06:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1360398 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ lucene/ lucene/analysis/ lucene/analysis/common/ lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/ lucene/analysis/common/src/java/org/apache/lucene/analys... Date: Wed, 11 Jul 2012 21:06:10 -0000 To: commits@lucene.apache.org From: tommaso@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120711210610.72DF02388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tommaso Date: Wed Jul 11 21:06:08 2012 New Revision: 1360398 URL: http://svn.apache.org/viewvc?rev=1360398&view=rev Log: [LUCENE-4207] - merged patch to analysis-uima tests to branch_4x Modified: lucene/dev/branches/branch_4x/ (props changed) lucene/dev/branches/branch_4x/dev-tools/ (props changed) lucene/dev/branches/branch_4x/lucene/ (props changed) lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed) lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed) lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed) lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed) lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed) lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed) lucene/dev/branches/branch_4x/lucene/README.txt (props changed) lucene/dev/branches/branch_4x/lucene/analysis/ (props changed) lucene/dev/branches/branch_4x/lucene/analysis/common/ (props changed) lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/package.html (props changed) lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/package.html (props changed) lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java lucene/dev/branches/branch_4x/lucene/backwards/ (props changed) lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed) lucene/dev/branches/branch_4x/lucene/build.xml (props changed) lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed) lucene/dev/branches/branch_4x/lucene/core/ (props changed) lucene/dev/branches/branch_4x/lucene/demo/ (props changed) lucene/dev/branches/branch_4x/lucene/facet/ (props changed) lucene/dev/branches/branch_4x/lucene/grouping/ (props changed) lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed) lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed) lucene/dev/branches/branch_4x/lucene/join/ (props changed) lucene/dev/branches/branch_4x/lucene/memory/ (props changed) lucene/dev/branches/branch_4x/lucene/misc/ (props changed) lucene/dev/branches/branch_4x/lucene/module-build.xml (props changed) lucene/dev/branches/branch_4x/lucene/queries/ (props changed) lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed) lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed) lucene/dev/branches/branch_4x/lucene/site/ (props changed) lucene/dev/branches/branch_4x/lucene/spatial/ (props changed) lucene/dev/branches/branch_4x/lucene/suggest/ (props changed) lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed) lucene/dev/branches/branch_4x/lucene/tools/ (props changed) lucene/dev/branches/branch_4x/solr/ (props changed) lucene/dev/branches/branch_4x/solr/CHANGES.txt (props changed) lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed) lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed) lucene/dev/branches/branch_4x/solr/README.txt (props changed) lucene/dev/branches/branch_4x/solr/build.xml (props changed) lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed) lucene/dev/branches/branch_4x/solr/common-build.xml (props changed) lucene/dev/branches/branch_4x/solr/contrib/ (props changed) lucene/dev/branches/branch_4x/solr/core/ (props changed) lucene/dev/branches/branch_4x/solr/dev-tools/ (props changed) lucene/dev/branches/branch_4x/solr/example/ (props changed) lucene/dev/branches/branch_4x/solr/lib/ (props changed) lucene/dev/branches/branch_4x/solr/lib/httpclient-LICENSE-ASL.txt (props changed) lucene/dev/branches/branch_4x/solr/lib/httpclient-NOTICE.txt (props changed) lucene/dev/branches/branch_4x/solr/lib/httpcore-LICENSE-ASL.txt (props changed) lucene/dev/branches/branch_4x/solr/lib/httpcore-NOTICE.txt (props changed) lucene/dev/branches/branch_4x/solr/lib/httpmime-LICENSE-ASL.txt (props changed) lucene/dev/branches/branch_4x/solr/lib/httpmime-NOTICE.txt (props changed) lucene/dev/branches/branch_4x/solr/scripts/ (props changed) lucene/dev/branches/branch_4x/solr/solrj/ (props changed) lucene/dev/branches/branch_4x/solr/test-framework/ (props changed) lucene/dev/branches/branch_4x/solr/testlogging.properties (props changed) lucene/dev/branches/branch_4x/solr/webapp/ (props changed) Modified: lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java?rev=1360398&r1=1360397&r2=1360398&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java (original) +++ lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java Wed Jul 11 21:06:08 2012 @@ -78,7 +78,7 @@ public class UIMABaseAnalyzerTest extend // try the search over the first doc DirectoryReader directoryReader = DirectoryReader.open(dir); IndexSearcher indexSearcher = new IndexSearcher(directoryReader); - TopDocs result = indexSearcher.search(new MatchAllDocsQuery(), 10); + TopDocs result = indexSearcher.search(new MatchAllDocsQuery(), 1); assertTrue(result.totalHits > 0); Document d = indexSearcher.doc(result.scoreDocs[0].doc); assertNotNull(d); @@ -99,7 +99,7 @@ public class UIMABaseAnalyzerTest extend directoryReader.close(); directoryReader = DirectoryReader.open(dir); indexSearcher = new IndexSearcher(directoryReader); - result = indexSearcher.search(new MatchAllDocsQuery(), 10); + result = indexSearcher.search(new MatchAllDocsQuery(), 2); Document d1 = indexSearcher.doc(result.scoreDocs[1].doc); assertNotNull(d1); assertNotNull(d1.getField("title")); @@ -109,7 +109,7 @@ public class UIMABaseAnalyzerTest extend // do a matchalldocs query to retrieve both docs indexSearcher = new IndexSearcher(directoryReader); - result = indexSearcher.search(new MatchAllDocsQuery(), 10); + result = indexSearcher.search(new MatchAllDocsQuery(), 2); assertEquals(2, result.totalHits); writer.close(); indexSearcher.getIndexReader().close(); @@ -119,7 +119,7 @@ public class UIMABaseAnalyzerTest extend @Test public void testRandomStrings() throws Exception { checkRandomData(random(), new UIMABaseAnalyzer("/uima/TestAggregateSentenceAE.xml", "org.apache.lucene.uima.ts.TokenAnnotation"), - 1000 * RANDOM_MULTIPLIER); + 100 * RANDOM_MULTIPLIER); } } Modified: lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java?rev=1360398&r1=1360397&r2=1360398&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java (original) +++ lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java Wed Jul 11 21:06:08 2012 @@ -21,7 +21,6 @@ import org.apache.lucene.analysis.BaseTo import org.apache.lucene.analysis.TokenStream; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import java.io.StringReader; @@ -60,10 +59,9 @@ public class UIMATypeAwareAnalyzerTest e } @Test - @Ignore("Where is TestAggregatedSentenceAE.xml") public void testRandomStrings() throws Exception { checkRandomData(random(), new UIMATypeAwareAnalyzer("/uima/TestAggregateSentenceAE.xml", - "org.apache.lucene.uima.ts.TokenAnnotation", "pos"), 1000 * RANDOM_MULTIPLIER); + "org.apache.lucene.uima.ts.TokenAnnotation", "pos"), 100 * RANDOM_MULTIPLIER); } }