changeset 65:08da99c27fa4

Fix XML descriptions to match schema. Validate test descriptions early during the build.
author shade
date Thu, 28 Nov 2013 13:40:59 +0400
parents e29395e8f369
children d7f7a93800e4
files tests-custom/pom.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long.xml tests-generated/pom.xml
diffstat 4 files changed, 42 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests-custom/pom.xml	Thu Nov 28 11:30:09 2013 +0400
+++ b/tests-custom/pom.xml	Thu Nov 28 13:40:59 2013 +0400
@@ -156,6 +156,25 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xml-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>validate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <validationSets>
+                        <validationSet>
+                            <dir>src/main/resources</dir>
+                            <systemId>${project.basedir}/../harness/src/main/resources/xsd/descriptions/test-descriptions.xsd</systemId>
+                        </validationSet>
+                    </validationSets>
+                </configuration>
+            </plugin>
         </plugins>
 
     </build>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer.xml	Thu Nov 28 11:30:09 2013 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer.xml	Thu Nov 28 13:40:59 2013 +0400
@@ -37,9 +37,9 @@
             <description>
                 Possible to see the default value, since the instance is published via race.
             </description>
-            <urls>
+            <refs>
                 <url>http://cs.oswego.edu/pipermail/concurrency-interest/2013-November/011951.html</url>
-            </urls>
+            </refs>
         </case>
         <case>
             <match>[1]</match>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long.xml	Thu Nov 28 11:30:09 2013 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long.xml	Thu Nov 28 13:40:59 2013 +0400
@@ -37,9 +37,9 @@
             <description>
                 Possible to see the default value, since the instance is published via race.
             </description>
-            <urls>
+            <refs>
                 <url>http://cs.oswego.edu/pipermail/concurrency-interest/2013-November/011951.html</url>
-            </urls>
+            </refs>
         </case>
         <case>
             <match>[1]</match>
--- a/tests-generated/pom.xml	Thu Nov 28 11:30:09 2013 +0400
+++ b/tests-generated/pom.xml	Thu Nov 28 13:40:59 2013 +0400
@@ -234,6 +234,25 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xml-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>validate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <validationSets>
+                        <validationSet>
+                            <dir>src/main/resources</dir>
+                            <systemId>${project.basedir}/../harness/src/main/resources/xsd/descriptions/test-descriptions.xsd</systemId>
+                        </validationSet>
+                    </validationSets>
+                </configuration>
+            </plugin>
         </plugins>
 
     </build>