You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/11/04 19:11:24 UTC
svn commit: r1031117 - in
/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene:
analysis/MockAnalyzer.java search/spans/TestBasics.java
Author: rmuir
Date: Thu Nov 4 18:11:24 2010
New Revision: 1031117
URL: http://svn.apache.org/viewvc?rev=1031117&view=rev
Log:
this stuff _must_ be consistent with trunk or we lose test coverage... _OnDiskFull was impossibly fast...
Modified:
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/MockAnalyzer.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/MockAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/MockAnalyzer.java?rev=1031117&r1=1031116&r2=1031117&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/MockAnalyzer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/MockAnalyzer.java Thu Nov 4 18:11:24 2010
@@ -29,19 +29,45 @@ import java.io.Reader;
* Analyzer for testing
*/
public final class MockAnalyzer extends Analyzer {
-
+ private boolean lowerCase;
+ private boolean payloads;
+ public static final int KEYWORD = 0;
+ public static final int WHITESPACE = 1;
+ public static final int SIMPLE = 2;
+ private int tokenizer;
+
public MockAnalyzer() {
+ this(WHITESPACE, true);
+ }
+
+ public MockAnalyzer(int tokenizer, boolean lowercase) {
+ this(tokenizer, lowercase, true);
+ }
+
+ public MockAnalyzer(int tokenizer, boolean lowercase, boolean payloads) {
+ this.tokenizer = tokenizer;
+ this.lowerCase = lowercase;
+ this.payloads = payloads;
}
public TokenStream tokenStream(String fieldName, Reader reader) {
- TokenStream result = new LowerCaseTokenizer(LuceneTestCase.TEST_VERSION_CURRENT, reader);
- result = new SimplePayloadFilter(result, fieldName);
+ TokenStream result;
+ if (tokenizer == KEYWORD)
+ result = new KeywordTokenizer(reader);
+ else if (tokenizer == SIMPLE)
+ result = new LetterTokenizer(LuceneTestCase.TEST_VERSION_CURRENT, reader);
+ else
+ result = new WhitespaceTokenizer(LuceneTestCase.TEST_VERSION_CURRENT, reader);
+ if (lowerCase)
+ result = new LowerCaseFilter(LuceneTestCase.TEST_VERSION_CURRENT, result);
+ if (payloads)
+ result = new SimplePayloadFilter(result, fieldName);
return result;
}
private class SavedStreams {
Tokenizer upstream;
- TokenFilter filter;
+ TokenStream filter;
}
@Override
@@ -49,8 +75,17 @@ public final class MockAnalyzer extends
SavedStreams saved = (SavedStreams) getPreviousTokenStream();
if (saved == null){
saved = new SavedStreams();
- saved.upstream = new LowerCaseTokenizer(LuceneTestCase.TEST_VERSION_CURRENT, reader);
- saved.filter = new SimplePayloadFilter(saved.upstream, fieldName);
+ if (tokenizer == KEYWORD)
+ saved.upstream = new KeywordTokenizer(reader);
+ else if (tokenizer == SIMPLE)
+ saved.upstream = new LetterTokenizer(LuceneTestCase.TEST_VERSION_CURRENT, reader);
+ else
+ saved.upstream = new WhitespaceTokenizer(LuceneTestCase.TEST_VERSION_CURRENT, reader);
+ saved.filter = saved.upstream;
+ if (lowerCase)
+ saved.filter = new LowerCaseFilter(LuceneTestCase.TEST_VERSION_CURRENT, saved.filter);
+ if (payloads)
+ saved.filter = new SimplePayloadFilter(saved.filter, fieldName);
setPreviousTokenStream(saved);
return saved.filter;
} else {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java?rev=1031117&r1=1031116&r2=1031117&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java Thu Nov 4 18:11:24 2010
@@ -69,7 +69,7 @@ public class TestBasics extends LuceneTe
public static void beforeClass() throws Exception {
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer())
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(MockAnalyzer.SIMPLE, true, true))
.setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
//writer.infoStream = System.out;
for (int i = 0; i < 2000; i++) {