lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwe...@apache.org
Subject svn commit: r1327554 - in /lucene/dev/trunk: dev-tools/eclipse/ dev-tools/idea/.idea/libraries/ lucene/core/src/test/org/apache/lucene/util/junitcompat/ lucene/test-framework/ lucene/test-framework/lib/ lucene/test-framework/src/java/org/apache/lucene/...
Date Wed, 18 Apr 2012 15:58:25 GMT
Author: dweiss
Date: Wed Apr 18 15:58:25 2012
New Revision: 1327554

URL: http://svn.apache.org/viewvc?rev=1327554&view=rev
Log:
LUCENE-3993: Polishing annoyances from JUnit4

- print @Ignore/@Assumption cause.
- perturb randomness in static contexts (LUCENE-3995).
- intellij idea (in)compatibilities.

Added:
    lucene/dev/trunk/lucene/test-framework/lib/junit4-ant-1.3.0.jar.sha1
    lucene/dev/trunk/lucene/test-framework/lib/randomizedtesting-runner-1.3.0.jar.sha1
Removed:
    lucene/dev/trunk/lucene/test-framework/lib/junit4-ant-1.2.0.jar.sha1
    lucene/dev/trunk/lucene/test-framework/lib/randomizedtesting-runner-1.2.0.jar.sha1
Modified:
    lucene/dev/trunk/dev-tools/eclipse/dot.classpath
    lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml
    lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java
    lucene/dev/trunk/lucene/test-framework/ivy.xml
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
    lucene/dev/trunk/solr/lib/log4j-1.2.16.jar.sha1

Modified: lucene/dev/trunk/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/dot.classpath?rev=1327554&r1=1327553&r2=1327554&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Wed Apr 18 15:58:25 2012
@@ -170,6 +170,6 @@
   <classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar"/>
   <classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-collections-3.2.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-1.2.0.jar"/>
+	<classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-1.3.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml?rev=1327554&r1=1327553&r2=1327554&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml Wed Apr 18 15:58:25 2012
@@ -2,7 +2,7 @@
   <library name="JUnit">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-1.2.0.jar!/"
/>
+      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-1.3.0.jar!/"
/>
     </CLASSES>
     <JAVADOC />
     <SOURCES />

Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java?rev=1327554&r1=1327553&r2=1327554&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java
(original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java
Wed Apr 18 15:58:25 2012
@@ -193,8 +193,6 @@ public class TestReproduceMessage extend
 
     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()));

Modified: lucene/dev/trunk/lucene/test-framework/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/ivy.xml?rev=1327554&r1=1327553&r2=1327554&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/ivy.xml (original)
+++ lucene/dev/trunk/lucene/test-framework/ivy.xml Wed Apr 18 15:58:25 2012
@@ -23,8 +23,8 @@
       <dependency org="org.apache.ant" name="ant-junit" rev="1.7.1" transitive="false"/>
       <dependency org="junit" name="junit" rev="4.10" transitive="false"/>
 
-      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="1.2.0"
transitive="false" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner"
rev="1.2.0" transitive="false"/>
+      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="1.3.0"
transitive="false" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner"
rev="1.3.0" transitive="false"/>
 
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
     </dependencies>

Added: lucene/dev/trunk/lucene/test-framework/lib/junit4-ant-1.3.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/lib/junit4-ant-1.3.0.jar.sha1?rev=1327554&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/lib/junit4-ant-1.3.0.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/test-framework/lib/junit4-ant-1.3.0.jar.sha1 Wed Apr 18 15:58:25
2012
@@ -0,0 +1 @@
+a367f0573ef833d8ac0b73654b8e0b82ad73b773

Added: lucene/dev/trunk/lucene/test-framework/lib/randomizedtesting-runner-1.3.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/lib/randomizedtesting-runner-1.3.0.jar.sha1?rev=1327554&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/lib/randomizedtesting-runner-1.3.0.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/test-framework/lib/randomizedtesting-runner-1.3.0.jar.sha1 Wed
Apr 18 15:58:25 2012
@@ -0,0 +1 @@
+ca4ac3a5419a9d0176fa24acd1be84f431bfe8d1

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=1327554&r1=1327553&r2=1327554&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
Wed Apr 18 15:58:25 2012
@@ -110,6 +110,7 @@ import org.junit.runners.model.MultipleF
 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.randomizedtestin
  * 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.randomizedtestin
   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 ext
     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");

Modified: lucene/dev/trunk/solr/lib/log4j-1.2.16.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/lib/log4j-1.2.16.jar.sha1?rev=1327554&r1=1327553&r2=1327554&view=diff
==============================================================================
--- lucene/dev/trunk/solr/lib/log4j-1.2.16.jar.sha1 (original)
+++ lucene/dev/trunk/solr/lib/log4j-1.2.16.jar.sha1 Wed Apr 18 15:58:25 2012
@@ -1 +1 @@
-7999a63bfccbc7c247a9aea10d83d4272bd492c6
\ No newline at end of file
+7999a63bfccbc7c247a9aea10d83d4272bd492c6



Mime
View raw message