Changeset 2011

Timestamp:

07/06/12 11:00:54 (12 years ago)

Author:

mwindhouwer

Message:

pom.xml:

• [Twan] removed the dependency on the parent POM

TestCMDValidate.java:

• added test for the new Schematron warnings on 'child' components/elements/attributes with the same name as the parent

CLARINWebService_warn-8.xml:

• triggers the new Schematron warnings

general-component-schema.xsd:

• rearranged Schematron rules a bit
• added rules to check if a nested component/element/attribute has the same name as its parent

Location:

ComponentRegistry/trunk/CMDValidate

Files:

• pom.xml (modified) (1 diff)
• src/test/java/clarin/cmdi/schema/cmd/TestCMDValidate.java (modified) (2 diffs)
• src/test/resources/docs/CLARINWebService_warn-8.xml (added)
• src/test/resources/schema/general-component-schema.xsd (modified) (2 diffs)

ComponentRegistry/trunk/CMDValidate/pom.xml

@@ -3 +3 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>clarin.cmdi</groupId>
-        <artifactId>componentRegistry.parent</artifactId>
-        <version>1.0</version>
-    </parent>
     <groupId>clarin.cmdi</groupId>
     <artifactId>cmd-validate</artifactId>

ComponentRegistry/trunk/CMDValidate/src/test/java/clarin/cmdi/schema/cmd/TestCMDValidate.java

@@ -45 +45 @@
 
     @Test
-    public void valid() throws Exception {
+    public void valid_0() throws Exception {
         assertTrue(validate("CLARINWebService.xml"));
         assertEquals(0, cmdValidator.getMessages().size());
@@ -140 +140 @@
         assertNotNull(message.text);
     }
+
+    @Test
+    public void valid_8() throws Exception {
+        assertTrue(validate("CLARINWebService_warn-8.xml"));
+
+        final List<Message> messages = cmdValidator.getMessages();
+        assertEquals(2, messages.size());
+        Message message = messages.get(0);
+        assertFalse(message.error);
+        assertEquals("/CMD_ComponentSpec[1]/CMD_Component[1]",message.location);
+        assertNotNull(message.test);
+        assertEquals("A nested component or element has the same name ('Service') as this component! Please, consider to rename one of them.",message.text);
+        message = messages.get(1);
+        assertFalse(message.error);
+        assertEquals("/CMD_ComponentSpec[1]/CMD_Component[1]/CMD_Component[1]/AttributeList[1]/Attribute[1]",message.location);
+        assertNotNull(message.test);
+        assertEquals("An attribute has the same name ('Service') as its element or component! Please, consider to rename one of them.",message.text);
+    }
 }

ComponentRegistry/trunk/CMDValidate/src/test/resources/schema/general-component-schema.xsd

@@ -38 +38 @@
         <xs:annotation>
             <xs:appinfo>
-                <sch:pattern id="component" name="CMD component group">
+                <sch:pattern id="c_sibs" name="Check siblings">
                     <sch:rule context="CMD_Component|CMD_Element">
                         <sch:assert test="empty(preceding-sibling::*[@name=current()/@name])">Sibling components or elements should all have a different name. Found multiple components or elements named '<sch:value-of select="@name"/>'!</sch:assert>
+                    </sch:rule>
+                </sch:pattern>
+                <sch:pattern id="c_nest" name="Check nesting">
+                    <sch:rule context="CMD_Component[exists(CMD_Component|CMD_Element)]" role="warning">
+                        <sch:assert test="empty((CMD_Component|CMD_Element)[@name=current()/@name])">A nested component or element has the same name ('<sch:value-of select="@name"/>') as this component! Please, consider to rename one of them.</sch:assert>
                     </sch:rule>
                 </sch:pattern>
@@ -99 +104 @@
                 <xs:annotation>
                     <xs:appinfo>
-                        <sch:pattern id="attribute" name="CMD attribute">
+                        <sch:pattern id="a_res" name="Check reserved attribute names">
+                            <sch:rule context="Attribute">
+                                <sch:assert test="not(Name=('ref','ComponentId'))">Attribute name shouldn't be 'ref' or 'ComponentId', as these are used internally by CMD!</sch:assert>
+                            </sch:rule>
+                        </sch:pattern>
+                        <sch:pattern id="a_sibs" name="Check attribute siblings">
                             <sch:rule context="Attribute">
                                 <sch:assert test="empty(preceding-sibling::Attribute[Name=current()/Name])">All attributes in an attribute list should have a different name. Found multiple attributes named '<sch:value-of select="Name"/>'!</sch:assert>
-                                <sch:assert test="not(Name=('ref','ComponentId'))">Attribute name shouldn't be 'ref' or 'ComponentId', as these are used internally by CMD!</sch:assert>
+                            </sch:rule>
+                        </sch:pattern>
+                        <sch:pattern id="a_nest" name="Check attribute nesting">
+                            <sch:rule context="Attribute" role="warning">
+                                <sch:assert test="empty((ancestor::CMD_Component|ancestor::CMD_Element)[1][@name=current()/Name])">An attribute has the same name ('<sch:value-of select="Name"/>') as its element or component! Please, consider to rename one of them.</sch:assert>
                             </sch:rule>
                         </sch:pattern>