You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2020/05/12 14:26:36 UTC
[maven-surefire] branch SUREFIRE-1788 updated (d715f82 -> ab1b325)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch SUREFIRE-1788
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
discard d715f82 other ITs should not be so sensitive to TestNG and Mockito Reflection [ERROR]s
new ab1b325 other ITs should not be so sensitive to TestNG and Mockito Reflection [ERROR]s
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d715f82)
\
N -- N -- N refs/heads/SUREFIRE-1788 (ab1b325)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-surefire] 01/01: other ITs should not be so sensitive to
TestNG and Mockito Reflection [ERROR]s
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch SUREFIRE-1788
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit ab1b3258aaecb5d2a1f6832b8483bc723eb9c2c7
Author: tibordigana <ti...@apache.org>
AuthorDate: Tue May 12 13:39:58 2020 +0200
other ITs should not be so sensitive to TestNG and Mockito Reflection [ERROR]s
---
.../surefire/its/CheckTestNgListenerReporterIT.java | 2 +-
.../maven/surefire/its/CheckTestNgSuiteXmlIT.java | 7 ++++---
.../maven/surefire/its/CheckTestNgVersionsIT.java | 2 +-
.../apache/maven/surefire/its/JUnitPlatformIT.java | 6 +++---
.../org/apache/maven/surefire/its/TwoTestCasesIT.java | 2 +-
.../Surefire1712ExtractedModulenameWithoutASMIT.java | 16 +++++++++-------
.../surefire/its/jiras/Surefire673MockitoIT.java | 6 ++++--
...urefire735ForkFailWithRedirectConsoleOutputIT.java | 19 ++++++++++++++++---
8 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
index 6221914..57c89b4 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
@@ -103,7 +103,7 @@ public class CheckTestNgListenerReporterIT
}
launcher.executeTest()
- .verifyErrorFree( 1 )
+ .assertTestSuiteResults( 1, 0, 0, 0 )
.getTargetFile( "resultlistener-output.txt" ).assertFileExists()
.getTargetFile( "suitelistener-output.txt" ).assertFileExists()
.getTargetFile( "reporter-output.txt" ).assertFileExists();
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
index d4b26e8..5d6cc81 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
@@ -34,8 +34,9 @@ public class CheckTestNgSuiteXmlIT
@Test
public void suiteXml()
{
- unpack().executeTest()
- .verifyErrorFree( 2 );
+ unpack()
+ .executeTest()
+ .assertTestSuiteResults( 2, 0, 0, 0 );
}
@Test
@@ -52,7 +53,7 @@ public class CheckTestNgSuiteXmlIT
unpack().forkCount( 2 )
.reuseForks( true )
.executeTest()
- .verifyErrorFree( 2 );
+ .assertTestSuiteResults( 2, 0, 0, 0 );
}
private SurefireLauncher unpack()
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
index 64235ee..9a0c1f7 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
@@ -205,7 +205,7 @@ public class CheckTestNgVersionsIT
final OutputValidator outputValidator = launcher.executeTest();
- outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 0 );
+ outputValidator.assertTestSuiteResults( 3, 0, 0, 0 );
if ( validateRunOrder )
{
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
index 7a0754f..e6f5ba3 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
@@ -78,7 +78,7 @@ public class JUnitPlatformIT
.sysProp( "junit5.version", junit5Version )
.sysProp( "jqwik.version", jqwikVersion )
.executeTest()
- .verifyErrorFree( 1 );
+ .assertTestSuiteResults( 1, 0, 0, 0 );
}
@Test
@@ -88,7 +88,7 @@ public class JUnitPlatformIT
.sysProp( "junit5.version", junit5Version )
.sysProp( "jqwik.version", jqwikVersion )
.executeTest()
- .verifyErrorFree( 1 );
+ .assertTestSuiteResults( 1, 0, 0, 0 );
}
@Test
@@ -99,7 +99,7 @@ public class JUnitPlatformIT
.sysProp( "junit5.version", junit5Version )
.sysProp( "jqwik.version", jqwikVersion )
.executeTest()
- .verifyErrorFree( 7 );
+ .assertTestSuiteResults( 7, 0, 0, 0 );
validator.getSurefireReportsFile( "TEST-junitplatformenginejupiter.BasicJupiterTest.xml", UTF_8 )
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
index 23e6dd0..02458ed 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
@@ -120,7 +120,7 @@ public class TwoTestCasesIT
.sysProp( "testNgVersion", "5.7" )
.sysProp( "testNgClassifier", "jdk15" )
.executeTest();
- outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 2, 0, 0, 0 );
+ outputValidator.assertTestSuiteResults( 2, 0, 0, 0 );
List<ReportTestSuite> reports = HelperAssertions.extractReports( outputValidator.getBaseDir() );
Set<String> classNames = extractClassNames( reports );
assertContains( classNames, "testng.two.TestNGTestTwo" );
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1712ExtractedModulenameWithoutASMIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1712ExtractedModulenameWithoutASMIT.java
index 92c56ad..ce8ce68 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1712ExtractedModulenameWithoutASMIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1712ExtractedModulenameWithoutASMIT.java
@@ -22,7 +22,8 @@ package org.apache.maven.surefire.its.jiras;
import org.apache.maven.surefire.its.AbstractJigsawIT;
import org.junit.Test;
-import java.io.IOException;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
/**
* See the JIRA https://issues.apache.org/jira/browse/SUREFIRE-1712
@@ -35,14 +36,15 @@ public class Surefire1712ExtractedModulenameWithoutASMIT
{
@Test
public void test()
- throws IOException
+ throws Exception
{
assumeJava9()
- .debugLogging()
- .executeTest()
- .assertTestSuiteResults( 1, 0, 0, 0 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "main module descriptor name: wtf.g4s8.oot" );
+ .debugLogging()
+ .executeTest()
+ .assertTestSuiteResults( 1, 0, 0, 0 )
+ .assertThatLogLine( containsString( "Unsupported class file major version" ), is( 0 ) )
+ .assertThatLogLine( containsString( "at org.objectweb.asm.ClassReader.<init>" ), is( 0 ) )
+ .verifyTextInLog( "main module descriptor name: wtf.g4s8.oot" );
}
@Override
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
index 7f3e2ca..74469c9 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
@@ -33,6 +33,8 @@ public class Surefire673MockitoIT
@Test
public void testBuildFailingWhenErrors()
{
- unpack( "/surefire-673-mockito" ).executeTest().verifyErrorFreeLog();
+ unpack( "/surefire-673-mockito" )
+ .executeTest()
+ .assertTestSuiteResults( 1, 0, 0, 0 );
}
-}
\ No newline at end of file
+}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
index efbb0f7..a8515ac 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
@@ -19,6 +19,7 @@ package org.apache.maven.surefire.its.jiras;
* under the License.
*/
+import org.apache.maven.it.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
@@ -26,8 +27,10 @@ import org.junit.Test;
import java.io.File;
import java.io.FilenameFilter;
+import java.util.Collection;
import static org.fest.assertions.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.containsString;
/**
* @author Kristian Rosenvold
@@ -37,14 +40,14 @@ public class Surefire735ForkFailWithRedirectConsoleOutputIT
{
@Test
- public void vmStartFail()
+ public void vmStartFail() throws VerificationException
{
OutputValidator outputValidator = unpack().failNever().executeTest();
assertJvmCrashed( outputValidator );
}
@Test
- public void vmStartFailShouldFailBuildk()
+ public void vmStartFailShouldFailBuildk() throws VerificationException
{
OutputValidator outputValidator = unpack().maven().withFailure().executeTest();
assertJvmCrashed( outputValidator );
@@ -55,8 +58,18 @@ public class Surefire735ForkFailWithRedirectConsoleOutputIT
return unpack( "fork-fail" );
}
- private static void assertJvmCrashed( OutputValidator outputValidator )
+ private static void assertJvmCrashed( OutputValidator outputValidator ) throws VerificationException
{
+ Collection<String> matchedLines =
+ outputValidator.loadLogLines( containsString( "Invalid maximum heap size: -Xmxxxx712743m" ) );
+ if ( !matchedLines.isEmpty() )
+ {
+ // the error line was printed in std/err by the JVM
+ return;
+ }
+
+ // the error line should be printed in std/out by the JVM if we use the process pipes
+ // then the ForkClient caught it and printed in the dump stream
File reportDir = outputValidator.getSurefireReportsDirectory();
String[] dumpFiles = reportDir.list( new FilenameFilter()
{