svn commit: r967177 - in /lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/util: LuceneTestCase.java LuceneTestCaseJ4.java

[rm...@apache.org]

Author: rmuir
Date: Fri Jul 23 17:33:26 2010
New Revision: 967177

URL: http://svn.apache.org/viewvc?rev=967177&view=rev
Log:
add support for -Dtests.codec=random... all core tests pass with this

Modified:
    lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
    lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java

Modified: lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java?rev=967177&r1=967176&r2=967177&view=diff
==============================================================================
--- lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java Fri Jul 23 17:33:26 2010
@@ -35,6 +35,7 @@ import org.apache.lucene.search.FieldCac
 import org.apache.lucene.search.FieldCache.CacheEntry;
 import org.apache.lucene.util.FieldCacheSanityChecker.Insanity;
 import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.preflex.PreFlexCodec;
 import org.apache.lucene.index.codecs.preflexrw.PreFlexRWCodec;
 
 /** 
@@ -117,6 +118,8 @@ public abstract class LuceneTestCase ext
     savedBoolMaxClauseCount = BooleanQuery.getMaxClauseCount();
     savedDefaultCodec = CodecProvider.getDefaultCodec();
     codec = _TestUtil.getTestCodec();
+    if (codec.equals("random"))
+      codec = CodecProvider.CORE_CODECS[seedRnd.nextInt(CodecProvider.CORE_CODECS.length)];
     //nocommit
     if (codec.equals("PreFlex")) {
         CodecProvider.getDefault().register(new PreFlexRWCodec());
@@ -150,6 +153,7 @@ public abstract class LuceneTestCase ext
     // nocommit
     if (codec.equals("PreFlex")) {
         CodecProvider.getDefault().unregister(new PreFlexRWCodec());
+        CodecProvider.getDefault().register(new PreFlexCodec());
     } 
     CodecProvider.setDefaultCodec(savedDefaultCodec);
     
@@ -301,6 +305,9 @@ public abstract class LuceneTestCase ext
       seed = null;
       super.runBare();
     } catch (Throwable e) {
+      if (_TestUtil.getTestCodec().equals("random")) {
+        System.out.println("NOTE: random codec of testcase '" + getName() + "' was: " + codec);
+      }
       if (seed != null) {
         System.out.println("NOTE: random seed of testcase '" + getName() + "' was: " + seed);
       }

Modified: lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java?rev=967177&r1=967176&r2=967177&view=diff
==============================================================================
--- lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java (original)
+++ lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java Fri Jul 23 17:33:26 2010
@@ -23,6 +23,7 @@ import org.apache.lucene.search.FieldCac
 import org.apache.lucene.search.FieldCache.CacheEntry;
 import org.apache.lucene.util.FieldCacheSanityChecker.Insanity;
 import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.preflex.PreFlexCodec;
 import org.apache.lucene.index.codecs.preflexrw.PreFlexRWCodec;
 
 import org.junit.After;
@@ -140,6 +141,8 @@ public class LuceneTestCaseJ4 {
   public static void beforeClassLuceneTestCaseJ4() {
     savedDefaultCodec = CodecProvider.getDefaultCodec();
     codec = _TestUtil.getTestCodec();
+    if (codec.equals("random"))
+      codec = CodecProvider.CORE_CODECS[seedRnd.nextInt(CodecProvider.CORE_CODECS.length)];
     //nocommit
     if (codec.equals("PreFlex")) {
         CodecProvider.getDefault().register(new PreFlexRWCodec());
@@ -150,8 +153,10 @@ public class LuceneTestCaseJ4 {
   @AfterClass
   public static void afterClassLuceneTestCaseJ4() {
     //nocommit
-    if (codec.equals("PreFlex"))
+    if (codec.equals("PreFlex")) {
         CodecProvider.getDefault().unregister(new PreFlexRWCodec());
+        CodecProvider.getDefault().register(new PreFlexCodec());
+    }
     CodecProvider.setDefaultCodec(savedDefaultCodec);
   }
 
@@ -420,6 +425,10 @@ public class LuceneTestCaseJ4 {
       System.out.println("NOTE: random static seed of testclass '" + getName() + "' was: " + staticSeed);
     }
     
+    if (_TestUtil.getTestCodec().equals("random")) {
+      System.out.println("NOTE: random codec of testcase '" + getName() + "' was: " + codec);
+    }
+
     if (seed != null) {
       System.out.println("NOTE: random seed of testcase '" + getName() + "' was: " + seed);
     }