You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2024/07/06 20:45:57 UTC
(maven-surefire) 01/01: [SUREFIRE-2250] Surefire Test Report Schema properties element is not consistent with the code
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SUREFIRE-2250
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit d1777028eb011834dd109f7c17b2766d683a150d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jul 6 22:36:31 2024 +0200
[SUREFIRE-2250] Surefire Test Report Schema properties element is not consistent with the code
This closes #758
---
.../org/apache/maven/plugin/surefire/AbstractSurefireMojo.java | 2 +-
.../plugin/surefire/extensions/SurefireStatelessReporter.java | 2 +-
.../extensions/junit5/JUnit5Xml30StatelessReporter.java | 2 +-
.../plugin/surefire/extensions/StatelessReporterTest.java | 8 ++++----
.../maven/plugin/surefire/report/StatelessXmlReporterTest.java | 10 +++++-----
.../src/site/apt/examples/junit-platform.apt.vm | 2 +-
.../src/site/resources/xsd/surefire-test-report.xsd | 4 ++--
.../src/test/resources/surefire-1894/TEST-surefire.MyTest.xml | 2 +-
.../apache/maven/surefire/extensions/StatelessReporter.java | 4 ++--
.../fixture/testsuitexmlparser/TEST-org.acme.FlakyTest.xml | 2 +-
10 files changed, 19 insertions(+), 19 deletions(-)
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 bdd76ff64..4c98873fe 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
@@ -1978,7 +1978,7 @@ public abstract class AbstractSurefireMojo extends AbstractMojo implements Suref
private StartupReportConfiguration getStartupReportConfiguration(String configChecksum, boolean isForking) {
SurefireStatelessReporter xmlReporter = statelessTestsetReporter == null
- ? new SurefireStatelessReporter(/*todo call def. constr.*/ isDisableXmlReport(), "3.0.1")
+ ? new SurefireStatelessReporter(/*todo call def. constr.*/ isDisableXmlReport(), "3.0.2")
: statelessTestsetReporter;
xmlReporter.setDisable(isDisableXmlReport()); // todo change to Boolean in the version 3.0.0-M6
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireStatelessReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireStatelessReporter.java
index 55bb25790..26b416484 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireStatelessReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireStatelessReporter.java
@@ -41,7 +41,7 @@ public class SurefireStatelessReporter
* Activated in the injection point of MOJO.
*/
public SurefireStatelessReporter() {
- this(false, "3.0.1");
+ this(false, "3.0.2");
}
/**
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/junit5/JUnit5Xml30StatelessReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/junit5/JUnit5Xml30StatelessReporter.java
index 9207d545e..e6cc39d56 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/junit5/JUnit5Xml30StatelessReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/junit5/JUnit5Xml30StatelessReporter.java
@@ -26,7 +26,7 @@ import org.apache.maven.plugin.surefire.report.WrappedReportEntry;
import org.apache.maven.surefire.extensions.StatelessReportEventListener;
/**
- * The extension of {@link StatelessReportEventListener xml reporter} based on XSD version 3.0.1 for JUnit5.
+ * The extension of {@link StatelessReportEventListener XML reporter} based on XSD version 3.0.2 for JUnit5.
* Selectively enables phrased classes, methods and report files upon JUnit5 annotation <em>DisplayName</em>.
*
* author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java
index 377cf68f1..c628f8b14 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java
@@ -55,7 +55,7 @@ public class StatelessReporterTest {
@Test
public void shouldAssertToStringXmlReporter() {
SurefireStatelessReporter extension = new SurefireStatelessReporter();
- assertThat(extension.toString()).isEqualTo("SurefireStatelessReporter{version=3.0.1, disable=false}");
+ assertThat(extension.toString()).isEqualTo("SurefireStatelessReporter{version=3.0.2, disable=false}");
}
@Test
@@ -69,7 +69,7 @@ public class StatelessReporterTest {
reportsDirectory, reportNameSuffix, true, 5, schema, true, true, testClassMethodRunHistory);
SurefireStatelessReporter extension = new SurefireStatelessReporter();
- assertThat(extension.getVersion()).isEqualTo("3.0.1");
+ assertThat(extension.getVersion()).isEqualTo("3.0.2");
extension.setVersion("V3");
assertThat(extension.getVersion()).isEqualTo("V3");
@@ -128,7 +128,7 @@ public class StatelessReporterTest {
public void shouldAssertToStringJUnit5ConsoleReporter() {
JUnit5Xml30StatelessReporter extension = new JUnit5Xml30StatelessReporter();
assertThat(extension.toString())
- .isEqualTo("JUnit5Xml30StatelessReporter{version=3.0.1, disable=false, "
+ .isEqualTo("JUnit5Xml30StatelessReporter{version=3.0.2, disable=false, "
+ "usePhrasedFileName=false, usePhrasedTestSuiteClassName=false, "
+ "usePhrasedTestCaseClassName=false, usePhrasedTestCaseMethodName=false}");
}
@@ -144,7 +144,7 @@ public class StatelessReporterTest {
reportsDirectory, reportNameSuffix, true, 5, schema, true, true, testClassMethodRunHistory);
JUnit5Xml30StatelessReporter extension = new JUnit5Xml30StatelessReporter();
- assertThat(extension.getVersion()).isEqualTo("3.0.1");
+ assertThat(extension.getVersion()).isEqualTo("3.0.2");
extension.setVersion("V3");
assertThat(extension.getVersion()).isEqualTo("V3");
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 aa41e4b77..362facb15 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
@@ -105,7 +105,7 @@ public class StatelessXmlReporterTest extends TestCase {
0,
new ConcurrentHashMap<String, Deque<WrappedReportEntry>>(),
XSD,
- "3.0.1",
+ "3.0.2",
false,
false,
false,
@@ -167,7 +167,7 @@ public class StatelessXmlReporterTest extends TestCase {
0,
new ConcurrentHashMap<String, Deque<WrappedReportEntry>>(),
XSD,
- "3.0.1",
+ "3.0.2",
false,
false,
false,
@@ -271,7 +271,7 @@ public class StatelessXmlReporterTest extends TestCase {
1,
new HashMap<String, Deque<WrappedReportEntry>>(),
XSD,
- "3.0.1",
+ "3.0.2",
false,
false,
false,
@@ -376,7 +376,7 @@ public class StatelessXmlReporterTest extends TestCase {
rerunStats.testSucceeded(testTwoSecondError);
StatelessXmlReporter reporter = new StatelessXmlReporter(
- reportDir, null, false, 1, new HashMap<>(), XSD, "3.0.1", false, false, false, false, true, true);
+ reportDir, null, false, 1, new HashMap<>(), XSD, "3.0.2", false, false, false, false, true, true);
WrappedReportEntry testSetReportEntry = new WrappedReportEntry(
new SimpleReportEntry(
@@ -540,7 +540,7 @@ public class StatelessXmlReporterTest extends TestCase {
null);
StatelessXmlReporter reporter = new StatelessXmlReporter(
- reportDir, null, false, 1, new HashMap<>(), XSD, "3.0.1", false, false, false, false, true, true);
+ reportDir, null, false, 1, new HashMap<>(), XSD, "3.0.2", false, false, false, false, true, true);
reporter.testSetCompleted(testReport, stats);
}
diff --git a/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm b/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm
index 0ea31bc68..deb8582f5 100644
--- a/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm
@@ -632,7 +632,7 @@ else
<configuration>
<statelessTestsetReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5Xml30StatelessReporter">
<disable>false</disable>
- <version>3.0.1</version>
+ <version>3.0.2</version>
<usePhrasedFileName>false</usePhrasedFileName>
<usePhrasedTestSuiteClassName>true</usePhrasedTestSuiteClassName>
<usePhrasedTestCaseClassName>true</usePhrasedTestCaseClassName>
diff --git a/maven-surefire-plugin/src/site/resources/xsd/surefire-test-report.xsd b/maven-surefire-plugin/src/site/resources/xsd/surefire-test-report.xsd
index 2c901dc6f..e6a1e5c20 100644
--- a/maven-surefire-plugin/src/site/resources/xsd/surefire-test-report.xsd
+++ b/maven-surefire-plugin/src/site/resources/xsd/surefire-test-report.xsd
@@ -17,11 +17,11 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="3.0.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="3.0.2">
<xs:element name="testsuite">
<xs:complexType>
<xs:sequence>
- <xs:element name="properties" minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="properties" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="property" minOccurs="0" maxOccurs="unbounded">
diff --git a/maven-surefire-report-plugin/src/test/resources/surefire-1894/TEST-surefire.MyTest.xml b/maven-surefire-report-plugin/src/test/resources/surefire-1894/TEST-surefire.MyTest.xml
index 690513df8..297ab070c 100644
--- a/maven-surefire-report-plugin/src/test/resources/surefire-1894/TEST-surefire.MyTest.xml
+++ b/maven-surefire-report-plugin/src/test/resources/surefire-1894/TEST-surefire.MyTest.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="surefire.MyTest" version="3.0.1" time="0" tests="1" errors="1" skipped="0" failures="0">
+<testsuite name="surefire.MyTest" version="3.0.2" time="0" tests="1" errors="1" skipped="0" failures="0">
<properties>
<property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
</properties>
diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
index 021d12231..3cf833daa 100644
--- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
@@ -40,7 +40,7 @@ public abstract class StatelessReporter<R extends TestSetReportEntry, S, C exten
private boolean disable;
/**
- * Version of reporter. It is version <em>3.0.1</em> used by default in XML reporter.
+ * Version of reporter. It is version <em>3.0.2</em> used by default in XML reporter.
*/
private String version;
@@ -62,7 +62,7 @@ public abstract class StatelessReporter<R extends TestSetReportEntry, S, C exten
}
public String getVersion() {
- return isBlank(version) ? "3.0.1" : version;
+ return isBlank(version) ? "3.0.2" : version;
}
public void setVersion(String version) {
diff --git a/surefire-report-parser/src/test/resources/fixture/testsuitexmlparser/TEST-org.acme.FlakyTest.xml b/surefire-report-parser/src/test/resources/fixture/testsuitexmlparser/TEST-org.acme.FlakyTest.xml
index e1d4ddad3..22999fdbe 100644
--- a/surefire-report-parser/src/test/resources/fixture/testsuitexmlparser/TEST-org.acme.FlakyTest.xml
+++ b/surefire-report-parser/src/test/resources/fixture/testsuitexmlparser/TEST-org.acme.FlakyTest.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<testsuite version="3.0.1" name="org.acme.FlakyTest" time="1.324" tests="1" errors="0" skipped="0" failures="0">
+<testsuite version="3.0.2" name="org.acme.FlakyTest" time="1.324" tests="1" errors="0" skipped="0" failures="0">
<properties>
<property name="java.class.version" value="55.0"/>
</properties>