lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Uwe Schindler" <...@thetaphi.de>
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
Date Thu, 18 Mar 2010 12:06:31 GMT
I see no missing merges here. Only the markrmiller solr add/revert and the initial IWConfig add/revert are marked as unmerged.

-----
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: uwe@thetaphi.de


> -----Original Message-----
> From: Michael McCandless [mailto:lucene@mikemccandless.com]
> Sent: Thursday, March 18, 2010 1:23 AM
> To: java-dev@lucene.apache.org
> 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
> 
> 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,  <uschindler@apache.org> wrote:
> > Author: uschindler
> > Date: Wed Mar 17 12:06:27 2010
> > New Revision: 924247
> >
> > URL: http://svn.apache.org/viewvc?rev=924247&view=rev
> > 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 be merged at all
> > - add/removal of solr (922942,922951)
> > - 922583: IndexWriterConfig mega-patch of Shai
> > - 922806: dito
> > - 923238: dito
> >
> > Added:
> >    lucene/java/branches/flex_1458/backwards/
> >      - copied from r924207, lucene/java/trunk/backwards/
> >    lucene/java/branches/flex_1458/backwards/backwards-readme.txt
> >      - copied unchanged from r924207,
> lucene/java/trunk/backwards/backwards-readme.txt
> >    lucene/java/branches/flex_1458/backwards/src/
> >      - copied from r923483,
> lucene/java/branches/flex_1458_3_0_back_compat_tests/src/
> > Modified:
> >    lucene/java/branches/flex_1458/   (props changed)
> >    lucene/java/branches/flex_1458/CHANGES.txt
> >    lucene/java/branches/flex_1458/build.xml   (contents, props
> changed)
> >    lucene/java/branches/flex_1458/common-build.xml
> >    lucene/java/branches/flex_1458/contrib/   (props changed)
> >    lucene/java/branches/flex_1458/contrib/CHANGES.txt   (props
> changed)
> >    lucene/java/branches/flex_1458/contrib/analyzers/common/build.xml
> >
>  lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/a
> pache/lucene/analysis/hi/HindiStemFilter.java
> >
>  lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/a
> pache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
> >
>  lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/a
> pache/lucene/analysis/cz/TestCzechAnalyzer.java
> >
>  lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/a
> pache/lucene/analysis/de/TestGermanStemFilter.java
> >
>  lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/a
> pache/lucene/analysis/nl/TestDutchStemmer.java
> >
>  lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/a
> pache/lucene/analysis/ru/TestRussianAnalyzer.java
> >
>  lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/a
> pache/lucene/analysis/ru/TestRussianStem.java
> >
>  lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/a
> pache/lucene/analysis/snowball/   (props changed)
> >
>  lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/a
> pache/lucene/analysis/snowball/TestSnowballVocab.java
> >
>  lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/l
> ucene/benchmark/byTask/TestPerfTasksLogic.java
> >
>  lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/l
> ucene/benchmark/quality/TestQualityRun.java
> >    lucene/java/branches/flex_1458/contrib/db/bdb-
> je/src/test/org/apache/lucene/store/je/JEStoreTest.java
> >
>  lucene/java/branches/flex_1458/contrib/db/bdb/src/test/org/apache/luce
> ne/store/db/DbStoreTest.java
> >    lucene/java/branches/flex_1458/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFra
> gListBuilderTest.java
> >    lucene/java/branches/flex_1458/contrib/highlighter/src/test/
> (props changed)
> >
>  lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache
> /lucene/search/highlight/HighlighterTest.java
> >
>  lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apach
> e/lucene/store/instantiated/TestIndicesEquals.java   (props changed)
> >
>  lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/luce
> ne/index/memory/MemoryIndex.java
> >
>  lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/luce
> ne/index/memory/MemoryIndexTest.java
> >
>  lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene
> /index/TestIndexSplitter.java
> >
>  lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache
> /lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java
> >
>  lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache
> /lucene/queryParser/standard/TestQueryParserWrapper.java
> >
>  lucene/java/branches/flex_1458/contrib/spatial/src/test/org/apache/luc
> ene/spatial/tier/TestCartesian.java
> >
>  lucene/java/branches/flex_1458/contrib/spatial/src/test/org/apache/luc
> ene/spatial/tier/TestDistance.java
> >
>  lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lu
> cene/queryParser/surround/query/SrndPrefixQuery.java
> >
>  lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lu
> cene/queryParser/surround/query/SrndTermQuery.java
> >
>  lucene/java/branches/flex_1458/contrib/surround/src/java/org/apache/lu
> cene/queryParser/surround/query/SrndTruncQuery.java
> >
>  lucene/java/branches/flex_1458/contrib/wordnet/src/test/org/apache/luc
> ene/wordnet/TestSynonymTokenFilter.java
> >
>  lucene/java/branches/flex_1458/contrib/wordnet/src/test/org/apache/luc
> ene/wordnet/TestWordnet.java
> >    lucene/java/branches/flex_1458/contrib/xml-query-
> parser/src/test/org/apache/lucene/xmlparser/TestParser.java
> >    lucene/java/branches/flex_1458/docs/fileformats.html
> >    lucene/java/branches/flex_1458/docs/fileformats.pdf
> >
>  lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/ASC
> IIFoldingFilter.java
> >
>  lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tok
> enizer.java   (props changed)
> >
>  lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexW
> riter.java
> >
>  lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Multi
> TermQueryWrapperFilter.java   (props changed)
> >
>  lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/Attribu
> teSource.java
> >
>  lucene/java/branches/flex_1458/src/site/src/documentation/content/xdoc
> s/fileformats.xml
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/Tes
> tISOLatin1AccentFilter.java   (props changed)
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/Tes
> tPorterStemFilter.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/Tes
> tStopFilter.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/Tes
> tDateTools.java   (props changed)
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/Tes
> tNumberTools.java   (props changed)
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBa
> ckwardsCompatibility.java   (contents, props changed)
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBy
> teSlices.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestCh
> eckIndex.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestCo
> mpoundFile.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestCo
> ncurrentMergeScheduler.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestDo
> c.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestFi
> eldsReader.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIn
> dexReader.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIn
> dexReaderCloneNorms.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIn
> dexReaderReopen.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIn
> dexWriter.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIn
> dexWriterDelete.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIn
> dexWriterExceptions.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIn
> dexWriterLockRelease.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestSt
> ressIndexing2.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestTe
> rmdocPerf.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestTh
> readedOptimize.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/queryParser/
> TestQueryParser.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestC
> ustomSearcherSort.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestM
> ultiSearcherRanking.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestN
> umericRangeQuery32.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestN
> umericRangeQuery64.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestS
> corerPerf.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestW
> ildcard.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/funct
> ion/FunctionTestSetup.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/paylo
> ads/PayloadHelper.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans
> /TestPayloadSpans.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestBu
> fferedIndexInput.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestDi
> rectory.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestLo
> ckFactory.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestRA
> MDirectory.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestWi
> ndowsMMap.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/LuceneT
> estCase.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/LuceneT
> estCaseJ4.java
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAtt
> ributeSource.java   (contents, props changed)
> >
>  lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/_TestUt
> il.java
> >
> > Propchange: lucene/java/branches/flex_1458/
> > ---------------------------------------------------------------------
> ---------
> > --- svn:ignore (original)
> > +++ svn:ignore Wed Mar 17 12:06:27 2010
> > @@ -1,8 +1,6 @@
> >  build
> >  dist
> >  backwards
> > -target
> > -test
> >  *~
> >  velocity.log
> >  build.properties
> >
> > Propchange: lucene/java/branches/flex_1458/
> > ---------------------------------------------------------------------
> ---------
> > --- svn:mergeinfo (original)
> > +++ svn:mergeinfo Wed Mar 17 12:06:27 2010
> > @@ -2,4 +2,4 @@
> >  /lucene/java/branches/lucene_2_9:817269-
> 818600,829134,829881,831036,896850,909334
> >  /lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336
> >  /lucene/java/branches/lucene_3_0:880793,896906
> > -/lucene/java/trunk:824912-825292,827043-833960,880727-
> 886190,889185,889614-
> 916543,916596,916685,916755,916769,917019,917148,917154,917161,917203-
> 917204,919060,919119,919718,919731,919869,920237-920499
> > +/lucene/java/trunk:824912-825292,827043-833960,880727-
> 886190,889185,889614-
> 916543,916596,916685,916755,916769,917019,917148,917154,917161,917203-
> 917204,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=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > --- 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
> >   with FuzzyQuery to ensure that exact matches are always scored
> higher,
> >   because only the boost will be used in scoring.  (Robert Muir)
> >
> > +* LUCENE-2015: Add a static method foldToASCII to ASCIIFoldingFilter
> to
> > +  expose its folding logic.  (Cédrik Lime via Robert Muir)
> > +
> >  Bug fixes
> >
> >  * LUCENE-2119: Don't throw NegativeArraySizeException if you pass
> > @@ -185,6 +188,11 @@ New features
> >  * LUCENE-2247: Added a CharArrayMap<V> for performance improvements
> >   in some stemmers and synonym filters. (Uwe Schindler)
> >
> > +* LUCENE-2314: Added AttributeSource.copyTo(AttributeSource) that
> > +  allows to use cloneAttributes() and this method as a replacement
> > +  for captureState()/restoreState(), if the state itsself
> > +  needs to be inspected/modified.  (Uwe Schindler)
> > +
> >  Optimizations
> >
> >  * LUCENE-2075: Terms dict cache is now shared across threads instead
> > @@ -246,10 +254,14 @@ Optimizations
> >
> >  Build
> >
> > - * LUCENE-2124: Moved the JDK-based collation support from
> contrib/collation
> > +* LUCENE-2124: Moved the JDK-based collation support from
> contrib/collation
> >    into core, and moved the ICU-based collation support into
> contrib/icu.
> >    (Robert Muir)
> >
> > +* LUCENE-2326: Removed SVN checkouts for backwards tests. The
> backwards branch
> > +  is now included in the svn repository using "svn copy" after
> release.
> > +  (Uwe Schindler)
> > +
> >  Test Cases
> >
> >  * LUCENE-2037 Allow Junit4 tests in our envrionment (Erick Erickson
> > @@ -271,6 +283,19 @@ Test Cases
> >   from LuceneTestCase(J4), that contains the release version.
> >   (Uwe Schindler, Simon Willnauer, Shai Erera)
> >
> > +* LUCENE-2313, LUCENE-2322: Add VERBOSE to LuceneTestCase(J4) to
> control
> > +  verbosity of tests. If VERBOSE==false (default) tests should not
> print
> > +  anything other than errors to System.(out|err). The setting can be
> > +  changed with -Dtests.verbose=true on test invokation.
> > +  (Shai Erera, Paul Elschot, Uwe Schindler)
> > +
> > +* LUCENE-2318: Remove inconsistent system property code for
> retrieving
> > +  temp and data directories inside test cases. It is now centralized
> in
> > +  LuceneTestCase(J4). Also changed lots of tests to use
> > +  getClass().getResourceAsStream() to retrieve test data. Tests
> needing
> > +  access to "real" files from the test folder itsself, can use
> > +  LuceneTestCase(J4).getDataFile().  (Uwe Schindler)
> > +
> >  ================== Release 2.9.2 / 3.0.1 2010-02-26
> ====================
> >
> >  Changes in backwards compatibility policy
> >
> > Modified: lucene/java/branches/flex_1458/build.xml
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/build.xml?r
> ev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > --- 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 @@
> >     <pathelement location="${build.dir}/classes/java"/>
> >   </path>
> >
> > -  <path id="backwards.classpath">
> > -    <pathelement
> location="${build.dir}/${backwards.branch}/classes/java"/>
> > -  </path>
> > -
> >   <path id="demo.classpath">
> >     <path refid="classpath"/>
> >     <pathelement location="${build.dir}/classes/demo"/>
> > @@ -58,7 +54,7 @@
> >
> >   <patternset id="src.dist.patterns"
> >
> includes="src/,build.xml,*build*.xml,docs/,*.txt,contrib/,*pom.xml*,lib
> /"
> > -              excludes="contrib/db/*/lib/,contrib/*/ext-
> libs/,src/site/build/,contrib/benchmark/temp/**,contrib/benchmark/work/
> **"
> > +              excludes="contrib/db/*/lib/,contrib/*/ext-
> libs/,src/site/build/,contrib/benchmark/temp/,contrib/benchmark/work/,c
> ontrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/da
> ta/"
> >   />
> >   <patternset id="binary.build.dist.patterns"
> >
> includes="${final.name}.jar,${demo.war.name}.war,${demo.name}.jar,docs/
> ,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
> > @@ -79,91 +75,58 @@
> >   <target name="test" depends="test-core, test-contrib, test-
> backwards"
> >           description="Runs all unit tests (core, contrib and back-
> compat)"
> >   />
> > +
> > +  <path id="backwards.compile.classpath">
> > +    <pathelement location="${build.dir.backwards}/classes/java"/>
> > +  </path>
> >
> > -  <path id="backwards.test.classpath">
> > +  <path id="backwards.test.compile.classpath">
> >     <path refid="junit-path"/>
> > -    <pathelement
> location="${build.dir}/${backwards.branch}/${backwards.branch}.jar"/>
> > +    <pathelement location="${build.dir.backwards}/classes/java"/>
> >   </path>
> >
> >   <path id="backwards.junit.classpath">
> >     <path refid="junit-path"/>
> > -    <pathelement
> location="${build.dir}/${backwards.branch}/classes/test"/>
> > +    <pathelement location="${build.dir.backwards}/classes/test"/>
> >     <pathelement location="${build.dir}/${final.name}.jar"/>
> >     <pathelement path="${java.class.path}"/>
> >   </path>
> >
> > -  <available property="backwards.available"
> file="${backwards.dir}/${backwards.branch}/src"/>
> > +  <available property="backwards.available"
> file="${backwards.dir}/src"/>
> >
> > -  <target name="init-backwards-checkout"
> unless="backwards.available" description="Creates the sparse svn
> checkout for backwards branch.">
> > -    <sequential>
> > -      <echo>Initial SVN checkout for '${backwards.branch}'...</echo>
> > -      <mkdir dir="${backwards.dir}"/>
> > -      <exec dir="${backwards.dir}" executable="${svn.exe}"
> failifexecutionfails="false" failonerror="true">
> > -        <arg line="checkout --trust-server-cert --non-interactive -r
> ${backwards.rev} --depth empty
> https://svn.apache.org/repos/asf/lucene/java/branches/${backwards.branc
> h} ${backwards.branch}"/>
> > -      </exec>
> > -      <exec dir="${backwards.dir}" executable="${svn.exe}"
> failifexecutionfails="false" failonerror="true">
> > -        <arg line="update --trust-server-cert --non-interactive -r
> ${backwards.rev} --set-depth infinity ${backwards.branch}/src"/>
> > -      </exec>
> > -    </sequential>
> > -  </target>
> > -
> > -  <target name="download-backwards" depends="init-backwards-
> checkout" description="Downloads a previous Lucene version.">
> > -    <sequential>
> > -      <echo>Update backwards branch '${backwards.branch}' to
> revision ${backwards.rev}...</echo>
> > -      <exec dir="${backwards.dir}" executable="${svn.exe}"
> failifexecutionfails="false" failonerror="true">
> > -        <arg line="update --trust-server-cert --non-interactive -r
> ${backwards.rev} ${backwards.branch}"/>
> > -      </exec>
> > -    </sequential>
> > -  </target>
> > -
> >   <!-- remove this -->
> >   <target name="test-tag" depends="test-backwards"
> description="deprecated"/>
> > +
> > +  <target name="test-backwards-message"
> unless="backwards.available">
> > +<echo level="warning">WARNING: Backwards compatibility tests can
> only be run from SVN checkout.
> > +The source distribution does not contain sources of the previous
> Lucene Java version.</echo>
> > +  </target>
> >
> > -  <target name="test-backwards" depends="download-backwards,
> compile-core, jar-core"
> > -       description="Runs tests of a previous Lucene version.">
> > +  <target name="test-backwards" depends="compile-core, jar-core,
> test-backwards-message"
> > +       description="Runs tests of a previous Lucene version."
> if="backwards.available">
> >        <sequential>
> > -    <available property="backwards.tests.available"
> file="${backwards.dir}/${backwards.branch}/src/test" />
> > -
> > -         <fail unless="backwards.tests.available">
> > -               Backwards branch '${backwards.branch}' could not be
> found in directory '${backwards.dir}'.
> > -         </fail>
> > -         <mkdir dir="${build.dir}/${backwards.branch}"/>
> > +      <mkdir dir="${build.dir.backwards}"/>
> >
> >          <!-- first compile branch classes -->
> >          <compile
> > -           srcdir="${backwards.dir}/${backwards.branch}/src/java"
> > -           destdir="${build.dir}/${backwards.branch}/classes/java"
> > -      javac.source="${javac.source.backwards}"
> javac.target="${javac.target.backwards}">
> > -         <classpath refid="backwards.classpath"/>
> > +        srcdir="${backwards.dir}/src/java"
> > +        destdir="${build.dir.backwards}/classes/java"
> > +        javac.source="${javac.source.backwards}"
> javac.target="${javac.target.backwards}"
> > +      >
> > +        <classpath refid="backwards.compile.classpath"/>
> >          </compile>
> > -
> > -         <!-- compile jar for branch -->
> > -      <jarify
> basedir="${build.dir}/${backwards.branch}/classes/java"
> > -
> destfile="${build.dir}/${backwards.branch}/${backwards.branch}.jar" />
> >
> > -         <!-- compile branch tests against branch jar -->
> > -         <compile-test-macro
> srcdir="${backwards.dir}/${backwards.branch}/src/test"
> destdir="${build.dir}/${backwards.branch}/classes/test"
> > -
> test.classpath="backwards.test.classpath"
> javac.source="${javac.source.backwards}"
> javac.target="${javac.target.backwards}"/>
> > +      <!-- compile branch tests against branch classpath -->
> > +      <compile-test-macro srcdir="${backwards.dir}/src/test"
> destdir="${build.dir.backwards}/classes/test"
> > +                  test.classpath="backwards.test.compile.classpath"
> javac.source="${javac.source.backwards}"
> javac.target="${javac.target.backwards}"/>
> >
> >          <!-- run branch tests against trunk jar -->
> > -      <test-macro
> dataDir="${backwards.dir}/${backwards.branch}/src/test"
> > -                         tempDir="${build.dir}/${backwards.branch}"
> > +      <test-macro dataDir="${backwards.dir}/src/test"
> > +              tempDir="${build.dir.backwards}/test"
> >                          junit.classpath="backwards.junit.classpath"
> >               junit.output.dir="${junit.output.dir.backwards}" />
> >        </sequential>
> >   </target>
> > -
> > -
> > -  <!-- remove this soon -->
> > -  <target name="clean-tags"
> > -    description="deprecated: removes the old 'tag' subdir">
> > -    <delete dir="${common.dir}/tags"/>
> > -  </target>
> > -
> > -  <target name="clean-backwards"
> > -    description="Removes contents of the '${backwards.dir}'
> directory">
> > -    <delete dir="${backwards.dir}"/>
> > -  </target>
> >
> >   <!--
> ================================================================== -->
> >   <!-- J A R
>      -->
> >
> > Propchange: lucene/java/branches/flex_1458/build.xml
> > ---------------------------------------------------------------------
> ---------
> > --- svn:mergeinfo (original)
> > +++ svn:mergeinfo Wed Mar 17 12:06:27 2010
> > @@ -1,2 +1,2 @@
> >  /lucene/java/branches/lucene_2_9/build.xml:909334
> > -
> /lucene/java/trunk/build.xml:916596,916685,916755,916769,917019,917148,
> 917154,917161,917203-917204,919060,919119,919718,919731,919869,920237-
> 920499
> >
> +/lucene/java/trunk/build.xml:916596,916685,916755,916769,917019,917148
> ,917154,917161,917203-917204,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/common-build.xml
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/common-
> build.xml?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > --- lucene/java/branches/flex_1458/common-build.xml (original)
> > +++ lucene/java/branches/flex_1458/common-build.xml Wed Mar 17
> 12:06:27 2010
> > @@ -42,8 +42,6 @@
> >   <property name="Name" value="Lucene"/>
> >   <property name="dev.version" value="3.1-dev"/>
> >   <property name="version" value="${dev.version}"/>
> > -  <property name="backwards.branch"
> value="flex_1458_3_0_back_compat_tests"/>
> > -  <property name="backwards.rev" value="921812"/>
> >   <property name="spec.version" value="${version}"/>
> >   <property name="year" value="2000-${current.year}"/>
> >   <property name="final.name" value="lucene-${name}-${version}"/>
> > @@ -86,7 +84,6 @@
> >
> >   <property name="src.dir" location="src/java"/>
> >   <property name="build.dir" location="build"/>
> > -  <property name="backwards.dir" location="backwards"/>
> >   <property name="dist.dir" location="dist"/>
> >   <property name="maven.dist.dir" location="dist/maven"/>
> >   <property name="m2.repository.url"
> value="file://${maven.dist.dir}"/>
> > @@ -95,10 +92,13 @@
> >   <property name="javacc.home" location="${common.dir}"/>
> >   <property name="jflex.home" location="${common.dir}"/>
> >
> > +  <property name="backwards.dir" location="backwards"/>
> > +  <property name="build.dir.backwards"
> location="${build.dir}/backwards"/>
> > +
> >   <property name="junit.output.dir" location="${build.dir}/test"/>
> > -  <property name="junit.output.dir.backwards"
> location="${build.dir}/bw-test"/>
> > +  <property name="junit.output.dir.backwards"
> location="${build.dir.backwards}/test"/>
> >   <property name="junit.reports"
> location="${build.dir}/test/reports"/>
> > -  <property name="junit.reports.backwards"
> location="${build.dir}/bw-test/reports"/>
> > +  <property name="junit.reports.backwards"
> location="${build.dir.backwards}/test/reports"/>
> >   <property name="junit.includes"
> value="**/Test*.java,**/*Test.java"/>
> >   <property name="junit.excludes" value=""/>
> >
> > @@ -418,7 +418,6 @@
> >              <sysproperty key="tests.verbose"
> value="${tests.verbose}"/>
> >
> >              <!-- TODO: create propertyset for test properties, so
> each project can have its own set -->
> > -             <sysproperty key="dataDir" file="@{dataDir}"/>
> >              <sysproperty key="tempDir" file="@{tempDir}"/>
> >              <sysproperty key="java.io.tmpdir" file="@{tempDir}"/>
> >              <sysproperty key="lucene.version"
> value="${dev.version}"/>
> > @@ -553,8 +552,8 @@
> >       <!-- this fileset let's the task work for individual contribs,
> >            as well as the project as a whole
> >        -->
> > -      <fileset dir="${build.dir}">
> > -        <include name="**/bw-test/TEST-*.xml"/>
> > +      <fileset dir="${build.dir.backwards}">
> > +        <include name="**/test/TEST-*.xml"/>
> >       </fileset>
> >       <report format="frames" todir="${junit.reports.backwards}"/>
> >     </junitreport>
> >
> > Propchange: lucene/java/branches/flex_1458/contrib/
> > ---------------------------------------------------------------------
> ---------
> > --- svn:mergeinfo (original)
> > +++ svn:mergeinfo Wed Mar 17 12:06:27 2010
> > @@ -2,4 +2,4 @@
> >  /lucene/java/branches/lucene_2_9/contrib:817269-
> 818600,825998,829134,829816,829881,831036,896850,909334
> >  /lucene/java/branches/lucene_2_9_back_compat_tests/contrib:818601-
> 821336
> >  /lucene/java/branches/lucene_3_0/contrib:880793,896906
> > -/lucene/java/trunk/contrib:824912-825292,827043-833960,880727-
> 886190,889185,889614-
> 916543,916596,916685,916755,916769,917019,917148,917154,917161,917203-
> 917204,919060,919119,919718,919731,919869,920237-920499
> > +/lucene/java/trunk/contrib:824912-825292,827043-833960,880727-
> 886190,889185,889614-
> 916543,916596,916685,916755,916769,917019,917148,917154,917161,917203-
> 917204,919060,919119,919718,919731,919869,920237-
> 920499,922013,922277,922525,922528,922602,922624,922797,922799,922886-
> 922887,923112,924151,924207
> >
> > 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 @@
> >  /lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-
> 818600,825998,826775,829134,829816,829881,831036,896850
> >
>  /lucene/java/branches/lucene_2_9_back_compat_tests/contrib/CHANGES.txt
> :818601-821336
> >  /lucene/java/branches/lucene_3_0/contrib/CHANGES.txt:880793,896906
> > -/lucene/java/trunk/contrib/CHANGES.txt:829439-833960,880727-
> 886190,889185,889622,889667,889866-
> 899001,916596,916685,916755,916769,917019,917148,917154,917161,917203-
> 917204,919060,919119,919718,919731,919869,920237-920499
> > +/lucene/java/trunk/contrib/CHANGES.txt:829439-833960,880727-
> 886190,889185,889622,889667,889866-
> 899001,916596,916685,916755,916769,917019,917148,917154,917161,917203-
> 917204,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/contrib/analyzers/common/build.xml
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/build.xml?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > --- lucene/java/branches/flex_1458/contrib/analyzers/common/build.xml
> (original)
> > +++ lucene/java/branches/flex_1458/contrib/analyzers/common/build.xml
> Wed Mar 17 12:06:27 2010
> > @@ -35,20 +35,4 @@
> >     <path refid="junit-path"/>
> >     <pathelement location="${build.dir}/classes/java"/>
> >   </path>
> > -
> > -  <target name="compile-test" depends="download-snowball-vocab-
> tests, common.compile-test" />
> > -  <property name="snowball.vocab.rev" value="500"/>
> > -  <property name="snowball.vocab.url"
> > -            value="svn://svn.tartarus.org/snowball/trunk/data"/>
> > -  <property name="snowball.vocab.dir"
> value="src/test/org/apache/lucene/analysis/snowball"/>
> > -
> > -  <target name="download-snowball-vocab-tests" depends="compile-
> core"
> > -             description="Downloads Snowball vocabulary tests">
> > -       <sequential>
> > -         <mkdir dir="${snowball.vocab.dir}"/>
> > -           <exec dir="${snowball.vocab.dir}" executable="${svn.exe}"
> failifexecutionfails="false" failonerror="true">
> > -             <arg line="checkout --trust-server-cert --non-
> interactive -r ${snowball.vocab.rev} ${snowball.vocab.url}"/>
> > -           </exec>
> > -       </sequential>
> > -  </target>
> >  </project>
> >
> > Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/hi/HindiStemFilter.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilter.ja
> va?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/hi/HindiStemFilter.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/ap
> ache/lucene/analysis/hi/HindiStemFilter.java Wed Mar 17 12:06:27 2010
> > @@ -32,7 +32,7 @@ public final class HindiStemFilter exten
> >   private final KeywordAttribute keywordAtt =
> addAttribute(KeywordAttribute.class);
> >   private final HindiStemmer stemmer = new HindiStemmer();
> >
> > -  protected HindiStemFilter(TokenStream input) {
> > +  public HindiStemFilter(TokenStream input) {
> >     super(input);
> >   }
> >
> >
> > Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/test/org/apache/lucene/analysis/compound/TestCompound
> WordTokenFilter.java?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
> (original)
> > +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/compound/TestCompoundWordTokenFilter.java Wed Mar
> 17 12:06:27 2010
> > @@ -30,9 +30,6 @@ import org.apache.lucene.analysis.compou
> >  import org.apache.lucene.analysis.tokenattributes.TermAttribute;
> >
> >  public class TestCompoundWordTokenFilter extends
> BaseTokenStreamTestCase {
> > -  static final File dataDir = new File(System.getProperty("dataDir",
> "./bin"));
> > -  static final File testFile = new File(dataDir,
> "org/apache/lucene/analysis/compound/da_UTF8.xml");
> > -
> >   public void testHyphenationCompoundWordsDA() throws Exception {
> >     String[] dict = { "læse", "hest" };
> >
> > @@ -143,6 +140,6 @@ public class TestCompoundWordTokenFilter
> >   }
> >
> >   private Reader getHyphenationReader() throws Exception {
> > -    return new InputStreamReader(new FileInputStream(testFile),
> "UTF-8");
> > +    return new
> InputStreamReader(getClass().getResourceAsStream("da_UTF8.xml"), "UTF-
> 8");
> >   }
> >  }
> >
> > Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/cz/TestCzechAnalyzer.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.
> java?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/cz/TestCzechAnalyzer.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/cz/TestCzechAnalyzer.java Wed Mar 17 12:06:27 2010
> > @@ -35,8 +35,6 @@ import org.apache.lucene.util.Version;
> >  *
> >  */
> >  public class TestCzechAnalyzer extends BaseTokenStreamTestCase {
> > -  File dataDir = new File(System.getProperty("dataDir", "./bin"));
> > -  File customStopFile = new File(dataDir,
> "org/apache/lucene/analysis/cz/customStopWordFile.txt");
> >
> >   /**
> >    * @deprecated Remove this test when support for 3.0 indexes is no
> longer needed.
> > @@ -105,7 +103,7 @@ public class TestCzechAnalyzer extends B
> >     assertAnalyzesToReuse(cz, "Česká Republika",
> >       new String[] { "Ä eská", "republika" });
> >
> > -    InputStream stopwords = new FileInputStream(customStopFile);
> > +    InputStream stopwords =
> getClass().getResourceAsStream("customStopWordFile.txt");
> >     cz.loadStopWords(stopwords, "UTF-8");
> >
> >     assertAnalyzesToReuse(cz, "ÄŒeská Republika", new String[] { "Ä
> eská" });
> >
> > Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/de/TestGermanStemFilter.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilt
> er.java?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/de/TestGermanStemFilter.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/de/TestGermanStemFilter.java Wed Mar 17 12:06:27
> 2010
> > @@ -41,10 +41,7 @@ public class TestGermanStemFilter extend
> >     Tokenizer tokenizer = new KeywordTokenizer(new StringReader(""));
> >     TokenFilter filter = new GermanStemFilter(new
> LowerCaseFilter(TEST_VERSION_CURRENT, tokenizer));
> >     // read test cases from external file:
> > -    File dataDir = new File(System.getProperty("dataDir", "./bin"));
> > -    File testFile = new File(dataDir,
> "org/apache/lucene/analysis/de/data.txt");
> > -    FileInputStream fis = new FileInputStream(testFile);
> > -    InputStreamReader isr = new InputStreamReader(fis, "iso-8859-
> 1");
> > +    InputStreamReader isr = new
> InputStreamReader(getClass().getResourceAsStream("data.txt"), "iso-
> 8859-1");
> >     BufferedReader breader = new BufferedReader(isr);
> >     while(true) {
> >       String line = breader.readLine();
> > @@ -61,6 +58,5 @@ public class TestGermanStemFilter extend
> >     }
> >     breader.close();
> >     isr.close();
> > -    fis.close();
> >   }
> >  }
> >
> > Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/nl/TestDutchStemmer.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.j
> ava?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/nl/TestDutchStemmer.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/nl/TestDutchStemmer.java Wed Mar 17 12:06:27 2010
> > @@ -32,8 +32,6 @@ import org.apache.lucene.util.Version;
> >  *
> >  */
> >  public class TestDutchStemmer extends BaseTokenStreamTestCase {
> > -  File dataDir = new File(System.getProperty("dataDir", "./bin"));
> > -  File customDictFile = new File(dataDir,
> "org/apache/lucene/analysis/nl/customStemDict.txt");
> >
> >   public void testWithSnowballExamples() throws Exception {
> >         check("lichaamsziek", "lichaamsziek");
> > @@ -172,6 +170,7 @@ public class TestDutchStemmer extends Ba
> >   public void testStemDictionaryReuse() throws Exception {
> >     DutchAnalyzer a = new DutchAnalyzer(TEST_VERSION_CURRENT);
> >     checkOneTermReuse(a, "lichamelijk", "licham");
> > +    File customDictFile = getDataFile("customStemDict.txt");
> >     a.setStemDictionary(customDictFile);
> >     checkOneTermReuse(a, "lichamelijk",
> "somethingentirelydifferent");
> >   }
> >
> > Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ru/TestRussianAnalyzer.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyze
> r.java?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ru/TestRussianAnalyzer.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ru/TestRussianAnalyzer.java Wed Mar 17 12:06:27
> 2010
> > @@ -41,14 +41,6 @@ public class TestRussianAnalyzer extends
> >
> >     private InputStreamReader sampleUnicode;
> >
> > -    private File dataDir;
> > -
> > -    @Override
> > -    protected void setUp() throws Exception {
> > -      super.setUp();
> > -      dataDir = new File(System.getProperty("dataDir", "./bin"));
> > -    }
> > -
> >     /**
> >      * @deprecated remove this test and its datafiles in Lucene 4.0
> >      * the Snowball version has its own data tests.
> > @@ -59,12 +51,12 @@ public class TestRussianAnalyzer extends
> >         RussianAnalyzer ra = new RussianAnalyzer(Version.LUCENE_30);
> >         inWords =
> >             new InputStreamReader(
> > -                new FileInputStream(new File(dataDir,
> "/org/apache/lucene/analysis/ru/testUTF8.txt")),
> > +                getClass().getResourceAsStream("testUTF8.txt"),
> >                 "UTF-8");
> >
> >         sampleUnicode =
> >             new InputStreamReader(
> > -                new FileInputStream(new File(dataDir,
> "/org/apache/lucene/analysis/ru/resUTF8.htm")),
> > +                getClass().getResourceAsStream("resUTF8.htm"),
> >                 "UTF-8");
> >
> >         TokenStream in = ra.tokenStream("all", inWords);
> >
> > Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ru/TestRussianStem.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianStem.ja
> va?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ru/TestRussianStem.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/ru/TestRussianStem.java Wed Mar 17 12:06:27 2010
> > @@ -47,13 +47,11 @@ public class TestRussianStem extends Luc
> >         //System.out.println(new java.util.Date());
> >         String str;
> >
> > -        File dataDir = new File(System.getProperty("dataDir",
> "./bin"));
> > -
> >         // open and read words into an array list
> >         BufferedReader inWords =
> >             new BufferedReader(
> >                 new InputStreamReader(
> > -                    new FileInputStream(new File(dataDir,
> "/org/apache/lucene/analysis/ru/wordsUTF8.txt")),
> > +                    getClass().getResourceAsStream("wordsUTF8.txt"),
> >                     "UTF-8"));
> >         while ((str = inWords.readLine()) != null)
> >         {
> > @@ -65,7 +63,7 @@ public class TestRussianStem extends Luc
> >         BufferedReader inStems =
> >             new BufferedReader(
> >                 new InputStreamReader(
> > -                    new FileInputStream(new File(dataDir,
> "/org/apache/lucene/analysis/ru/stemsUTF8.txt")),
> > +                    getClass().getResourceAsStream("stemsUTF8.txt"),
> >                     "UTF-8"));
> >         while ((str = inStems.readLine()) != null)
> >         {
> >
> > Propchange:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/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/test/org/ap
> ache/lucene/analysis/snowball/
> >            ('svn:ignore' removed)
> >
> > Modified:
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/snowball/TestSnowballVocab.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ana
> lyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball
> Vocab.java?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/snowball/TestSnowballVocab.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/ap
> ache/lucene/analysis/snowball/TestSnowballVocab.java Wed Mar 17
> 12:06:27 2010
> > @@ -35,18 +35,24 @@ import org.apache.lucene.analysis.Tokeni
> >  */
> >  public class TestSnowballVocab extends BaseTokenStreamTestCase {
> >   private Tokenizer tokenizer = new KeywordTokenizer(new
> StringReader(""));
> > -  static final File dataDir = new File(System.getProperty("dataDir",
> "./bin"));
> > -  static final File dataRoot = new File(dataDir,
> > -      "org/apache/lucene/analysis/snowball/data");
> > +  File dataRoot = null;
> > +
> > +  @Override
> > +  protected void setUp() throws Exception {
> > +    super.setUp();
> > +    try {
> > +      dataRoot = getDataFile("data");
> > +    } catch (IOException ioe) {
> > +      dataRoot = null;
> > +      System.err.println("WARN: This test was disabled, as the
> snowball test files are not available!");
> > +    }
> > +  }
> >
> >   /**
> >    * Run all languages against their snowball vocabulary tests.
> >    */
> >   public void testStemmers() throws IOException {
> > -    if (!dataRoot.exists()) {
> > -      System.err.println("WARN: This test was disabled, as the svn
> checkout of snowball test files is not supported on your system!");
> > -      return;
> > -    }
> > +    if (dataRoot == null) return;
> >     assertCorrectOutput("Danish", "danish");
> >     assertCorrectOutput("Dutch", "dutch");
> >     assertCorrectOutput("English", "english");
> > @@ -78,7 +84,7 @@ public class TestSnowballVocab extends B
> >    */
> >   private void assertCorrectOutput(String snowballLanguage, String
> dataDirectory)
> >       throws IOException {
> > -    System.err.println("checking snowball language: " +
> snowballLanguage);
> > +    if (VERBOSE) System.out.println("checking snowball language: " +
> snowballLanguage);
> >     TokenStream filter = new SnowballFilter(tokenizer,
> snowballLanguage);
> >     InputStream vocFile = new FileInputStream(new File(dataRoot,
> >         dataDirectory + "/voc.txt"));
> >
> > Modified:
> lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lu
> cene/benchmark/byTask/TestPerfTasksLogic.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ben
> chmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.j
> ava?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lu
> cene/benchmark/byTask/TestPerfTasksLogic.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lu
> cene/benchmark/byTask/TestPerfTasksLogic.java Wed Mar 17 12:06:27 2010
> > @@ -53,7 +53,6 @@ import org.apache.lucene.util.LuceneTest
> >  */
> >  public class TestPerfTasksLogic extends LuceneTestCase {
> >
> > -  private static final boolean DEBUG = false;
> >   static final String NEW_LINE =
> System.getProperty("line.separator");
> >
> >   // properties in effect in all tests here
> > @@ -373,7 +372,7 @@ public class TestPerfTasksLogic extends
> >    * Test WriteLineDoc and LineDocSource.
> >    */
> >   public void testLineDocFile() throws Exception {
> > -    File lineFile = new File(System.getProperty("tempDir"),
> "test.reuters.lines.txt");
> > +    File lineFile = new File(TEMP_DIR, "test.reuters.lines.txt");
> >
> >     // We will call WriteLineDocs this many times
> >     final int NUM_TRY_DOCS = 50;
> > @@ -547,7 +546,7 @@ public class TestPerfTasksLogic extends
> >   }
> >
> >   private static void logTstLogic (String txt) {
> > -    if (!DEBUG)
> > +    if (!VERBOSE)
> >       return;
> >     System.out.println("Test logic of:");
> >     System.out.println(txt);
> >
> > Modified:
> lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lu
> cene/benchmark/quality/TestQualityRun.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ben
> chmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java
> ?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lu
> cene/benchmark/quality/TestQualityRun.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lu
> cene/benchmark/quality/TestQualityRun.java Wed Mar 17 12:06:27 2010
> > @@ -35,8 +35,7 @@ import org.apache.lucene.benchmark.quali
> >  import org.apache.lucene.benchmark.quality.utils.SubmissionReport;
> >  import org.apache.lucene.search.IndexSearcher;
> >  import org.apache.lucene.store.FSDirectory;
> > -
> > -import junit.framework.TestCase;
> > +import org.apache.lucene.util.LuceneTestCase;
> >
> >  /**
> >  * Test that quality run does its job.
> > @@ -45,9 +44,7 @@ import junit.framework.TestCase;
> >  * this test will not work correctly, as it does not dynamically
> >  * generate its test trec topics/qrels!
> >  */
> > -public class TestQualityRun extends TestCase {
> > -
> > -  private static boolean DEBUG =
> Boolean.getBoolean("tests.verbose");
> > +public class TestQualityRun extends LuceneTestCase {
> >
> >   public TestQualityRun(String name) {
> >     super(name);
> > @@ -63,7 +60,7 @@ public class TestQualityRun extends Test
> >     int maxResults = 1000;
> >     String docNameField = "doctitle"; // orig docID is in the linedoc
> format title
> >
> > -    PrintWriter logger = DEBUG ? new PrintWriter(System.out,true) :
> null;
> > +    PrintWriter logger = VERBOSE ? new PrintWriter(System.out,true)
> : null;
> >
> >     // <tests src dir> for topics/qrels files -
> src/test/org/apache/lucene/benchmark/quality
> >     File srcTestDir = new File(new File(new File(new File(new File(
> > @@ -89,7 +86,7 @@ public class TestQualityRun extends Test
> >     QualityQueryParser qqParser = new SimpleQQParser("title","body");
> >     QualityBenchmark qrun = new QualityBenchmark(qqs, qqParser,
> searcher, docNameField);
> >
> > -    SubmissionReport submitLog = DEBUG ? new
> SubmissionReport(logger, "TestRun") : null;
> > +    SubmissionReport submitLog = VERBOSE ? new
> SubmissionReport(logger, "TestRun") : null;
> >     qrun.setMaxResults(maxResults);
> >     QualityStats stats[] = qrun.execute(judge, submitLog, logger);
> >
> >
> > Modified: lucene/java/branches/flex_1458/contrib/db/bdb-
> je/src/test/org/apache/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=924247&r1=9
> 24246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > --- 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;
> >  *
> >  */
> >  public class JEStoreTest extends LuceneTestCase {
> > -    protected File dbHome = new
> File(System.getProperty("java.io.tmpdir"),"index");
> > +    protected File dbHome = new File(TEMP_DIR,"index");
> >
> >     protected Environment env;
> >
> > @@ -127,7 +127,7 @@ public class JEStoreTest extends LuceneT
> >         Transaction txn = env.beginTransaction(null, null);
> >         Directory store = null;
> >
> > -        System.out.println("Writing files byte by byte");
> > +        if (VERBOSE) System.out.println("Writing files byte by
> byte");
> >
> >         try {
> >             store = new JEDirectory(txn, index, blocks);
> > @@ -159,11 +159,13 @@ public class JEStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         duration = (int) (end.getTime() - start.getTime());
> >         System.out.print(duration);
> >         System.out.print(" total milliseconds to create, ");
> >         System.out.print(totalLength / duration);
> >         System.out.println(" kb/s");
> > +        }
> >
> >         try {
> >             txn = env.beginTransaction(null, null);
> > @@ -208,11 +210,13 @@ public class JEStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         duration = (int) (end.getTime() - start.getTime());
> >         System.out.print(duration);
> >         System.out.print(" total milliseconds to read, ");
> >         System.out.print(totalLength / duration);
> >         System.out.println(" kb/s");
> > +        }
> >
> >         try {
> >             txn = env.beginTransaction(null, null);
> > @@ -244,12 +248,14 @@ public class JEStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         System.out.print(end.getTime() - start.getTime());
> >         System.out.println(" total milliseconds to delete");
> >
> >         System.out.print(end.getTime() - veryStart.getTime());
> >         System.out.println(" total milliseconds");
> >     }
> > +    }
> >
> >     public void testDelete() throws Exception {
> >         final int count = 250;
> > @@ -267,7 +273,7 @@ public class JEStoreTest extends LuceneT
> >         Transaction txn = env.beginTransaction(null, null);
> >         Directory store = null;
> >
> > -        System.out.println("Writing files byte by byte");
> > +        if (VERBOSE) System.out.println("Writing files byte by
> byte");
> >
> >         try {
> >             store = new JEDirectory(txn, index, blocks);
> > @@ -299,11 +305,13 @@ public class JEStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         duration = (int) (end.getTime() - start.getTime());
> >         System.out.print(duration);
> >         System.out.print(" total milliseconds to read, ");
> >         System.out.print(totalLength / duration);
> >         System.out.println(" kb/s");
> > +        }
> >
> >         try {
> >             txn = env.beginTransaction(null, null);
> > @@ -337,6 +345,7 @@ public class JEStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         System.out.print(end.getTime() - start.getTime());
> >         System.out.println(" total milliseconds to delete even
> files");
> >
> > @@ -345,6 +354,7 @@ public class JEStoreTest extends LuceneT
> >         System.out.print(" total milliseconds to create, ");
> >         System.out.print(totalLength / duration);
> >         System.out.println(" kb/s");
> > +        }
> >
> >         try {
> >             txn = env.beginTransaction(null, null);
> > @@ -395,11 +405,13 @@ public class JEStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         duration = (int) (end.getTime() - start.getTime());
> >         System.out.print(duration);
> >         System.out.print(" total milliseconds to read, ");
> >         System.out.print(totalLength / duration);
> >         System.out.println(" kb/s");
> > +        }
> >
> >         try {
> >             txn = env.beginTransaction(null, null);
> > @@ -434,11 +446,13 @@ public class JEStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         System.out.print(end.getTime() - start.getTime());
> >         System.out.println(" total milliseconds to delete");
> >
> >         System.out.print(end.getTime() - veryStart.getTime());
> >         System.out.println(" total milliseconds");
> > +        }
> >
> >         Cursor cursor = null;
> >         try {
> > @@ -491,7 +505,7 @@ public class JEStoreTest extends LuceneT
> >         Transaction txn = env.beginTransaction(null, null);
> >         Directory store = null;
> >
> > -        System.out.println("Writing files as one byte array");
> > +        if (VERBOSE) System.out.println("Writing files as one byte
> array");
> >
> >         try {
> >             store = new JEDirectory(txn, index, blocks);
> > @@ -521,11 +535,13 @@ public class JEStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         duration = (int) (end.getTime() - start.getTime());
> >         System.out.print(duration);
> >         System.out.print(" total milliseconds to create, ");
> >         System.out.print(totalLength / duration);
> >         System.out.println(" kb/s");
> > +        }
> >
> >         try {
> >             txn = env.beginTransaction(null, null);
> > @@ -571,11 +587,13 @@ public class JEStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         duration = (int) (end.getTime() - start.getTime());
> >         System.out.print(duration);
> >         System.out.print(" total milliseconds to read, ");
> >         System.out.print(totalLength / duration);
> >         System.out.println(" kb/s");
> > +        }
> >
> >         try {
> >             txn = env.beginTransaction(null, null);
> > @@ -607,10 +625,12 @@ public class JEStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         System.out.print(end.getTime() - start.getTime());
> >         System.out.println(" total milliseconds to delete");
> >
> >         System.out.print(end.getTime() - veryStart.getTime());
> >         System.out.println(" total milliseconds");
> >     }
> > +    }
> >  }
> >
> > Modified:
> lucene/java/branches/flex_1458/contrib/db/bdb/src/test/org/apache/lucen
> e/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=924247&r1=
> 924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/db/bdb/src/test/org/apache/lucen
> e/store/db/DbStoreTest.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/db/bdb/src/test/org/apache/lucen
> e/store/db/DbStoreTest.java Wed Mar 17 12:06:27 2010
> > @@ -43,7 +43,7 @@ import org.apache.lucene.util.LuceneTest
> >  * Adapted from org.apache.lucene.StoreTest with larger files and
> random bytes.
> >  */
> >  public class DbStoreTest extends LuceneTestCase {
> > -    protected File dbHome = new
> File(System.getProperty("java.io.tmpdir"),"index");
> > +    protected File dbHome = new File(TEMP_DIR,"index");
> >     protected Environment env;
> >     protected Database index, blocks;
> >
> > @@ -129,7 +129,7 @@ public class DbStoreTest extends LuceneT
> >         Transaction txn = env.beginTransaction(null, null);
> >         Directory store = null;
> >
> > -        System.out.println("Writing files byte by byte");
> > +        if (VERBOSE) System.out.println("Writing files byte by
> byte");
> >
> >         try {
> >             store = new DbDirectory(txn, index, blocks);
> > @@ -161,11 +161,13 @@ public class DbStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         duration = (int) (end.getTime() - start.getTime());
> >         System.out.print(duration);
> >         System.out.print(" total milliseconds to create, ");
> >         System.out.print(totalLength / duration);
> >         System.out.println(" kb/s");
> > +        }
> >
> >         try {
> >             txn = env.beginTransaction(null, null);
> > @@ -211,11 +213,13 @@ public class DbStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         duration = (int) (end.getTime() - start.getTime());
> >         System.out.print(duration);
> >         System.out.print(" total milliseconds to read, ");
> >         System.out.print(totalLength / duration);
> >         System.out.println(" kb/s");
> > +        }
> >
> >         try {
> >             txn = env.beginTransaction(null, null);
> > @@ -248,12 +252,14 @@ public class DbStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         System.out.print(end.getTime() - start.getTime());
> >         System.out.println(" total milliseconds to delete");
> >
> >         System.out.print(end.getTime() - veryStart.getTime());
> >         System.out.println(" total milliseconds");
> >     }
> > +    }
> >
> >     public void testArrays()
> >         throws Exception
> > @@ -274,7 +280,7 @@ public class DbStoreTest extends LuceneT
> >         Transaction txn = env.beginTransaction(null, null);
> >         Directory store = null;
> >
> > -        System.out.println("Writing files as one byte array");
> > +        if (VERBOSE) System.out.println("Writing files as one byte
> array");
> >
> >         try {
> >             store = new DbDirectory(txn, index, blocks);
> > @@ -304,11 +310,13 @@ public class DbStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         duration = (int) (end.getTime() - start.getTime());
> >         System.out.print(duration);
> >         System.out.print(" total milliseconds to create, ");
> >         System.out.print(totalLength / duration);
> >         System.out.println(" kb/s");
> > +        }
> >
> >         try {
> >             txn = env.beginTransaction(null, null);
> > @@ -355,11 +363,13 @@ public class DbStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         duration = (int) (end.getTime() - start.getTime());
> >         System.out.print(duration);
> >         System.out.print(" total milliseconds to read, ");
> >         System.out.print(totalLength / duration);
> >         System.out.println(" kb/s");
> > +        }
> >
> >         try {
> >             txn = env.beginTransaction(null, null);
> > @@ -392,10 +402,12 @@ public class DbStoreTest extends LuceneT
> >
> >         end = new Date();
> >
> > +        if (VERBOSE) {
> >         System.out.print(end.getTime() - start.getTime());
> >         System.out.println(" total milliseconds to delete");
> >
> >         System.out.print(end.getTime() - veryStart.getTime());
> >         System.out.println(" total milliseconds");
> >     }
> > +    }
> >  }
> >
> > Modified: lucene/java/branches/flex_1458/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFra
> gListBuilderTest.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/fas
> t-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFra
> gListBuilderTest.java?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > --- lucene/java/branches/flex_1458/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFra
> gListBuilderTest.java (original)
> > +++ lucene/java/branches/flex_1458/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFra
> gListBuilderTest.java Wed Mar 17 12:06:27 2010
> > @@ -48,7 +48,7 @@ public class SimpleFragListBuilderTest e
> >     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
> >     FieldFragList ffl = sflb.createFieldFragList( fpl( "\"abcdefgh
> jklmnopqrs\"", "abcdefgh   jklmnopqrs" ),
> SimpleFragListBuilder.MIN_FRAG_CHAR_SIZE );
> >     assertEquals( 1, ffl.fragInfos.size() );
> > -    System.out.println( ffl.fragInfos.get( 0 ).toString() );
> > +    if (VERBOSE) System.out.println( ffl.fragInfos.get( 0
> ).toString() );
> >     assertEquals( "subInfos=(abcdefghjklmnopqrs((0,21)))/1.0(0,21)",
> ffl.fragInfos.get( 0 ).toString() );
> >   }
> >
> >
> > 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 @@
> >
>  /lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-
> 818600,825998,826775,829134,829816,829881,831036,896850,909334
> >
>  /lucene/java/branches/lucene_2_9_back_compat_tests/contrib/highlighter
> /src/test:818601-821336
> >
>  /lucene/java/branches/lucene_3_0/contrib/highlighter/src/test:880793,8
> 96906
> > -/lucene/java/trunk/contrib/highlighter/src/test:829439-
> 833960,880727-886190,889185,889614-
> 916543,916596,916685,916755,916769,917019,917148,917154,917161,917203-
> 917204,919060,919119,919718,919731,919869,920237-920499
> > +/lucene/java/trunk/contrib/highlighter/src/test:829439-
> 833960,880727-886190,889185,889614-
> 916543,916596,916685,916755,916769,917019,917148,917154,917161,917203-
> 917204,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/contrib/highlighter/src/test/org/apache/
> lucene/search/highlight/HighlighterTest.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/hig
> hlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.ja
> va?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/
> lucene/search/highlight/HighlighterTest.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/
> lucene/search/highlight/HighlighterTest.java Wed Mar 17 12:06:27 2010
> > @@ -142,7 +142,7 @@ public class HighlighterTest extends Bas
> >
> >       String fragment = highlighter.getBestFragment(stream,
> storedField);
> >
> > -      System.out.println(fragment);
> > +      if (VERBOSE) System.out.println(fragment);
> >     }
> >   }
> >
> > @@ -158,7 +158,7 @@ public class HighlighterTest extends Bas
> >     Query q = parser.parse("\"world Flatland\"~3");
> >     String expected = "I call our <B>world</B> <B>Flatland</B>, not
> because we call it so,";
> >     String observed = highlightField(q, "SOME_FIELD_NAME", s1);
> > -    System.out.println("Expected: \"" + expected + "\n" + "Observed:
> \"" + observed);
> > +    if (VERBOSE) System.out.println("Expected: \"" + expected + "\n"
> + "Observed: \"" + observed);
> >     assertEquals("Query in the default field results in text for
> *ANY* field being highlighted",
> >         expected, observed);
> >
> > @@ -170,7 +170,7 @@ public class HighlighterTest extends Bas
> >     q = parser.parse("text:\"world Flatland\"~3");
> >     expected = s1;
> >     observed = highlightField(q, FIELD_NAME, s1);
> > -    System.out.println("Expected: \"" + expected + "\n" + "Observed:
> \"" + observed);
> > +    if (VERBOSE) System.out.println("Expected: \"" + expected + "\n"
> + "Observed: \"" + observed);
> >     assertEquals(
> >         "Query in a named field does not result in highlighting when
> that field isn't in the query",
> >         s1, highlightField(q, FIELD_NAME, s1));
> > @@ -209,7 +209,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           "...");
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >     }
> >
> >     // Not sure we can assert anything here - just running to check
> we dont
> > @@ -258,7 +258,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           "...");
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >     }
> >
> >     assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> > @@ -280,7 +280,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           "...");
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >     }
> >
> >     assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> > @@ -302,7 +302,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           "...");
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >     }
> >
> >     assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> > @@ -328,7 +328,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           "...");
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >     }
> >
> >     assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> > @@ -352,7 +352,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           "...");
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >     }
> >
> >     assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> > @@ -377,7 +377,7 @@ public class HighlighterTest extends Bas
> >
> >  //      String result =
> >         highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,"...");
> > -      //System.out.println("\t" + result);
> > +      //if (VERBOSE) System.out.println("\t" + result);
> >     }
> >
> >
> > @@ -398,7 +398,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           "...");
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >     }
> >
> >     assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> > @@ -420,7 +420,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           "...");
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >
> >       assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> >           numHighlights == 3);
> > @@ -443,7 +443,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> >           maxNumFragmentsRequired, "...");
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >
> >     }
> >
> > @@ -462,7 +462,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> >           maxNumFragmentsRequired, "...");
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >
> >     }
> >   }
> > @@ -484,7 +484,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           "...");
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >
> >       assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> >           numHighlights == 4);
> > @@ -553,7 +553,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           "...");
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >     }
> >     // Not sure we can assert anything here - just running to check
> we dont
> >     // throw any exceptions
> > @@ -702,7 +702,7 @@ public class HighlighterTest extends Bas
> >     // can't rewrite ConstantScore if you want to highlight it -
> >     // it rewrites to ConstantScoreQuery which cannot be highlighted
> >     // query = unReWrittenQuery.rewrite(reader);
> > -    System.out.println("Searching for: " +
> query.toString(FIELD_NAME));
> > +    if (VERBOSE) System.out.println("Searching for: " +
> query.toString(FIELD_NAME));
> >     hits = searcher.search(query, null, 1000);
> >
> >     for (int i = 0; i < hits.totalHits; i++) {
> > @@ -722,7 +722,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           fragmentSeparator);
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >     }
> >     assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> >         numHighlights == 5);
> > @@ -750,7 +750,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           fragmentSeparator);
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >     }
> >     assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> >         numHighlights == 5);
> > @@ -778,7 +778,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           fragmentSeparator);
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >     }
> >     assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> >         numHighlights == 5);
> > @@ -934,7 +934,7 @@ public class HighlighterTest extends Bas
> >               HighlighterTest.this);
> >           highlighter.setTextFragmenter(new SimpleFragmenter(40));
> >           String result = highlighter.getBestFragment(tokenStream,
> text);
> > -          System.out.println("\t" + result);
> > +          if (VERBOSE) System.out.println("\t" + result);
> >         }
> >         assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> >             numHighlights == 4);
> > @@ -1065,7 +1065,7 @@ public class HighlighterTest extends Bas
> >           Highlighter highlighter = getHighlighter(query, FIELD_NAME,
> tokenStream,
> >               HighlighterTest.this);
> >           String result = highlighter.getBestFragment(tokenStream,
> text);
> > -          System.out.println("\t" + result);
> > +          if (VERBOSE) System.out.println("\t" + result);
> >         }
> >         assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> >             numHighlights == 4);
> > @@ -1099,7 +1099,7 @@ public class HighlighterTest extends Bas
> >           assertTrue("Failed to find correct number of text
> Fragments: " + fragmentResults.length
> >               + " vs " + stringResults.length, fragmentResults.length
> == stringResults.length);
> >           for (int j = 0; j < stringResults.length; j++) {
> > -            System.out.println(fragmentResults[j]);
> > +            if (VERBOSE) System.out.println(fragmentResults[j]);
> >             assertTrue("Failed to find same text Fragments: " +
> fragmentResults[j] + " found",
> >
> fragmentResults[j].toString().equals(stringResults[j]));
> >
> > @@ -1217,7 +1217,7 @@ public class HighlighterTest extends Bas
> >
> >         QueryParser parser = new QueryParser(TEST_VERSION,
> FIELD_NAME, analyzer);
> >         Query query = parser.parse("JF? or Kenned*");
> > -        System.out.println("Searching with primitive query");
> > +        if (VERBOSE) System.out.println("Searching with primitive
> query");
> >         // forget to set this and...
> >         // query=query.rewrite(reader);
> >         TopDocs hits = searcher.search(query, null, 1000);
> > @@ -1240,7 +1240,7 @@ public class HighlighterTest extends Bas
> >           String highlightedText =
> highlighter.getBestFragments(tokenStream, text,
> >               maxNumFragmentsRequired, "...");
> >
> > -          System.out.println(highlightedText);
> > +          if (VERBOSE) System.out.println(highlightedText);
> >         }
> >         // We expect to have zero highlights if the query is multi-
> terms and is
> >         // not
> > @@ -1353,7 +1353,7 @@ public class HighlighterTest extends Bas
> >     QueryParser parser = new QueryParser(TEST_VERSION, FIELD_NAME,
> new StandardAnalyzer(TEST_VERSION));
> >
> parser.setMultiTermRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_QUERY_R
> EWRITE);
> >     query = parser.parse("multi*");
> > -    System.out.println("Searching for: " +
> query.toString(FIELD_NAME));
> > +    if (VERBOSE) System.out.println("Searching for: " +
> query.toString(FIELD_NAME));
> >     // at this point the multisearcher calls combine(query[])
> >     hits = multiSearcher.search(query, null, 1000);
> >
> > @@ -1371,7 +1371,7 @@ public class HighlighterTest extends Bas
> >       String text =
> multiSearcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
> >       TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new
> StringReader(text));
> >       String highlightedText =
> highlighter.getBestFragment(tokenStream, text);
> > -      System.out.println(highlightedText);
> > +      if (VERBOSE) System.out.println(highlightedText);
> >     }
> >     assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> >         numHighlights == 2);
> > @@ -1645,7 +1645,7 @@ public class HighlighterTest extends Bas
> >     for( int i = 0; i < hits.totalHits; i++ ){
> >       Document doc = searcher.doc( hits.scoreDocs[i].doc );
> >       String result = h.getBestFragment( a, "t_text1", doc.get(
> "t_text1" ));
> > -      System.out.println("result:" +  result);
> > +      if (VERBOSE) System.out.println("result:" +  result);
> >       assertEquals("more <B>random</B> words for second field",
> result);
> >     }
> >     searcher.close();
> > @@ -1698,7 +1698,7 @@ public class HighlighterTest extends Bas
> >     // for any multi-term queries to work (prefix, wildcard,
> range,fuzzy etc)
> >     // you must use a rewritten query!
> >     query = unReWrittenQuery.rewrite(reader);
> > -    System.out.println("Searching for: " +
> query.toString(FIELD_NAME));
> > +    if (VERBOSE) System.out.println("Searching for: " +
> query.toString(FIELD_NAME));
> >     hits = searcher.search(query, null, 1000);
> >   }
> >
> > @@ -1714,7 +1714,7 @@ public class HighlighterTest extends Bas
> >
> >       String result = highlighter.getBestFragments(tokenStream, text,
> maxNumFragmentsRequired,
> >           "...");
> > -      System.out.println("\t" + result);
> > +      if (VERBOSE) System.out.println("\t" + result);
> >
> >       assertTrue("Failed to find correct number of highlights " +
> numHighlights + " found",
> >           numHighlights == expectedHighlights);
> > @@ -1935,16 +1935,16 @@ class SynonymTokenizer extends TokenStre
> >
> >         String result = highlighter.getBestFragments(tokenStream,
> text, maxNumFragmentsRequired,
> >             fragmentSeparator);
> > -        System.out.println("\t" + result);
> > +        if (HighlighterTest.VERBOSE) System.out.println("\t" +
> result);
> >       }
> >     }
> >
> >     abstract void run() throws Exception;
> >
> >     void start() throws Exception {
> > -      System.out.println("Run QueryScorer");
> > +      if (HighlighterTest.VERBOSE) System.out.println("Run
> QueryScorer");
> >       run();
> > -      System.out.println("Run QueryTermScorer");
> > +      if (HighlighterTest.VERBOSE) System.out.println("Run
> QueryTermScorer");
> >       mode = QUERY_TERM;
> >       run();
> >     }
> >
> > 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 @@
> >
>  /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/stor
> e/instantiated/TestIndicesEquals.java:916596,916685,916755,916769,91701
> 9,917148,917154,917161,917203-
> 917204,919060,919119,919718,919731,919869,920237-920499
> >
> +/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/sto
> re/instantiated/TestIndicesEquals.java:916596,916685,916755,916769,9170
> 19,917148,917154,917161,917203-
> 917204,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/contrib/memory/src/java/org/apache/lucen
> e/index/memory/MemoryIndex.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/mem
> ory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=924247
> &r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucen
> e/index/memory/MemoryIndex.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucen
> e/index/memory/MemoryIndex.java Wed Mar 17 12:06:27 2010
> > @@ -51,6 +51,7 @@ import org.apache.lucene.search.Searcher
> >  import org.apache.lucene.search.Scorer;
> >  import org.apache.lucene.search.Similarity;
> >  import org.apache.lucene.store.RAMDirectory; // for javadocs
> > +import org.apache.lucene.util.Constants; // for javadocs
> >
> >  /**
> >  * High-performance single-document main memory Apache Lucene
> fulltext search index.
> > @@ -1207,7 +1208,7 @@ public class MemoryIndex implements Seri
> >
> ///////////////////////////////////////////////////////////////////////
> ////////
> >   private static final class VM {
> >
> > -    public static final int PTR = is64BitVM() ? 8 : 4;
> > +    public static final int PTR = Constants.JRE_IS_64BIT ? 8 : 4;
> >
> >     // bytes occupied by primitive data types
> >     public static final int BOOLEAN = 1;
> > @@ -1272,18 +1273,6 @@ public class MemoryIndex implements Seri
> >         return sizeOfObject(PTR + INT) + sizeOfIntArray(len);
> >     }
> >
> > -    private static boolean is64BitVM() {
> > -        try {
> > -            int bits = Integer.getInteger("sun.arch.data.model",
> 0).intValue();
> > -            if (bits != 0) return bits == 64;
> > -
> > -            // fallback if sun.arch.data.model isn't available
> > -            return
> System.getProperty("java.vm.name").toLowerCase().indexOf("64") >= 0;
> > -        } catch (Throwable t) {
> > -            return false; // better safe than sorry (applets,
> security managers, etc.) ...
> > -        }
> > -    }
> > -
> >     /** logarithm to the base 2. Example: log2(4) == 2, log2(8) == 3
> */
> >     private static double log2(double value) {
> >       return Math.log(value) / Math.log(2);
> >
> > Modified:
> lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/lucen
> e/index/memory/MemoryIndexTest.java
> > URL:
> http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/mem
> ory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=92
> 4247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/lucen
> e/index/memory/MemoryIndexTest.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/lucen
> e/index/memory/MemoryIndexTest.java Wed Mar 17 12:06:27 2010
> > @@ -201,8 +201,6 @@ public class MemoryIndexTest extends Bas
> >
> >   private Analyzer analyzer;
> >
> > -  private final boolean verbose = false;
> > -
> >   private static final String FIELD_NAME = "content";
> >
> >   /** Runs the tests and/or benchmark */
> > @@ -226,7 +224,7 @@ public class MemoryIndexTest extends Bas
> >       "src/java/test/org/apache/lucene/queryParser/*.java",
> >
> "contrib/memory/src/java/org/apache/lucene/index/memory/*.java",
> >     });
> > -    System.out.println("files = " + java.util.Arrays.asList(files));
> > +    if (VERBOSE) System.out.println("files = " +
> java.util.Arrays.asList(files));
> >     String[] xargs = new String[] {
> >       "1", "1", "memram",
> >
> "@contrib/memory/src/test/org/apache/lucene/index/memory/testqueries.tx
> t",
> > @@ -284,7 +282,7 @@ public class MemoryIndexTest extends Bas
> >     boolean first = true;
> >
> >     for (int iter=0; iter < iters; iter++) {
> > -      System.out.println("\n########### iteration=" + iter);
> > +      if (VERBOSE) System.out.println("\n########### iteration=" +
> iter);
> >       long start = System.currentTimeMillis();
> >       long bytes = 0;
> >
> > @@ -297,7 +295,7 @@ public class MemoryIndexTest extends Bas
> >           bytes += file.length();
> >           String text = toString(new FileInputStream(file), null);
> >           Document doc = createDocument(text);
> > -          if (verbose) System.out.println("\n*********** FILE=" +
> file);
> > +          if (VERBOSE) System.out.println("\n*********** FILE=" +
> file);
> >
> >           boolean measureIndexing = false; // toggle this to measure
> query performance
> >           MemoryIndex memind = null;
> > @@ -341,7 +339,7 @@ public class MemoryIndexTest extends Bas
> >                 }
> >                 if (useRAMIndex) score2 = query(ramsearcher, query);
> >                 if (useMemIndex && useRAMIndex) {
> > -                  if (verbose) System.out.println("diff="+ (score1-
> score2) + ", query=" + queries[q] + ", s1=" + score1 + ", s2=" +
> score2);
> > +                  if (VERBOSE) System.out.println("diff="+ (score1-
> score2) + ", query=" + queries[q] + ", s1=" + score1 + ", s2=" +
> score2);
> >                   if (score1 != score2 || score1 < 0.0f || score2 <
> 0.0f || score1 > 1.0f || score2 > 1.0f) {
> >                     throw new IllegalStateException("BUG DETECTED:" +
> (i*(q+1)) + " at query=" + queries[q] + ", file=" + file + ", anal=" +
> analyzer);
> >                   }
> > @@ -350,13 +348,14 @@ public class MemoryIndexTest extends Bas
> >
> >             } catch (Throwable t) {
> >               if (t instanceof OutOfMemoryError) t.printStackTrace();
> > -              System.out.println("Fatal error at query=" +
> queries[q] + ", file=" + file + ", anal=" + analyzer);
> > +              if (VERBOSE) System.out.println("Fatal error at
> query=" + queries[q] + ", file=" + file + ", anal=" + analyzer);
> >               throw t;
> >             }
> >           }
> >         }
> >       }
> >       long end = System.currentTimeMillis();
> > +      if (VERBOSE) {
> >       System.out.println("\nsecs = " + ((end-start)/1000.0f));
> >       System.out.println("queries/sec= " +
> >         (1.0f * runs * queries.length * analyzers.length *
> files.length
> > @@ -364,6 +363,9 @@ public class MemoryIndexTest extends Bas
> >       float mb = (1.0f * bytes * queries.length * runs) / (1024.0f *
> 1024.0f);
> >       System.out.println("MB/sec = " + (mb / ((end-start)/1000.0f)));
> >     }
> > +    }
> > +
> > +    if (!VERBOSE) return;
> >
> >     if (useMemIndex && useRAMIndex)
> >       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/mis
> c/src/test/org/apache/lucene/index/TestIndexSplitter.java?rev=924247&r1
> =924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/
> index/TestIndexSplitter.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/
> index/TestIndexSplitter.java Wed Mar 17 12:06:27 2010
> > @@ -27,11 +27,10 @@ import org.apache.lucene.util._TestUtil;
> >
> >  public class TestIndexSplitter extends LuceneTestCase {
> >   public void test() throws Exception {
> > -    String tmpDir = System.getProperty("java.io.tmpdir");
> > -    File dir = new File(tmpDir, "testfilesplitter");
> > +    File dir = new File(TEMP_DIR, "testfilesplitter");
> >     _TestUtil.rmDir(dir);
> >     dir.mkdirs();
> > -    File destDir = new File(tmpDir, "testfilesplitterdest");
> > +    File destDir = new File(TEMP_DIR, "testfilesplitterdest");
> >     _TestUtil.rmDir(destDir);
> >     destDir.mkdirs();
> >     FSDirectory fsDir = FSDirectory.open(dir);
> > @@ -61,7 +60,7 @@ public class TestIndexSplitter extends L
> >     assertEquals(50, r.maxDoc());
> >
> >     // now test cmdline
> > -    File destDir2 = new File(tmpDir, "testfilesplitterdest2");
> > +    File destDir2 = new File(TEMP_DIR, "testfilesplitterdest2");
> >     _TestUtil.rmDir(destDir2);
> >     destDir2.mkdirs();
> >     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/que
> ryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryPars
> erSimpleSample.java?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/
> lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java
> (original)
> > +++
> lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/
> lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java Wed Mar
> 17 12:06:27 2010
> > @@ -19,8 +19,6 @@ package org.apache.lucene.queryParser.sp
> >
> >  import javax.management.Query;
> >
> > -import junit.framework.TestCase;
> > -
> >  import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
> >  import org.apache.lucene.queryParser.core.nodes.OrQueryNode;
> >  import org.apache.lucene.queryParser.core.nodes.QueryNode;
> > @@ -29,6 +27,7 @@ import org.apache.lucene.queryParser.cor
> >  import
> org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser;
> >  import org.apache.lucene.search.spans.SpanQuery;
> >  import org.apache.lucene.search.spans.SpanTermQuery;
> > +import org.apache.lucene.util.LuceneTestCase;
> >
> >  /**
> >  * This test case demonstrates how the new query parser can be
> used.<br/>
> > @@ -94,7 +93,7 @@ import org.apache.lucene.search.spans.Sp
> >  * @see UniqueFieldAttribute
> >  *
> >  */
> > -public class TestSpanQueryParserSimpleSample extends TestCase {
> > +public class TestSpanQueryParserSimpleSample extends LuceneTestCase
> {
> >
> >   public TestSpanQueryParserSimpleSample() {
> >     // empty constructor
> > @@ -104,12 +103,6 @@ public class TestSpanQueryParserSimpleSa
> >     super(testName);
> >   }
> >
> > -  public static junit.framework.Test suite() {
> > -    junit.framework.TestSuite suite = new junit.framework.TestSuite(
> > -        TestSpanQueryParserSimpleSample.class);
> > -    return suite;
> > -  }
> > -
> >   public void testBasicDemo() throws Exception {
> >     SyntaxParser queryParser = new StandardSyntaxParser();
> >
> > @@ -133,13 +126,13 @@ public class TestSpanQueryParserSimpleSa
> >     spanProcessorPipeline.addProcessor(new
> UniqueFieldQueryNodeProcessor());
> >
> >     // print to show out the QueryNode tree before being processed
> > -    System.out.println(queryTree);
> > +    if (VERBOSE) System.out.println(queryTree);
> >
> >     // Process the QueryTree using our new Processors
> >     queryTree = spanProcessorPipeline.process(queryTree);
> >
> >     // print to show out the QueryNode tree after being processed
> > -    System.out.println(queryTree);
> > +    if (VERBOSE) System.out.println(queryTree);
> >
> >     // create a instance off the Builder
> >     SpansQueryTreeBuilder spansQueryTreeBuilder = new
> SpansQueryTreeBuilder();
> >
> > 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/que
> ryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParse
> rWrapper.java?rev=924247&r1=924246&r2=924247&view=diff
> >
> =======================================================================
> =======
> > ---
> lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/
> lucene/queryParser/standard/TestQueryParserWrapper.java (original)
> > +++
> lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/
> lucene/queryParser/standard/TestQueryParserWrapper.java Wed Mar 17
> 12:06:27 2010
> > @@ -1068,7 +1068,7 @@ public class TestQueryParserWrapper exte
> >         .parse("(fieldX:xxxxx OR fieldy:xxxxxxxx)^2 AND (fieldx:the
> OR fieldy:foo)");
> >     assertNotNull("result is null and it shouldn't be", result);
> >     assertTrue("result is not a BooleanQuery", result instanceof
> BooleanQuery);
> > -    System.out.println("Result: " + result);
> > +    if (VERBOSE) System.out.println("Result: " + result);
> >     assertTrue(((BooleanQuery) result).clauses().size() + " does not
> equal: "
> >         + 2, ((BooleanQuery) result).clauses().size() == 2);
> >   }
> >
> >
> >
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: java-dev-help@lucene.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org


Mime
View raw message