Return-Path: Delivered-To: apmail-lucene-java-dev-archive@www.apache.org Received: (qmail 61977 invoked from network); 18 Mar 2010 00:23:57 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 18 Mar 2010 00:23:57 -0000 Received: (qmail 26592 invoked by uid 500); 18 Mar 2010 00:23:56 -0000 Delivered-To: apmail-lucene-java-dev-archive@lucene.apache.org Received: (qmail 26552 invoked by uid 500); 18 Mar 2010 00:23:56 -0000 Mailing-List: contact java-dev-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@lucene.apache.org Delivered-To: mailing list java-dev@lucene.apache.org Received: (qmail 26543 invoked by uid 99); 18 Mar 2010 00:23:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Mar 2010 00:23:56 +0000 X-ASF-Spam-Status: No, hits=0.7 required=10.0 tests=RCVD_IN_DNSWL_NONE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [209.85.216.198] (HELO mail-px0-f198.google.com) (209.85.216.198) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Mar 2010 00:23:47 +0000 Received: by pxi36 with SMTP id 36so1094895pxi.21 for ; Wed, 17 Mar 2010 17:23:24 -0700 (PDT) MIME-Version: 1.0 Received: by 10.114.54.34 with SMTP id c34mr385604waa.33.1268871804521; Wed, 17 Mar 2010 17:23:24 -0700 (PDT) Date: Wed, 17 Mar 2010 19:23:24 -0500 Message-ID: <9ac0c6aa1003171723yda14f3fq72a32d3deb9f336b@mail.gmail.com> Subject: Re: svn commit: r924247 [1/4] - in /lucene/java/branches/flex_1458: ./ backwards/ backwards/src/ contrib/ contrib/analyzers/common/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/ contrib/analyzers/common/src/test/org/apache/lucene/a From: Michael McCandless To: java-dev@lucene.apache.org Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org OK I've merged these to flex. The one line jdoc fix for LUCENE-2294 (svn rev 922624) isn't listed as merged (in mergeinfo), but I did merge it! Mike On Wed, Mar 17, 2010 at 7:06 AM, wrote: > Author: uschindler > Date: Wed Mar 17 12:06:27 2010 > New Revision: 924247 > > URL: http://svn.apache.org/viewvc?rev=3D924247&view=3Drev > Log: > Merge partially up to trunk rev 924207 > > The following revs were excluded: > - 921480,921485,921532: Commit and revert of IWConfig, does not need to b= e merged at all > - add/removal of solr (922942,922951) > - 922583: IndexWriterConfig mega-patch of Shai > - 922806: dito > - 923238: dito > > Added: > =A0 =A0lucene/java/branches/flex_1458/backwards/ > =A0 =A0 =A0- copied from r924207, lucene/java/trunk/backwards/ > =A0 =A0lucene/java/branches/flex_1458/backwards/backwards-readme.txt > =A0 =A0 =A0- copied unchanged from r924207, lucene/java/trunk/backwards/b= ackwards-readme.txt > =A0 =A0lucene/java/branches/flex_1458/backwards/src/ > =A0 =A0 =A0- copied from r923483, lucene/java/branches/flex_1458_3_0_back= _compat_tests/src/ > Modified: > =A0 =A0lucene/java/branches/flex_1458/ =A0 (props changed) > =A0 =A0lucene/java/branches/flex_1458/CHANGES.txt > =A0 =A0lucene/java/branches/flex_1458/build.xml =A0 (contents, props chan= ged) > =A0 =A0lucene/java/branches/flex_1458/common-build.xml > =A0 =A0lucene/java/branches/flex_1458/contrib/ =A0 (props changed) > =A0 =A0lucene/java/branches/flex_1458/contrib/CHANGES.txt =A0 (props chan= ged) > =A0 =A0lucene/java/branches/flex_1458/contrib/analyzers/common/build.xml > =A0 =A0lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/o= rg/apache/lucene/analysis/hi/HindiStemFilter.java > =A0 =A0lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/o= rg/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java > =A0 =A0lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/o= rg/apache/lucene/analysis/cz/TestCzechAnalyzer.java > =A0 =A0lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/o= rg/apache/lucene/analysis/de/TestGermanStemFilter.java > =A0 =A0lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/o= rg/apache/lucene/analysis/nl/TestDutchStemmer.java > =A0 =A0lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/o= rg/apache/lucene/analysis/ru/TestRussianAnalyzer.java > =A0 =A0lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/o= rg/apache/lucene/analysis/ru/TestRussianStem.java > =A0 =A0lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/o= rg/apache/lucene/analysis/snowball/ =A0 (props changed) > =A0 =A0lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/o= rg/apache/lucene/analysis/snowball/TestSnowballVocab.java > =A0 =A0lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apac= he/lucene/benchmark/byTask/TestPerfTasksLogic.java > =A0 =A0lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apac= he/lucene/benchmark/quality/TestQualityRun.java > =A0 =A0lucene/java/branches/flex_1458/contrib/db/bdb-je/src/test/org/apac= he/lucene/store/je/JEStoreTest.java > =A0 =A0lucene/java/branches/flex_1458/contrib/db/bdb/src/test/org/apache/= lucene/store/db/DbStoreTest.java > =A0 =A0lucene/java/branches/flex_1458/contrib/fast-vector-highlighter/src= /test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.ja= va > =A0 =A0lucene/java/branches/flex_1458/contrib/highlighter/src/test/ =A0 (= props changed) > =A0 =A0lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/ap= ache/lucene/search/highlight/HighlighterTest.java > =A0 =A0lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/a= pache/lucene/store/instantiated/TestIndicesEquals.java =A0 (props changed) > =A0 =A0lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/= lucene/index/memory/MemoryIndex.java > =A0 =A0lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/= lucene/index/memory/MemoryIndexTest.java > =A0 =A0lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lu= cene/index/TestIndexSplitter.java > =A0 =A0lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/ap= ache/lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java > =A0 =A0lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/ap= ache/lucene/queryParser/standard/TestQueryParserWrapper.java > =A0 =A0lucene/java/branches/flex_1458/contrib/spatial/src/test/org/apache= /lucene/spatial/tier/TestCartesian.java > =A0 =A0lucene/java/branches/flex_1458/contrib/spatial/src/test/org/apache= /lucene/spatial/tier/TestDistance.java > =A0 =A0lucene/java/branches/flex_1458/contrib/surround/src/java/org/apach= e/lucene/queryParser/surround/query/SrndPrefixQuery.java > =A0 =A0lucene/java/branches/flex_1458/contrib/surround/src/java/org/apach= e/lucene/queryParser/surround/query/SrndTermQuery.java > =A0 =A0lucene/java/branches/flex_1458/contrib/surround/src/java/org/apach= e/lucene/queryParser/surround/query/SrndTruncQuery.java > =A0 =A0lucene/java/branches/flex_1458/contrib/wordnet/src/test/org/apache= /lucene/wordnet/TestSynonymTokenFilter.java > =A0 =A0lucene/java/branches/flex_1458/contrib/wordnet/src/test/org/apache= /lucene/wordnet/TestWordnet.java > =A0 =A0lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/o= rg/apache/lucene/xmlparser/TestParser.java > =A0 =A0lucene/java/branches/flex_1458/docs/fileformats.html > =A0 =A0lucene/java/branches/flex_1458/docs/fileformats.pdf > =A0 =A0lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis= /ASCIIFoldingFilter.java > =A0 =A0lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis= /Tokenizer.java =A0 (props changed) > =A0 =A0lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/In= dexWriter.java > =A0 =A0lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/M= ultiTermQueryWrapperFilter.java =A0 (props changed) > =A0 =A0lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/Att= ributeSource.java > =A0 =A0lucene/java/branches/flex_1458/src/site/src/documentation/content/= xdocs/fileformats.xml > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis= /TestISOLatin1AccentFilter.java =A0 (props changed) > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis= /TestPorterStemFilter.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis= /TestStopFilter.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/document= /TestDateTools.java =A0 (props changed) > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/document= /TestNumberTools.java =A0 (props changed) > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stBackwardsCompatibility.java =A0 (contents, props changed) > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stByteSlices.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stCheckIndex.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stCompoundFile.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stConcurrentMergeScheduler.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stDoc.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stFieldsReader.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stIndexReader.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stIndexReaderCloneNorms.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stIndexReaderReopen.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stIndexWriter.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stIndexWriterDelete.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stIndexWriterExceptions.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stIndexWriterLockRelease.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stStressIndexing2.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stTermdocPerf.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/Te= stThreadedOptimize.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/queryPar= ser/TestQueryParser.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/T= estCustomSearcherSort.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/T= estMultiSearcherRanking.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/T= estNumericRangeQuery32.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/T= estNumericRangeQuery64.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/T= estScorerPerf.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/T= estWildcard.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/f= unction/FunctionTestSetup.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/p= ayloads/PayloadHelper.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/s= pans/TestPayloadSpans.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/Te= stBufferedIndexInput.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/Te= stDirectory.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/Te= stLockFactory.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/Te= stRAMDirectory.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/Te= stWindowsMMap.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/Luc= eneTestCase.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/Luc= eneTestCaseJ4.java > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/Tes= tAttributeSource.java =A0 (contents, props changed) > =A0 =A0lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/_Te= stUtil.java > > Propchange: lucene/java/branches/flex_1458/ > -------------------------------------------------------------------------= ----- > --- svn:ignore (original) > +++ svn:ignore Wed Mar 17 12:06:27 2010 > @@ -1,8 +1,6 @@ > =A0build > =A0dist > =A0backwards > -target > -test > =A0*~ > =A0velocity.log > =A0build.properties > > Propchange: lucene/java/branches/flex_1458/ > -------------------------------------------------------------------------= ----- > --- svn:mergeinfo (original) > +++ svn:mergeinfo Wed Mar 17 12:06:27 2010 > @@ -2,4 +2,4 @@ > =A0/lucene/java/branches/lucene_2_9:817269-818600,829134,829881,831036,89= 6850,909334 > =A0/lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336 > =A0/lucene/java/branches/lucene_3_0:880793,896906 > -/lucene/java/trunk:824912-825292,827043-833960,880727-886190,889185,8896= 14-916543,916596,916685,916755,916769,917019,917148,917154,917161,917203-91= 7204,919060,919119,919718,919731,919869,920237-920499 > +/lucene/java/trunk:824912-825292,827043-833960,880727-886190,889185,8896= 14-916543,916596,916685,916755,916769,917019,917148,917154,917161,917203-91= 7204,919060,919119,919718,919731,919869,920237-920499,922013,922277,922525,= 922528,922602,922624,922797,922799,922886-922887,923112,924151,924207 > > Modified: lucene/java/branches/flex_1458/CHANGES.txt > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/CHANGES.= txt?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/CHANGES.txt (original) > +++ lucene/java/branches/flex_1458/CHANGES.txt Wed Mar 17 12:06:27 2010 > @@ -113,6 +113,9 @@ API Changes > =A0 with FuzzyQuery to ensure that exact matches are always scored higher= , > =A0 because only the boost will be used in scoring. =A0(Robert Muir) > > +* LUCENE-2015: Add a static method foldToASCII to ASCIIFoldingFilter to > + =A0expose its folding logic. =A0(C=C3=A9drik Lime via Robert Muir) > + > =A0Bug fixes > > =A0* LUCENE-2119: Don't throw NegativeArraySizeException if you pass > @@ -185,6 +188,11 @@ New features > =A0* LUCENE-2247: Added a CharArrayMap for performance improvements > =A0 in some stemmers and synonym filters. (Uwe Schindler) > > +* LUCENE-2314: Added AttributeSource.copyTo(AttributeSource) that > + =A0allows to use cloneAttributes() and this method as a replacement > + =A0for captureState()/restoreState(), if the state itsself > + =A0needs to be inspected/modified. =A0(Uwe Schindler) > + > =A0Optimizations > > =A0* LUCENE-2075: Terms dict cache is now shared across threads instead > @@ -246,10 +254,14 @@ Optimizations > > =A0Build > > - * LUCENE-2124: Moved the JDK-based collation support from contrib/colla= tion > +* LUCENE-2124: Moved the JDK-based collation support from contrib/collat= ion > =A0 =A0into core, and moved the ICU-based collation support into contrib/= icu. > =A0 =A0(Robert Muir) > > +* LUCENE-2326: Removed SVN checkouts for backwards tests. The backwards = branch > + =A0is now included in the svn repository using "svn copy" after release= . > + =A0(Uwe Schindler) > + > =A0Test Cases > > =A0* LUCENE-2037 Allow Junit4 tests in our envrionment (Erick Erickson > @@ -271,6 +283,19 @@ Test Cases > =A0 from LuceneTestCase(J4), that contains the release version. > =A0 (Uwe Schindler, Simon Willnauer, Shai Erera) > > +* LUCENE-2313, LUCENE-2322: Add VERBOSE to LuceneTestCase(J4) to control > + =A0verbosity of tests. If VERBOSE=3D=3Dfalse (default) tests should not= print > + =A0anything other than errors to System.(out|err). The setting can be > + =A0changed with -Dtests.verbose=3Dtrue on test invokation. > + =A0(Shai Erera, Paul Elschot, Uwe Schindler) > + > +* LUCENE-2318: Remove inconsistent system property code for retrieving > + =A0temp and data directories inside test cases. It is now centralized i= n > + =A0LuceneTestCase(J4). Also changed lots of tests to use > + =A0getClass().getResourceAsStream() to retrieve test data. Tests needin= g > + =A0access to "real" files from the test folder itsself, can use > + =A0LuceneTestCase(J4).getDataFile(). =A0(Uwe Schindler) > + > =A0=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Release 2.9.2 /= 3.0.1 2010-02-26 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > > =A0Changes in backwards compatibility policy > > Modified: lucene/java/branches/flex_1458/build.xml > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/build.xm= l?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/build.xml (original) > +++ lucene/java/branches/flex_1458/build.xml Wed Mar 17 12:06:27 2010 > @@ -33,10 +33,6 @@ > =A0 =A0 > =A0 > > - =A0 > - =A0 =A0 > - =A0 > - > =A0 > =A0 =A0 > =A0 =A0 > @@ -58,7 +54,7 @@ > > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 includes=3D"src/,build.xml,*build*.xml,docs/,= *.txt,contrib/,*pom.xml*,lib/" > - =A0 =A0 =A0 =A0 =A0 =A0 =A0excludes=3D"contrib/db/*/lib/,contrib/*/ext-= libs/,src/site/build/,contrib/benchmark/temp/**,contrib/benchmark/work/**" > + =A0 =A0 =A0 =A0 =A0 =A0 =A0excludes=3D"contrib/db/*/lib/,contrib/*/ext-= libs/,src/site/build/,contrib/benchmark/temp/,contrib/benchmark/work/,contr= ib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/data/" > =A0 /> > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 includes=3D"${final.name}.jar,${demo.war.name= }.war,${demo.name}.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*= .jar" > @@ -79,91 +75,58 @@ > =A0 =A0 =A0 =A0 =A0 =A0 description=3D"Runs all unit tests (core, contrib and= back-compat)" > =A0 /> > + > + =A0 > + =A0 =A0 > + =A0 > > - =A0 > + =A0 > =A0 =A0 > - =A0 =A0 > + =A0 =A0 > =A0 > > =A0 > =A0 =A0 > - =A0 =A0 > + =A0 =A0 > =A0 =A0 > =A0 =A0 > =A0 > > - =A0 > + =A0 > > - =A0 > - =A0 =A0 > - =A0 =A0 =A0Initial SVN checkout for '${backwards.branch}'... > - =A0 =A0 =A0 > - =A0 =A0 =A0 > - =A0 =A0 =A0 =A0 > - =A0 =A0 =A0 > - =A0 =A0 =A0 > - =A0 =A0 =A0 =A0 > - =A0 =A0 =A0 > - =A0 =A0 > - =A0 > - > - =A0 > - =A0 =A0 > - =A0 =A0 =A0Update backwards branch '${backwards.branch}' to revis= ion ${backwards.rev}... > - =A0 =A0 =A0 > - =A0 =A0 =A0 =A0 > - =A0 =A0 =A0 > - =A0 =A0 > - =A0 > - > =A0 > =A0 > + > + =A0 > +WARNING: Backwards compatibility tests can only = be run from SVN checkout. > +The source distribution does not contain sources of the previous Lucene = Java version. > + =A0 > > - =A0 - =A0 =A0 =A0 description=3D"Runs tests of a previous Lucene version."> > + =A0 + =A0 =A0 =A0 description=3D"Runs tests of a previous Lucene version." if= =3D"backwards.available"> > =A0 =A0 =A0 =A0 > - =A0 =A0 > - > - =A0 =A0 =A0 =A0 > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 Backwards branch '${backwards.branch}' coul= d not be found in directory '${backwards.dir}'. > - =A0 =A0 =A0 =A0 > - =A0 =A0 =A0 =A0 > + =A0 =A0 =A0 > > =A0 =A0 =A0 =A0 =A0 > =A0 =A0 =A0 =A0 =A0 - =A0 =A0 =A0 =A0 =A0 srcdir=3D"${backwards.dir}/${backwards.branch}/src/= java" > - =A0 =A0 =A0 =A0 =A0 destdir=3D"${build.dir}/${backwards.branch}/classes= /java" > - =A0 =A0 =A0javac.source=3D"${javac.source.backwards}" javac.target=3D"$= {javac.target.backwards}"> > - =A0 =A0 =A0 =A0 > + =A0 =A0 =A0 =A0srcdir=3D"${backwards.dir}/src/java" > + =A0 =A0 =A0 =A0destdir=3D"${build.dir.backwards}/classes/java" > + =A0 =A0 =A0 =A0javac.source=3D"${javac.source.backwards}" javac.target= =3D"${javac.target.backwards}" > + =A0 =A0 =A0> > + =A0 =A0 =A0 =A0 > =A0 =A0 =A0 =A0 =A0 > - > - =A0 =A0 =A0 =A0 > - =A0 =A0 =A0 - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 destfile=3D"${build.dir= }/${backwards.branch}/${backwards.branch}.jar" /> > > - =A0 =A0 =A0 =A0 > - =A0 =A0 =A0 =A0 - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 test.classpath=3D"backwards.test.classpath" javac.= source=3D"${javac.source.backwards}" javac.target=3D"${javac.target.backwar= ds}"/> > + =A0 =A0 =A0 > + =A0 =A0 =A0 + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0test.classpath=3D"backwards.test.com= pile.classpath" javac.source=3D"${javac.source.backwards}" javac.target=3D"= ${javac.target.backwards}"/> > > =A0 =A0 =A0 =A0 =A0 > - =A0 =A0 =A0 - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 tempDir=3D"${build.dir}= /${backwards.branch}" > + =A0 =A0 =A0 + =A0 =A0 =A0 =A0 =A0 =A0 =A0tempDir=3D"${build.dir.backwards}/test" > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0junit.classpath=3D"bac= kwards.junit.classpath" > =A0 =A0 =A0 =A0 =A0 =A0 =A0 junit.output.dir=3D"${junit.output.dir.backwa= rds}" /> > =A0 =A0 =A0 =A0 > =A0 > - > - > - =A0 > - =A0 - =A0 =A0description=3D"deprecated: removes the old 'tag' subdir"> > - =A0 =A0 > - =A0 > - > - =A0 - =A0 =A0description=3D"Removes contents of the '${backwards.dir}' direct= ory"> > - =A0 =A0 > - =A0 > > =A0 > =A0 > > Propchange: lucene/java/branches/flex_1458/build.xml > -------------------------------------------------------------------------= ----- > --- svn:mergeinfo (original) > +++ svn:mergeinfo Wed Mar 17 12:06:27 2010 > @@ -1,2 +1,2 @@ > =A0/lucene/java/branches/lucene_2_9/build.xml:909334 > -/lucene/java/trunk/build.xml:916596,916685,916755,916769,917019,917148,9= 17154,917161,917203-917204,919060,919119,919718,919731,919869,920237-920499 > +/lucene/java/trunk/build.xml:916596,916685,916755,916769,917019,917148,9= 17154,917161,917203-917204,919060,919119,919718,919731,919869,920237-920499= ,922013,922277,922525,922528,922602,922624,922797,922799,922886-922887,9231= 12,924151,924207 > > Modified: lucene/java/branches/flex_1458/common-build.xml > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/common-b= uild.xml?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/common-build.xml (original) > +++ lucene/java/branches/flex_1458/common-build.xml Wed Mar 17 12:06:27 2= 010 > @@ -42,8 +42,6 @@ > =A0 > =A0 > =A0 > - =A0 > - =A0 > =A0 > =A0 > =A0 > @@ -86,7 +84,6 @@ > > =A0 > =A0 > - =A0 > =A0 > =A0 > =A0 > @@ -95,10 +92,13 @@ > =A0 > =A0 > > + =A0 > + =A0 > + > =A0 > - =A0 > + =A0 > =A0 > - =A0 > + =A0 > =A0 > =A0 > > @@ -418,7 +418,6 @@ > =A0 =A0 =A0 =A0 =A0 =A0 =A0 > > =A0 =A0 =A0 =A0 =A0 =A0 =A0 > - =A0 =A0 =A0 =A0 =A0 =A0 > =A0 =A0 =A0 =A0 =A0 =A0 =A0 > =A0 =A0 =A0 =A0 =A0 =A0 =A0 > =A0 =A0 =A0 =A0 =A0 =A0 =A0 > @@ -553,8 +552,8 @@ > =A0 =A0 =A0 > - =A0 =A0 =A0 > - =A0 =A0 =A0 =A0 > + =A0 =A0 =A0 > + =A0 =A0 =A0 =A0 > =A0 =A0 =A0 > =A0 =A0 =A0 > =A0 =A0 > > Propchange: lucene/java/branches/flex_1458/contrib/ > -------------------------------------------------------------------------= ----- > --- svn:mergeinfo (original) > +++ svn:mergeinfo Wed Mar 17 12:06:27 2010 > @@ -2,4 +2,4 @@ > =A0/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,8= 29816,829881,831036,896850,909334 > =A0/lucene/java/branches/lucene_2_9_back_compat_tests/contrib:818601-8213= 36 > =A0/lucene/java/branches/lucene_3_0/contrib:880793,896906 > -/lucene/java/trunk/contrib:824912-825292,827043-833960,880727-886190,889= 185,889614-916543,916596,916685,916755,916769,917019,917148,917154,917161,9= 17203-917204,919060,919119,919718,919731,919869,920237-920499 > +/lucene/java/trunk/contrib:824912-825292,827043-833960,880727-886190,889= 185,889614-916543,916596,916685,916755,916769,917019,917148,917154,917161,9= 17203-917204,919060,919119,919718,919731,919869,920237-920499,922013,922277= ,922525,922528,922602,922624,922797,922799,922886-922887,923112,924151,9242= 07 > > Propchange: lucene/java/branches/flex_1458/contrib/CHANGES.txt > -------------------------------------------------------------------------= ----- > --- svn:mergeinfo (original) > +++ svn:mergeinfo Wed Mar 17 12:06:27 2010 > @@ -2,4 +2,4 @@ > =A0/lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825= 998,826775,829134,829816,829881,831036,896850 > =A0/lucene/java/branches/lucene_2_9_back_compat_tests/contrib/CHANGES.txt= :818601-821336 > =A0/lucene/java/branches/lucene_3_0/contrib/CHANGES.txt:880793,896906 > -/lucene/java/trunk/contrib/CHANGES.txt:829439-833960,880727-886190,88918= 5,889622,889667,889866-899001,916596,916685,916755,916769,917019,917148,917= 154,917161,917203-917204,919060,919119,919718,919731,919869,920237-920499 > +/lucene/java/trunk/contrib/CHANGES.txt:829439-833960,880727-886190,88918= 5,889622,889667,889866-899001,916596,916685,916755,916769,917019,917148,917= 154,917161,917203-917204,919060,919119,919718,919731,919869,920237-920499,9= 22013,922277,922525,922528,922602,922624,922797,922799,922886-922887,923112= ,924151,924207 > > Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/build.x= ml > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= analyzers/common/build.xml?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/analyzers/common/build.xml (or= iginal) > +++ lucene/java/branches/flex_1458/contrib/analyzers/common/build.xml Wed= Mar 17 12:06:27 2010 > @@ -35,20 +35,4 @@ > =A0 =A0 > =A0 =A0 > =A0 > - > - =A0 > - =A0 > - =A0 - =A0 =A0 =A0 =A0 =A0 =A0value=3D"svn://svn.tartarus.org/snowball/trunk/d= ata"/> > - =A0 > - > - =A0 - =A0 =A0 =A0 =A0 =A0 =A0 description=3D"Downloads Snowball vocabulary te= sts"> > - =A0 =A0 =A0 > - =A0 =A0 =A0 =A0 > - =A0 =A0 =A0 =A0 =A0 > - =A0 =A0 =A0 =A0 =A0 =A0 > - =A0 =A0 =A0 =A0 =A0 > - =A0 =A0 =A0 > - =A0 > =A0 > > Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/jav= a/org/apache/lucene/analysis/hi/HindiStemFilter.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilter.jav= a?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/= apache/lucene/analysis/hi/HindiStemFilter.java (original) > +++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/= apache/lucene/analysis/hi/HindiStemFilter.java Wed Mar 17 12:06:27 2010 > @@ -32,7 +32,7 @@ public final class HindiStemFilter exten > =A0 private final KeywordAttribute keywordAtt =3D addAttribute(KeywordAtt= ribute.class); > =A0 private final HindiStemmer stemmer =3D new HindiStemmer(); > > - =A0protected HindiStemFilter(TokenStream input) { > + =A0public HindiStemFilter(TokenStream input) { > =A0 =A0 super(input); > =A0 } > > > Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/tes= t/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= analyzers/common/src/test/org/apache/lucene/analysis/compound/TestCompoundW= ordTokenFilter.java?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java (original) > +++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java Wed Mar 17= 12:06:27 2010 > @@ -30,9 +30,6 @@ import org.apache.lucene.analysis.compou > =A0import org.apache.lucene.analysis.tokenattributes.TermAttribute; > > =A0public class TestCompoundWordTokenFilter extends BaseTokenStreamTestCa= se { > - =A0static final File dataDir =3D new File(System.getProperty("dataDir",= "./bin")); > - =A0static final File testFile =3D new File(dataDir, "org/apache/lucene/= analysis/compound/da_UTF8.xml"); > - > =A0 public void testHyphenationCompoundWordsDA() throws Exception { > =A0 =A0 String[] dict =3D { "l=C3=A6se", "hest" }; > > @@ -143,6 +140,6 @@ public class TestCompoundWordTokenFilter > =A0 } > > =A0 private Reader getHyphenationReader() throws Exception { > - =A0 =A0return new InputStreamReader(new FileInputStream(testFile), "UTF= -8"); > + =A0 =A0return new InputStreamReader(getClass().getResourceAsStream("da_= UTF8.xml"), "UTF-8"); > =A0 } > =A0} > > Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/tes= t/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.j= ava?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/cz/TestCzechAnalyzer.java (original) > +++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/cz/TestCzechAnalyzer.java Wed Mar 17 12:06:27 2010 > @@ -35,8 +35,6 @@ import org.apache.lucene.util.Version; > =A0* > =A0*/ > =A0public class TestCzechAnalyzer extends BaseTokenStreamTestCase { > - =A0File dataDir =3D new File(System.getProperty("dataDir", "./bin")); > - =A0File customStopFile =3D new File(dataDir, "org/apache/lucene/analysi= s/cz/customStopWordFile.txt"); > > =A0 /** > =A0 =A0* @deprecated Remove this test when support for 3.0 indexes is no = longer needed. > @@ -105,7 +103,7 @@ public class TestCzechAnalyzer extends B > =A0 =A0 assertAnalyzesToReuse(cz, "=C4=8Cesk=C3=A1 Republika", > =A0 =A0 =A0 new String[] { "=C4 esk=C3=A1", "republika" }); > > - =A0 =A0InputStream stopwords =3D new FileInputStream(customStopFile); > + =A0 =A0InputStream stopwords =3D getClass().getResourceAsStream("custom= StopWordFile.txt"); > =A0 =A0 cz.loadStopWords(stopwords, "UTF-8"); > > =A0 =A0 assertAnalyzesToReuse(cz, "=C4=8Cesk=C3=A1 Republika", new String= [] { "=C4 esk=C3=A1" }); > > Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/tes= t/org/apache/lucene/analysis/de/TestGermanStemFilter.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilte= r.java?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/de/TestGermanStemFilter.java (original) > +++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/de/TestGermanStemFilter.java Wed Mar 17 12:06:27 201= 0 > @@ -41,10 +41,7 @@ public class TestGermanStemFilter extend > =A0 =A0 Tokenizer tokenizer =3D new KeywordTokenizer(new StringReader("")= ); > =A0 =A0 TokenFilter filter =3D new GermanStemFilter(new LowerCaseFilter(T= EST_VERSION_CURRENT, tokenizer)); > =A0 =A0 // read test cases from external file: > - =A0 =A0File dataDir =3D new File(System.getProperty("dataDir", "./bin")= ); > - =A0 =A0File testFile =3D new File(dataDir, "org/apache/lucene/analysis/= de/data.txt"); > - =A0 =A0FileInputStream fis =3D new FileInputStream(testFile); > - =A0 =A0InputStreamReader isr =3D new InputStreamReader(fis, "iso-8859-1= "); > + =A0 =A0InputStreamReader isr =3D new InputStreamReader(getClass().getRe= sourceAsStream("data.txt"), "iso-8859-1"); > =A0 =A0 BufferedReader breader =3D new BufferedReader(isr); > =A0 =A0 while(true) { > =A0 =A0 =A0 String line =3D breader.readLine(); > @@ -61,6 +58,5 @@ public class TestGermanStemFilter extend > =A0 =A0 } > =A0 =A0 breader.close(); > =A0 =A0 isr.close(); > - =A0 =A0fis.close(); > =A0 } > =A0} > > Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/tes= t/org/apache/lucene/analysis/nl/TestDutchStemmer.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= analyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.ja= va?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/nl/TestDutchStemmer.java (original) > +++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/nl/TestDutchStemmer.java Wed Mar 17 12:06:27 2010 > @@ -32,8 +32,6 @@ import org.apache.lucene.util.Version; > =A0* > =A0*/ > =A0public class TestDutchStemmer extends BaseTokenStreamTestCase { > - =A0File dataDir =3D new File(System.getProperty("dataDir", "./bin")); > - =A0File customDictFile =3D new File(dataDir, "org/apache/lucene/analysi= s/nl/customStemDict.txt"); > > =A0 public void testWithSnowballExamples() throws Exception { > =A0 =A0 =A0 =A0 check("lichaamsziek", "lichaamsziek"); > @@ -172,6 +170,7 @@ public class TestDutchStemmer extends Ba > =A0 public void testStemDictionaryReuse() throws Exception { > =A0 =A0 DutchAnalyzer a =3D new DutchAnalyzer(TEST_VERSION_CURRENT); > =A0 =A0 checkOneTermReuse(a, "lichamelijk", "licham"); > + =A0 =A0File customDictFile =3D getDataFile("customStemDict.txt"); > =A0 =A0 a.setStemDictionary(customDictFile); > =A0 =A0 checkOneTermReuse(a, "lichamelijk", "somethingentirelydifferent")= ; > =A0 } > > Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/tes= t/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer= .java?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/ru/TestRussianAnalyzer.java (original) > +++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/ru/TestRussianAnalyzer.java Wed Mar 17 12:06:27 2010 > @@ -41,14 +41,6 @@ public class TestRussianAnalyzer extends > > =A0 =A0 private InputStreamReader sampleUnicode; > > - =A0 =A0private File dataDir; > - > - =A0 =A0@Override > - =A0 =A0protected void setUp() throws Exception { > - =A0 =A0 =A0super.setUp(); > - =A0 =A0 =A0dataDir =3D new File(System.getProperty("dataDir", "./bin"))= ; > - =A0 =A0} > - > =A0 =A0 /** > =A0 =A0 =A0* @deprecated remove this test and its datafiles in Lucene 4.0 > =A0 =A0 =A0* the Snowball version has its own data tests. > @@ -59,12 +51,12 @@ public class TestRussianAnalyzer extends > =A0 =A0 =A0 =A0 RussianAnalyzer ra =3D new RussianAnalyzer(Version.LUCENE= _30); > =A0 =A0 =A0 =A0 inWords =3D > =A0 =A0 =A0 =A0 =A0 =A0 new InputStreamReader( > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0new FileInputStream(new File(dataDir, "/= org/apache/lucene/analysis/ru/testUTF8.txt")), > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0getClass().getResourceAsStream("testUTF8= .txt"), > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "UTF-8"); > > =A0 =A0 =A0 =A0 sampleUnicode =3D > =A0 =A0 =A0 =A0 =A0 =A0 new InputStreamReader( > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0new FileInputStream(new File(dataDir, "/= org/apache/lucene/analysis/ru/resUTF8.htm")), > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0getClass().getResourceAsStream("resUTF8.= htm"), > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "UTF-8"); > > =A0 =A0 =A0 =A0 TokenStream in =3D ra.tokenStream("all", inWords); > > Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/tes= t/org/apache/lucene/analysis/ru/TestRussianStem.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianStem.jav= a?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/ru/TestRussianStem.java (original) > +++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/ru/TestRussianStem.java Wed Mar 17 12:06:27 2010 > @@ -47,13 +47,11 @@ public class TestRussianStem extends Luc > =A0 =A0 =A0 =A0 //System.out.println(new java.util.Date()); > =A0 =A0 =A0 =A0 String str; > > - =A0 =A0 =A0 =A0File dataDir =3D new File(System.getProperty("dataDir", = "./bin")); > - > =A0 =A0 =A0 =A0 // open and read words into an array list > =A0 =A0 =A0 =A0 BufferedReader inWords =3D > =A0 =A0 =A0 =A0 =A0 =A0 new BufferedReader( > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 new InputStreamReader( > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0new FileInputStream(new File(dat= aDir, "/org/apache/lucene/analysis/ru/wordsUTF8.txt")), > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0getClass().getResourceAsStream("= wordsUTF8.txt"), > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "UTF-8")); > =A0 =A0 =A0 =A0 while ((str =3D inWords.readLine()) !=3D null) > =A0 =A0 =A0 =A0 { > @@ -65,7 +63,7 @@ public class TestRussianStem extends Luc > =A0 =A0 =A0 =A0 BufferedReader inStems =3D > =A0 =A0 =A0 =A0 =A0 =A0 new BufferedReader( > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 new InputStreamReader( > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0new FileInputStream(new File(dat= aDir, "/org/apache/lucene/analysis/ru/stemsUTF8.txt")), > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0getClass().getResourceAsStream("= stemsUTF8.txt"), > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "UTF-8")); > =A0 =A0 =A0 =A0 while ((str =3D inStems.readLine()) !=3D null) > =A0 =A0 =A0 =A0 { > > Propchange: lucene/java/branches/flex_1458/contrib/analyzers/common/src/t= est/org/apache/lucene/analysis/snowball/ > -------------------------------------------------------------------------= ----- > --- svn:externals (added) > +++ svn:externals Wed Mar 17 12:06:27 2010 > @@ -0,0 +1 @@ > +data -r500 svn://svn.tartarus.org/snowball/trunk/data > > Propchange: lucene/java/branches/flex_1458/contrib/analyzers/common/src/t= est/org/apache/lucene/analysis/snowball/ > =A0 =A0 =A0 =A0 =A0 =A0('svn:ignore' removed) > > Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/tes= t/org/apache/lucene/analysis/snowball/TestSnowballVocab.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballV= ocab.java?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/snowball/TestSnowballVocab.java (original) > +++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/= apache/lucene/analysis/snowball/TestSnowballVocab.java Wed Mar 17 12:06:27 = 2010 > @@ -35,18 +35,24 @@ import org.apache.lucene.analysis.Tokeni > =A0*/ > =A0public class TestSnowballVocab extends BaseTokenStreamTestCase { > =A0 private Tokenizer tokenizer =3D new KeywordTokenizer(new StringReader= ("")); > - =A0static final File dataDir =3D new File(System.getProperty("dataDir",= "./bin")); > - =A0static final File dataRoot =3D new File(dataDir, > - =A0 =A0 =A0"org/apache/lucene/analysis/snowball/data"); > + =A0File dataRoot =3D null; > + > + =A0@Override > + =A0protected void setUp() throws Exception { > + =A0 =A0super.setUp(); > + =A0 =A0try { > + =A0 =A0 =A0dataRoot =3D getDataFile("data"); > + =A0 =A0} catch (IOException ioe) { > + =A0 =A0 =A0dataRoot =3D null; > + =A0 =A0 =A0System.err.println("WARN: This test was disabled, as the sno= wball test files are not available!"); > + =A0 =A0} > + =A0} > > =A0 /** > =A0 =A0* Run all languages against their snowball vocabulary tests. > =A0 =A0*/ > =A0 public void testStemmers() throws IOException { > - =A0 =A0if (!dataRoot.exists()) { > - =A0 =A0 =A0System.err.println("WARN: This test was disabled, as the svn= checkout of snowball test files is not supported on your system!"); > - =A0 =A0 =A0return; > - =A0 =A0} > + =A0 =A0if (dataRoot =3D=3D null) return; > =A0 =A0 assertCorrectOutput("Danish", "danish"); > =A0 =A0 assertCorrectOutput("Dutch", "dutch"); > =A0 =A0 assertCorrectOutput("English", "english"); > @@ -78,7 +84,7 @@ public class TestSnowballVocab extends B > =A0 =A0*/ > =A0 private void assertCorrectOutput(String snowballLanguage, String data= Directory) > =A0 =A0 =A0 throws IOException { > - =A0 =A0System.err.println("checking snowball language: " + snowballLang= uage); > + =A0 =A0if (VERBOSE) System.out.println("checking snowball language: " += snowballLanguage); > =A0 =A0 TokenStream filter =3D new SnowballFilter(tokenizer, snowballLang= uage); > =A0 =A0 InputStream vocFile =3D new FileInputStream(new File(dataRoot, > =A0 =A0 =A0 =A0 dataDirectory + "/voc.txt")); > > Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/a= pache/lucene/benchmark/byTask/TestPerfTasksLogic.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.ja= va?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/= lucene/benchmark/byTask/TestPerfTasksLogic.java (original) > +++ lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/= lucene/benchmark/byTask/TestPerfTasksLogic.java Wed Mar 17 12:06:27 2010 > @@ -53,7 +53,6 @@ import org.apache.lucene.util.LuceneTest > =A0*/ > =A0public class TestPerfTasksLogic extends LuceneTestCase { > > - =A0private static final boolean DEBUG =3D false; > =A0 static final String NEW_LINE =3D System.getProperty("line.separator")= ; > > =A0 // properties in effect in all tests here > @@ -373,7 +372,7 @@ public class TestPerfTasksLogic extends > =A0 =A0* Test WriteLineDoc and LineDocSource. > =A0 =A0*/ > =A0 public void testLineDocFile() throws Exception { > - =A0 =A0File lineFile =3D new File(System.getProperty("tempDir"), "test.= reuters.lines.txt"); > + =A0 =A0File lineFile =3D new File(TEMP_DIR, "test.reuters.lines.txt"); > > =A0 =A0 // We will call WriteLineDocs this many times > =A0 =A0 final int NUM_TRY_DOCS =3D 50; > @@ -547,7 +546,7 @@ public class TestPerfTasksLogic extends > =A0 } > > =A0 private static void logTstLogic (String txt) { > - =A0 =A0if (!DEBUG) > + =A0 =A0if (!VERBOSE) > =A0 =A0 =A0 return; > =A0 =A0 System.out.println("Test logic of:"); > =A0 =A0 System.out.println(txt); > > Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/a= pache/lucene/benchmark/quality/TestQualityRun.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java?= rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/= lucene/benchmark/quality/TestQualityRun.java (original) > +++ lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/= lucene/benchmark/quality/TestQualityRun.java Wed Mar 17 12:06:27 2010 > @@ -35,8 +35,7 @@ import org.apache.lucene.benchmark.quali > =A0import org.apache.lucene.benchmark.quality.utils.SubmissionReport; > =A0import org.apache.lucene.search.IndexSearcher; > =A0import org.apache.lucene.store.FSDirectory; > - > -import junit.framework.TestCase; > +import org.apache.lucene.util.LuceneTestCase; > > =A0/** > =A0* Test that quality run does its job. > @@ -45,9 +44,7 @@ import junit.framework.TestCase; > =A0* this test will not work correctly, as it does not dynamically > =A0* generate its test trec topics/qrels! > =A0*/ > -public class TestQualityRun extends TestCase { > - > - =A0private static boolean DEBUG =3D Boolean.getBoolean("tests.verbose")= ; > +public class TestQualityRun extends LuceneTestCase { > > =A0 public TestQualityRun(String name) { > =A0 =A0 super(name); > @@ -63,7 +60,7 @@ public class TestQualityRun extends Test > =A0 =A0 int maxResults =3D 1000; > =A0 =A0 String docNameField =3D "doctitle"; // orig docID is in the lined= oc format title > > - =A0 =A0PrintWriter logger =3D DEBUG ? new PrintWriter(System.out,true) = : null; > + =A0 =A0PrintWriter logger =3D VERBOSE ? new PrintWriter(System.out,true= ) : null; > > =A0 =A0 // for topics/qrels files - src/test/org/apache/l= ucene/benchmark/quality > =A0 =A0 File srcTestDir =3D new File(new File(new File(new File(new File( > @@ -89,7 +86,7 @@ public class TestQualityRun extends Test > =A0 =A0 QualityQueryParser qqParser =3D new SimpleQQParser("title","body"= ); > =A0 =A0 QualityBenchmark qrun =3D new QualityBenchmark(qqs, qqParser, sea= rcher, docNameField); > > - =A0 =A0SubmissionReport submitLog =3D DEBUG ? new SubmissionReport(logg= er, "TestRun") : null; > + =A0 =A0SubmissionReport submitLog =3D VERBOSE ? new SubmissionReport(lo= gger, "TestRun") : null; > =A0 =A0 qrun.setMaxResults(maxResults); > =A0 =A0 QualityStats stats[] =3D qrun.execute(judge, submitLog, logger); > > > Modified: lucene/java/branches/flex_1458/contrib/db/bdb-je/src/test/org/a= pache/lucene/store/je/JEStoreTest.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= db/bdb-je/src/test/org/apache/lucene/store/je/JEStoreTest.java?rev=3D924247= &r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/db/bdb-je/src/test/org/apache/= lucene/store/je/JEStoreTest.java (original) > +++ lucene/java/branches/flex_1458/contrib/db/bdb-je/src/test/org/apache/= lucene/store/je/JEStoreTest.java Wed Mar 17 12:06:27 2010 > @@ -46,7 +46,7 @@ import com.sleepycat.je.Transaction; > =A0* > =A0*/ > =A0public class JEStoreTest extends LuceneTestCase { > - =A0 =A0protected File dbHome =3D new File(System.getProperty("java.io.t= mpdir"),"index"); > + =A0 =A0protected File dbHome =3D new File(TEMP_DIR,"index"); > > =A0 =A0 protected Environment env; > > @@ -127,7 +127,7 @@ public class JEStoreTest extends LuceneT > =A0 =A0 =A0 =A0 Transaction txn =3D env.beginTransaction(null, null); > =A0 =A0 =A0 =A0 Directory store =3D null; > > - =A0 =A0 =A0 =A0System.out.println("Writing files byte by byte"); > + =A0 =A0 =A0 =A0if (VERBOSE) System.out.println("Writing files byte by b= yte"); > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 store =3D new JEDirectory(txn, index, blocks); > @@ -159,11 +159,13 @@ public class JEStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 duration =3D (int) (end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.print(duration); > =A0 =A0 =A0 =A0 System.out.print(" total milliseconds to create, "); > =A0 =A0 =A0 =A0 System.out.print(totalLength / duration); > =A0 =A0 =A0 =A0 System.out.println(" kb/s"); > + =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 txn =3D env.beginTransaction(null, null); > @@ -208,11 +210,13 @@ public class JEStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 duration =3D (int) (end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.print(duration); > =A0 =A0 =A0 =A0 System.out.print(" total milliseconds to read, "); > =A0 =A0 =A0 =A0 System.out.print(totalLength / duration); > =A0 =A0 =A0 =A0 System.out.println(" kb/s"); > + =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 txn =3D env.beginTransaction(null, null); > @@ -244,12 +248,14 @@ public class JEStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 System.out.print(end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.println(" total milliseconds to delete"); > > =A0 =A0 =A0 =A0 System.out.print(end.getTime() - veryStart.getTime()); > =A0 =A0 =A0 =A0 System.out.println(" total milliseconds"); > =A0 =A0 } > + =A0 =A0} > > =A0 =A0 public void testDelete() throws Exception { > =A0 =A0 =A0 =A0 final int count =3D 250; > @@ -267,7 +273,7 @@ public class JEStoreTest extends LuceneT > =A0 =A0 =A0 =A0 Transaction txn =3D env.beginTransaction(null, null); > =A0 =A0 =A0 =A0 Directory store =3D null; > > - =A0 =A0 =A0 =A0System.out.println("Writing files byte by byte"); > + =A0 =A0 =A0 =A0if (VERBOSE) System.out.println("Writing files byte by b= yte"); > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 store =3D new JEDirectory(txn, index, blocks); > @@ -299,11 +305,13 @@ public class JEStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 duration =3D (int) (end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.print(duration); > =A0 =A0 =A0 =A0 System.out.print(" total milliseconds to read, "); > =A0 =A0 =A0 =A0 System.out.print(totalLength / duration); > =A0 =A0 =A0 =A0 System.out.println(" kb/s"); > + =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 txn =3D env.beginTransaction(null, null); > @@ -337,6 +345,7 @@ public class JEStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 System.out.print(end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.println(" total milliseconds to delete even fi= les"); > > @@ -345,6 +354,7 @@ public class JEStoreTest extends LuceneT > =A0 =A0 =A0 =A0 System.out.print(" total milliseconds to create, "); > =A0 =A0 =A0 =A0 System.out.print(totalLength / duration); > =A0 =A0 =A0 =A0 System.out.println(" kb/s"); > + =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 txn =3D env.beginTransaction(null, null); > @@ -395,11 +405,13 @@ public class JEStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 duration =3D (int) (end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.print(duration); > =A0 =A0 =A0 =A0 System.out.print(" total milliseconds to read, "); > =A0 =A0 =A0 =A0 System.out.print(totalLength / duration); > =A0 =A0 =A0 =A0 System.out.println(" kb/s"); > + =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 txn =3D env.beginTransaction(null, null); > @@ -434,11 +446,13 @@ public class JEStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 System.out.print(end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.println(" total milliseconds to delete"); > > =A0 =A0 =A0 =A0 System.out.print(end.getTime() - veryStart.getTime()); > =A0 =A0 =A0 =A0 System.out.println(" total milliseconds"); > + =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0 Cursor cursor =3D null; > =A0 =A0 =A0 =A0 try { > @@ -491,7 +505,7 @@ public class JEStoreTest extends LuceneT > =A0 =A0 =A0 =A0 Transaction txn =3D env.beginTransaction(null, null); > =A0 =A0 =A0 =A0 Directory store =3D null; > > - =A0 =A0 =A0 =A0System.out.println("Writing files as one byte array"); > + =A0 =A0 =A0 =A0if (VERBOSE) System.out.println("Writing files as one by= te array"); > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 store =3D new JEDirectory(txn, index, blocks); > @@ -521,11 +535,13 @@ public class JEStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 duration =3D (int) (end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.print(duration); > =A0 =A0 =A0 =A0 System.out.print(" total milliseconds to create, "); > =A0 =A0 =A0 =A0 System.out.print(totalLength / duration); > =A0 =A0 =A0 =A0 System.out.println(" kb/s"); > + =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 txn =3D env.beginTransaction(null, null); > @@ -571,11 +587,13 @@ public class JEStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 duration =3D (int) (end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.print(duration); > =A0 =A0 =A0 =A0 System.out.print(" total milliseconds to read, "); > =A0 =A0 =A0 =A0 System.out.print(totalLength / duration); > =A0 =A0 =A0 =A0 System.out.println(" kb/s"); > + =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 txn =3D env.beginTransaction(null, null); > @@ -607,10 +625,12 @@ public class JEStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 System.out.print(end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.println(" total milliseconds to delete"); > > =A0 =A0 =A0 =A0 System.out.print(end.getTime() - veryStart.getTime()); > =A0 =A0 =A0 =A0 System.out.println(" total milliseconds"); > =A0 =A0 } > + =A0 =A0} > =A0} > > Modified: lucene/java/branches/flex_1458/contrib/db/bdb/src/test/org/apac= he/lucene/store/db/DbStoreTest.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= db/bdb/src/test/org/apache/lucene/store/db/DbStoreTest.java?rev=3D924247&r1= =3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/db/bdb/src/test/org/apache/luc= ene/store/db/DbStoreTest.java (original) > +++ lucene/java/branches/flex_1458/contrib/db/bdb/src/test/org/apache/luc= ene/store/db/DbStoreTest.java Wed Mar 17 12:06:27 2010 > @@ -43,7 +43,7 @@ import org.apache.lucene.util.LuceneTest > =A0* Adapted from org.apache.lucene.StoreTest with larger files and rando= m bytes. > =A0*/ > =A0public class DbStoreTest extends LuceneTestCase { > - =A0 =A0protected File dbHome =3D new File(System.getProperty("java.io.t= mpdir"),"index"); > + =A0 =A0protected File dbHome =3D new File(TEMP_DIR,"index"); > =A0 =A0 protected Environment env; > =A0 =A0 protected Database index, blocks; > > @@ -129,7 +129,7 @@ public class DbStoreTest extends LuceneT > =A0 =A0 =A0 =A0 Transaction txn =3D env.beginTransaction(null, null); > =A0 =A0 =A0 =A0 Directory store =3D null; > > - =A0 =A0 =A0 =A0System.out.println("Writing files byte by byte"); > + =A0 =A0 =A0 =A0if (VERBOSE) System.out.println("Writing files byte by b= yte"); > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 store =3D new DbDirectory(txn, index, blocks); > @@ -161,11 +161,13 @@ public class DbStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 duration =3D (int) (end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.print(duration); > =A0 =A0 =A0 =A0 System.out.print(" total milliseconds to create, "); > =A0 =A0 =A0 =A0 System.out.print(totalLength / duration); > =A0 =A0 =A0 =A0 System.out.println(" kb/s"); > + =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 txn =3D env.beginTransaction(null, null); > @@ -211,11 +213,13 @@ public class DbStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 duration =3D (int) (end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.print(duration); > =A0 =A0 =A0 =A0 System.out.print(" total milliseconds to read, "); > =A0 =A0 =A0 =A0 System.out.print(totalLength / duration); > =A0 =A0 =A0 =A0 System.out.println(" kb/s"); > + =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 txn =3D env.beginTransaction(null, null); > @@ -248,12 +252,14 @@ public class DbStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 System.out.print(end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.println(" total milliseconds to delete"); > > =A0 =A0 =A0 =A0 System.out.print(end.getTime() - veryStart.getTime()); > =A0 =A0 =A0 =A0 System.out.println(" total milliseconds"); > =A0 =A0 } > + =A0 =A0} > > =A0 =A0 public void testArrays() > =A0 =A0 =A0 =A0 throws Exception > @@ -274,7 +280,7 @@ public class DbStoreTest extends LuceneT > =A0 =A0 =A0 =A0 Transaction txn =3D env.beginTransaction(null, null); > =A0 =A0 =A0 =A0 Directory store =3D null; > > - =A0 =A0 =A0 =A0System.out.println("Writing files as one byte array"); > + =A0 =A0 =A0 =A0if (VERBOSE) System.out.println("Writing files as one by= te array"); > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 store =3D new DbDirectory(txn, index, blocks); > @@ -304,11 +310,13 @@ public class DbStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 duration =3D (int) (end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.print(duration); > =A0 =A0 =A0 =A0 System.out.print(" total milliseconds to create, "); > =A0 =A0 =A0 =A0 System.out.print(totalLength / duration); > =A0 =A0 =A0 =A0 System.out.println(" kb/s"); > + =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 txn =3D env.beginTransaction(null, null); > @@ -355,11 +363,13 @@ public class DbStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 duration =3D (int) (end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.print(duration); > =A0 =A0 =A0 =A0 System.out.print(" total milliseconds to read, "); > =A0 =A0 =A0 =A0 System.out.print(totalLength / duration); > =A0 =A0 =A0 =A0 System.out.println(" kb/s"); > + =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0 try { > =A0 =A0 =A0 =A0 =A0 =A0 txn =3D env.beginTransaction(null, null); > @@ -392,10 +402,12 @@ public class DbStoreTest extends LuceneT > > =A0 =A0 =A0 =A0 end =3D new Date(); > > + =A0 =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 =A0 System.out.print(end.getTime() - start.getTime()); > =A0 =A0 =A0 =A0 System.out.println(" total milliseconds to delete"); > > =A0 =A0 =A0 =A0 System.out.print(end.getTime() - veryStart.getTime()); > =A0 =A0 =A0 =A0 System.out.println(" total milliseconds"); > =A0 =A0 } > + =A0 =A0} > =A0} > > Modified: lucene/java/branches/flex_1458/contrib/fast-vector-highlighter/= src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest= .java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/S= impleFragListBuilderTest.java?rev=3D924247&r1=3D924246&r2=3D924247&view=3Dd= iff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/fast-vector-highlighter/src/te= st/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java = (original) > +++ lucene/java/branches/flex_1458/contrib/fast-vector-highlighter/src/te= st/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java = Wed Mar 17 12:06:27 2010 > @@ -48,7 +48,7 @@ public class SimpleFragListBuilderTest e > =A0 =A0 SimpleFragListBuilder sflb =3D new SimpleFragListBuilder(); > =A0 =A0 FieldFragList ffl =3D sflb.createFieldFragList( fpl( "\"abcdefgh = jklmnopqrs\"", "abcdefgh =A0 jklmnopqrs" ), SimpleFragListBuilder.MIN_FRAG_= CHAR_SIZE ); > =A0 =A0 assertEquals( 1, ffl.fragInfos.size() ); > - =A0 =A0System.out.println( ffl.fragInfos.get( 0 ).toString() ); > + =A0 =A0if (VERBOSE) System.out.println( ffl.fragInfos.get( 0 ).toString= () ); > =A0 =A0 assertEquals( "subInfos=3D(abcdefghjklmnopqrs((0,21)))/1.0(0,21)"= , ffl.fragInfos.get( 0 ).toString() ); > =A0 } > > > Propchange: lucene/java/branches/flex_1458/contrib/highlighter/src/test/ > -------------------------------------------------------------------------= ----- > --- svn:mergeinfo (original) > +++ svn:mergeinfo Wed Mar 17 12:06:27 2010 > @@ -2,4 +2,4 @@ > =A0/lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-8= 18600,825998,826775,829134,829816,829881,831036,896850,909334 > =A0/lucene/java/branches/lucene_2_9_back_compat_tests/contrib/highlighter= /src/test:818601-821336 > =A0/lucene/java/branches/lucene_3_0/contrib/highlighter/src/test:880793,8= 96906 > -/lucene/java/trunk/contrib/highlighter/src/test:829439-833960,880727-886= 190,889185,889614-916543,916596,916685,916755,916769,917019,917148,917154,9= 17161,917203-917204,919060,919119,919718,919731,919869,920237-920499 > +/lucene/java/trunk/contrib/highlighter/src/test:829439-833960,880727-886= 190,889185,889614-916543,916596,916685,916755,916769,917019,917148,917154,9= 17161,917203-917204,919060,919119,919718,919731,919869,920237-920499,922013= ,922277,922525,922528,922602,922624,922797,922799,922886-922887,923112,9241= 51,924207 > > Modified: lucene/java/branches/flex_1458/contrib/highlighter/src/test/org= /apache/lucene/search/highlight/HighlighterTest.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.jav= a?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apach= e/lucene/search/highlight/HighlighterTest.java (original) > +++ lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apach= e/lucene/search/highlight/HighlighterTest.java Wed Mar 17 12:06:27 2010 > @@ -142,7 +142,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String fragment =3D highlighter.getBestFragment(stream, store= dField); > > - =A0 =A0 =A0System.out.println(fragment); > + =A0 =A0 =A0if (VERBOSE) System.out.println(fragment); > =A0 =A0 } > =A0 } > > @@ -158,7 +158,7 @@ public class HighlighterTest extends Bas > =A0 =A0 Query q =3D parser.parse("\"world Flatland\"~3"); > =A0 =A0 String expected =3D "I call our world Flatland, not= because we call it so,"; > =A0 =A0 String observed =3D highlightField(q, "SOME_FIELD_NAME", s1); > - =A0 =A0System.out.println("Expected: \"" + expected + "\n" + "Observed:= \"" + observed); > + =A0 =A0if (VERBOSE) System.out.println("Expected: \"" + expected + "\n"= + "Observed: \"" + observed); > =A0 =A0 assertEquals("Query in the default field results in text for *ANY= * field being highlighted", > =A0 =A0 =A0 =A0 expected, observed); > > @@ -170,7 +170,7 @@ public class HighlighterTest extends Bas > =A0 =A0 q =3D parser.parse("text:\"world Flatland\"~3"); > =A0 =A0 expected =3D s1; > =A0 =A0 observed =3D highlightField(q, FIELD_NAME, s1); > - =A0 =A0System.out.println("Expected: \"" + expected + "\n" + "Observed:= \"" + observed); > + =A0 =A0if (VERBOSE) System.out.println("Expected: \"" + expected + "\n"= + "Observed: \"" + observed); > =A0 =A0 assertEquals( > =A0 =A0 =A0 =A0 "Query in a named field does not result in highlighting w= hen that field isn't in the query", > =A0 =A0 =A0 =A0 s1, highlightField(q, FIELD_NAME, s1)); > @@ -209,7 +209,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 "..."); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 } > > =A0 =A0 // Not sure we can assert anything here - just running to check w= e dont > @@ -258,7 +258,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 "..."); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 } > > =A0 =A0 assertTrue("Failed to find correct number of highlights " + numHi= ghlights + " found", > @@ -280,7 +280,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 "..."); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 } > > =A0 =A0 assertTrue("Failed to find correct number of highlights " + numHi= ghlights + " found", > @@ -302,7 +302,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 "..."); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 } > > =A0 =A0 assertTrue("Failed to find correct number of highlights " + numHi= ghlights + " found", > @@ -328,7 +328,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 "..."); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 } > > =A0 =A0 assertTrue("Failed to find correct number of highlights " + numHi= ghlights + " found", > @@ -352,7 +352,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 "..."); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 } > > =A0 =A0 assertTrue("Failed to find correct number of highlights " + numHi= ghlights + " found", > @@ -377,7 +377,7 @@ public class HighlighterTest extends Bas > > =A0// =A0 =A0 =A0String result =3D > =A0 =A0 =A0 =A0 highlighter.getBestFragments(tokenStream, text, maxNumFra= gmentsRequired,"..."); > - =A0 =A0 =A0//System.out.println("\t" + result); > + =A0 =A0 =A0//if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 } > > > @@ -398,7 +398,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 "..."); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 } > > =A0 =A0 assertTrue("Failed to find correct number of highlights " + numHi= ghlights + " found", > @@ -420,7 +420,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 "..."); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > > =A0 =A0 =A0 assertTrue("Failed to find correct number of highlights " + n= umHighlights + " found", > =A0 =A0 =A0 =A0 =A0 numHighlights =3D=3D 3); > @@ -443,7 +443,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, > =A0 =A0 =A0 =A0 =A0 maxNumFragmentsRequired, "..."); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > > =A0 =A0 } > > @@ -462,7 +462,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, > =A0 =A0 =A0 =A0 =A0 maxNumFragmentsRequired, "..."); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > > =A0 =A0 } > =A0 } > @@ -484,7 +484,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 "..."); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > > =A0 =A0 =A0 assertTrue("Failed to find correct number of highlights " + n= umHighlights + " found", > =A0 =A0 =A0 =A0 =A0 numHighlights =3D=3D 4); > @@ -553,7 +553,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 "..."); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 } > =A0 =A0 // Not sure we can assert anything here - just running to check w= e dont > =A0 =A0 // throw any exceptions > @@ -702,7 +702,7 @@ public class HighlighterTest extends Bas > =A0 =A0 // can't rewrite ConstantScore if you want to highlight it - > =A0 =A0 // it rewrites to ConstantScoreQuery which cannot be highlighted > =A0 =A0 // query =3D unReWrittenQuery.rewrite(reader); > - =A0 =A0System.out.println("Searching for: " + query.toString(FIELD_NAME= )); > + =A0 =A0if (VERBOSE) System.out.println("Searching for: " + query.toStri= ng(FIELD_NAME)); > =A0 =A0 hits =3D searcher.search(query, null, 1000); > > =A0 =A0 for (int i =3D 0; i < hits.totalHits; i++) { > @@ -722,7 +722,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 fragmentSeparator); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 } > =A0 =A0 assertTrue("Failed to find correct number of highlights " + numHi= ghlights + " found", > =A0 =A0 =A0 =A0 numHighlights =3D=3D 5); > @@ -750,7 +750,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 fragmentSeparator); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 } > =A0 =A0 assertTrue("Failed to find correct number of highlights " + numHi= ghlights + " found", > =A0 =A0 =A0 =A0 numHighlights =3D=3D 5); > @@ -778,7 +778,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 fragmentSeparator); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 } > =A0 =A0 assertTrue("Failed to find correct number of highlights " + numHi= ghlights + " found", > =A0 =A0 =A0 =A0 numHighlights =3D=3D 5); > @@ -934,7 +934,7 @@ public class HighlighterTest extends Bas > =A0 =A0 =A0 =A0 =A0 =A0 =A0 HighlighterTest.this); > =A0 =A0 =A0 =A0 =A0 highlighter.setTextFragmenter(new SimpleFragmenter(40= )); > =A0 =A0 =A0 =A0 =A0 String result =3D highlighter.getBestFragment(tokenSt= ream, text); > - =A0 =A0 =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 =A0 =A0 } > =A0 =A0 =A0 =A0 assertTrue("Failed to find correct number of highlights "= + numHighlights + " found", > =A0 =A0 =A0 =A0 =A0 =A0 numHighlights =3D=3D 4); > @@ -1065,7 +1065,7 @@ public class HighlighterTest extends Bas > =A0 =A0 =A0 =A0 =A0 Highlighter highlighter =3D getHighlighter(query, FIE= LD_NAME, tokenStream, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 HighlighterTest.this); > =A0 =A0 =A0 =A0 =A0 String result =3D highlighter.getBestFragment(tokenSt= ream, text); > - =A0 =A0 =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > =A0 =A0 =A0 =A0 } > =A0 =A0 =A0 =A0 assertTrue("Failed to find correct number of highlights "= + numHighlights + " found", > =A0 =A0 =A0 =A0 =A0 =A0 numHighlights =3D=3D 4); > @@ -1099,7 +1099,7 @@ public class HighlighterTest extends Bas > =A0 =A0 =A0 =A0 =A0 assertTrue("Failed to find correct number of text Fra= gments: " + fragmentResults.length > =A0 =A0 =A0 =A0 =A0 =A0 =A0 + " vs " + stringResults.length, fragmentResu= lts.length =3D=3D stringResults.length); > =A0 =A0 =A0 =A0 =A0 for (int j =3D 0; j < stringResults.length; j++) { > - =A0 =A0 =A0 =A0 =A0 =A0System.out.println(fragmentResults[j]); > + =A0 =A0 =A0 =A0 =A0 =A0if (VERBOSE) System.out.println(fragmentResults[= j]); > =A0 =A0 =A0 =A0 =A0 =A0 assertTrue("Failed to find same text Fragments: "= + fragmentResults[j] + " found", > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 fragmentResults[j].toString().equals(stri= ngResults[j])); > > @@ -1217,7 +1217,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 =A0 QueryParser parser =3D new QueryParser(TEST_VERSION, FIEL= D_NAME, analyzer); > =A0 =A0 =A0 =A0 Query query =3D parser.parse("JF? or Kenned*"); > - =A0 =A0 =A0 =A0System.out.println("Searching with primitive query"); > + =A0 =A0 =A0 =A0if (VERBOSE) System.out.println("Searching with primitiv= e query"); > =A0 =A0 =A0 =A0 // forget to set this and... > =A0 =A0 =A0 =A0 // query=3Dquery.rewrite(reader); > =A0 =A0 =A0 =A0 TopDocs hits =3D searcher.search(query, null, 1000); > @@ -1240,7 +1240,7 @@ public class HighlighterTest extends Bas > =A0 =A0 =A0 =A0 =A0 String highlightedText =3D highlighter.getBestFragmen= ts(tokenStream, text, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 maxNumFragmentsRequired, "..."); > > - =A0 =A0 =A0 =A0 =A0System.out.println(highlightedText); > + =A0 =A0 =A0 =A0 =A0if (VERBOSE) System.out.println(highlightedText); > =A0 =A0 =A0 =A0 } > =A0 =A0 =A0 =A0 // We expect to have zero highlights if the query is mult= i-terms and is > =A0 =A0 =A0 =A0 // not > @@ -1353,7 +1353,7 @@ public class HighlighterTest extends Bas > =A0 =A0 QueryParser parser =3D new QueryParser(TEST_VERSION, FIELD_NAME, = new StandardAnalyzer(TEST_VERSION)); > =A0 =A0 parser.setMultiTermRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_Q= UERY_REWRITE); > =A0 =A0 query =3D parser.parse("multi*"); > - =A0 =A0System.out.println("Searching for: " + query.toString(FIELD_NAME= )); > + =A0 =A0if (VERBOSE) System.out.println("Searching for: " + query.toStri= ng(FIELD_NAME)); > =A0 =A0 // at this point the multisearcher calls combine(query[]) > =A0 =A0 hits =3D multiSearcher.search(query, null, 1000); > > @@ -1371,7 +1371,7 @@ public class HighlighterTest extends Bas > =A0 =A0 =A0 String text =3D multiSearcher.doc(hits.scoreDocs[i].doc).get(= FIELD_NAME); > =A0 =A0 =A0 TokenStream tokenStream =3D analyzer.tokenStream(FIELD_NAME, = new StringReader(text)); > =A0 =A0 =A0 String highlightedText =3D highlighter.getBestFragment(tokenS= tream, text); > - =A0 =A0 =A0System.out.println(highlightedText); > + =A0 =A0 =A0if (VERBOSE) System.out.println(highlightedText); > =A0 =A0 } > =A0 =A0 assertTrue("Failed to find correct number of highlights " + numHi= ghlights + " found", > =A0 =A0 =A0 =A0 numHighlights =3D=3D 2); > @@ -1645,7 +1645,7 @@ public class HighlighterTest extends Bas > =A0 =A0 for( int i =3D 0; i < hits.totalHits; i++ ){ > =A0 =A0 =A0 Document doc =3D searcher.doc( hits.scoreDocs[i].doc ); > =A0 =A0 =A0 String result =3D h.getBestFragment( a, "t_text1", doc.get( "= t_text1" )); > - =A0 =A0 =A0System.out.println("result:" + =A0result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("result:" + =A0result); > =A0 =A0 =A0 assertEquals("more random words for second field", res= ult); > =A0 =A0 } > =A0 =A0 searcher.close(); > @@ -1698,7 +1698,7 @@ public class HighlighterTest extends Bas > =A0 =A0 // for any multi-term queries to work (prefix, wildcard, range,fu= zzy etc) > =A0 =A0 // you must use a rewritten query! > =A0 =A0 query =3D unReWrittenQuery.rewrite(reader); > - =A0 =A0System.out.println("Searching for: " + query.toString(FIELD_NAME= )); > + =A0 =A0if (VERBOSE) System.out.println("Searching for: " + query.toStri= ng(FIELD_NAME)); > =A0 =A0 hits =3D searcher.search(query, null, 1000); > =A0 } > > @@ -1714,7 +1714,7 @@ public class HighlighterTest extends Bas > > =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStream, t= ext, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 "..."); > - =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\t" + result); > > =A0 =A0 =A0 assertTrue("Failed to find correct number of highlights " + n= umHighlights + " found", > =A0 =A0 =A0 =A0 =A0 numHighlights =3D=3D expectedHighlights); > @@ -1935,16 +1935,16 @@ class SynonymTokenizer extends TokenStre > > =A0 =A0 =A0 =A0 String result =3D highlighter.getBestFragments(tokenStrea= m, text, maxNumFragmentsRequired, > =A0 =A0 =A0 =A0 =A0 =A0 fragmentSeparator); > - =A0 =A0 =A0 =A0System.out.println("\t" + result); > + =A0 =A0 =A0 =A0if (HighlighterTest.VERBOSE) System.out.println("\t" + r= esult); > =A0 =A0 =A0 } > =A0 =A0 } > > =A0 =A0 abstract void run() throws Exception; > > =A0 =A0 void start() throws Exception { > - =A0 =A0 =A0System.out.println("Run QueryScorer"); > + =A0 =A0 =A0if (HighlighterTest.VERBOSE) System.out.println("Run QuerySc= orer"); > =A0 =A0 =A0 run(); > - =A0 =A0 =A0System.out.println("Run QueryTermScorer"); > + =A0 =A0 =A0if (HighlighterTest.VERBOSE) System.out.println("Run QueryTe= rmScorer"); > =A0 =A0 =A0 mode =3D QUERY_TERM; > =A0 =A0 =A0 run(); > =A0 =A0 } > > Propchange: lucene/java/branches/flex_1458/contrib/instantiated/src/test/= org/apache/lucene/store/instantiated/TestIndicesEquals.java > -------------------------------------------------------------------------= ----- > --- svn:mergeinfo (original) > +++ svn:mergeinfo Wed Mar 17 12:06:27 2010 > @@ -1,2 +1,2 @@ > =A0/lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apa= che/lucene/store/instantiated/TestIndicesEquals.java:909334 > -/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store= /instantiated/TestIndicesEquals.java:916596,916685,916755,916769,917019,917= 148,917154,917161,917203-917204,919060,919119,919718,919731,919869,920237-9= 20499 > +/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store= /instantiated/TestIndicesEquals.java:916596,916685,916755,916769,917019,917= 148,917154,917161,917203-917204,919060,919119,919718,919731,919869,920237-9= 20499,922013,922277,922525,922528,922602,922624,922797,922799,922886-922887= ,923112,924151,924207 > > Modified: lucene/java/branches/flex_1458/contrib/memory/src/java/org/apac= he/lucene/index/memory/MemoryIndex.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=3D92424= 7&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/luc= ene/index/memory/MemoryIndex.java (original) > +++ lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/luc= ene/index/memory/MemoryIndex.java Wed Mar 17 12:06:27 2010 > @@ -51,6 +51,7 @@ import org.apache.lucene.search.Searcher > =A0import org.apache.lucene.search.Scorer; > =A0import org.apache.lucene.search.Similarity; > =A0import org.apache.lucene.store.RAMDirectory; // for javadocs > +import org.apache.lucene.util.Constants; // for javadocs > > =A0/** > =A0* High-performance single-document main memory Apache Lucene fulltext = search index. > @@ -1207,7 +1208,7 @@ public class MemoryIndex implements Seri > =A0 /////////////////////////////////////////////////////////////////////= ////////// > =A0 private static final class VM { > > - =A0 =A0public static final int PTR =3D is64BitVM() ? 8 : 4; > + =A0 =A0public static final int PTR =3D Constants.JRE_IS_64BIT ? 8 : 4; > > =A0 =A0 // bytes occupied by primitive data types > =A0 =A0 public static final int BOOLEAN =3D 1; > @@ -1272,18 +1273,6 @@ public class MemoryIndex implements Seri > =A0 =A0 =A0 =A0 return sizeOfObject(PTR + INT) + sizeOfIntArray(len); > =A0 =A0 } > > - =A0 =A0private static boolean is64BitVM() { > - =A0 =A0 =A0 =A0try { > - =A0 =A0 =A0 =A0 =A0 =A0int bits =3D Integer.getInteger("sun.arch.data.m= odel", 0).intValue(); > - =A0 =A0 =A0 =A0 =A0 =A0if (bits !=3D 0) return bits =3D=3D 64; > - > - =A0 =A0 =A0 =A0 =A0 =A0// fallback if sun.arch.data.model isn't availab= le > - =A0 =A0 =A0 =A0 =A0 =A0return System.getProperty("java.vm.name").toLowe= rCase().indexOf("64") >=3D 0; > - =A0 =A0 =A0 =A0} catch (Throwable t) { > - =A0 =A0 =A0 =A0 =A0 =A0return false; // better safe than sorry (applets= , security managers, etc.) ... > - =A0 =A0 =A0 =A0} > - =A0 =A0} > - > =A0 =A0 /** logarithm to the base 2. Example: log2(4) =3D=3D 2, log2(8) = =3D=3D 3 */ > =A0 =A0 private static double log2(double value) { > =A0 =A0 =A0 return Math.log(value) / Math.log(2); > > Modified: lucene/java/branches/flex_1458/contrib/memory/src/test/org/apac= he/lucene/index/memory/MemoryIndexTest.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=3D9= 24247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/luc= ene/index/memory/MemoryIndexTest.java (original) > +++ lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/luc= ene/index/memory/MemoryIndexTest.java Wed Mar 17 12:06:27 2010 > @@ -201,8 +201,6 @@ public class MemoryIndexTest extends Bas > > =A0 private Analyzer analyzer; > > - =A0private final boolean verbose =3D false; > - > =A0 private static final String FIELD_NAME =3D "content"; > > =A0 /** Runs the tests and/or benchmark */ > @@ -226,7 +224,7 @@ public class MemoryIndexTest extends Bas > =A0 =A0 =A0 "src/java/test/org/apache/lucene/queryParser/*.java", > =A0 =A0 =A0 "contrib/memory/src/java/org/apache/lucene/index/memory/*.jav= a", > =A0 =A0 }); > - =A0 =A0System.out.println("files =3D " + java.util.Arrays.asList(files)= ); > + =A0 =A0if (VERBOSE) System.out.println("files =3D " + java.util.Arrays.= asList(files)); > =A0 =A0 String[] xargs =3D new String[] { > =A0 =A0 =A0 "1", "1", "memram", > =A0 =A0 =A0 "@contrib/memory/src/test/org/apache/lucene/index/memory/test= queries.txt", > @@ -284,7 +282,7 @@ public class MemoryIndexTest extends Bas > =A0 =A0 boolean first =3D true; > > =A0 =A0 for (int iter=3D0; iter < iters; iter++) { > - =A0 =A0 =A0System.out.println("\n########### iteration=3D" + iter); > + =A0 =A0 =A0if (VERBOSE) System.out.println("\n########### iteration=3D"= + iter); > =A0 =A0 =A0 long start =3D System.currentTimeMillis(); > =A0 =A0 =A0 long bytes =3D 0; > > @@ -297,7 +295,7 @@ public class MemoryIndexTest extends Bas > =A0 =A0 =A0 =A0 =A0 bytes +=3D file.length(); > =A0 =A0 =A0 =A0 =A0 String text =3D toString(new FileInputStream(file), n= ull); > =A0 =A0 =A0 =A0 =A0 Document doc =3D createDocument(text); > - =A0 =A0 =A0 =A0 =A0if (verbose) System.out.println("\n*********** FILE= =3D" + file); > + =A0 =A0 =A0 =A0 =A0if (VERBOSE) System.out.println("\n*********** FILE= =3D" + file); > > =A0 =A0 =A0 =A0 =A0 boolean measureIndexing =3D false; // toggle this to = measure query performance > =A0 =A0 =A0 =A0 =A0 MemoryIndex memind =3D null; > @@ -341,7 +339,7 @@ public class MemoryIndexTest extends Bas > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 } > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (useRAMIndex) score2 =3D query(ramsear= cher, query); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (useMemIndex && useRAMIndex) { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (verbose) System.out.println("dif= f=3D"+ (score1-score2) + ", query=3D" + queries[q] + ", s1=3D" + score1 + "= , s2=3D" + score2); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (VERBOSE) System.out.println("dif= f=3D"+ (score1-score2) + ", query=3D" + queries[q] + ", s1=3D" + score1 + "= , s2=3D" + score2); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (score1 !=3D score2 || score1 < 0.= 0f || score2 < 0.0f || score1 > 1.0f || score2 > 1.0f) { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 throw new IllegalStateException("= BUG DETECTED:" + (i*(q+1)) + " at query=3D" + queries[q] + ", file=3D" + fi= le + ", anal=3D" + analyzer); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 } > @@ -350,13 +348,14 @@ public class MemoryIndexTest extends Bas > > =A0 =A0 =A0 =A0 =A0 =A0 } catch (Throwable t) { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (t instanceof OutOfMemoryError) t.printSta= ckTrace(); > - =A0 =A0 =A0 =A0 =A0 =A0 =A0System.out.println("Fatal error at query=3D"= + queries[q] + ", file=3D" + file + ", anal=3D" + analyzer); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0if (VERBOSE) System.out.println("Fatal error= at query=3D" + queries[q] + ", file=3D" + file + ", anal=3D" + analyzer); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 throw t; > =A0 =A0 =A0 =A0 =A0 =A0 } > =A0 =A0 =A0 =A0 =A0 } > =A0 =A0 =A0 =A0 } > =A0 =A0 =A0 } > =A0 =A0 =A0 long end =3D System.currentTimeMillis(); > + =A0 =A0 =A0if (VERBOSE) { > =A0 =A0 =A0 System.out.println("\nsecs =3D " + ((end-start)/1000.0f)); > =A0 =A0 =A0 System.out.println("queries/sec=3D " + > =A0 =A0 =A0 =A0 (1.0f * runs * queries.length * analyzers.length * files.= length > @@ -364,6 +363,9 @@ public class MemoryIndexTest extends Bas > =A0 =A0 =A0 float mb =3D (1.0f * bytes * queries.length * runs) / (1024.0= f * 1024.0f); > =A0 =A0 =A0 System.out.println("MB/sec =3D " + (mb / ((end-start)/1000.0f= ))); > =A0 =A0 } > + =A0 =A0} > + > + =A0 =A0if (!VERBOSE) return; > > =A0 =A0 if (useMemIndex && useRAMIndex) > =A0 =A0 =A0 System.out.println("No bug found. done."); > > Modified: lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache= /lucene/index/TestIndexSplitter.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= misc/src/test/org/apache/lucene/index/TestIndexSplitter.java?rev=3D924247&r= 1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucen= e/index/TestIndexSplitter.java (original) > +++ lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucen= e/index/TestIndexSplitter.java Wed Mar 17 12:06:27 2010 > @@ -27,11 +27,10 @@ import org.apache.lucene.util._TestUtil; > > =A0public class TestIndexSplitter extends LuceneTestCase { > =A0 public void test() throws Exception { > - =A0 =A0String tmpDir =3D System.getProperty("java.io.tmpdir"); > - =A0 =A0File dir =3D new File(tmpDir, "testfilesplitter"); > + =A0 =A0File dir =3D new File(TEMP_DIR, "testfilesplitter"); > =A0 =A0 _TestUtil.rmDir(dir); > =A0 =A0 dir.mkdirs(); > - =A0 =A0File destDir =3D new File(tmpDir, "testfilesplitterdest"); > + =A0 =A0File destDir =3D new File(TEMP_DIR, "testfilesplitterdest"); > =A0 =A0 _TestUtil.rmDir(destDir); > =A0 =A0 destDir.mkdirs(); > =A0 =A0 FSDirectory fsDir =3D FSDirectory.open(dir); > @@ -61,7 +60,7 @@ public class TestIndexSplitter extends L > =A0 =A0 assertEquals(50, r.maxDoc()); > > =A0 =A0 // now test cmdline > - =A0 =A0File destDir2 =3D new File(tmpDir, "testfilesplitterdest2"); > + =A0 =A0File destDir2 =3D new File(TEMP_DIR, "testfilesplitterdest2"); > =A0 =A0 _TestUtil.rmDir(destDir2); > =A0 =A0 destDir2.mkdirs(); > =A0 =A0 IndexSplitter.main(new String[] {dir.getAbsolutePath(), destDir2.= getAbsolutePath(), splitSegName}); > > Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/test/org= /apache/lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParse= rSimpleSample.java?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apach= e/lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java (original) > +++ lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apach= e/lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java Wed Mar 17 = 12:06:27 2010 > @@ -19,8 +19,6 @@ package org.apache.lucene.queryParser.sp > > =A0import javax.management.Query; > > -import junit.framework.TestCase; > - > =A0import org.apache.lucene.queryParser.core.config.QueryConfigHandler; > =A0import org.apache.lucene.queryParser.core.nodes.OrQueryNode; > =A0import org.apache.lucene.queryParser.core.nodes.QueryNode; > @@ -29,6 +27,7 @@ import org.apache.lucene.queryParser.cor > =A0import org.apache.lucene.queryParser.standard.parser.StandardSyntaxPar= ser; > =A0import org.apache.lucene.search.spans.SpanQuery; > =A0import org.apache.lucene.search.spans.SpanTermQuery; > +import org.apache.lucene.util.LuceneTestCase; > > =A0/** > =A0* This test case demonstrates how the new query parser can be used. > @@ -94,7 +93,7 @@ import org.apache.lucene.search.spans.Sp > =A0* @see UniqueFieldAttribute > =A0* > =A0*/ > -public class TestSpanQueryParserSimpleSample extends TestCase { > +public class TestSpanQueryParserSimpleSample extends LuceneTestCase { > > =A0 public TestSpanQueryParserSimpleSample() { > =A0 =A0 // empty constructor > @@ -104,12 +103,6 @@ public class TestSpanQueryParserSimpleSa > =A0 =A0 super(testName); > =A0 } > > - =A0public static junit.framework.Test suite() { > - =A0 =A0junit.framework.TestSuite suite =3D new junit.framework.TestSuit= e( > - =A0 =A0 =A0 =A0TestSpanQueryParserSimpleSample.class); > - =A0 =A0return suite; > - =A0} > - > =A0 public void testBasicDemo() throws Exception { > =A0 =A0 SyntaxParser queryParser =3D new StandardSyntaxParser(); > > @@ -133,13 +126,13 @@ public class TestSpanQueryParserSimpleSa > =A0 =A0 spanProcessorPipeline.addProcessor(new UniqueFieldQueryNodeProces= sor()); > > =A0 =A0 // print to show out the QueryNode tree before being processed > - =A0 =A0System.out.println(queryTree); > + =A0 =A0if (VERBOSE) System.out.println(queryTree); > > =A0 =A0 // Process the QueryTree using our new Processors > =A0 =A0 queryTree =3D spanProcessorPipeline.process(queryTree); > > =A0 =A0 // print to show out the QueryNode tree after being processed > - =A0 =A0System.out.println(queryTree); > + =A0 =A0if (VERBOSE) System.out.println(queryTree); > > =A0 =A0 // create a instance off the Builder > =A0 =A0 SpansQueryTreeBuilder spansQueryTreeBuilder =3D new SpansQueryTre= eBuilder(); > > Modified: lucene/java/branches/flex_1458/contrib/queryparser/src/test/org= /apache/lucene/queryParser/standard/TestQueryParserWrapper.java > URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/= queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParser= Wrapper.java?rev=3D924247&r1=3D924246&r2=3D924247&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apach= e/lucene/queryParser/standard/TestQueryParserWrapper.java (original) > +++ lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apach= e/lucene/queryParser/standard/TestQueryParserWrapper.java Wed Mar 17 12:06:= 27 2010 > @@ -1068,7 +1068,7 @@ public class TestQueryParserWrapper exte > =A0 =A0 =A0 =A0 .parse("(fieldX:xxxxx OR fieldy:xxxxxxxx)^2 AND (fieldx:t= he OR fieldy:foo)"); > =A0 =A0 assertNotNull("result is null and it shouldn't be", result); > =A0 =A0 assertTrue("result is not a BooleanQuery", result instanceof Bool= eanQuery); > - =A0 =A0System.out.println("Result: " + result); > + =A0 =A0if (VERBOSE) System.out.println("Result: " + result); > =A0 =A0 assertTrue(((BooleanQuery) result).clauses().size() + " does not = equal: " > =A0 =A0 =A0 =A0 + 2, ((BooleanQuery) result).clauses().size() =3D=3D 2); > =A0 } > > > --------------------------------------------------------------------- To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org For additional commands, e-mail: java-dev-help@lucene.apache.org