You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mf...@apache.org on 2016/01/13 07:06:01 UTC
[01/15] maven-surefire git commit: [SUREFIRE] Badges to README.md
[Forced Update!]
Repository: maven-surefire
Updated Branches:
refs/heads/SUREFIRE-1217 e2d85bdc3 -> 1b7ade292 (forced update)
[SUREFIRE] Badges to README.md
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7b7e47a2
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7b7e47a2
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7b7e47a2
Branch: refs/heads/SUREFIRE-1217
Commit: 7b7e47a20830f0a6fb62c8e13d29489d580606cb
Parents: 62009ac
Author: Tibor17 <ti...@lycos.com>
Authored: Sun Jan 10 22:13:24 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Sun Jan 10 22:13:24 2016 +0100
----------------------------------------------------------------------
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7b7e47a2/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index bb8ee6b..0958be6 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
[](https://maven-badges.herokuapp.com/maven-central/org.apache.maven.surefire/surefire)
[](http://www.apache.org/licenses/LICENSE-2.0.html)
-[](http://d7.mnpk.org/jcb/jenkins/c/http/builds.apache.org/job/maven-surefire?style=flat-square)
+[](https://img.shields.io/jenkins/c/https/builds.apache.org/maven-surefire.svg)
[](https://builds.apache.org/job/maven-surefire)
[](https://builds.apache.org/job/maven-surefire-windows)
[](https://builds.apache.org/job/maven-surefire-mvn-2.2.1)
@@ -10,7 +10,7 @@
Surefire needs Maven 3.0.5 and JDK 1.6+ to be built.
But in order to run IT tests, you can do:
* -DmavenHomeUsed= path to a Maven 2.x home
-* or -Pmaven-2.2.1, this profile will download a Maven 2.2.1 distrib and use it for integration tests.
+* or -Pmaven-2.2.1, this profile will download Maven 2.2.1 distribution and use it for integration tests.
In order to run tests for a release check during the vote the following memory requirements are needed:
export MAVEN_OPTS="-Xmx768m -XX:MaxPermSize=1g -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true"
[04/15] maven-surefire git commit: [SUREFIRE] Badges to README.md
Posted by mf...@apache.org.
[SUREFIRE] Badges to README.md
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c538089b
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c538089b
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c538089b
Branch: refs/heads/SUREFIRE-1217
Commit: c538089b1e500f243f3b5017da4b901ee695a1d6
Parents: bc9700a
Author: Tibor17 <ti...@lycos.com>
Authored: Tue Jan 12 23:37:02 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Tue Jan 12 23:37:02 2016 +0100
----------------------------------------------------------------------
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c538089b/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 00dd7bf..f1cab84 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
[](https://maven.apache.org/surefire/)
-[!CI](https://img.shields.io/badge/CI-Jenkins-red.svg?style=flat-square)](https://jenkins-ci.org/)
+[](https://jenkins-ci.org/)
[](https://maven-badges.herokuapp.com/maven-central/org.apache.maven.surefire/surefire)
[](http://www.apache.org/licenses/LICENSE-2.0.html)
[06/15] maven-surefire git commit: [SUREFIRE] fixed little checkstyle
issues
Posted by mf...@apache.org.
[SUREFIRE] fixed little checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/641f9717
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/641f9717
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/641f9717
Branch: refs/heads/SUREFIRE-1217
Commit: 641f971715d713c3d934c27f49030082e067c0c7
Parents: d618491
Author: Tibor17 <ti...@lycos.com>
Authored: Wed Jan 13 01:20:03 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Wed Jan 13 01:20:03 2016 +0100
----------------------------------------------------------------------
.../org/apache/maven/surefire/common/junit4/Notifier.java | 9 +++++----
.../org/apache/maven/surefire/testng/TestNGExecutor.java | 1 +
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/641f9717/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
index 20b711e..dfa3948 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
@@ -74,17 +74,16 @@ public class Notifier
return new Notifier()
{
@Override
- public Notifier asFailFast( boolean failFast )
+ public void asFailFast( @SuppressWarnings( { "unused", "checkstyle:hiddenfieldcheck" } ) boolean failFast )
{
throw new UnsupportedOperationException( "pure notifier" );
}
};
}
- public Notifier asFailFast( boolean failFast )
+ public void asFailFast( boolean enableFailFast )
{
- this.failFast = failFast;
- return this;
+ failFast = enableFailFast;
}
public final boolean isFailFast()
@@ -93,6 +92,7 @@ public class Notifier
}
@Override
+ @SuppressWarnings( "checkstyle:redundantthrowscheck" ) // checkstyle is wrong here, see super.fireTestStarted()
public final void fireTestStarted( Description description ) throws StoppedByUserException
{
// If fireTestStarted() throws exception (== skipped test), the class must not be removed from testClassNames.
@@ -130,6 +130,7 @@ public class Notifier
return this;
}
+ @SuppressWarnings( "unused" )
public final Notifier addListeners( RunListener... given )
{
for ( RunListener listener : given )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/641f9717/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
index 529ed89..3c78b60 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
@@ -73,6 +73,7 @@ final class TestNGExecutor
throw new IllegalStateException( "not instantiable constructor" );
}
+ @SuppressWarnings( "checkstyle:parameternumbercheck" )
static void run( Iterable<Class<?>> testClasses, String testSourceDirectory,
Map<String, String> options, // string,string because TestNGMapConfigurator#configure()
RunListener reportManager, File reportsDirectory,
[14/15] maven-surefire git commit: SUREFIRE-1217: Create
FailsafeStatelessXmlReporter.
Posted by mf...@apache.org.
SUREFIRE-1217: Create FailsafeStatelessXmlReporter.
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c78d238a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c78d238a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c78d238a
Branch: refs/heads/SUREFIRE-1217
Commit: c78d238aa37c9bb7d863082ad7a139251731ca4f
Parents: 8b59849
Author: Mirko Friedenhagen <mf...@apache.org>
Authored: Sun Jan 10 21:28:29 2016 +0100
Committer: Mirko Friedenhagen <mf...@apache.org>
Committed: Wed Jan 13 07:05:33 2016 +0100
----------------------------------------------------------------------
.../report/FailsafeStatelessXmlReporter.java | 39 ++++++++++++++++++++
.../surefire/report/StatelessXmlReporter.java | 20 ++++++++--
.../report/StatelessXmlReporterTest.java | 8 +++-
3 files changed, 62 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c78d238a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FailsafeStatelessXmlReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FailsafeStatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FailsafeStatelessXmlReporter.java
new file mode 100644
index 0000000..5689aaf
--- /dev/null
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FailsafeStatelessXmlReporter.java
@@ -0,0 +1,39 @@
+package org.apache.maven.plugin.surefire.report;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Extension of {@link StatelessXmlReporter} for the maven-failsafe-plugin.
+ *
+ * @since 2.19.2
+ */
+public class FailsafeStatelessXmlReporter extends StatelessXmlReporter {
+
+ static final String FAILSAFE_TEST_REPORT_XSD = "https://maven.apache.org/surefire/maven-failsafe-plugin/xsd/failsafe-test-report.xsd";
+
+ public FailsafeStatelessXmlReporter(File reportsDirectory, String reportNameSuffix, boolean trimStackTrace, int rerunFailingTestsCount, Map<String, Map<String, List<WrappedReportEntry>>> testClassMethodRunHistoryMap) {
+ super(reportsDirectory, reportNameSuffix, trimStackTrace, rerunFailingTestsCount, testClassMethodRunHistoryMap,
+ FAILSAFE_TEST_REPORT_XSD);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c78d238a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index 3305c5b..bff5620 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -86,6 +86,8 @@ public class StatelessXmlReporter
private static final Charset ENCODING_CS = Charset.forName( ENCODING );
+ static final String SUREFIRE_TEST_REPORT_XSD = "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd";
+
private final File reportsDirectory;
private final String reportNameSuffix;
@@ -98,15 +100,27 @@ public class StatelessXmlReporter
// and the list of runs for each test method
private final Map<String, Map<String, List<WrappedReportEntry>>> testClassMethodRunHistoryMap;
+ final String testReportXsd;
+
public StatelessXmlReporter( File reportsDirectory, String reportNameSuffix, boolean trimStackTrace,
int rerunFailingTestsCount,
Map<String, Map<String, List<WrappedReportEntry>>> testClassMethodRunHistoryMap )
{
+ this( reportsDirectory, reportNameSuffix, trimStackTrace, rerunFailingTestsCount,
+ testClassMethodRunHistoryMap, SUREFIRE_TEST_REPORT_XSD);
+ }
+
+ StatelessXmlReporter( File reportsDirectory, String reportNameSuffix, boolean trimStackTrace,
+ int rerunFailingTestsCount,
+ Map<String, Map<String, List<WrappedReportEntry>>> testClassMethodRunHistoryMap,
+ String testReportXsd )
+ {
this.reportsDirectory = reportsDirectory;
this.reportNameSuffix = reportNameSuffix;
this.trimStackTrace = trimStackTrace;
this.rerunFailingTestsCount = rerunFailingTestsCount;
this.testClassMethodRunHistoryMap = testClassMethodRunHistoryMap;
+ this.testReportXsd = testReportXsd;
}
public void testSetCompleted( WrappedReportEntry testSetReportEntry, TestSetStats testSetStats )
@@ -129,7 +143,7 @@ public class StatelessXmlReporter
ppw.setEncoding( ENCODING );
createTestSuiteElement( ppw, testSetReportEntry, testSetStats, reportNameSuffix,
- testSetReportEntry.elapsedTimeAsString() );
+ testSetReportEntry.elapsedTimeAsString(), testReportXsd );
showProperties( ppw );
@@ -348,14 +362,14 @@ public class StatelessXmlReporter
}
private static void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats,
- String reportNameSuffix1, String timeAsString )
+ String reportNameSuffix1, String timeAsString, String testReportXsd )
{
ppw.startElement( "testsuite" );
ppw.addAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" );
ppw.addAttribute( "xsi:noNamespaceSchemaLocation",
- "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" );
+ testReportXsd );
ppw.addAttribute( "name", report.getReportName( reportNameSuffix1 ) );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c78d238a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
index 09fa1d1..643a291 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
@@ -84,8 +84,7 @@ public class StatelessXmlReporterTest
public void testFileNameWithoutSuffix()
{
StatelessXmlReporter reporter =
- new StatelessXmlReporter( reportDir, null, false, 0,
- new ConcurrentHashMap<String, Map<String, List<WrappedReportEntry>>>() );
+ createStatelessXmlReporter();
reporter.cleanTestHistoryMap();
ReportEntry reportEntry = new SimpleReportEntry( getClass().getName(), getClass().getName(), 12 );
@@ -99,6 +98,11 @@ public class StatelessXmlReporterTest
expectedReportFile.exists() );
}
+ StatelessXmlReporter createStatelessXmlReporter() {
+ return new StatelessXmlReporter( reportDir, null, false, 0,
+ new ConcurrentHashMap<String, Map<String, List<WrappedReportEntry>>>() );
+ }
+
public void testAllFieldsSerialized()
throws IOException
[09/15] maven-surefire git commit: [SUREFIRE] added Jacoco
Posted by mf...@apache.org.
[SUREFIRE] added Jacoco
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7466f098
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7466f098
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7466f098
Branch: refs/heads/SUREFIRE-1217
Commit: 7466f09853d64721a2e81225f2382266d1d500a9
Parents: 9875d2a
Author: Tibor17 <ti...@lycos.com>
Authored: Wed Jan 13 02:44:51 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Wed Jan 13 02:44:51 2016 +0100
----------------------------------------------------------------------
pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7466f098/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b411225..ebb69de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -295,6 +295,7 @@
<configuration>
<!-- NOTE: Be sure to isolate the Surefire version under test from the version running the tests! -->
<useSystemClassLoader>false</useSystemClassLoader>
+ <argLine>${surefireArgLine}</argLine>
</configuration>
</plugin>
<plugin>
@@ -315,6 +316,14 @@
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.7.5.201505241946</version>
+ <configuration>
+ <propertyName>surefireArgLine</propertyName>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
[15/15] maven-surefire git commit: SUREFIRE-1217: Extract factory
method for StatelessXmlReporter.
Posted by mf...@apache.org.
SUREFIRE-1217: Extract factory method for StatelessXmlReporter.
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/6a96365f
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/6a96365f
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/6a96365f
Branch: refs/heads/SUREFIRE-1217
Commit: 6a96365f83dcab772cd3a2e5403c1e98a206bffa
Parents: c78d238
Author: Mirko Friedenhagen <mf...@apache.org>
Authored: Sun Jan 10 21:36:18 2016 +0100
Committer: Mirko Friedenhagen <mf...@apache.org>
Committed: Wed Jan 13 07:05:33 2016 +0100
----------------------------------------------------------------------
.../report/StatelessXmlReporterTest.java | 24 ++++++++------------
1 file changed, 9 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/6a96365f/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
index 643a291..c710a7e 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
@@ -84,7 +84,7 @@ public class StatelessXmlReporterTest
public void testFileNameWithoutSuffix()
{
StatelessXmlReporter reporter =
- createStatelessXmlReporter();
+ createStatelessXmlReporter(0);
reporter.cleanTestHistoryMap();
ReportEntry reportEntry = new SimpleReportEntry( getClass().getName(), getClass().getName(), 12 );
@@ -98,12 +98,6 @@ public class StatelessXmlReporterTest
expectedReportFile.exists() );
}
- StatelessXmlReporter createStatelessXmlReporter() {
- return new StatelessXmlReporter( reportDir, null, false, 0,
- new ConcurrentHashMap<String, Map<String, List<WrappedReportEntry>>>() );
- }
-
-
public void testAllFieldsSerialized()
throws IOException
{
@@ -141,8 +135,7 @@ public class StatelessXmlReporterTest
ReportEntryType.ERROR, 13, stdOut, stdErr );
stats.testSucceeded( t2 );
- StatelessXmlReporter reporter = new StatelessXmlReporter( reportDir, null, false, 0,
- new ConcurrentHashMap<String, Map<String, List<WrappedReportEntry>>>() );
+ StatelessXmlReporter reporter = createStatelessXmlReporter(0);
reporter.testSetCompleted( testSetReportEntry, stats );
FileInputStream fileInputStream = new FileInputStream( expectedReportFile );
@@ -175,6 +168,7 @@ public class StatelessXmlReporterTest
assertEquals( stdErrPrefix + "?&-&£ &#0;&#31;", tcb.getChild( "system-err" ).getValue() );
}
+
public void testOutputRerunFlakyFailure()
throws IOException
{
@@ -220,12 +214,7 @@ public class StatelessXmlReporterTest
rerunStats.testSucceeded( testTwoSecondError );
rerunStats.testSucceeded( testThreeSecondRun );
- StatelessXmlReporter reporter =
- new StatelessXmlReporter( reportDir,
- null,
- false,
- 1,
- new HashMap<String, Map<String, List<WrappedReportEntry>>>() );
+ StatelessXmlReporter reporter = createStatelessXmlReporter(1);
reporter.testSetCompleted( testSetReportEntry, stats );
reporter.testSetCompleted( testSetReportEntry, rerunStats );
@@ -283,6 +272,11 @@ public class StatelessXmlReporterTest
assertNull( testCaseThree.getChild( "system-err" ) );
}
+ StatelessXmlReporter createStatelessXmlReporter(int rerunFailingTestCount) {
+ return new StatelessXmlReporter( reportDir, null, false, rerunFailingTestCount,
+ new ConcurrentHashMap<String, Map<String, List<WrappedReportEntry>>>() );
+ }
+
private boolean defaultCharsetSupportsSpecialChar()
{
// some charsets are not able to deal with \u0115 on both ways of the conversion
[08/15] maven-surefire git commit: [SUREFIRE] fixed little checkstyle
issues
Posted by mf...@apache.org.
[SUREFIRE] fixed little checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9875d2a2
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9875d2a2
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9875d2a2
Branch: refs/heads/SUREFIRE-1217
Commit: 9875d2a260a9fb81b6496bc8ed62722181b47142
Parents: f25c10d
Author: Tibor17 <ti...@lycos.com>
Authored: Wed Jan 13 02:35:08 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Wed Jan 13 02:35:08 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/maven/surefire/common/junit4/Notifier.java | 2 --
.../main/java/org/apache/maven/surefire/testng/TestNGExecutor.java | 2 --
2 files changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9875d2a2/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
index 43df609..dfa3948 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
@@ -91,7 +91,6 @@ public class Notifier
return failFast;
}
- // CHECKSTYLE:OFF
@Override
@SuppressWarnings( "checkstyle:redundantthrowscheck" ) // checkstyle is wrong here, see super.fireTestStarted()
public final void fireTestStarted( Description description ) throws StoppedByUserException
@@ -104,7 +103,6 @@ public class Notifier
testClassNames.remove( cutTestClassAndMethod( description ).getClazz() );
}
}
- // CHECKSTYLE:ON
@Override
public final void fireTestFailure( Failure failure )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9875d2a2/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
index 4f2abcf..3c78b60 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
@@ -73,7 +73,6 @@ final class TestNGExecutor
throw new IllegalStateException( "not instantiable constructor" );
}
- // CHECKSTYLE:OFF
@SuppressWarnings( "checkstyle:parameternumbercheck" )
static void run( Iterable<Class<?>> testClasses, String testSourceDirectory,
Map<String, String> options, // string,string because TestNGMapConfigurator#configure()
@@ -133,7 +132,6 @@ final class TestNGExecutor
extractVerboseLevel( options ) );
testng.run();
}
- // CHECKSTYLE:ON
private static boolean isCliDebugOrShowErrors( List<CommandLineOption> mainCliOptions )
{
[11/15] maven-surefire git commit: SUREFIRE-1217: Copy
failsafe-test-report.xsd.
Posted by mf...@apache.org.
SUREFIRE-1217: Copy failsafe-test-report.xsd.
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9ba6b60f
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9ba6b60f
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9ba6b60f
Branch: refs/heads/SUREFIRE-1217
Commit: 9ba6b60f886f625b28e50fb3cda785870b326bc0
Parents: 6a96365
Author: Mirko Friedenhagen <mf...@apache.org>
Authored: Sun Jan 10 21:39:33 2016 +0100
Committer: Mirko Friedenhagen <mf...@apache.org>
Committed: Wed Jan 13 07:05:33 2016 +0100
----------------------------------------------------------------------
.../site/resources/xsd/failsafe-test-report.xsd | 123 +++++++++++++++++++
1 file changed, 123 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9ba6b60f/maven-failsafe-plugin/src/site/resources/xsd/failsafe-test-report.xsd
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/site/resources/xsd/failsafe-test-report.xsd b/maven-failsafe-plugin/src/site/resources/xsd/failsafe-test-report.xsd
new file mode 100644
index 0000000..7ef8d60
--- /dev/null
+++ b/maven-failsafe-plugin/src/site/resources/xsd/failsafe-test-report.xsd
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="testsuite">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="properties" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="property" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="value" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="testcase" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="failure" nillable="true" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="message" type="xs:string" />
+ <xs:attribute name="type" type="xs:string" use="required" />
+ <xs:attribute name="time">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="(([0-9]{0,3},)*[0-9]{3}|[0-9]{0,3})*(\.[0-9]{0,3})?" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="rerunFailure" nillable="true" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="message" type="xs:string" />
+ <xs:attribute name="type" type="xs:string" use="required" />
+ <xs:attribute name="time">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="(([0-9]{0,3},)*[0-9]{3}|[0-9]{0,3})*(\.[0-9]{0,3})?"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="skipped" nillable="true" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="message" type="xs:string" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="error" nillable="true" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="message" type="xs:string" />
+ <xs:attribute name="type" type="xs:string" use="required" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="system-out" nillable="true" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="system-err" nillable="true" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="classname" type="xs:string" />
+ <xs:attribute name="group" type="xs:string" />
+ <xs:attribute name="time" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="(([0-9]{0,3},)*[0-9]{3}|[0-9]{0,3})*(\.[0-9]{0,3})?"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="time">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="(([0-9]{0,3},)*[0-9]{3}|[0-9]{0,3})*(\.[0-9]{0,3})?"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="tests" type="xs:string" use="required"/>
+ <xs:attribute name="errors" type="xs:string" use="required"/>
+ <xs:attribute name="skipped" type="xs:string" use="required"/>
+ <xs:attribute name="failures" type="xs:string" use="required"/>
+ <xs:attribute name="group" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
[02/15] maven-surefire git commit: Merge remote-tracking branch
'origin/master'
Posted by mf...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/97525c57
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/97525c57
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/97525c57
Branch: refs/heads/SUREFIRE-1217
Commit: 97525c57b98ed2ed9b899bdcc7416ed3fc81bd8e
Parents: 7b7e47a 536f5c6
Author: Tibor17 <ti...@lycos.com>
Authored: Sun Jan 10 22:13:39 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Sun Jan 10 22:13:39 2016 +0100
----------------------------------------------------------------------
.../apache/maven/plugin/surefire/report/StatelessXmlReporter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[07/15] maven-surefire git commit: [SUREFIRE] fixed little checkstyle
issues
Posted by mf...@apache.org.
[SUREFIRE] fixed little checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/f25c10d7
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/f25c10d7
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/f25c10d7
Branch: refs/heads/SUREFIRE-1217
Commit: f25c10d70cf319207abaaa33da5438d41d9b7b6c
Parents: 641f971
Author: Tibor17 <ti...@lycos.com>
Authored: Wed Jan 13 02:04:46 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Wed Jan 13 02:04:46 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/maven/surefire/common/junit4/Notifier.java | 2 ++
.../main/java/org/apache/maven/surefire/testng/TestNGExecutor.java | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f25c10d7/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
index dfa3948..43df609 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/Notifier.java
@@ -91,6 +91,7 @@ public class Notifier
return failFast;
}
+ // CHECKSTYLE:OFF
@Override
@SuppressWarnings( "checkstyle:redundantthrowscheck" ) // checkstyle is wrong here, see super.fireTestStarted()
public final void fireTestStarted( Description description ) throws StoppedByUserException
@@ -103,6 +104,7 @@ public class Notifier
testClassNames.remove( cutTestClassAndMethod( description ).getClazz() );
}
}
+ // CHECKSTYLE:ON
@Override
public final void fireTestFailure( Failure failure )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f25c10d7/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
index 3c78b60..4f2abcf 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
@@ -73,6 +73,7 @@ final class TestNGExecutor
throw new IllegalStateException( "not instantiable constructor" );
}
+ // CHECKSTYLE:OFF
@SuppressWarnings( "checkstyle:parameternumbercheck" )
static void run( Iterable<Class<?>> testClasses, String testSourceDirectory,
Map<String, String> options, // string,string because TestNGMapConfigurator#configure()
@@ -132,6 +133,7 @@ final class TestNGExecutor
extractVerboseLevel( options ) );
testng.run();
}
+ // CHECKSTYLE:ON
private static boolean isCliDebugOrShowErrors( List<CommandLineOption> mainCliOptions )
{
[03/15] maven-surefire git commit: [SUREFIRE] Badges to README.md
Posted by mf...@apache.org.
[SUREFIRE] Badges to README.md
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/bc9700a6
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/bc9700a6
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/bc9700a6
Branch: refs/heads/SUREFIRE-1217
Commit: bc9700a64615ec2568ae4da51c1886daeff01fb5
Parents: 97525c5
Author: Tibor17 <ti...@lycos.com>
Authored: Tue Jan 12 23:35:50 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Tue Jan 12 23:35:50 2016 +0100
----------------------------------------------------------------------
README.md | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bc9700a6/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 0958be6..00dd7bf 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
[](https://maven.apache.org/surefire/)
+[!CI](https://img.shields.io/badge/CI-Jenkins-red.svg?style=flat-square)](https://jenkins-ci.org/)
[](https://maven-badges.herokuapp.com/maven-central/org.apache.maven.surefire/surefire)
[](http://www.apache.org/licenses/LICENSE-2.0.html)
[](https://img.shields.io/jenkins/c/https/builds.apache.org/maven-surefire.svg)
+[](https://img.shields.io/jenkins/t/https/builds.apache.org/maven-surefire.svg)
[](https://builds.apache.org/job/maven-surefire)
[](https://builds.apache.org/job/maven-surefire-windows)
[](https://builds.apache.org/job/maven-surefire-mvn-2.2.1)
[13/15] maven-surefire git commit: SUREFIRE-1217: Move failsafe xsd
to surefire and differentiate in index.apt.vm.
Posted by mf...@apache.org.
SUREFIRE-1217: Move failsafe xsd to surefire and differentiate in index.apt.vm.
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/2a246c58
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/2a246c58
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/2a246c58
Branch: refs/heads/SUREFIRE-1217
Commit: 2a246c58eb6957753089701711d97ef7729a80fd
Parents: 9ba6b60
Author: Mirko Friedenhagen <mf...@apache.org>
Authored: Sun Jan 10 21:57:10 2016 +0100
Committer: Mirko Friedenhagen <mf...@apache.org>
Committed: Wed Jan 13 07:05:33 2016 +0100
----------------------------------------------------------------------
.../site/resources/xsd/failsafe-test-report.xsd | 123 -------------------
maven-surefire-plugin/src/site/apt/index.apt.vm | 4 +
.../site/resources/xsd/failsafe-test-report.xsd | 123 +++++++++++++++++++
3 files changed, 127 insertions(+), 123 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2a246c58/maven-failsafe-plugin/src/site/resources/xsd/failsafe-test-report.xsd
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/site/resources/xsd/failsafe-test-report.xsd b/maven-failsafe-plugin/src/site/resources/xsd/failsafe-test-report.xsd
deleted file mode 100644
index 7ef8d60..0000000
--- a/maven-failsafe-plugin/src/site/resources/xsd/failsafe-test-report.xsd
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="testsuite">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="properties" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="property" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="value" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="testcase" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="failure" nillable="true" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="message" type="xs:string" />
- <xs:attribute name="type" type="xs:string" use="required" />
- <xs:attribute name="time">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern value="(([0-9]{0,3},)*[0-9]{3}|[0-9]{0,3})*(\.[0-9]{0,3})?" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="rerunFailure" nillable="true" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="message" type="xs:string" />
- <xs:attribute name="type" type="xs:string" use="required" />
- <xs:attribute name="time">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern value="(([0-9]{0,3},)*[0-9]{3}|[0-9]{0,3})*(\.[0-9]{0,3})?"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="skipped" nillable="true" minOccurs="0" maxOccurs="1">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="message" type="xs:string" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="error" nillable="true" minOccurs="0" maxOccurs="1">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="message" type="xs:string" />
- <xs:attribute name="type" type="xs:string" use="required" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="system-out" nillable="true" minOccurs="0" maxOccurs="1"/>
- <xs:element name="system-err" nillable="true" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="classname" type="xs:string" />
- <xs:attribute name="group" type="xs:string" />
- <xs:attribute name="time" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern value="(([0-9]{0,3},)*[0-9]{3}|[0-9]{0,3})*(\.[0-9]{0,3})?"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="time">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern value="(([0-9]{0,3},)*[0-9]{3}|[0-9]{0,3})*(\.[0-9]{0,3})?"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="tests" type="xs:string" use="required"/>
- <xs:attribute name="errors" type="xs:string" use="required"/>
- <xs:attribute name="skipped" type="xs:string" use="required"/>
- <xs:attribute name="failures" type="xs:string" use="required"/>
- <xs:attribute name="group" type="xs:string"/>
- </xs:complexType>
- </xs:element>
-</xs:schema>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2a246c58/maven-surefire-plugin/src/site/apt/index.apt.vm
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/apt/index.apt.vm b/maven-surefire-plugin/src/site/apt/index.apt.vm
index 9c7ef2f..611e606 100644
--- a/maven-surefire-plugin/src/site/apt/index.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/index.apt.vm
@@ -79,7 +79,11 @@ mvn verify
By default, these files are generated at <<<$\{basedir\}/target/${thisPlugin.toLowerCase()}-reports>>>.
+#{if}(${project.artifactId}=="maven-surefire-plugin")
The schema for the Surefire XML reports is available at {{{./xsd/surefire-test-report.xsd}Surefire XML Report Schema}}.
+#{else}
+ The schema for the Failsafe XML reports is available at {{{./xsd/failsafe-test-report.xsd}Failsafe XML Report Schema}}.
+#{end}
For an HTML format of the report, please see the
{{{http://maven.apache.org/plugins/maven-surefire-report-plugin/}Maven Surefire Report Plugin}}.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2a246c58/maven-surefire-plugin/src/site/resources/xsd/failsafe-test-report.xsd
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/resources/xsd/failsafe-test-report.xsd b/maven-surefire-plugin/src/site/resources/xsd/failsafe-test-report.xsd
new file mode 100644
index 0000000..7ef8d60
--- /dev/null
+++ b/maven-surefire-plugin/src/site/resources/xsd/failsafe-test-report.xsd
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="testsuite">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="properties" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="property" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="value" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="testcase" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="failure" nillable="true" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="message" type="xs:string" />
+ <xs:attribute name="type" type="xs:string" use="required" />
+ <xs:attribute name="time">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="(([0-9]{0,3},)*[0-9]{3}|[0-9]{0,3})*(\.[0-9]{0,3})?" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="rerunFailure" nillable="true" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="message" type="xs:string" />
+ <xs:attribute name="type" type="xs:string" use="required" />
+ <xs:attribute name="time">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="(([0-9]{0,3},)*[0-9]{3}|[0-9]{0,3})*(\.[0-9]{0,3})?"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="skipped" nillable="true" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="message" type="xs:string" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="error" nillable="true" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="message" type="xs:string" />
+ <xs:attribute name="type" type="xs:string" use="required" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="system-out" nillable="true" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="system-err" nillable="true" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="classname" type="xs:string" />
+ <xs:attribute name="group" type="xs:string" />
+ <xs:attribute name="time" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="(([0-9]{0,3},)*[0-9]{3}|[0-9]{0,3})*(\.[0-9]{0,3})?"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="time">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="(([0-9]{0,3},)*[0-9]{3}|[0-9]{0,3})*(\.[0-9]{0,3})?"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="tests" type="xs:string" use="required"/>
+ <xs:attribute name="errors" type="xs:string" use="required"/>
+ <xs:attribute name="skipped" type="xs:string" use="required"/>
+ <xs:attribute name="failures" type="xs:string" use="required"/>
+ <xs:attribute name="group" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
[12/15] maven-surefire git commit: [SUREFIRE-1217] Checkstyle
Posted by mf...@apache.org.
[SUREFIRE-1217] Checkstyle
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/1b7ade29
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/1b7ade29
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/1b7ade29
Branch: refs/heads/SUREFIRE-1217
Commit: 1b7ade2921d63d1f91d030ac0bdecae4362f1a86
Parents: 2a246c5
Author: Mirko Friedenhagen <mf...@apache.org>
Authored: Wed Jan 13 07:03:24 2016 +0100
Committer: Mirko Friedenhagen <mf...@apache.org>
Committed: Wed Jan 13 07:05:33 2016 +0100
----------------------------------------------------------------------
.../report/FailsafeStatelessXmlReporter.java | 15 ++++++++++-----
.../plugin/surefire/report/StatelessXmlReporter.java | 8 ++++----
2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1b7ade29/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FailsafeStatelessXmlReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FailsafeStatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FailsafeStatelessXmlReporter.java
index 5689aaf..815cf84 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FailsafeStatelessXmlReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FailsafeStatelessXmlReporter.java
@@ -28,12 +28,17 @@ import java.util.Map;
*
* @since 2.19.2
*/
-public class FailsafeStatelessXmlReporter extends StatelessXmlReporter {
+public class FailsafeStatelessXmlReporter extends StatelessXmlReporter
+{
- static final String FAILSAFE_TEST_REPORT_XSD = "https://maven.apache.org/surefire/maven-failsafe-plugin/xsd/failsafe-test-report.xsd";
+ static final String FAILSAFE_TEST_REPORT_XSD = "https://maven.apache.org/surefire/maven-failsafe-plugin/"
+ + "xsd/failsafe-test-report.xsd";
- public FailsafeStatelessXmlReporter(File reportsDirectory, String reportNameSuffix, boolean trimStackTrace, int rerunFailingTestsCount, Map<String, Map<String, List<WrappedReportEntry>>> testClassMethodRunHistoryMap) {
- super(reportsDirectory, reportNameSuffix, trimStackTrace, rerunFailingTestsCount, testClassMethodRunHistoryMap,
- FAILSAFE_TEST_REPORT_XSD);
+ public FailsafeStatelessXmlReporter( File reportsDirectory, String reportNameSuffix, boolean trimStackTrace,
+ int rerunFailingTestsCount,
+ Map<String, Map<String, List<WrappedReportEntry>>> testClassMethodRunHistoryMap )
+ {
+ super( reportsDirectory, reportNameSuffix, trimStackTrace, rerunFailingTestsCount,
+ testClassMethodRunHistoryMap, FAILSAFE_TEST_REPORT_XSD );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1b7ade29/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index bff5620..26b6dc1 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -107,13 +107,13 @@ public class StatelessXmlReporter
Map<String, Map<String, List<WrappedReportEntry>>> testClassMethodRunHistoryMap )
{
this( reportsDirectory, reportNameSuffix, trimStackTrace, rerunFailingTestsCount,
- testClassMethodRunHistoryMap, SUREFIRE_TEST_REPORT_XSD);
+ testClassMethodRunHistoryMap, SUREFIRE_TEST_REPORT_XSD );
}
StatelessXmlReporter( File reportsDirectory, String reportNameSuffix, boolean trimStackTrace,
- int rerunFailingTestsCount,
- Map<String, Map<String, List<WrappedReportEntry>>> testClassMethodRunHistoryMap,
- String testReportXsd )
+ int rerunFailingTestsCount,
+ Map<String, Map<String, List<WrappedReportEntry>>> testClassMethodRunHistoryMap,
+ String testReportXsd )
{
this.reportsDirectory = reportsDirectory;
this.reportNameSuffix = reportNameSuffix;
[05/15] maven-surefire git commit: [SUREFIRE] Badges to README.md
Posted by mf...@apache.org.
[SUREFIRE] Badges to README.md
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/d6184910
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/d6184910
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/d6184910
Branch: refs/heads/SUREFIRE-1217
Commit: d6184910a7dc75bc77acee37b5fac64dec529182
Parents: c538089
Author: Tibor17 <ti...@lycos.com>
Authored: Tue Jan 12 23:48:23 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Tue Jan 12 23:48:23 2016 +0100
----------------------------------------------------------------------
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d6184910/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index f1cab84..33038b3 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
[](https://jenkins-ci.org/)
[](https://maven-badges.herokuapp.com/maven-central/org.apache.maven.surefire/surefire)
-[](http://www.apache.org/licenses/LICENSE-2.0.html)
+[](http://www.apache.org/licenses/LICENSE-2.0.html)
[](https://img.shields.io/jenkins/c/https/builds.apache.org/maven-surefire.svg)
[](https://img.shields.io/jenkins/t/https/builds.apache.org/maven-surefire.svg)
[](https://builds.apache.org/job/maven-surefire)
[10/15] maven-surefire git commit: [SUREFIRE] code cleanup
Posted by mf...@apache.org.
[SUREFIRE] code cleanup
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/8b598496
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/8b598496
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/8b598496
Branch: refs/heads/SUREFIRE-1217
Commit: 8b59849619ba3dc16a7d4c4de2dac8b061130a45
Parents: 7466f09
Author: Tibor17 <ti...@lycos.com>
Authored: Wed Jan 13 03:52:37 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Wed Jan 13 03:52:37 2016 +0100
----------------------------------------------------------------------
.../maven/plugin/surefire/AbstractSurefireMojo.java | 16 +++++-----------
.../lazytestprovider/TestLessInputStream.java | 14 --------------
.../maven/plugin/surefire/util/Relocator.java | 10 ++++------
.../maven/plugin/surefire/util/ScannerUtil.java | 6 ++----
4 files changed, 11 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8b598496/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 3b3af1d..111c9c5 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1607,8 +1607,7 @@ public abstract class AbstractSurefireMojo
return StringUtils.isNotBlank( getTest() );
}
- @SuppressWarnings( "checkstyle:modifierorder" )
- private @Nonnull List<String> readListFromFile( @Nonnull final File file )
+ @Nonnull private List<String> readListFromFile( @Nonnull final File file )
{
getLog().debug( "Reading list from: " + file );
@@ -1645,8 +1644,7 @@ public abstract class AbstractSurefireMojo
}
}
- @SuppressWarnings( "checkstyle:modifierorder" )
- private @Nonnull List<String> getExcludeList()
+ @Nonnull private List<String> getExcludeList()
throws MojoFailureException
{
List<String> actualExcludes = null;
@@ -1752,8 +1750,7 @@ public abstract class AbstractSurefireMojo
return specificTests;
}
- @SuppressWarnings( "checkstyle:modifierorder" )
- private @Nonnull List<String> filterNulls( @Nonnull List<String> toFilter )
+ @Nonnull private List<String> filterNulls( @Nonnull List<String> toFilter )
{
List<String> result = new ArrayList<String>( toFilter.size() );
for ( String item : toFilter )
@@ -2471,8 +2468,7 @@ public abstract class AbstractSurefireMojo
this.testNgArtifact = testNgArtifact;
}
- @SuppressWarnings( "checkstyle:modifierorder" )
- public @Nonnull String getProviderName()
+ @Nonnull public String getProviderName()
{
return "org.apache.maven.surefire.testng.TestNGProvider";
}
@@ -2664,7 +2660,6 @@ public abstract class AbstractSurefireMojo
this.dynamicProvider = dynamicProviderInfo;
}
- @SuppressWarnings( "checkstyle:modifierorder" )
@Nonnull List<ProviderInfo> resolve()
{
List<ProviderInfo> providersToRun = new ArrayList<ProviderInfo>();
@@ -2679,8 +2674,7 @@ public abstract class AbstractSurefireMojo
return manuallyConfiguredProviders.isEmpty() ? autoDetectOneProvider() : providersToRun;
}
- @SuppressWarnings( "checkstyle:modifierorder" )
- private @Nonnull List<ProviderInfo> autoDetectOneProvider()
+ @Nonnull private List<ProviderInfo> autoDetectOneProvider()
{
List<ProviderInfo> providersToRun = new ArrayList<ProviderInfo>();
for ( ProviderInfo wellKnownProvider : wellKnownProviders )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8b598496/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java
index 04d39b3..b6ae42c 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java
@@ -237,20 +237,6 @@ public final class TestLessInputStream
}
@SuppressWarnings( "checkstyle:innerassignment" )
- private void addTailNode( Command command )
- {
- Node newTail = new Node( command );
- Node currentTail = head;
- do
- {
- for ( Node successor; ( successor = currentTail.next.get() ) != null; )
- {
- currentTail = successor;
- }
- } while ( !currentTail.next.compareAndSet( null, newTail ) );
- }
-
- @SuppressWarnings( "checkstyle:innerassignment" )
private boolean addTailNodeIfAbsent( Command command )
{
Node newTail = new Node( command );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8b598496/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java
index eb5964c..89117af 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java
@@ -30,8 +30,8 @@ import javax.annotation.Nullable;
*/
public class Relocator
{
- @SuppressWarnings( "checkstyle:modifierorder" )
- private final @Nullable String relocation;
+ @Nullable
+ private final String relocation;
private static final String RELOCATION_BASE = "org.apache.maven.surefire.";
@@ -46,14 +46,12 @@ public class Relocator
relocation = "shadefire";
}
- @SuppressWarnings( "checkstyle:modifierorder" )
- private @Nullable String getRelocation()
+ @Nullable private String getRelocation()
{
return relocation;
}
- @SuppressWarnings( "checkstyle:modifierorder" )
- public @Nonnull String relocate( @Nonnull String className )
+ @Nonnull public String relocate( @Nonnull String className )
{
if ( relocation == null )
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8b598496/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java
index 4ec6689..9989176 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java
@@ -36,15 +36,13 @@ final class ScannerUtil
@Deprecated
private static final boolean IS_NON_UNIX_FS = ( !FS.equals( "/" ) );
- @SuppressWarnings( "checkstyle:modifierorder" )
- public static @Nonnull String convertJarFileResourceToJavaClassName( @Nonnull String test )
+ @Nonnull public static String convertJarFileResourceToJavaClassName( @Nonnull String test )
{
return StringUtils.removeEnd( test, ".class" ).replace( "/", "." );
}
- @SuppressWarnings( "checkstyle:modifierorder" )
@Deprecated
- public static @Nonnull String convertSlashToSystemFileSeparator( @Nonnull String path )
+ @Nonnull public static String convertSlashToSystemFileSeparator( @Nonnull String path )
{
return ( IS_NON_UNIX_FS ? path.replace( "/", FS ) : path );
}