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 2010/10/19 14:42:30 UTC
svn commit: r1024219 - in /lucene/dev/trunk:
lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/
lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/
lucene/src/test/org/apache/lucene/document/ lucene/sr...
Author: rmuir
Date: Tue Oct 19 12:42:30 2010
New Revision: 1024219
URL: http://svn.apache.org/viewvc?rev=1024219&view=rev
Log:
LUCENE-2652: remove obselete runners, they are inconsistent with @beforeClass and obselete in the build today
Modified:
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/messages/TestNLS.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/trunk/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/util/DateMathParserTest.java
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java?rev=1024219&r1=1024218&r2=1024219&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java Tue Oct 19 12:42:30 2010
@@ -43,7 +43,6 @@ import org.apache.lucene.search.BooleanC
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.automaton.BasicAutomata;
import org.apache.lucene.util.automaton.CharacterRunAutomaton;
-import org.junit.runner.RunWith;
import java.io.IOException;
import java.io.Reader;
@@ -51,7 +50,6 @@ import java.text.DateFormat;
import java.util.Calendar;
import java.util.GregorianCalendar;
-@RunWith(LuceneTestCase.LocalizedTestCaseRunner.class)
public class TestPrecedenceQueryParser extends LuceneTestCase {
public static Analyzer qpAnalyzer = new QPTestAnalyzer();
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java?rev=1024219&r1=1024218&r2=1024219&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java Tue Oct 19 12:42:30 2010
@@ -76,7 +76,6 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util.automaton.BasicAutomata;
import org.apache.lucene.util.automaton.CharacterRunAutomaton;
import org.apache.lucene.util.automaton.RegExp;
-import org.junit.runner.RunWith;
/**
* This test case is a copy of the core Lucene query parser test, it was adapted
@@ -84,7 +83,6 @@ import org.junit.runner.RunWith;
*
* Tests QueryParser.
*/
-@RunWith(LuceneTestCase.LocalizedTestCaseRunner.class)
public class TestQPHelper extends LuceneTestCase {
public static Analyzer qpAnalyzer = new QPTestAnalyzer();
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java?rev=1024219&r1=1024218&r2=1024219&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java Tue Oct 19 12:42:30 2010
@@ -21,11 +21,9 @@ import java.io.IOException;
import java.io.Reader;
import java.text.Collator;
import java.text.DateFormat;
-import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
-import java.util.HashSet;
import java.util.List;
import java.util.Locale;
@@ -72,7 +70,6 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util.automaton.BasicAutomata;
import org.apache.lucene.util.automaton.CharacterRunAutomaton;
import org.apache.lucene.util.automaton.RegExp;
-import org.junit.runner.RunWith;
/**
* This test case is a copy of the core Lucene query parser test, it was adapted
@@ -83,7 +80,6 @@ import org.junit.runner.RunWith;
* @deprecated this entire test case tests QueryParserWrapper which is
* deprecated. When QPW is gone, so will the test.
*/
-@RunWith(LuceneTestCase.LocalizedTestCaseRunner.class)
@Deprecated
public class TestQueryParserWrapper extends LuceneTestCase {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java?rev=1024219&r1=1024218&r2=1024219&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java Tue Oct 19 12:42:30 2010
@@ -9,7 +9,6 @@ import java.util.TimeZone;
import java.util.Locale;
import org.apache.lucene.util.LuceneTestCase;
-import org.junit.runner.RunWith;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,7 +26,6 @@ import org.junit.runner.RunWith;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@RunWith(LuceneTestCase.LocalizedTestCaseRunner.class)
public class TestDateTools extends LuceneTestCase {
public void testStringToDate() throws ParseException {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java?rev=1024219&r1=1024218&r2=1024219&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java Tue Oct 19 12:42:30 2010
@@ -41,7 +41,6 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.Version;
-import org.junit.runner.RunWith;
// TODO: test multiple codecs here?
@@ -60,7 +59,6 @@ import org.junit.runner.RunWith;
// goes to 1 before next one known to exist
// - skipTo(term)
// - skipTo(doc)
-@RunWith(LuceneTestCase.MultiCodecTestCaseRunner.class)
public class TestCodecs extends LuceneTestCase {
private static String[] fieldNames = new String[] {"one", "two", "three", "four"};
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java?rev=1024219&r1=1024218&r2=1024219&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java Tue Oct 19 12:42:30 2010
@@ -22,11 +22,9 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.*;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.*;
-import org.junit.runner.RunWith;
import java.io.File;
-@RunWith(LuceneTestCase.MultiCodecTestCaseRunner.class)
public class TestStressIndexing extends LuceneTestCase {
private static abstract class TimedThread extends Thread {
volatile boolean failed;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1024219&r1=1024218&r2=1024219&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java Tue Oct 19 12:42:30 2010
@@ -35,9 +35,7 @@ import org.apache.lucene.document.Fielda
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
-import org.junit.runner.RunWith;
-@RunWith(LuceneTestCase.MultiCodecTestCaseRunner.class)
public class TestStressIndexing2 extends LuceneTestCase {
static int maxFields=4;
static int bigFieldSize=10;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/messages/TestNLS.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/messages/TestNLS.java?rev=1024219&r1=1024218&r2=1024219&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/messages/TestNLS.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/messages/TestNLS.java Tue Oct 19 12:42:30 2010
@@ -20,11 +20,9 @@ package org.apache.lucene.messages;
import java.util.Locale;
import org.apache.lucene.util.LuceneTestCase;
-import org.junit.runner.RunWith;
/**
*/
-@RunWith(LuceneTestCase.LocalizedTestCaseRunner.class)
public class TestNLS extends LuceneTestCase {
public void testMessageLoading() {
Message invalidSyntax = new MessageImpl(
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java?rev=1024219&r1=1024218&r2=1024219&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java Tue Oct 19 12:42:30 2010
@@ -21,11 +21,9 @@ import java.io.IOException;
import java.io.Reader;
import java.text.Collator;
import java.text.DateFormat;
-import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
-import java.util.HashSet;
import java.util.Locale;
import org.apache.lucene.analysis.Analyzer;
@@ -64,12 +62,10 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util.automaton.BasicAutomata;
import org.apache.lucene.util.automaton.CharacterRunAutomaton;
import org.apache.lucene.util.automaton.RegExp;
-import org.junit.runner.RunWith;
/**
* Tests QueryParser.
*/
-@RunWith(LuceneTestCase.LocalizedTestCaseRunner.class)
public class TestQueryParser extends LuceneTestCase {
public static Analyzer qpAnalyzer = new QPTestAnalyzer();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java?rev=1024219&r1=1024218&r2=1024219&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java Tue Oct 19 12:42:30 2010
@@ -901,104 +901,4 @@ public abstract class LuceneTestCase ext
}
}
}
-
- /**
- * Test runner for Lucene test classes that test Locale-sensitive behavior.
- * <p>
- * This class will run tests under the default Locale, but then will also run
- * tests under all available JVM locales. This is helpful to ensure tests will
- * not fail under a different environment.
- * </p>
- */
- public static class LocalizedTestCaseRunner extends LuceneTestCaseRunner {
- /**
- * Before changing the default Locale, save the default Locale here so
- * that it can be restored.
- */
- private final Locale defaultLocale = Locale.getDefault();
-
- /**
- * The locale being used as the system default Locale
- */
- private Locale locale;
-
- private final RunListener listener = new RunListener() {
- @Override
- public void testFailure(Failure failure) throws Exception {
- super.testFailure(failure);
- String methodName = failure.getDescription().getMethodName();
- if (locale.equals(defaultLocale))
- System.out.println("Test failure of '" + methodName
- + "' occurred with the default Locale " + locale);
- else
- System.out.println("Test failure of '" + methodName
- + "' occurred under a different Locale " + locale);
- }
- };
-
- public LocalizedTestCaseRunner(Class<?> clazz) throws InitializationError {
- super(clazz);
- }
-// FIXME see LUCENE-2652
-// @Override
-// protected void runChild(FrameworkMethod arg0, RunNotifier arg1) {
-// arg1.addListener(listener);
-// locale = defaultLocale;
-// super.runChild(arg0, arg1);
-//
-// for (Locale other : Locale.getAvailableLocales()) {
-// locale = other;
-// Locale.setDefault(locale);
-// super.runChild(arg0, arg1);
-// }
-//
-// Locale.setDefault(defaultLocale);
-// }
- }
-
- /**
- * Test runner for Lucene test classes that run across all core codecs.
- */
- public static class MultiCodecTestCaseRunner extends LuceneTestCaseRunner {
- /**
- * Before changing the default Codec, save the default Codec here so
- * that it can be restored.
- */
- private final String defaultCodec = CodecProvider.getDefaultCodec();
-
- /**
- * The Codec being used as the system default
- */
- private String codec;
-
- private final RunListener listener = new RunListener() {
- @Override
- public void testFailure(Failure failure) throws Exception {
- super.testFailure(failure);
- String methodName = failure.getDescription().getMethodName();
- System.out.println("Test failure of '" + methodName
- + "' occurred with codec " + codec);
- }
- };
-
- public MultiCodecTestCaseRunner(Class<?> clazz) throws InitializationError {
- super(clazz);
- }
-
- @Override
- protected void runChild(FrameworkMethod arg0, RunNotifier arg1) {
- arg1.addListener(listener);
- // If we're running w/ PreFlex codec we must swap in the
- // test-only PreFlexRW codec (since core PreFlex can
- // only read segments):
- swapCodec(new PreFlexRWCodec());
- for (String other : CodecProvider.CORE_CODECS) {
- codec = other;
- CodecProvider.setDefaultCodec(codec);
- super.runChild(arg0, arg1);
- }
- CodecProvider.setDefaultCodec(defaultCodec);
- }
-
- }
}
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java?rev=1024219&r1=1024218&r2=1024219&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java Tue Oct 19 12:42:30 2010
@@ -19,16 +19,12 @@ package org.apache.solr.schema;
import org.apache.solr.schema.DateField;
import org.apache.solr.util.DateMathParser;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.util.LuceneTestCase;
-import org.junit.runner.RunWith;
import java.util.Date;
import java.util.TimeZone;
import java.util.Locale;
-import java.text.DateFormat;
-@RunWith(LuceneTestCase.LocalizedTestCaseRunner.class)
public class LegacyDateFieldTest extends LuceneTestCase {
// if and when this class is removed, make sure to refactor all
// appropriate code to DateFieldTest
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/util/DateMathParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/util/DateMathParserTest.java?rev=1024219&r1=1024218&r2=1024219&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/util/DateMathParserTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/util/DateMathParserTest.java Tue Oct 19 12:42:30 2010
@@ -19,7 +19,6 @@ package org.apache.solr.util;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.util.DateMathParser;
-import org.junit.runner.RunWith;
import java.text.SimpleDateFormat;
import java.text.DateFormat;
@@ -35,7 +34,6 @@ import java.text.ParseException;
/**
* Tests that the functions in DateMathParser
*/
-@RunWith(LuceneTestCase.LocalizedTestCaseRunner.class)
public class DateMathParserTest extends LuceneTestCase {
public static TimeZone UTC = TimeZone.getTimeZone("UTC");