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 2019/04/08 10:46:35 UTC
[maven-surefire] 01/02: did not call two JUnit4 tests
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch SUREFIRE-1617
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 13ab2d3371f40c8197966ec4cfcfe13cae2d7e50
Author: tibordigana <ti...@apache.org>
AuthorDate: Mon Apr 8 05:35:32 2019 +0200
did not call two JUnit4 tests
---
maven-surefire-report-plugin/pom.xml | 7 +++++++
.../org/apache/maven/plugins/surefire/report/Surefire597Test.java | 6 +++---
.../plugins/surefire/report/SurefireSchemaValidationTest.java | 6 +++---
.../plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java | 2 +-
.../surefire/report/stubs/SurefireRepMavenProjectStub2.java | 6 ++++--
5 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index 18da79f..cf941ce 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -185,6 +185,13 @@
<classpathDependencyExclude>org.fusesource.jansi:jansi</classpathDependencyExclude>
</classpathDependencyExcludes>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-shadefire</artifactId>
+ <version>3.0.0-M3</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire597Test.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire597Test.java
index 02af6c4..96e0b33 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire597Test.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire597Test.java
@@ -19,10 +19,10 @@ package org.apache.maven.plugins.surefire.report;
* under the License.
*/
+import junit.framework.TestCase;
import org.apache.maven.doxia.module.xhtml.XhtmlSink;
import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.plugin.surefire.log.api.NullConsoleLogger;
-import org.junit.Test;
import java.io.File;
import java.io.StringWriter;
@@ -37,9 +37,9 @@ import static org.apache.maven.plugins.surefire.report.Utils.toSystemNewLine;
* Prevent fom NPE if failure type and message is null however detail presents.
*/
public class Surefire597Test
+ extends TestCase
{
- @Test
- public void corruptedTestCaseFailureWithMissingErrorTypeAndMessage()
+ public void testCorruptedTestCaseFailureWithMissingErrorTypeAndMessage()
throws Exception
{
File basedir = new File( "." ).getCanonicalFile();
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireSchemaValidationTest.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireSchemaValidationTest.java
index 008f206..9292fcf 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireSchemaValidationTest.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireSchemaValidationTest.java
@@ -28,20 +28,20 @@ import java.nio.file.Paths;
import javax.xml.transform.stream.StreamSource;
+import junit.framework.TestCase;
import org.apache.maven.shared.utils.io.DirectoryScanner;
import org.fest.assertions.Assertions;
import org.junit.Assert;
-import org.junit.Test;
import org.xmlunit.validation.Languages;
import org.xmlunit.validation.ValidationProblem;
import org.xmlunit.validation.ValidationResult;
import org.xmlunit.validation.Validator;
public class SurefireSchemaValidationTest
+ extends TestCase
{
- @Test
- public void validate_XMLs_against_schema()
+ public void testValidate_XMLs_against_schema()
throws Exception
{
File basedir = getProjectBasedir();
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java
index 155b683..d1f2c11 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java
@@ -35,7 +35,7 @@ public class SurefireRepMavenProjectStub
* {@inheritDoc}
*/
@Override
- public List getReportPlugins()
+ public List<ReportPlugin> getReportPlugins()
{
Reporting reporting = new Reporting();
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java
index 23b1e4e..0a41412 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java
@@ -21,6 +21,8 @@ package org.apache.maven.plugins.surefire.report.stubs;
import java.util.ArrayList;
import java.util.List;
+
+import org.apache.maven.model.ReportPlugin;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
/**
@@ -33,8 +35,8 @@ public class SurefireRepMavenProjectStub2
* {@inheritDoc}
*/
@Override
- public List getReportPlugins()
+ public List<ReportPlugin> getReportPlugins()
{
- return new ArrayList();
+ return new ArrayList<>();
}
}