You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/04/10 15:50:04 UTC
svn commit: r1311724 - in
/lucene/dev/branches/lucene3969/modules/analysis/common/src:
java/org/apache/lucene/analysis/shingle/ShingleFilter.java
test/org/apache/lucene/analysis/core/TestRandomChains.java
Author: uschindler
Date: Tue Apr 10 13:50:03 2012
New Revision: 1311724
URL: http://svn.apache.org/viewvc?rev=1311724&view=rev
Log:
Fix ShingleFilter reuse, some minor changes to testcase for speed and consistency
Modified:
lucene/dev/branches/lucene3969/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
Modified: lucene/dev/branches/lucene3969/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java?rev=1311724&r1=1311723&r2=1311724&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java (original)
+++ lucene/dev/branches/lucene3969/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java Tue Apr 10 13:50:03 2012
@@ -439,6 +439,8 @@ public final class ShingleFilter extends
super.reset();
gramSize.reset();
inputWindow.clear();
+ nextInputStreamToken = null;
+ isNextInputStreamToken = false;
numFillerTokensToInsert = 0;
isOutputHere = false;
noShingleOutput = true;
Modified: lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java?rev=1311724&r1=1311723&r2=1311724&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java (original)
+++ lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java Tue Apr 10 13:50:03 2012
@@ -130,17 +130,17 @@ public class TestRandomChains extends Ba
if (
// don't waste time with abstract classes or deprecated known-buggy ones
Modifier.isAbstract(modifiers) || !Modifier.isPublic(modifiers)
- || c.isAnnotationPresent(Deprecated.class)
|| c.isSynthetic() || c.isAnonymousClass() || c.isMemberClass() || c.isInterface()
- || !(Tokenizer.class.isAssignableFrom(c) || TokenFilter.class.isAssignableFrom(c) || CharStream.class.isAssignableFrom(c))
|| brokenComponents.contains(c)
+ || c.isAnnotationPresent(Deprecated.class)
+ || !(Tokenizer.class.isAssignableFrom(c) || TokenFilter.class.isAssignableFrom(c) || CharStream.class.isAssignableFrom(c))
) {
continue;
}
for (final Constructor<?> ctor : c.getConstructors()) {
- // don't test deprecated ctors, they likely have known bugs:
- if (ctor.isAnnotationPresent(Deprecated.class) || ctor.isSynthetic()) {
+ // don't test synthetic or deprecated ctors, they likely have known bugs:
+ if (ctor.isSynthetic() || ctor.isAnnotationPresent(Deprecated.class)) {
continue;
}
if (Tokenizer.class.isAssignableFrom(c)) {
@@ -258,9 +258,8 @@ public class TestRandomChains extends Ba
});
put(byte.class, new ArgProducer() {
@Override public Object create(Random random) {
- byte bytes[] = new byte[1];
- random.nextBytes(bytes);
- return Byte.valueOf(bytes[0]);
+ // this wraps to negative when casting to byte
+ return Byte.valueOf((byte) random.nextInt(256));
}
});
put(byte[].class, new ArgProducer() {
@@ -671,7 +670,7 @@ public class TestRandomChains extends Ba
}
static final class CheckThatYouDidntReadAnythingReaderWrapper extends CharFilter {
- boolean readSomething;
+ boolean readSomething = false;
CheckThatYouDidntReadAnythingReaderWrapper(Reader in) {
super(CharReader.get(in));