svn commit: r1291798 - /lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java

[us...@apache.org]

Author: uschindler
Date: Tue Feb 21 14:22:09 2012
New Revision: 1291798

URL: http://svn.apache.org/viewvc?rev=1291798&view=rev
Log:
Fix for some tests not liking non-atomic readers, sorry for noise.

Modified:
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java

Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1291798&r1=1291797&r2=1291798&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Tue Feb 21 14:22:09 2012
@@ -1349,6 +1349,8 @@ public abstract class LuceneTestCase ext
   
   /** Sometimes wrap the IndexReader as slow, parallel or filter reader (or combinations of that) */
   public static IndexReader maybeWrapReader(IndexReader r) throws IOException {
+    // TODO: remove this, and fix those tests to wrap before putting slow around:
+    final boolean wasOriginallyAtomic = r instanceof AtomicReader;
     if (rarely()) {
       for (int i = 0, c = random.nextInt(6)+1; i < c; i++) {
         switch(random.nextInt(4)) {
@@ -1361,7 +1363,9 @@ public abstract class LuceneTestCase ext
               new ParallelCompositeReader((CompositeReader) r);
             break;
           case 2:
-            r = new MultiReader(r);
+            if (!wasOriginallyAtomic) { // dont wrap originally atomic readers to be composite (some tests don't like)
+              r = new MultiReader(r);
+            }
             break;
           case 3:
             if (r instanceof AtomicReader) {