You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/09/17 22:41:46 UTC

svn commit: r1625814 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/CHANGES.txt lucene/test-framework/ lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java

Author: rjernst
Date: Wed Sep 17 20:41:46 2014
New Revision: 1625814

URL: http://svn.apache.org/r1625814
Log:
LUCENE-5957: Add option for tests to not randomize codec (merged 1625812)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/lucene/test-framework/   (props changed)
    lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java

Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1625814&r1=1625813&r2=1625814&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Wed Sep 17 20:41:46 2014
@@ -84,6 +84,9 @@ Tests
   the exact release
   (Ryan Ernst, Uwe Schindler)
 
+* LUCENE-5957: Add option for tests to not randomize codec
+  (Ryan Ernst)
+
 Build
 
 * LUCENE-5909: Smoke tester now has better command line parsing and

Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java?rev=1625814&r1=1625813&r2=1625814&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java Wed Sep 17 20:41:46 2014
@@ -161,7 +161,9 @@ final class TestRuleSetupAndRestoreClass
     
     savedCodec = Codec.getDefault();
     int randomVal = random.nextInt(12);
-    if ("Lucene3x".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) &&
+    if ("default".equals(TEST_CODEC)) {
+      codec = savedCodec; // just use the default, don't randomize
+    } else if ("Lucene3x".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) &&
                                           "random".equals(TEST_POSTINGSFORMAT) &&
                                           "random".equals(TEST_DOCVALUESFORMAT) &&
                                           randomVal == 10 &&