You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2012/06/29 11:11:18 UTC
svn commit: r1355279 - in /lucene/dev/branches/branch_4x/lucene:
core/src/test/org/apache/lucene/util/TestMaxFailuresRule.java
test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java
Author: dweiss
Date: Fri Jun 29 09:11:17 2012
New Revision: 1355279
URL: http://svn.apache.org/viewvc?rev=1355279&view=rev
Log:
LUCENE-4160: making tests more robust by restoring before-the-test number of failures.
Modified:
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestMaxFailuresRule.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestMaxFailuresRule.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestMaxFailuresRule.java?rev=1355279&r1=1355278&r2=1355279&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestMaxFailuresRule.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestMaxFailuresRule.java Fri Jun 29 09:11:17 2012
@@ -45,9 +45,11 @@ public class TestMaxFailuresRule extends
@Test
public void testMaxFailures() {
- int maxFailures = LuceneTestCase.ignoreAfterMaxFailures.getMaxFailures();
+ int maxFailures = LuceneTestCase.ignoreAfterMaxFailures.maxFailures;
+ int failuresSoFar = LuceneTestCase.ignoreAfterMaxFailures.failuresSoFar;
try {
- LuceneTestCase.ignoreAfterMaxFailures.setMaxFailures(2);
+ LuceneTestCase.ignoreAfterMaxFailures.maxFailures = 2;
+ LuceneTestCase.ignoreAfterMaxFailures.failuresSoFar = 0;
JUnitCore core = new JUnitCore();
final int [] assumptions = new int [1];
@@ -59,14 +61,16 @@ public class TestMaxFailuresRule extends
});
Result result = core.run(Nested.class);
- Assert.assertEquals(2, result.getFailureCount());
- Assert.assertEquals(0, result.getIgnoreCount());
Assert.assertEquals(100, result.getRunCount());
+ Assert.assertEquals(0, result.getIgnoreCount());
+ Assert.assertEquals(2, result.getFailureCount());
+
// JUnit doesn't pass back the number of successful tests, just make sure
// we did have enough assumption-failures.
Assert.assertTrue(assumptions[0] > 50);
} finally {
- LuceneTestCase.ignoreAfterMaxFailures.setMaxFailures(maxFailures);
+ LuceneTestCase.ignoreAfterMaxFailures.maxFailures = maxFailures;
+ LuceneTestCase.ignoreAfterMaxFailures.failuresSoFar = failuresSoFar;
}
}
}
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java?rev=1355279&r1=1355278&r2=1355279&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java Fri Jun 29 09:11:17 2012
@@ -37,14 +37,14 @@ import com.carrotsearch.randomizedtestin
*/
public final class TestRuleIgnoreAfterMaxFailures implements TestRule {
/**
- * Maximum failures.
+ * Maximum failures. Package scope for tests.
*/
- private int maxFailures;
+ int maxFailures;
/**
- * Current count of failures.
+ * Current count of failures. Package scope for tests.
*/
- private int failuresSoFar;
+ int failuresSoFar;
/**
* @param maxFailures
@@ -70,7 +70,6 @@ public final class TestRuleIgnoreAfterMa
s.evaluate();
} catch (Throwable t) {
if (!TestRuleMarkFailure.isAssumption(t)) {
- System.out.println("#" + d);
failuresSoFar++;
}
throw t;
@@ -78,13 +77,4 @@ public final class TestRuleIgnoreAfterMa
}
};
}
-
- /** For tests only. */
- void setMaxFailures(int maxFailures) {
- this.maxFailures = maxFailures;
- }
-
- int getMaxFailures() {
- return maxFailures;
- }
}