Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-3762: follow-up fix of -Dtestname, tests added. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1244423 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dawid Weiss 2012-02-15 10:16:27 +00:00
parent 6c34d407cd
commit 1fab3f480b
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSorePointsReported.java → lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java
View File

@ -1,5 +1,7 @@
package org.apache.lucene.util.junitcompat;
import java.util.Arrays;
import org.apache.lucene.util.LuceneTestCase;
import org.junit.After;
import org.junit.AfterClass;
@ -15,10 +17,9 @@ import org.junit.runner.JUnitCore;
import org.junit.runners.model.Statement;
/**
* Ensures proper functions of {@link LuceneTestCase#setUp()}
* and {@link LuceneTestCase#tearDown()}.
* Test reproduce message is right.
*/
public class TestSorePointsReported extends WithNestedTests {
public class TestReproduceMessage extends WithNestedTests {
public static SorePoint where;
public static SoreType type;
@ -97,7 +98,7 @@ public class TestSorePointsReported extends WithNestedTests {
* ASSUMPTIONS.
*/
public TestSorePointsReported() {
public TestReproduceMessage() {
super(true);
}
@ -173,6 +174,7 @@ public class TestSorePointsReported extends WithNestedTests {
type = SoreType.FAILURE;
where = SorePoint.RULE;
Assert.assertTrue(runAndReturnSyserr().contains("NOTE: reproduce with:"));
Assert.assertTrue(Arrays.asList(runAndReturnSyserr().split("\\s")).contains("-Dtestmethod=test"));
}
@Test
@ -180,6 +182,7 @@ public class TestSorePointsReported extends WithNestedTests {
type = SoreType.FAILURE;
where = SorePoint.BEFORE;
Assert.assertTrue(runAndReturnSyserr().contains("NOTE: reproduce with:"));
Assert.assertTrue(Arrays.asList(runAndReturnSyserr().split("\\s")).contains("-Dtestmethod=test"));
}
@Test
@ -187,6 +190,7 @@ public class TestSorePointsReported extends WithNestedTests {
type = SoreType.FAILURE;
where = SorePoint.TEST;
Assert.assertTrue(runAndReturnSyserr().contains("NOTE: reproduce with:"));
Assert.assertTrue(Arrays.asList(runAndReturnSyserr().split("\\s")).contains("-Dtestmethod=test"));
}
@Test
@ -194,6 +198,7 @@ public class TestSorePointsReported extends WithNestedTests {
type = SoreType.FAILURE;
where = SorePoint.AFTER;
Assert.assertTrue(runAndReturnSyserr().contains("NOTE: reproduce with:"));
Assert.assertTrue(Arrays.asList(runAndReturnSyserr().split("\\s")).contains("-Dtestmethod=test"));
}
@Test @Ignore
@ -226,6 +231,7 @@ public class TestSorePointsReported extends WithNestedTests {
type = SoreType.ERROR;
where = SorePoint.RULE;
Assert.assertTrue(runAndReturnSyserr().contains("NOTE: reproduce with:"));
Assert.assertTrue(Arrays.asList(runAndReturnSyserr().split("\\s")).contains("-Dtestmethod=test"));
}
@Test
@ -233,6 +239,7 @@ public class TestSorePointsReported extends WithNestedTests {
type = SoreType.ERROR;
where = SorePoint.BEFORE;
Assert.assertTrue(runAndReturnSyserr().contains("NOTE: reproduce with:"));
Assert.assertTrue(Arrays.asList(runAndReturnSyserr().split("\\s")).contains("-Dtestmethod=test"));
}
@Test
@ -240,6 +247,7 @@ public class TestSorePointsReported extends WithNestedTests {
type = SoreType.ERROR;
where = SorePoint.TEST;
Assert.assertTrue(runAndReturnSyserr().contains("NOTE: reproduce with:"));
Assert.assertTrue(Arrays.asList(runAndReturnSyserr().split("\\s")).contains("-Dtestmethod=test"));
}
@Test
@ -247,6 +255,7 @@ public class TestSorePointsReported extends WithNestedTests {
type = SoreType.ERROR;
where = SorePoint.AFTER;
Assert.assertTrue(runAndReturnSyserr().contains("NOTE: reproduce with:"));
Assert.assertTrue(Arrays.asList(runAndReturnSyserr().split("\\s")).contains("-Dtestmethod=test"));
}
@Test @Ignore
@ -260,7 +269,8 @@ public class TestSorePointsReported extends WithNestedTests {
JUnitCore.runClasses(Nested.class);
String err = getSysErr();
// syserr.println("Type: " + type + ", point: " + where + " resulted in:\n" + err);
//super.prevSysErr.println("Type: " + type + ", point: " + where + " resulted in:\n" + err);
//super.prevSysErr.println("---");
return err;
}
}

4
lucene/core/src/test/org/apache/lucene/util/junitcompat/WithNestedTests.java
View File

@ -49,8 +49,8 @@ public abstract class WithNestedTests {
protected PrintStream prevSysErr;
protected PrintStream prevSysOut;
protected ByteArrayOutputStream sysout;
protected ByteArrayOutputStream syserr;
private ByteArrayOutputStream sysout;
private ByteArrayOutputStream syserr;
@Before
public final void before() {

2
lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
View File

@ -534,7 +534,7 @@ public abstract class LuceneTestCase extends Assert {
private void starting(Description description) {
// set current method name for logging
LuceneTestCase.this.name = description.getDisplayName();
LuceneTestCase.this.name = description.getMethodName();
}
private void ending(Description description) {