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/09 17:15:12 UTC
svn commit: r1311278 -
/lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
Author: uschindler
Date: Mon Apr 9 15:15:11 2012
New Revision: 1311278
URL: http://svn.apache.org/viewvc?rev=1311278&view=rev
Log:
LUCENE-3969: Minor cleanups and code consistency
Modified:
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/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=1311278&r1=1311277&r2=1311278&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 Mon Apr 9 15:15:11 2012
@@ -289,7 +289,8 @@ public class TestRandomChains extends Ba
try {
return new HunspellDictionary(affixStream, dictStream, TEST_VERSION_CURRENT);
} catch (Exception ex) {
- throw new RuntimeException(ex);
+ Rethrow.rethrow(ex);
+ return null; // unreachable code
}
}
});
@@ -377,8 +378,9 @@ public class TestRandomChains extends Ba
}
try {
return b.build();
- } catch (Exception e) {
- throw new RuntimeException(e);
+ } catch (Exception ex) {
+ Rethrow.rethrow(ex);
+ return null; // unreachable code
}
}
@@ -410,6 +412,7 @@ public class TestRandomChains extends Ba
allowedTokenFilterArgs = Collections.newSetFromMap(new IdentityHashMap<Class<?>,Boolean>());
allowedTokenFilterArgs.addAll(argProducers.keySet());
allowedTokenFilterArgs.add(TokenStream.class);
+ // TODO: fix this one, thats broken:
allowedTokenFilterArgs.add(CommonGramsFilter.class);
allowedCharFilterArgs = Collections.newSetFromMap(new IdentityHashMap<Class<?>,Boolean>());
@@ -419,7 +422,7 @@ public class TestRandomChains extends Ba
}
@SuppressWarnings("unchecked")
- static <T> T createRandomArg(Random random, Class<T> paramType) {
+ static <T> T newRandomArg(Random random, Class<T> paramType) {
final ArgProducer producer = argProducers.get(paramType);
assertNotNull("No producer for arguments of type " + paramType.getName() + " found", producer);
return (T) producer.create(random);
@@ -435,9 +438,9 @@ public class TestRandomChains extends Ba
// TODO: maybe the collator one...???
args[i] = AttributeFactory.DEFAULT_ATTRIBUTE_FACTORY;
} else if (paramType == AttributeSource.class) {
- args[i] = null; // this always gives IAE: fine
+ args[i] = new AttributeSource();
} else {
- args[i] = createRandomArg(random, paramType);
+ args[i] = newRandomArg(random, paramType);
}
}
return args;
@@ -452,7 +455,7 @@ public class TestRandomChains extends Ba
} else if (paramType == CharStream.class) {
args[i] = CharReader.get(reader);
} else {
- args[i] = createRandomArg(random, paramType);
+ args[i] = newRandomArg(random, paramType);
}
}
return args;
@@ -465,10 +468,10 @@ public class TestRandomChains extends Ba
if (paramType == TokenStream.class) {
args[i] = stream;
} else if (paramType == CommonGramsFilter.class) {
- // CommonGramsQueryFilter takes this one explicitly
- args[i] = new CommonGramsFilter(TEST_VERSION_CURRENT, stream, createRandomArg(random, CharArraySet.class));
+ // TODO: fix this one, thats broken: CommonGramsQueryFilter takes this one explicitly
+ args[i] = new CommonGramsFilter(TEST_VERSION_CURRENT, stream, newRandomArg(random, CharArraySet.class));
} else {
- args[i] = createRandomArg(random, paramType);
+ args[i] = newRandomArg(random, paramType);
}
}
return args;