Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 72324 invoked from network); 10 Feb 2010 13:36:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Feb 2010 13:36:43 -0000 Received: (qmail 54851 invoked by uid 500); 10 Feb 2010 13:36:43 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 54812 invoked by uid 500); 10 Feb 2010 13:36:43 -0000 Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@lucene.apache.org Delivered-To: mailing list java-commits@lucene.apache.org Received: (qmail 54803 invoked by uid 99); 10 Feb 2010 13:36:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Feb 2010 13:36:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Feb 2010 13:36:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A6B642388A43; Wed, 10 Feb 2010 13:36:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r908496 [5/6] - in /lucene/java/trunk: ./ src/test/org/apache/lucene/ src/test/org/apache/lucene/analysis/ src/test/org/apache/lucene/collation/ src/test/org/apache/lucene/document/ src/test/org/apache/lucene/index/ src/test/org/apache/luce... Date: Wed, 10 Feb 2010 13:36:04 -0000 To: java-commits@lucene.apache.org From: uschindler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100210133606.A6B642388A43@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestDocBoost.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestDocBoost.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestDocBoost.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestDocBoost.java Wed Feb 10 13:35:57 2010 @@ -20,7 +20,6 @@ import java.io.IOException; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; import org.apache.lucene.analysis.SimpleAnalyzer; import org.apache.lucene.document.*; import org.apache.lucene.index.IndexReader; @@ -40,7 +39,7 @@ public void testDocBoost() throws Exception { RAMDirectory store = new RAMDirectory(); - IndexWriter writer = new IndexWriter(store, new SimpleAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter(store, new SimpleAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); Fieldable f1 = new Field("field", "word", Field.Store.YES, Field.Index.ANALYZED); Fieldable f2 = new Field("field", "word", Field.Store.YES, Field.Index.ANALYZED); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestDocIdSet.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestDocIdSet.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestDocIdSet.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestDocIdSet.java Wed Feb 10 13:35:57 2010 @@ -35,7 +35,6 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; import org.apache.lucene.util._TestUtil; public class TestDocIdSet extends LuceneTestCase { @@ -106,7 +105,7 @@ // Tests that if a Filter produces a null DocIdSet, which is given to // IndexSearcher, everything works fine. This came up in LUCENE-1754. Directory dir = new RAMDirectory(); - IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), MaxFieldLength.UNLIMITED); + IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), MaxFieldLength.UNLIMITED); Document doc = new Document(); doc.add(new Field("c", "val", Store.NO, Index.NOT_ANALYZED_NO_NORMS)); writer.addDocument(doc); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestElevationComparator.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestElevationComparator.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestElevationComparator.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestElevationComparator.java Wed Feb 10 13:35:57 2010 @@ -23,8 +23,6 @@ import org.apache.lucene.index.*; import org.apache.lucene.store.*; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; - import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -36,7 +34,7 @@ //@Test public void testSorting() throws Throwable { Directory directory = new MockRAMDirectory(); - IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); writer.setMaxBufferedDocs(2); writer.setMergeFactor(1000); writer.addDocument(adoc(new String[] {"id", "a", "title", "ipod", "str_s", "a"})); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestExplanations.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestExplanations.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestExplanations.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestExplanations.java Wed Feb 10 13:35:57 2010 @@ -32,7 +32,6 @@ import org.apache.lucene.search.spans.SpanTermQuery; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; /** * Tests primitive queries (ie: that rewrite to themselves) to @@ -52,7 +51,7 @@ public static final String KEY = "KEY"; public static final String FIELD = "field"; public static final QueryParser qp = - new QueryParser(Version.LUCENE_CURRENT, FIELD, new WhitespaceAnalyzer(Version.LUCENE_CURRENT)); + new QueryParser(TEST_VERSION_CURRENT, FIELD, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)); @Override public void tearDown() throws Exception { @@ -64,7 +63,7 @@ public void setUp() throws Exception { super.setUp(); RAMDirectory directory = new RAMDirectory(); - IndexWriter writer= new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, + IndexWriter writer= new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); for (int i = 0; i < docFields.length; i++) { Document doc = new Document(); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestFieldCache.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestFieldCache.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestFieldCache.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestFieldCache.java Wed Feb 10 13:35:57 2010 @@ -23,8 +23,6 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; - import java.io.IOException; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -41,7 +39,7 @@ protected void setUp() throws Exception { super.setUp(); RAMDirectory directory = new RAMDirectory(); - IndexWriter writer= new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer= new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); long theLong = Long.MAX_VALUE; double theDouble = Double.MAX_VALUE; byte theByte = Byte.MAX_VALUE; Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java Wed Feb 10 13:35:57 2010 @@ -27,7 +27,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.RAMDirectory; -import org.apache.lucene.util.Version; /** * A basic 'positive' Unit test class for the FieldCacheRangeFilter class. @@ -532,7 +531,7 @@ // test using a sparse index (with deleted docs). The DocIdSet should be not cacheable, as it uses TermDocs if the range contains 0 public void testSparseIndex() throws IOException { RAMDirectory dir = new RAMDirectory(); - IndexWriter writer = new IndexWriter(dir, new SimpleAnalyzer(Version.LUCENE_CURRENT), T, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter(dir, new SimpleAnalyzer(TEST_VERSION_CURRENT), T, IndexWriter.MaxFieldLength.LIMITED); for (int d = -20; d <= 20; d++) { Document doc = new Document(); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestFilteredQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestFilteredQuery.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestFilteredQuery.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestFilteredQuery.java Wed Feb 10 13:35:57 2010 @@ -27,8 +27,6 @@ import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.DocIdBitSet; -import org.apache.lucene.util.Version; - import java.util.BitSet; /** @@ -50,7 +48,7 @@ public void setUp() throws Exception { super.setUp(); directory = new RAMDirectory(); - IndexWriter writer = new IndexWriter (directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter (directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); Document doc = new Document(); doc.add (new Field("field", "one two three four five", Field.Store.YES, Field.Index.ANALYZED)); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestFilteredSearch.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestFilteredSearch.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestFilteredSearch.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestFilteredSearch.java Wed Feb 10 13:35:57 2010 @@ -20,8 +20,6 @@ import java.io.IOException; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; - import org.apache.lucene.analysis.WhitespaceAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -51,13 +49,13 @@ RAMDirectory directory = new RAMDirectory(); int[] filterBits = {1, 36}; SimpleDocIdSetFilter filter = new SimpleDocIdSetFilter(filterBits); - IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); searchFiltered(writer, directory, filter, enforceSingleSegment); // run the test on more than one segment enforceSingleSegment = false; // reset - it is stateful filter.reset(); - writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); // we index 60 docs - this will create 6 segments writer.setMaxBufferedDocs(10); searchFiltered(writer, directory, filter, enforceSingleSegment); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestFuzzyQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestFuzzyQuery.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestFuzzyQuery.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestFuzzyQuery.java Wed Feb 10 13:35:57 2010 @@ -33,7 +33,6 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.queryParser.QueryParser; -import org.apache.lucene.util.Version; /** * Tests {@link FuzzyQuery}. @@ -43,7 +42,7 @@ public void testFuzziness() throws Exception { RAMDirectory directory = new RAMDirectory(); - IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); addDoc("aaaaa", writer); addDoc("aaaab", writer); addDoc("aaabb", writer); @@ -200,7 +199,7 @@ public void testFuzzinessLong() throws Exception { RAMDirectory directory = new RAMDirectory(); - IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); addDoc("aaaaaaa", writer); addDoc("segment", writer); writer.optimize(); @@ -288,7 +287,7 @@ public void testTokenLengthOpt() throws IOException { RAMDirectory directory = new RAMDirectory(); - IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), + IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); addDoc("12345678911", writer); addDoc("segment", writer); @@ -320,7 +319,7 @@ public void testGiga() throws Exception { - StandardAnalyzer analyzer = new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT); + StandardAnalyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT); Directory index = new MockRAMDirectory(); IndexWriter w = new IndexWriter(index, analyzer, true, IndexWriter.MaxFieldLength.UNLIMITED); @@ -345,7 +344,7 @@ IndexReader r = w.getReader(); w.close(); - Query q = new QueryParser(Version.LUCENE_CURRENT, "field", analyzer).parse( "giga~0.9" ); + Query q = new QueryParser(TEST_VERSION_CURRENT, "field", analyzer).parse( "giga~0.9" ); // 3. search IndexSearcher searcher = new IndexSearcher(r); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java Wed Feb 10 13:35:57 2010 @@ -29,14 +29,13 @@ import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; /** * Tests MatchAllDocsQuery. * */ public class TestMatchAllDocsQuery extends LuceneTestCase { - private Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_CURRENT); + private Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT); public void testQuery() throws Exception { @@ -100,7 +99,7 @@ assertEquals(2, hits.length); // test parsable toString() - QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, "key", analyzer); + QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "key", analyzer); hits = is.search(qp.parse(new MatchAllDocsQuery().toString()), null, 1000).scoreDocs; assertEquals(2, hits.length); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java Wed Feb 10 13:35:57 2010 @@ -28,8 +28,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; - import java.io.IOException; import java.util.LinkedList; import java.util.Collections; @@ -47,7 +45,7 @@ public void testPhrasePrefix() throws IOException { RAMDirectory indexStore = new RAMDirectory(); - IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); add("blueberry pie", writer); add("blueberry strudel", writer); add("blueberry pizza", writer); @@ -141,7 +139,7 @@ // The contained PhraseMultiQuery must contain exactly one term array. RAMDirectory indexStore = new RAMDirectory(); - IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); add("blueberry pie", writer); add("blueberry chewing gum", writer); add("blue raspberry pie", writer); @@ -169,7 +167,7 @@ public void testPhrasePrefixWithBooleanQuery() throws IOException { RAMDirectory indexStore = new RAMDirectory(); - IndexWriter writer = new IndexWriter(indexStore, new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT, Collections.emptySet()), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter(indexStore, new StandardAnalyzer(TEST_VERSION_CURRENT, Collections.emptySet()), true, IndexWriter.MaxFieldLength.LIMITED); add("This is a test", "object", writer); add("a note", "note", writer); writer.close(); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiSearcher.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiSearcher.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiSearcher.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiSearcher.java Wed Feb 10 13:35:57 2010 @@ -30,8 +30,6 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.store.MockRAMDirectory; -import org.apache.lucene.util.Version; - import java.io.IOException; import java.util.Collections; import java.util.HashSet; @@ -84,9 +82,9 @@ lDoc3.add(new Field("handle", "1", Field.Store.YES, Field.Index.NOT_ANALYZED)); // creating an index writer for the first index - IndexWriter writerA = new IndexWriter(indexStoreA, new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writerA = new IndexWriter(indexStoreA, new StandardAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); // creating an index writer for the second index, but writing nothing - IndexWriter writerB = new IndexWriter(indexStoreB, new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writerB = new IndexWriter(indexStoreB, new StandardAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); //-------------------------------------------------------------------- // scenario 1 @@ -103,7 +101,7 @@ writerB.close(); // creating the query - QueryParser parser = new QueryParser(Version.LUCENE_CURRENT, "fulltext", new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT)); + QueryParser parser = new QueryParser(TEST_VERSION_CURRENT, "fulltext", new StandardAnalyzer(TEST_VERSION_CURRENT)); Query query = parser.parse("handle:1"); // building the searchables @@ -130,7 +128,7 @@ //-------------------------------------------------------------------- // adding one document to the empty index - writerB = new IndexWriter(indexStoreB, new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED); + writerB = new IndexWriter(indexStoreB, new StandardAnalyzer(TEST_VERSION_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED); writerB.addDocument(lDoc); writerB.optimize(); writerB.close(); @@ -176,7 +174,7 @@ readerB.close(); // optimizing the index with the writer - writerB = new IndexWriter(indexStoreB, new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED); + writerB = new IndexWriter(indexStoreB, new StandardAnalyzer(TEST_VERSION_CURRENT), false, IndexWriter.MaxFieldLength.LIMITED); writerB.optimize(); writerB.close(); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java Wed Feb 10 13:35:57 2010 @@ -26,8 +26,6 @@ import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.apache.lucene.util.Version; - import java.io.IOException; /** @@ -88,7 +86,7 @@ private void checkQuery(String queryStr) throws IOException, ParseException { // check result hit ranking if(verbose) System.out.println("Query: " + queryStr); - QueryParser queryParser = new QueryParser(Version.LUCENE_CURRENT, FIELD_NAME, new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT)); + QueryParser queryParser = new QueryParser(TEST_VERSION_CURRENT, FIELD_NAME, new StandardAnalyzer(TEST_VERSION_CURRENT)); Query query = queryParser.parse(queryStr); ScoreDoc[] multiSearcherHits = multiSearcher.search(query, null, 1000).scoreDocs; ScoreDoc[] singleSearcherHits = singleSearcher.search(query, null, 1000).scoreDocs; @@ -115,12 +113,12 @@ super.setUp(); // create MultiSearcher from two seperate searchers Directory d1 = new RAMDirectory(); - IndexWriter iw1 = new IndexWriter(d1, new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT), true, + IndexWriter iw1 = new IndexWriter(d1, new StandardAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); addCollection1(iw1); iw1.close(); Directory d2 = new RAMDirectory(); - IndexWriter iw2 = new IndexWriter(d2, new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT), true, + IndexWriter iw2 = new IndexWriter(d2, new StandardAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); addCollection2(iw2); iw2.close(); @@ -132,7 +130,7 @@ // create IndexSearcher which contains all documents Directory d = new RAMDirectory(); - IndexWriter iw = new IndexWriter(d, new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT), true, + IndexWriter iw = new IndexWriter(d, new StandardAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); addCollection1(iw); addCollection2(iw); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java Wed Feb 10 13:35:57 2010 @@ -26,8 +26,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.apache.lucene.util.Version; - import java.io.IOException; import java.text.Collator; import java.util.Locale; @@ -66,7 +64,7 @@ "X 4 5 6" }; small = new RAMDirectory(); - IndexWriter writer = new IndexWriter(small, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, + IndexWriter writer = new IndexWriter(small, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); for (int i = 0; i < data.length; i++) { @@ -617,7 +615,7 @@ /* build an index */ RAMDirectory farsiIndex = new RAMDirectory(); - IndexWriter writer = new IndexWriter(farsiIndex, new SimpleAnalyzer(Version.LUCENE_CURRENT), T, + IndexWriter writer = new IndexWriter(farsiIndex, new SimpleAnalyzer(TEST_VERSION_CURRENT), T, IndexWriter.MaxFieldLength.LIMITED); Document doc = new Document(); doc.add(new Field("content", "\u0633\u0627\u0628", Field.Store.YES, @@ -657,7 +655,7 @@ /* build an index */ RAMDirectory danishIndex = new RAMDirectory(); - IndexWriter writer = new IndexWriter(danishIndex, new SimpleAnalyzer(Version.LUCENE_CURRENT), T, + IndexWriter writer = new IndexWriter(danishIndex, new SimpleAnalyzer(TEST_VERSION_CURRENT), T, IndexWriter.MaxFieldLength.LIMITED); // Danish collation orders the words below in the given order Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java Wed Feb 10 13:35:57 2010 @@ -18,7 +18,6 @@ */ import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; import org.apache.lucene.analysis.SimpleAnalyzer; import org.apache.lucene.document.*; import org.apache.lucene.index.IndexReader; @@ -42,7 +41,7 @@ public void setUp() throws Exception { super.setUp(); IndexWriter writer - = new IndexWriter(directory, new SimpleAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + = new IndexWriter(directory, new SimpleAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); //writer.setUseCompoundFile(false); //writer.infoStream = System.out; for (int i = 0; i < numDocs; i++) { Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java Wed Feb 10 13:35:57 2010 @@ -30,7 +30,6 @@ import org.apache.lucene.index.IndexWriter.MaxFieldLength; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; public class TestMultiValuedNumericRangeQuery extends LuceneTestCase { @@ -44,7 +43,7 @@ final Random rnd = newRandom(); RAMDirectory directory = new RAMDirectory(); - IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, MaxFieldLength.UNLIMITED); + IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, MaxFieldLength.UNLIMITED); DecimalFormat format = new DecimalFormat("00000000000", new DecimalFormatSymbols(Locale.US)); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestNot.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestNot.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestNot.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestNot.java Wed Feb 10 13:35:57 2010 @@ -25,7 +25,6 @@ import org.apache.lucene.analysis.SimpleAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.util.Version; /** Similarity unit test. * @@ -39,7 +38,7 @@ public void testNot() throws Exception { RAMDirectory store = new RAMDirectory(); - IndexWriter writer = new IndexWriter(store, new SimpleAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter(store, new SimpleAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); Document d1 = new Document(); d1.add(new Field("field", "a b", Field.Store.YES, Field.Index.ANALYZED)); @@ -49,7 +48,7 @@ writer.close(); Searcher searcher = new IndexSearcher(store, true); - QueryParser parser = new QueryParser(Version.LUCENE_CURRENT, "field", new SimpleAnalyzer(Version.LUCENE_CURRENT)); + QueryParser parser = new QueryParser(TEST_VERSION_CURRENT, "field", new SimpleAnalyzer(TEST_VERSION_CURRENT)); Query query = parser.parse("a NOT b"); //System.out.println(query); ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java Wed Feb 10 13:35:57 2010 @@ -29,7 +29,6 @@ import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.Version; public class TestNumericRangeQuery32 extends LuceneTestCase { // distance of entries @@ -47,7 +46,7 @@ BooleanQuery.setMaxClauseCount(3*255*2 + 255); directory = new RAMDirectory(); - IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), + IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, MaxFieldLength.UNLIMITED); NumericField Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java Wed Feb 10 13:35:57 2010 @@ -28,7 +28,6 @@ import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.Version; public class TestNumericRangeQuery64 extends LuceneTestCase { // distance of entries @@ -46,7 +45,7 @@ BooleanQuery.setMaxClauseCount(7*255*2 + 255); directory = new RAMDirectory(); - IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), + IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, MaxFieldLength.UNLIMITED); NumericField Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java Wed Feb 10 13:35:57 2010 @@ -18,7 +18,6 @@ */ import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; import org.apache.lucene.analysis.SimpleAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -49,7 +48,7 @@ throws IOException { RAMDirectory indexStore = new RAMDirectory(); - IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); Document doc1 = new Document(); Document doc2 = new Document(); Document doc3 = new Document(); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestPhraseQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestPhraseQuery.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestPhraseQuery.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestPhraseQuery.java Wed Feb 10 13:35:57 2010 @@ -51,7 +51,7 @@ Analyzer analyzer = new Analyzer() { @Override public TokenStream tokenStream(String fieldName, Reader reader) { - return new WhitespaceTokenizer(Version.LUCENE_CURRENT, reader); + return new WhitespaceTokenizer(TEST_VERSION_CURRENT, reader); } @Override @@ -239,7 +239,7 @@ public void testPhraseQueryInConjunctionScorer() throws Exception { RAMDirectory directory = new RAMDirectory(); - IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, + IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); Document doc = new Document(); @@ -275,7 +275,7 @@ searcher.close(); - writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, + writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); doc = new Document(); doc.add(new Field("contents", "map entry woo", Field.Store.YES, Field.Index.ANALYZED)); @@ -325,7 +325,7 @@ public void testSlopScoring() throws IOException { Directory directory = new RAMDirectory(); - IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, + IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); Document doc = new Document(); @@ -362,8 +362,8 @@ } public void testToString() throws Exception { - StopAnalyzer analyzer = new StopAnalyzer(Version.LUCENE_CURRENT); - QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, "field", analyzer); + StopAnalyzer analyzer = new StopAnalyzer(TEST_VERSION_CURRENT); + QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "field", analyzer); qp.setEnablePositionIncrements(true); PhraseQuery q = (PhraseQuery)qp.parse("\"this hi this is a test is\""); assertEquals("field:\"? hi ? ? ? test\"", q.toString()); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestPositionIncrement.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestPositionIncrement.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestPositionIncrement.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestPositionIncrement.java Wed Feb 10 13:35:57 2010 @@ -191,7 +191,7 @@ assertEquals(0, hits.length); // should not find "1 2" because there is a gap of 1 in the index - QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, "field", + QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "field", new StopWhitespaceAnalyzer(false)); q = (PhraseQuery) qp.parse("\"1 2\""); hits = searcher.search(q, null, 1000).scoreDocs; @@ -215,7 +215,7 @@ assertEquals(0, hits.length); // when both qp qnd stopFilter propagate increments, we should find the doc. - qp = new QueryParser(Version.LUCENE_CURRENT, "field", + qp = new QueryParser(TEST_VERSION_CURRENT, "field", new StopWhitespaceAnalyzer(true)); qp.setEnablePositionIncrements(true); q = (PhraseQuery) qp.parse("\"1 stop 2\""); @@ -225,15 +225,15 @@ private static class StopWhitespaceAnalyzer extends Analyzer { boolean enablePositionIncrements; - final WhitespaceAnalyzer a = new WhitespaceAnalyzer(Version.LUCENE_CURRENT); + final WhitespaceAnalyzer a = new WhitespaceAnalyzer(TEST_VERSION_CURRENT); public StopWhitespaceAnalyzer(boolean enablePositionIncrements) { this.enablePositionIncrements = enablePositionIncrements; } @Override public TokenStream tokenStream(String fieldName, Reader reader) { TokenStream ts = a.tokenStream(fieldName,reader); - return new StopFilter(enablePositionIncrements?Version.LUCENE_CURRENT:Version.LUCENE_24, ts, - new CharArraySet(Version.LUCENE_CURRENT, Collections.singleton("stop"), true)); + return new StopFilter(enablePositionIncrements?TEST_VERSION_CURRENT:Version.LUCENE_24, ts, + new CharArraySet(TEST_VERSION_CURRENT, Collections.singleton("stop"), true)); } } @@ -318,7 +318,7 @@ @Override public TokenStream tokenStream(String fieldName, Reader reader) { - TokenStream result = new LowerCaseTokenizer(Version.LUCENE_CURRENT, reader); + TokenStream result = new LowerCaseTokenizer(LuceneTestCase.TEST_VERSION_CURRENT, reader); return new PayloadFilter(result, fieldName); } } Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixFilter.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixFilter.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixFilter.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixFilter.java Wed Feb 10 13:35:57 2010 @@ -18,7 +18,6 @@ */ import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; @@ -38,7 +37,7 @@ "/Computers/Mac/One", "/Computers/Mac/Two", "/Computers/Windows"}; - IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); for (int i = 0; i < categories.length; i++) { Document doc = new Document(); doc.add(new Field("category", categories[i], Field.Store.YES, Field.Index.NOT_ANALYZED)); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java Wed Feb 10 13:35:57 2010 @@ -18,8 +18,6 @@ */ import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; - import org.apache.lucene.analysis.WhitespaceAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -47,7 +45,7 @@ super.setUp(); IndexWriter writer = new IndexWriter(directory, - new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, + new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); for (int i = 0; i < 5137; ++i) { Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixQuery.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixQuery.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixQuery.java Wed Feb 10 13:35:57 2010 @@ -18,7 +18,6 @@ */ import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; @@ -37,7 +36,7 @@ String[] categories = new String[] {"/Computers", "/Computers/Mac", "/Computers/Windows"}; - IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); for (int i = 0; i < categories.length; i++) { Document doc = new Document(); doc.add(new Field("category", categories[i], Field.Store.YES, Field.Index.NOT_ANALYZED)); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestQueryTermVector.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestQueryTermVector.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestQueryTermVector.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestQueryTermVector.java Wed Feb 10 13:35:57 2010 @@ -18,7 +18,6 @@ */ import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; import org.apache.lucene.analysis.WhitespaceAnalyzer; public class TestQueryTermVector extends LuceneTestCase { @@ -43,7 +42,7 @@ result = new QueryTermVector(null); assertTrue(result.getTerms().length == 0); - result = new QueryTermVector("foo bar foo again foo bar go go go", new WhitespaceAnalyzer(Version.LUCENE_CURRENT)); + result = new QueryTermVector("foo bar foo again foo bar go go go", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)); assertTrue(result != null); terms = result.getTerms(); assertTrue(terms.length == 4); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java Wed Feb 10 13:35:57 2010 @@ -33,7 +33,7 @@ public void testBasic() throws Exception { Directory dir = new RAMDirectory(); - IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT), true, + IndexWriter writer = new IndexWriter(dir, new StandardAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); Document doc = new Document(); doc.add(new Field("field", "value", Store.NO, Index.ANALYZED)); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestScorerPerf.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestScorerPerf.java?rev=908496&r1=908495&r2=908496&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestScorerPerf.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestScorerPerf.java Wed Feb 10 13:35:57 2010 @@ -2,8 +2,6 @@ import org.apache.lucene.util.DocIdBitSet; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Version; - import java.util.Random; import java.util.BitSet; import java.io.IOException; @@ -46,7 +44,7 @@ // Create a dummy index with nothing in it. // This could possibly fail if Lucene starts checking for docid ranges... RAMDirectory rd = new RAMDirectory(); - IndexWriter iw = new IndexWriter(rd,new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter iw = new IndexWriter(rd,new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); iw.addDocument(new Document()); iw.close(); s = new IndexSearcher(rd, true); @@ -61,7 +59,7 @@ terms[i] = new Term("f",Character.toString((char)('A'+i))); } - IndexWriter iw = new IndexWriter(dir,new WhitespaceAnalyzer(Version.LUCENE_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); + IndexWriter iw = new IndexWriter(dir,new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.LIMITED); for (int i=0; i