From 561b4ca356e6fae53f0f16f4862fdd22305852fb Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Sat, 6 Jul 2024 22:36:31 +0200 Subject: [PATCH] [SUREFIRE-2250] Surefire Test Report Schema properties element is not consistent with the code This closes #758 --- .../maven/plugin/surefire/AbstractSurefireMojo.java | 2 +- .../surefire/extensions/SurefireStatelessReporter.java | 2 +- .../junit5/JUnit5Xml30StatelessReporter.java | 2 +- .../surefire/extensions/StatelessReporterTest.java | 8 ++++---- .../surefire/report/StatelessXmlReporterTest.java | 10 +++++----- .../src/site/apt/examples/junit-platform.apt.vm | 2 +- .../src/site/resources/xsd/surefire-test-report.xsd | 4 ++-- .../resources/surefire-1894/TEST-surefire.MyTest.xml | 2 +- .../maven/surefire/extensions/StatelessReporter.java | 4 ++-- .../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 bdd76ff64f..4c98873fe7 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 @@ private Artifact getShadefireArtifact() { 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 55bb25790d..26b4164846 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 9207d545ee..e6cc39d563 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.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 DisplayName. * * author Tibor Digana (tibor17) 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 377cf68f1f..c628f8b14e 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 void shouldCloneXmlReporter() { @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 void shouldCreateConsoleListener() { 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 void shouldCloneJUnit5XmlReporter() { 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 void shouldCreateJUnit5ConsoleListener() { 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 aa41e4b77d..362facb154 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 void testFileNameWithoutSuffix() { 0, new ConcurrentHashMap>(), XSD, - "3.0.1", + "3.0.2", false, false, false, @@ -167,7 +167,7 @@ public void testAllFieldsSerialized() throws IOException { 0, new ConcurrentHashMap>(), XSD, - "3.0.1", + "3.0.2", false, false, false, @@ -271,7 +271,7 @@ public void testOutputRerunFlakyFailure() throws IOException { 1, new HashMap>(), XSD, - "3.0.1", + "3.0.2", false, false, false, @@ -376,7 +376,7 @@ public void testOutputRerunFlakyAssumption() throws IOException { 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 void testReporterHandlesATestWithoutMessageAndWithEmptyStackTrace() { 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 0ea31bc685..deb8582f51 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 false - 3.0.1 + 3.0.2 false true true 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 2c901dc6fd..e6a1e5c203 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. --> - + - + 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 690513df88..297ab070cc 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 @@ - + 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 021d122314..3cf833daa1 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 StatelessReporter3.0.1 used by default in XML reporter. + * Version of reporter. It is version 3.0.2 used by default in XML reporter. */ private String version; @@ -62,7 +62,7 @@ public void setDisable(boolean disable) { } 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 e1d4ddad3a..22999fdbe7 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 @@ - +