You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/11/02 15:21:30 UTC
svn commit: r1196601 - in /lucene/dev/branches/lucene2621/lucene/src:
test-framework/java/org/apache/lucene/index/codecs/preflexrw/
test-framework/java/org/apache/lucene/util/
test/org/apache/lucene/index/codecs/preflex/
Author: rmuir
Date: Wed Nov 2 14:21:30 2011
New Revision: 1196601
URL: http://svn.apache.org/viewvc?rev=1196601&view=rev
Log:
LUCENE-3490: fix TestBackwardsCompatibility
Modified:
lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java?rev=1196601&r1=1196600&r2=1196601&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java Wed Nov 2 14:21:30 2011
@@ -19,6 +19,7 @@ package org.apache.lucene.index.codecs.p
import org.apache.lucene.index.codecs.PostingsFormat;
import org.apache.lucene.index.codecs.lucene3x.Lucene3xCodec;
+import org.apache.lucene.util.LuceneTestCase;
/**
* Writes 3.x-like indexes (not perfect emulation yet) for testing only!
@@ -29,6 +30,10 @@ public class PreFlexRWCodec extends Luce
@Override
public PostingsFormat postingsFormat() {
- return postings;
+ if (LuceneTestCase.PREFLEX_IMPERSONATION_IS_ACTIVE) {
+ return postings;
+ } else {
+ return super.postingsFormat();
+ }
}
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java?rev=1196601&r1=1196600&r2=1196601&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java Wed Nov 2 14:21:30 2011
@@ -170,6 +170,9 @@ public abstract class LuceneTestCase ext
*/
public static final int RANDOM_MULTIPLIER = Integer.parseInt(System.getProperty("tests.multiplier", "1"));
+ /** @lucene.internal */
+ public static boolean PREFLEX_IMPERSONATION_IS_ACTIVE;
+
private int savedBoolMaxClauseCount = BooleanQuery.getMaxClauseCount();
private volatile Thread.UncaughtExceptionHandler savedUncaughtExceptionHandler = null;
@@ -263,10 +266,12 @@ public abstract class LuceneTestCase ext
}
}
+ PREFLEX_IMPERSONATION_IS_ACTIVE = false;
savedCodec = Codec.getDefault();
final Codec codec;
if ("Lucene3x".equals(TEST_POSTINGSFORMAT) || ("random".equals(TEST_POSTINGSFORMAT) && random.nextInt(4) == 0)) { // preflex-only setup
codec = new PreFlexRWCodec();
+ PREFLEX_IMPERSONATION_IS_ACTIVE = true;
} else {
codec = new Lucene40Codec();
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java?rev=1196601&r1=1196600&r2=1196601&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java Wed Nov 2 14:21:30 2011
@@ -27,9 +27,15 @@ import org.apache.lucene.util.*;
import java.util.*;
import java.io.IOException;
+import org.junit.BeforeClass;
import org.junit.Test;
public class TestSurrogates extends LuceneTestCase {
+ /** we will manually instantiate preflex-rw here */
+ @BeforeClass
+ public static void beforeClass() {
+ LuceneTestCase.PREFLEX_IMPERSONATION_IS_ACTIVE = true;
+ }
private static String makeDifficultRandomUnicodeString(Random r) {
final int end = r.nextInt(20);