Changeset 6904 for metadata

Timestamp:

01/13/16 12:37:51 (8 years ago)

Author:

Menzo Windhouwer

Message:

M toolkit/src/test/java/eu/clarin/cmd/toolkit/TestCMDToolkit.java

• added downgrade tests

M toolkit/src/main/resources/toolkit/xsd/cmd-component.xsd

• readded a_res Schematron rule to warn that @ref and @ComponentId? wont survive a downgrade to 1.1

M toolkit/src/main/resources/toolkit/downgrade/cmd-component-1_2-to-1_1.xsl

• fixes around Attributes

Location:

metadata/trunk/toolkit/src

Files:

• main/resources/toolkit/downgrade/cmd-component-1_2-to-1_1.xsl (modified) (2 diffs)
• main/resources/toolkit/xsd/cmd-component.xsd (modified) (2 diffs)
• test/java/eu/clarin/cmd/toolkit/TestCMDToolkit.java (modified) (9 diffs)

metadata/trunk/toolkit/src/main/resources/toolkit/downgrade/cmd-component-1_2-to-1_1.xsl

@@ -73 +73 @@
     </xsl:template>
 
-    <!-- remove Vocabulary level -->
+    <!-- remove Vocabulary level, incl. attributes -->
     <xsl:template match="Vocabulary" priority="1">
         <xsl:apply-templates select="node()"/>
@@ -80 +80 @@
     <!-- turn Attribute child elements into attributes -->
     <xsl:template match="Attribute" priority="1">
-        <Attribute name="{Name}">
-            <Name>
-                <xsl:value-of select="@name"/>
-            </Name>
-            <xsl:if test="normalize-space(@ValueScheme)!=''">
-                <Type>
-                    <xsl:value-of select="@ValueScheme"/>
-                </Type>
-            </xsl:if>
-            <xsl:if test="normalize-space(@ConceptLink)!=''">
-                <ConceptLink>
-                    <xsl:value-of select="@ConceptLink"/>
-                </ConceptLink>
-            </xsl:if>
-            <xsl:apply-templates select="node()"/>
-        </Attribute>
+        <xsl:choose>
+            <xsl:when test="exists(parent::AttributeList/parent::Component) and Name=('ref','ComponentId')">
+                <xsl:message>WRN: user-defined ref and ComponentId attributes for a Component are not supported by CMDI 1.1!</xsl:message>
+            </xsl:when>
+            <xsl:otherwise>
+                <Attribute>
+                    <Name>
+                        <xsl:value-of select="@name"/>
+                    </Name>
+                    <xsl:if test="normalize-space(@ConceptLink)!=''">
+                        <ConceptLink>
+                            <xsl:value-of select="@ConceptLink"/>
+                        </ConceptLink>
+                    </xsl:if>
+                    <xsl:if test="normalize-space(@ValueScheme)!=''">
+                        <Type>
+                            <xsl:value-of select="@ValueScheme"/>
+                        </Type>
+                    </xsl:if>
+                    <!-- @Required is skipped -->
+                    <xsl:apply-templates select="node()"/>
+                </Attribute>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
     

metadata/trunk/toolkit/src/main/resources/toolkit/xsd/cmd-component.xsd

@@ -155 +155 @@
                     <sch:title>Check Vocabulary URI</sch:title>
                     <sch:rule context="Vocabulary[exists(@URI)]">
-                        <sch:assert test="exists(@ValueProperty)">When an external vocabulary (identified by the @URI) a @ValueProperty has to be specified!</sch:assert>
+                        <sch:assert test="exists(@ValueProperty)">When an external vocabulary is used (identified by the @URI) a @ValueProperty has to be specified!</sch:assert>
                     </sch:rule>
                 </sch:pattern>
@@ -205 +205 @@
                 <xs:annotation>
                     <xs:appinfo>
+                        <sch:pattern id="a_res">
+                            <sch:title>Check reserved attribute names</sch:title>
+                            <sch:rule context="Attribute" role="warning">
+                                <sch:assert test="not(exists(parent::AttributeList/parent::Component) and @name=('ref','ComponentId'))">Attributes with name 'ref' or 'ComponentId' will not be available in a downgrade to CMDI 1.1!</sch:assert>
+                            </sch:rule>
+                        </sch:pattern>
                         <sch:pattern id="a_sibs">
                             <sch:title>Check attribute siblings</sch:title>

metadata/trunk/toolkit/src/test/java/eu/clarin/cmd/toolkit/TestCMDToolkit.java

@@ -7 +7 @@
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 import java.nio.file.Paths;
 import java.util.HashMap;
@@ -45 +46 @@
 
     XsltTransformer upgradeCMDSpec = null;
+    XsltTransformer downgradeCMDSpec = null;
     XsltTransformer upgradeCMDRec = null;
     XsltTransformer transformCMDSpecInXSD = null;
     SchemAnon validateCMDSpec = null;
+    SchemAnon validateCMDoldSpec = null;
     SchemAnon validateCMDEnvelop = null;
 
@@ -54 +57 @@
         try {
             upgradeCMDSpec = SaxonUtils.buildTransformer(CMDToolkit.class.getResource("/toolkit/upgrade/cmd-component-1_1-to-1_2.xsl")).load();
+            downgradeCMDSpec = SaxonUtils.buildTransformer(CMDToolkit.class.getResource("/toolkit/downgrade/cmd-component-1_2-to-1_1.xsl")).load();
             upgradeCMDRec = SaxonUtils.buildTransformer(CMDToolkit.class.getResource("/toolkit/upgrade/cmd-record-1_1-to-1_2.xsl")).load();
             transformCMDSpecInXSD = SaxonUtils.buildTransformer(CMDToolkit.class.getResource("/toolkit/xslt/comp2schema.xsl")).load();
-            validateCMDSpec = new SchemAnon(CMDToolkit.class.getResource("/toolkit/xsd/cmd-component.xsd").toURI().toURL());
+            validateCMDSpec = new SchemAnon(CMDToolkit.class.getResource("/toolkit/xsd/cmd-component.xsd").toURI().toURL());            
+            validateCMDoldSpec = new SchemAnon(new URL("http://infra.clarin.eu/cmd/general-component-schema.xsd"));
+//            validateCMDoldSpec = new SchemAnon(new URL("file:///Users/menzowi/Documents/Projects/CLARIN/CMDI/CMDI-1.1/src/toolkit/general-component-schema.xsd"));
             validateCMDEnvelop = new SchemAnon(CMDToolkit.class.getResource("/toolkit/xsd/cmd-envelop.xsd").toURI().toURL());
         } catch(Exception e) {
@@ -116 +122 @@
     }
 
+    protected Document downgradeCMDSpec(String spec) throws Exception {
+        System.out.println("Downgrade CMD spec["+spec+"]");
+        return transform(downgradeCMDSpec,new javax.xml.transform.stream.StreamSource(new java.io.File(TestCMDToolkit.class.getResource(spec).toURI())));
+    }
+
+    protected Document downgradeCMDSpec(String spec,Source src) throws Exception {
+        System.out.println("Downgrade CMD spec["+spec+"]");
+        return transform(downgradeCMDSpec,src);
+    }
+
     protected Document upgradeCMDRecord(String rec) throws Exception {
         System.out.println("Upgrade CMD spec["+rec+"]");
@@ -138 +154 @@
     }
 
+    protected boolean validateCMDoldSpec(String spec,Source src) throws Exception {
+        System.out.println("Validate CMD 1.1 spec["+spec+"]");
+        boolean res = validateCMDoldSpec.validate(src);
+        System.out.println("CMD old spec["+spec+"]: "+(res?"VALID":"INVALID"));
+        printMessages(validateCMDoldSpec);
+        return res;
+    }
+
     protected boolean validateCMDSpec(String spec) throws Exception {
         return validateCMDSpec(spec,new StreamSource(new java.io.File(TestCMDToolkit.class.getResource(spec).toURI())));
@@ -194 +218 @@
         // so there should be no errors
         assertEquals(0, countErrors(profileAnon));
+        
+        // downgrade the 1.2 profile to 1.1
+        Document oldProfile = downgradeCMDSpec(profile+" (upgraded)",new DOMSource(upgradedProfile));
+        
+        // validate the 1.1 profile
+        boolean validOldProfile = validateCMDoldSpec(profile+" (downgraded)",new DOMSource(oldProfile));
+
+        // assertions
+        // the downgraded profile should be a valid CMDI 1.1 profile
+        assertTrue(validOldProfile);
+        // so there should be no errors
+        assertEquals(0, countErrors(validateCMDoldSpec));        
     }
 
@@ -219 +255 @@
         // the record should be a invalid as it misses a the required CoreVersion attribute
         assertFalse(validRecord);
+
+        // downgrade the 1.2 profile to 1.1
+        Document oldProfile = downgradeCMDSpec(profile);
+        
+        // validate the 1.1 profile
+        boolean validOldProfile = validateCMDoldSpec(profile+" (downgraded)",new DOMSource(oldProfile));
+
+        // assertions
+        // the downgraded profile should be a valid CMDI 1.1 profile
+        assertTrue(validOldProfile);
+        // so there should be no errors
+        assertEquals(0, countErrors(validateCMDoldSpec));        
     }
 
@@ -254 +302 @@
         // so there should be no errors
         assertEquals(0, countErrors(profileAnon));
+        
+        // downgrade the 1.2 profile to 1.1
+        Document oldProfile = downgradeCMDSpec(profile+" (upgraded)",new DOMSource(upgradedProfile));
+        
+        // validate the 1.1 profile
+        boolean validOldProfile = validateCMDoldSpec(profile+" (downgraded)",new DOMSource(oldProfile));
+
+        // assertions
+        // the downgraded profile should be a valid CMDI 1.1 profile
+        assertTrue(validOldProfile);
+        // so there should be no errors
+        assertEquals(0, countErrors(validateCMDoldSpec));        
     }
 
@@ -307 +367 @@
         // assertions
         assertFalse(validRecord);
+
+        // downgrade the 1.2 profile to 1.1
+        Document oldProfile = downgradeCMDSpec(profile+" (upgraded)",new DOMSource(upgradedProfile));
+        
+        // validate the 1.1 profile
+        boolean validOldProfile = validateCMDoldSpec(profile+" (downgraded)",new DOMSource(oldProfile));
+
+        // assertions
+        // the downgraded profile should be a valid CMDI 1.1 profile
+        assertTrue(validOldProfile);
+        // so there should be no errors
+        assertEquals(0, countErrors(validateCMDoldSpec));        
     }