diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath index 734a70ae45e..3025255d37c 100644 --- a/dev-tools/eclipse/dot.classpath +++ b/dev-tools/eclipse/dot.classpath @@ -170,6 +170,6 @@ - + diff --git a/dev-tools/idea/.idea/libraries/JUnit.xml b/dev-tools/idea/.idea/libraries/JUnit.xml index 7fdf55e50bf..f985ed0cffa 100644 --- a/dev-tools/idea/.idea/libraries/JUnit.xml +++ b/dev-tools/idea/.idea/libraries/JUnit.xml @@ -2,7 +2,7 @@ - + diff --git a/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java b/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java index 51be9b6cf80..57128bfa907 100644 --- a/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java +++ b/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java @@ -193,8 +193,6 @@ public class TestReproduceMessage extends WithNestedTests { final String syserr = runAndReturnSyserr(); - super.prevSysOut.println(getSysErr() + "\n" + getSysOut()); - Assert.assertTrue(syserr.contains("NOTE: reproduce with:")); Assert.assertTrue(Arrays.asList(syserr.split("\\s")).contains("-Dtests.method=test")); Assert.assertTrue(Arrays.asList(syserr.split("\\s")).contains("-Dtests.class=*." + Nested.class.getSimpleName())); diff --git a/lucene/test-framework/ivy.xml b/lucene/test-framework/ivy.xml index 53c594b2d28..1c0363f85bd 100644 --- a/lucene/test-framework/ivy.xml +++ b/lucene/test-framework/ivy.xml @@ -23,8 +23,8 @@ - - + + diff --git a/lucene/test-framework/lib/junit4-ant-1.2.0.jar.sha1 b/lucene/test-framework/lib/junit4-ant-1.2.0.jar.sha1 deleted file mode 100644 index ffe5e8250fe..00000000000 --- a/lucene/test-framework/lib/junit4-ant-1.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -68caf5916290e52964f1a437a398c09e8c950d71 diff --git a/lucene/test-framework/lib/junit4-ant-1.3.0.jar.sha1 b/lucene/test-framework/lib/junit4-ant-1.3.0.jar.sha1 new file mode 100644 index 00000000000..ddeb0c17b7d --- /dev/null +++ b/lucene/test-framework/lib/junit4-ant-1.3.0.jar.sha1 @@ -0,0 +1 @@ +a367f0573ef833d8ac0b73654b8e0b82ad73b773 diff --git a/lucene/test-framework/lib/randomizedtesting-runner-1.2.0.jar.sha1 b/lucene/test-framework/lib/randomizedtesting-runner-1.2.0.jar.sha1 deleted file mode 100644 index 3994c20fe7b..00000000000 --- a/lucene/test-framework/lib/randomizedtesting-runner-1.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a804c83963e6fed618cfeed7cd2fda127d69f8d3 diff --git a/lucene/test-framework/lib/randomizedtesting-runner-1.3.0.jar.sha1 b/lucene/test-framework/lib/randomizedtesting-runner-1.3.0.jar.sha1 new file mode 100644 index 00000000000..a67ce16f824 --- /dev/null +++ b/lucene/test-framework/lib/randomizedtesting-runner-1.3.0.jar.sha1 @@ -0,0 +1 @@ +ca4ac3a5419a9d0176fa24acd1be84f431bfe8d1 diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java index 479770d790f..a5bb7792363 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java @@ -110,6 +110,7 @@ import org.junit.runners.model.MultipleFailureException; import org.junit.runners.model.Statement; import com.carrotsearch.randomizedtesting.JUnit4MethodProvider; +import com.carrotsearch.randomizedtesting.MixWithSuiteName; import com.carrotsearch.randomizedtesting.RandomizedContext; import com.carrotsearch.randomizedtesting.RandomizedRunner; import com.carrotsearch.randomizedtesting.annotations.*; @@ -140,6 +141,7 @@ import com.carrotsearch.randomizedtesting.annotations.*; * if you annotate your derived class correctly with the annotations above * @see #assertSaneFieldCaches(String) */ +@RunWith(RandomizedRunner.class) @TestMethodProviders({ LuceneJUnit3MethodProvider.class, JUnit4MethodProvider.class @@ -148,11 +150,11 @@ import com.carrotsearch.randomizedtesting.annotations.*; RequireAssertions.class, NoStaticHooksShadowing.class }) -@RunWith(RandomizedRunner.class) +@SeedDecorators({MixWithSuiteName.class}) // See LUCENE-3995 for rationale. @ThreadLeaks(failTestIfLeaking = false) public abstract class LuceneTestCase extends Assert { /** - * true iff tests are run in verbose mode. Note: if it is false, tests are not + * true if and only if tests are run in verbose mode. Note: if it is false, tests are not * expected to print any messages. */ public static final boolean VERBOSE = Boolean.getBoolean("tests.verbose"); @@ -406,6 +408,7 @@ public abstract class LuceneTestCase extends Assert { savedCodec = Codec.getDefault(); final Codec codec; int randomVal = random().nextInt(10); + System.out.println("randomVal: " + randomVal); if ("Lucene3x".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) && randomVal < 2)) { // preflex-only setup codec = Codec.forName("Lucene3x"); diff --git a/solr/lib/log4j-1.2.16.jar.sha1 b/solr/lib/log4j-1.2.16.jar.sha1 index e300a572ee1..4b09bd1cc40 100644 --- a/solr/lib/log4j-1.2.16.jar.sha1 +++ b/solr/lib/log4j-1.2.16.jar.sha1 @@ -1 +1 @@ -7999a63bfccbc7c247a9aea10d83d4272bd492c6 \ No newline at end of file +7999a63bfccbc7c247a9aea10d83d4272bd492c6