You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/06/06 19:16:42 UTC
svn commit: r1346991 -
/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
Author: mikemccand
Date: Wed Jun 6 17:16:41 2012
New Revision: 1346991
URL: http://svn.apache.org/viewvc?rev=1346991&view=rev
Log:
if -Dtests.postingsformat is specified don't pick SimpleTextCodec nor AppendingCodec
Modified:
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java?rev=1346991&r1=1346990&r2=1346991&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java Wed Jun 6 17:16:41 2012
@@ -153,6 +153,7 @@ final class TestRuleSetupAndRestoreClass
PREFLEX_IMPERSONATION_IS_ACTIVE = false;
savedCodec = Codec.getDefault();
int randomVal = random.nextInt(10);
+
/* note: re-enable this if we make a 4.x impersonator
if ("Lucene3x".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) &&
"random".equals(TEST_POSTINGSFORMAT) &&
@@ -161,15 +162,7 @@ final class TestRuleSetupAndRestoreClass
codec = Codec.forName("Lucene3x");
assert (codec instanceof PreFlexRWCodec) : "fix your classpath to have tests-framework.jar before lucene-core.jar";
PREFLEX_IMPERSONATION_IS_ACTIVE = true;
- } else */if ("SimpleText".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) && randomVal == 9 && !shouldAvoidCodec("SimpleText"))) {
- codec = new SimpleTextCodec();
- } else if ("Appending".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) && randomVal == 8 && !shouldAvoidCodec("Appending"))) {
- codec = new AppendingCodec();
- } else if (!"random".equals(TEST_CODEC)) {
- codec = Codec.forName(TEST_CODEC);
- } else if ("random".equals(TEST_POSTINGSFORMAT)) {
- codec = new RandomCodec(random, avoidCodecs);
- } else {
+ } else */ if (!"random".equals(TEST_POSTINGSFORMAT)) {
codec = new Lucene40Codec() {
private final PostingsFormat format = PostingsFormat.forName(TEST_POSTINGSFORMAT);
@@ -183,6 +176,16 @@ final class TestRuleSetupAndRestoreClass
return super.toString() + ": " + format.toString();
}
};
+ } else if ("SimpleText".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) && randomVal == 9 && !shouldAvoidCodec("SimpleText"))) {
+ codec = new SimpleTextCodec();
+ } else if ("Appending".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) && randomVal == 8 && !shouldAvoidCodec("Appending"))) {
+ codec = new AppendingCodec();
+ } else if (!"random".equals(TEST_CODEC)) {
+ codec = Codec.forName(TEST_CODEC);
+ } else if ("random".equals(TEST_POSTINGSFORMAT)) {
+ codec = new RandomCodec(random, avoidCodecs);
+ } else {
+ assert false;
}
Codec.setDefault(codec);