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:13 UTC
[13/15] maven-surefire git commit: SUREFIRE-1217: Move failsafe xsd
to surefire and differentiate in index.apt.vm.
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>