Changeset 4524

Timestamp:

02/17/14 10:58:11 (10 years ago)

Author:

mwindhouwer

Message:

M src/test/resources/schema/general-component-schema.xsd

• added a Schematron rule to test if there are no multiple references to the same component among siblings

A src/test/resources/docs/CLARINWebService_faulty-9.xml
M src/test/java/clarin/cmdi/schema/cmd/TestCMDValidate.java

• added test on faulty document with a double component reference

Location:

ComponentRegistry/trunk/CMDValidate/src/test

Files:

• java/clarin/cmdi/schema/cmd/TestCMDValidate.java (modified) (1 diff)
• resources/docs/CLARINWebService_faulty-9.xml (added)
• resources/schema/general-component-schema.xsd (modified) (3 diffs)

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

@@ -158 +158 @@
         assertEquals("An attribute has the same name ('Service') as its element or component! Please, consider to rename one of them.",message.text);
     }
+
+    @Test
+    public void invalid_9() throws Exception {
+        assertFalse(validate("CLARINWebService_faulty-9.xml"));
+
+        final List<Message> messages = cmdValidator.getMessages();
+        assertEquals(1, messages.size());
+        Message message = messages.get(0);
+        assertTrue(message.error);
+        assertEquals("/CMD_ComponentSpec[1]/CMD_Component[1]/CMD_Component[1]/CMD_Component[2]/CMD_Component[1]/CMD_Component[2]/CMD_Component[3]", message.location);
+        assertEquals("empty(preceding-sibling::CMD_Component[@ComponentId=current()/@ComponentId])", message.test);
+        assertNotNull(message.text);
+    }
+
 }

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

@@ -38 +38 @@
         <xs:annotation>
             <xs:appinfo>
-                <sch:pattern id="c_sibs" name="Check siblings">
+                <sch:pattern id="c_sibs">
+                    <sch:title>Check siblings</sch:title>
                     <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:pattern id="c_csibs">
+                    <sch:title>Check component siblings</sch:title>
+                    <sch:rule context="CMD_Component">
+                        <sch:assert test="empty(preceding-sibling::CMD_Component[@ComponentId=current()/@ComponentId])">Sibling components should all be different. Found multiple components with id '<sch:value-of select="@ComponentId"/>'!</sch:assert>
+                    </sch:rule>
+                </sch:pattern>
+                <!-- TODO: the names of referenced external components are not known, so we can't currently check two or more of them use the same name -->
+                <sch:pattern id="c_nest">
+                    <sch:title>Check nesting</sch:title>
                     <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>
@@ -104 +113 @@
                 <xs:annotation>
                     <xs:appinfo>
-                        <sch:pattern id="a_res" name="Check reserved attribute names">
+                        <sch:pattern id="a_res">
+                            <sch:title>Check reserved attribute names</sch:title>
                             <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:pattern id="a_sibs">
+                            <sch:title>Check attribute siblings</sch:title>
                             <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:rule>
                         </sch:pattern>
-                        <sch:pattern id="a_nest" name="Check attribute nesting">
+                        <sch:pattern id="a_nest">
+                            <sch:title>Check attribute nesting</sch:title>
                             <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>
@@ -305 +317 @@
         <xs:annotation>
             <xs:appinfo>
-                <sch:pattern id="item" name="CMD enumeration item">
+                <sch:pattern id="item">
+                    <sch:title>CMD enumeration item</sch:title>
                     <sch:rule context="item">
                         <sch:assert test="empty(preceding-sibling::item[.=current()])">All items in an enumeration should be different. Found multiple items with value '<sch:value-of select="."/>'!</sch:assert>