Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java =================================================================== --- contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java (revision 806538) +++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java (working copy) @@ -156,8 +156,8 @@ */ public TokenStream init(TokenStream tokenStream) throws IOException { position = -1; - termAtt = (TermAttribute) tokenStream.getAttribute(TermAttribute.class); - posIncAtt = (PositionIncrementAttribute) tokenStream.getAttribute(PositionIncrementAttribute.class); + termAtt = (TermAttribute) tokenStream.addAttribute(TermAttribute.class); + posIncAtt = (PositionIncrementAttribute) tokenStream.addAttribute(PositionIncrementAttribute.class); if(!skipInitExtractor) { if(fieldWeightedSpanTerms != null) { fieldWeightedSpanTerms.clear(); Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermScorer.java =================================================================== --- contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermScorer.java (revision 806538) +++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermScorer.java (working copy) @@ -95,7 +95,7 @@ * @see org.apache.lucene.search.highlight.Scorer#init(org.apache.lucene.analysis.TokenStream) */ public TokenStream init(TokenStream tokenStream) { - termAtt = (TermAttribute) tokenStream.getAttribute(TermAttribute.class); + termAtt = (TermAttribute) tokenStream.addAttribute(TermAttribute.class); return null; } Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleFragmenter.java =================================================================== --- contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleFragmenter.java (revision 806538) +++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleFragmenter.java (working copy) @@ -47,7 +47,7 @@ * @see org.apache.lucene.search.highlight.Fragmenter#start(java.lang.String, org.apache.lucene.analysis.TokenStream) */ public void start(String originalText, TokenStream stream) { - offsetAtt = (OffsetAttribute) stream.getAttribute(OffsetAttribute.class); + offsetAtt = (OffsetAttribute) stream.addAttribute(OffsetAttribute.class); currentNumFrags = 1; } Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java =================================================================== --- contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java (revision 806538) +++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java (working copy) @@ -101,8 +101,8 @@ position = -1; currentNumFrags = 1; textSize = originalText.length(); - termAtt = (TermAttribute) tokenStream.getAttribute(TermAttribute.class); - posIncAtt = (PositionIncrementAttribute) tokenStream.getAttribute(PositionIncrementAttribute.class); - offsetAtt = (OffsetAttribute) tokenStream.getAttribute(OffsetAttribute.class); + termAtt = (TermAttribute) tokenStream.addAttribute(TermAttribute.class); + posIncAtt = (PositionIncrementAttribute) tokenStream.addAttribute(PositionIncrementAttribute.class); + offsetAtt = (OffsetAttribute) tokenStream.addAttribute(OffsetAttribute.class); } } Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenGroup.java =================================================================== --- contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenGroup.java (revision 806538) +++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenGroup.java (working copy) @@ -41,8 +41,8 @@ private TermAttribute termAtt; public TokenGroup(TokenStream tokenStream) { - offsetAtt = (OffsetAttribute) tokenStream.getAttribute(OffsetAttribute.class); - termAtt = (TermAttribute) tokenStream.getAttribute(TermAttribute.class); + offsetAtt = (OffsetAttribute) tokenStream.addAttribute(OffsetAttribute.class); + termAtt = (TermAttribute) tokenStream.addAttribute(TermAttribute.class); } void addToken(float score) { Index: contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java =================================================================== --- contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (revision 806538) +++ contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (working copy) @@ -33,8 +33,6 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import junit.framework.TestCase; - import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.LowerCaseTokenizer; import org.apache.lucene.analysis.SimpleAnalyzer; @@ -78,6 +76,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.Version; +import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -85,7 +84,7 @@ * JUnit Test for Highlighter class. * */ -public class HighlighterTest extends TestCase implements Formatter { +public class HighlighterTest extends BaseTokenStreamTestCase implements Formatter { private IndexReader reader; static final String FIELD_NAME = "contents"; private Query query; @@ -1600,10 +1599,8 @@ } } - /* - * @see TestCase#setUp() - */ protected void setUp() throws Exception { + super.setUp(); ramDir = new RAMDirectory(); IndexWriter writer = new IndexWriter(ramDir, new StandardAnalyzer(), true); for (int i = 0; i < texts.length; i++) { @@ -1624,9 +1621,6 @@ } - /* - * @see TestCase#tearDown() - */ protected void tearDown() throws Exception { super.tearDown(); } @@ -1692,9 +1686,9 @@ public SynonymTokenizer(TokenStream realStream, Map synonyms) { this.realStream = realStream; this.synonyms = synonyms; - realTermAtt = (TermAttribute) realStream.getAttribute(TermAttribute.class); - realPosIncrAtt = (PositionIncrementAttribute) realStream.getAttribute(PositionIncrementAttribute.class); - realOffsetAtt = (OffsetAttribute) realStream.getAttribute(OffsetAttribute.class); + realTermAtt = (TermAttribute) realStream.addAttribute(TermAttribute.class); + realPosIncrAtt = (PositionIncrementAttribute) realStream.addAttribute(PositionIncrementAttribute.class); + realOffsetAtt = (OffsetAttribute) realStream.addAttribute(OffsetAttribute.class); termAtt = (TermAttribute) addAttribute(TermAttribute.class); posIncrAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class); Index: contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java =================================================================== --- contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (revision 806538) +++ contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (working copy) @@ -33,8 +33,7 @@ import java.util.List; import java.util.Set; -import junit.framework.TestCase; - +import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.SimpleAnalyzer; import org.apache.lucene.analysis.StopAnalyzer; @@ -198,7 +197,7 @@ */ -public class MemoryIndexTest extends TestCase { +public class MemoryIndexTest extends BaseTokenStreamTestCase { private Analyzer analyzer; private boolean fastMode = false; @@ -214,7 +213,8 @@ /* all files will be open relative to this */ public String fileDir; - public void setUp() { + protected void setUp() throws Exception { + super.setUp(); fileDir = System.getProperty("lucene.common.dir", null); } Index: contrib/memory/src/test/org/apache/lucene/index/memory/PatternAnalyzerTest.java =================================================================== --- contrib/memory/src/test/org/apache/lucene/index/memory/PatternAnalyzerTest.java (revision 806538) +++ contrib/memory/src/test/org/apache/lucene/index/memory/PatternAnalyzerTest.java (working copy) @@ -31,8 +31,7 @@ import java.util.Set; import java.util.regex.Pattern; -import junit.framework.TestCase; - +import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.analysis.LetterTokenizer; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopAnalyzer; @@ -58,8 +57,9 @@ Thus the PatternAnalyzer produces correct output, whereas the WhitespaceAnalyzer silently truncates text, and so the comparison results in assertEquals() don't match up. +TODO: Convert to new TokenStream API! */ -public class PatternAnalyzerTest extends TestCase { +public class PatternAnalyzerTest extends LuceneTestCase { /** Runs the tests and/or benchmark */ public static void main(String[] args) throws Throwable { Index: contrib/memory/src/test/org/apache/lucene/index/memory/TestSynonymTokenFilter.java =================================================================== --- contrib/memory/src/test/org/apache/lucene/index/memory/TestSynonymTokenFilter.java (revision 806538) +++ contrib/memory/src/test/org/apache/lucene/index/memory/TestSynonymTokenFilter.java (working copy) @@ -31,10 +31,9 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TermAttribute; +import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import junit.framework.TestCase; - -public class TestSynonymTokenFilter extends TestCase { +public class TestSynonymTokenFilter extends BaseTokenStreamTestCase { File dataDir = new File(System.getProperty("dataDir", "./bin")); File testFile = new File(dataDir, "org/apache/lucene/index/memory/testSynonyms.txt"); Index: src/java/org/apache/lucene/index/TermsHashPerField.java =================================================================== --- src/java/org/apache/lucene/index/TermsHashPerField.java (revision 806538) +++ src/java/org/apache/lucene/index/TermsHashPerField.java (working copy) @@ -249,7 +249,7 @@ private boolean doNextCall; void start(Fieldable f) { - termAtt = (TermAttribute) fieldState.attributeSource.getAttribute(TermAttribute.class); + termAtt = (TermAttribute) fieldState.attributeSource.addAttribute(TermAttribute.class); consumer.start(f); if (nextPerField != null) { nextPerField.start(f); Index: src/java/org/apache/lucene/search/QueryTermVector.java =================================================================== --- src/java/org/apache/lucene/search/QueryTermVector.java (revision 806538) +++ src/java/org/apache/lucene/search/QueryTermVector.java (working copy) @@ -61,7 +61,7 @@ boolean hasMoreTokens = false; stream.reset(); - TermAttribute termAtt = (TermAttribute) stream.getAttribute(TermAttribute.class); + TermAttribute termAtt = (TermAttribute) stream.addAttribute(TermAttribute.class); hasMoreTokens = stream.incrementToken(); while (hasMoreTokens) { Index: src/java/org/apache/lucene/util/AttributeSource.java =================================================================== --- src/java/org/apache/lucene/util/AttributeSource.java (revision 806538) +++ src/java/org/apache/lucene/util/AttributeSource.java (working copy) @@ -249,7 +249,11 @@ *

Signature for Java 1.5: public <T extends Attribute> T getAttribute(Class<T>) * * @throws IllegalArgumentException if this AttributeSource does not contain the - * Attribute + * Attribute. It is recommended to always use {@link #addAttribute} even in consumers + * of TokenStreams, because you cannot know if a specific TokenStream really uses + * a specific Attribute. {@link #addAttribute} will automatically make the attribute + * available. If you want to only use the attribute, if it is available (to optimize + * consuming), use {@link #hasAttribute}. */ public Attribute getAttribute(Class attClass) { final Attribute att = (Attribute) this.attributes.get(attClass); Index: src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java =================================================================== --- src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (revision 0) +++ src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (revision 0) @@ -0,0 +1,67 @@ +package org.apache.lucene.analysis; + +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import org.apache.lucene.util.LuceneTestCase; + +/** + * Base class for all Lucene unit tests that use TokenStreams. + *

+ * This class runs all tests twice, one time with {@link TokenStream#setOnlyUseNewAPI} false + * and after that one time with true. + */ +public abstract class BaseTokenStreamTestCase extends LuceneTestCase { + + private boolean onlyUseNewAPI = false; + + public BaseTokenStreamTestCase() { + super(); + } + + public BaseTokenStreamTestCase(String name) { + super(name); + } + + // @Override + protected void setUp() throws Exception { + super.setUp(); + TokenStream.setOnlyUseNewAPI(onlyUseNewAPI); + } + + // @Override + public void runBare() throws Throwable { + // Do the test with onlyUseNewAPI=false (default) + try { + onlyUseNewAPI = false; + super.runBare(); + } catch (Throwable e) { + System.out.println("Test failure of "+getName()+" occurred with onlyUseNewAPI=false"); + throw e; + } + + // Do the test again with onlyUseNewAPI=true + try { + onlyUseNewAPI = true; + super.runBare(); + } catch (Throwable e) { + System.out.println("Test failure of "+getName()+" occurred with onlyUseNewAPI=true"); + throw e; + } + } + +} Property changes on: src\test\org\apache\lucene\analysis\BaseTokenStreamTestCase.java ___________________________________________________________________ Added: svn:keywords + Date Author Id Revision HeadURL Added: svn:eol-style + native Index: src/test/org/apache/lucene/analysis/BaseTokenTestCase.java =================================================================== --- src/test/org/apache/lucene/analysis/BaseTokenTestCase.java (revision 806538) +++ src/test/org/apache/lucene/analysis/BaseTokenTestCase.java (working copy) @@ -25,6 +25,7 @@ import org.apache.lucene.util.LuceneTestCase; +/* TODO: Convert to new TokenStream API. Token instances must be removed for that to work */ public abstract class BaseTokenTestCase extends LuceneTestCase { public static String tsToString(TokenStream in) throws IOException { StringBuffer out = new StringBuffer(); @@ -48,6 +49,12 @@ } */ + protected void setUp() throws Exception { + super.setUp(); + // force this to false, as we use Token and next() + TokenStream.setOnlyUseNewAPI(false); + } + public void assertTokEqual(List/**/ a, List/**/ b) { assertTokEq(a,b,false); assertTokEq(b,a,false); Index: src/test/org/apache/lucene/analysis/TestAnalyzers.java =================================================================== --- src/test/org/apache/lucene/analysis/TestAnalyzers.java (revision 806538) +++ src/test/org/apache/lucene/analysis/TestAnalyzers.java (working copy) @@ -26,9 +26,8 @@ import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; import org.apache.lucene.analysis.tokenattributes.TermAttribute; import org.apache.lucene.index.Payload; -import org.apache.lucene.util.LuceneTestCase; -public class TestAnalyzers extends LuceneTestCase { +public class TestAnalyzers extends BaseTokenStreamTestCase { public TestAnalyzers(String name) { super(name); Index: src/test/org/apache/lucene/analysis/TestASCIIFoldingFilter.java =================================================================== --- src/test/org/apache/lucene/analysis/TestASCIIFoldingFilter.java (revision 806538) +++ src/test/org/apache/lucene/analysis/TestASCIIFoldingFilter.java (working copy) @@ -18,14 +18,13 @@ */ import org.apache.lucene.analysis.tokenattributes.TermAttribute; -import org.apache.lucene.util.LuceneTestCase; import java.io.StringReader; import java.util.List; import java.util.ArrayList; import java.util.Iterator; -public class TestASCIIFoldingFilter extends LuceneTestCase { +public class TestASCIIFoldingFilter extends BaseTokenStreamTestCase { // testLain1Accents() is a copy of TestLatin1AccentFilter.testU(). public void testLatin1Accents() throws Exception { Index: src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java =================================================================== --- src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java (revision 806538) +++ src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java (working copy) @@ -20,8 +20,6 @@ import java.io.IOException; -import org.apache.lucene.util.LuceneTestCase; - import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.TermAttribute; import org.apache.lucene.document.Document; @@ -34,7 +32,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -public class TestCachingTokenFilter extends LuceneTestCase { +public class TestCachingTokenFilter extends BaseTokenStreamTestCase { private String[] tokens = new String[] {"term1", "term2", "term3", "term2"}; public void testCaching() throws IOException { Index: src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java =================================================================== --- src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (revision 806538) +++ src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (working copy) @@ -18,11 +18,10 @@ */ import org.apache.lucene.analysis.tokenattributes.TermAttribute; -import org.apache.lucene.util.LuceneTestCase; import java.io.StringReader; -public class TestISOLatin1AccentFilter extends LuceneTestCase { +public class TestISOLatin1AccentFilter extends BaseTokenStreamTestCase { public void testU() throws Exception { TokenStream stream = new WhitespaceTokenizer(new StringReader("Des mot clés À LA CHAÎNE À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï IJ Ð Ñ Ò Ó Ô Õ Ö Ø Œ Þ Ù Ú Û Ü Ý Ÿ à á â ã ä å æ ç è é ê ë ì í î ï ij ð ñ ò ó ô õ ö ø œ ß þ ù ú û ü ý ÿ fi fl")); ISOLatin1AccentFilter filter = new ISOLatin1AccentFilter(stream); Index: src/test/org/apache/lucene/analysis/TestKeywordAnalyzer.java =================================================================== --- src/test/org/apache/lucene/analysis/TestKeywordAnalyzer.java (revision 806538) +++ src/test/org/apache/lucene/analysis/TestKeywordAnalyzer.java (working copy) @@ -31,9 +31,8 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.RAMDirectory; -import org.apache.lucene.util.LuceneTestCase; -public class TestKeywordAnalyzer extends LuceneTestCase { +public class TestKeywordAnalyzer extends BaseTokenStreamTestCase { private RAMDirectory directory; private IndexSearcher searcher; Index: src/test/org/apache/lucene/analysis/TestLengthFilter.java =================================================================== --- src/test/org/apache/lucene/analysis/TestLengthFilter.java (revision 806538) +++ src/test/org/apache/lucene/analysis/TestLengthFilter.java (working copy) @@ -18,11 +18,10 @@ */ import org.apache.lucene.analysis.tokenattributes.TermAttribute; -import org.apache.lucene.util.LuceneTestCase; import java.io.StringReader; -public class TestLengthFilter extends LuceneTestCase { +public class TestLengthFilter extends BaseTokenStreamTestCase { public void testFilter() throws Exception { TokenStream stream = new WhitespaceTokenizer( Index: src/test/org/apache/lucene/analysis/TestNumericTokenStream.java =================================================================== --- src/test/org/apache/lucene/analysis/TestNumericTokenStream.java (revision 806538) +++ src/test/org/apache/lucene/analysis/TestNumericTokenStream.java (working copy) @@ -17,12 +17,11 @@ * limitations under the License. */ -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; import org.apache.lucene.analysis.tokenattributes.TermAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; -public class TestNumericTokenStream extends LuceneTestCase { +public class TestNumericTokenStream extends BaseTokenStreamTestCase { static final long lvalue = 4573245871874382L; static final int ivalue = 123456; Index: src/test/org/apache/lucene/analysis/TestPerFieldAnalzyerWrapper.java =================================================================== --- src/test/org/apache/lucene/analysis/TestPerFieldAnalzyerWrapper.java (revision 806538) +++ src/test/org/apache/lucene/analysis/TestPerFieldAnalzyerWrapper.java (working copy) @@ -3,7 +3,6 @@ import java.io.StringReader; import org.apache.lucene.analysis.tokenattributes.TermAttribute; -import org.apache.lucene.util.LuceneTestCase; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -22,7 +21,7 @@ * limitations under the License. */ -public class TestPerFieldAnalzyerWrapper extends LuceneTestCase { +public class TestPerFieldAnalzyerWrapper extends BaseTokenStreamTestCase { public void testPerField() throws Exception { String text = "Qwerty"; PerFieldAnalyzerWrapper analyzer = Index: src/test/org/apache/lucene/analysis/TestStandardAnalyzer.java =================================================================== --- src/test/org/apache/lucene/analysis/TestStandardAnalyzer.java (revision 806538) +++ src/test/org/apache/lucene/analysis/TestStandardAnalyzer.java (working copy) @@ -5,7 +5,6 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TermAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; -import org.apache.lucene.util.LuceneTestCase; import java.io.StringReader; @@ -25,7 +24,7 @@ * limitations under the License. */ -public class TestStandardAnalyzer extends LuceneTestCase { +public class TestStandardAnalyzer extends BaseTokenStreamTestCase { private Analyzer a = new StandardAnalyzer(); Index: src/test/org/apache/lucene/analysis/TestStopAnalyzer.java =================================================================== --- src/test/org/apache/lucene/analysis/TestStopAnalyzer.java (revision 806538) +++ src/test/org/apache/lucene/analysis/TestStopAnalyzer.java (working copy) @@ -19,7 +19,6 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TermAttribute; -import org.apache.lucene.util.LuceneTestCase; import java.io.StringReader; import java.io.IOException; @@ -27,7 +26,7 @@ import java.util.Set; import java.util.HashSet; -public class TestStopAnalyzer extends LuceneTestCase { +public class TestStopAnalyzer extends BaseTokenStreamTestCase { private StopAnalyzer stop = new StopAnalyzer(false); private Set inValidTokens = new HashSet(); Index: src/test/org/apache/lucene/analysis/TestStopFilter.java =================================================================== --- src/test/org/apache/lucene/analysis/TestStopFilter.java (revision 806538) +++ src/test/org/apache/lucene/analysis/TestStopFilter.java (working copy) @@ -19,7 +19,6 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TermAttribute; import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; import java.io.IOException; import java.io.StringReader; @@ -27,7 +26,7 @@ import java.util.Set; -public class TestStopFilter extends LuceneTestCase { +public class TestStopFilter extends BaseTokenStreamTestCase { private final static boolean VERBOSE = false; Index: src/test/org/apache/lucene/analysis/TestTeeSinkTokenFilter.java =================================================================== --- src/test/org/apache/lucene/analysis/TestTeeSinkTokenFilter.java (revision 806538) +++ src/test/org/apache/lucene/analysis/TestTeeSinkTokenFilter.java (working copy) @@ -22,7 +22,6 @@ import org.apache.lucene.analysis.tokenattributes.TermAttribute; import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; import java.io.IOException; import java.io.StringReader; @@ -32,7 +31,7 @@ /** * tests for the TestTeeSinkTokenFilter */ -public class TestTeeSinkTokenFilter extends LuceneTestCase { +public class TestTeeSinkTokenFilter extends BaseTokenStreamTestCase { protected StringBuffer buffer1; protected StringBuffer buffer2; protected String[] tokens1; Index: src/test/org/apache/lucene/index/TestDocumentWriter.java =================================================================== --- src/test/org/apache/lucene/index/TestDocumentWriter.java (revision 806538) +++ src/test/org/apache/lucene/index/TestDocumentWriter.java (working copy) @@ -38,10 +38,10 @@ import org.apache.lucene.document.Field.TermVector; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.AttributeSource; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util._TestUtil; -public class TestDocumentWriter extends LuceneTestCase { +public class TestDocumentWriter extends BaseTokenStreamTestCase { private RAMDirectory dir; public TestDocumentWriter(String s) { Index: src/test/org/apache/lucene/queryParser/TestMultiAnalyzer.java =================================================================== --- src/test/org/apache/lucene/queryParser/TestMultiAnalyzer.java (revision 806538) +++ src/test/org/apache/lucene/queryParser/TestMultiAnalyzer.java (working copy) @@ -30,7 +30,7 @@ import org.apache.lucene.analysis.tokenattributes.TermAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; import org.apache.lucene.search.Query; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.analysis.BaseTokenStreamTestCase; /** * Test QueryParser's ability to deal with Analyzers that return more @@ -38,7 +38,7 @@ * increment > 1. * */ -public class TestMultiAnalyzer extends LuceneTestCase { +public class TestMultiAnalyzer extends BaseTokenStreamTestCase { private static int multiToken = 0; Index: src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java =================================================================== --- src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java (revision 806538) +++ src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java (working copy) @@ -35,12 +35,12 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.analysis.BaseTokenStreamTestCase; /** * Tests QueryParser. */ -public class TestMultiFieldQueryParser extends LuceneTestCase { +public class TestMultiFieldQueryParser extends BaseTokenStreamTestCase { /** test stop words arsing for both the non static form, and for the * corresponding static form (qtxt, fields[]). */ Index: src/test/org/apache/lucene/queryParser/TestQueryParser.java =================================================================== --- src/test/org/apache/lucene/queryParser/TestQueryParser.java (revision 806538) +++ src/test/org/apache/lucene/queryParser/TestQueryParser.java (working copy) @@ -58,12 +58,12 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.RAMDirectory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.analysis.BaseTokenStreamTestCase; /** * Tests QueryParser. */ -public class TestQueryParser extends LuceneTestCase { +public class TestQueryParser extends BaseTokenStreamTestCase { public static Analyzer qpAnalyzer = new QPTestAnalyzer(); Index: src/test/org/apache/lucene/search/TestPositionIncrement.java =================================================================== --- src/test/org/apache/lucene/search/TestPositionIncrement.java (revision 806538) +++ src/test/org/apache/lucene/search/TestPositionIncrement.java (working copy) @@ -40,7 +40,7 @@ import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.LowerCaseTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.index.Payload; @@ -56,7 +56,7 @@ * * @version $Revision$ */ -public class TestPositionIncrement extends LuceneTestCase { +public class TestPositionIncrement extends BaseTokenStreamTestCase { public void testSetPosition() throws Exception { Analyzer analyzer = new Analyzer() { Index: src/test/org/apache/lucene/util/LuceneTestCase.java =================================================================== --- src/test/org/apache/lucene/util/LuceneTestCase.java (revision 806538) +++ src/test/org/apache/lucene/util/LuceneTestCase.java (working copy) @@ -24,6 +24,7 @@ import junit.framework.TestCase; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.index.ConcurrentMergeScheduler; import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.FieldCache.CacheEntry; @@ -58,7 +59,9 @@ } protected void setUp() throws Exception { + super.setUp(); ConcurrentMergeScheduler.setTestMode(); + TokenStream.setOnlyUseNewAPI(false); } /** @@ -96,6 +99,7 @@ } finally { purgeFieldCache(FieldCache.DEFAULT); } + super.tearDown(); } /**