Changeset 6262

Timestamp:

06/02/15 10:33:02 (9 years ago)

Author:

Menzo Windhouwer

Message:

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

• added more tests

A toolkit/src/test/resources/toolkit/OLAC

• test based on an invalid OLAC CMD record

Location:

metadata/trunk/toolkit

Files:

• . (modified) (1 prop)
• src/main/resources/toolkit/upgrade/cmd-record-1_1-to-1_2.xsl (modified) (1 diff)
• src/test/java/eu/clarin/cmd/toolkit/TestCMDToolkit.java (modified) (7 diffs)
• src/test/resources/toolkit/OLAC (added)
• src/test/resources/toolkit/OLAC/profiles (added)
• src/test/resources/toolkit/OLAC/profiles/OLAC-DcmiTerms.xml (added)
• src/test/resources/toolkit/OLAC/records (added)
• src/test/resources/toolkit/OLAC/records/org_rosettaproject-record.xml (added)
• src/test/resources/toolkit/Utrecht (deleted)
• src/test/resources/toolkit/successor/profiles/successor-valid.xml (modified) (1 diff)

metadata/trunk/toolkit/src/main/resources/toolkit/upgrade/cmd-record-1_1-to-1_2.xsl

@@ -146 +146 @@
     
     <!-- move CMD attributes to the CMD namespace -->
+    <!-- TODO: @ref is allowed on elements, how to know if this is a element or a component with no children? -->
+    <!--<xsl:template match="cmd0:Components//*[exists(*)]/@ref">-->
     <xsl:template match="cmd0:Components//@ref">
         <xsl:attribute name="cmd:ref" select="."/>

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

@@ -22 +22 @@
 import net.sf.saxon.s9api.DOMDestination;
 import net.sf.saxon.s9api.QName;
+import net.sf.saxon.s9api.XPathCompiler;
+import net.sf.saxon.s9api.XPathExecutable;
+import net.sf.saxon.s9api.XPathSelector;
 import net.sf.saxon.s9api.XdmAtomicValue;
 import net.sf.saxon.s9api.XdmDestination;
@@ -45 +48 @@
     XsltTransformer transformCMDSpecInXSD = null;
     SchemAnon validateCMDSpec = null; 
+    SchemAnon validateCMDEnvelop = null; 
 
     @Before
@@ -53 +57 @@
             transformCMDSpecInXSD = SaxonUtils.buildTransformer(CMDToolkit.class.getResource("/toolkit/xslt/comp2schema.xsl")).load();
             validateCMDSpec = new SchemAnon(CMDToolkit.class.getResource("/toolkit/xsd/cmd-component.xsd").toURI().toURL()); 
+            validateCMDEnvelop = new SchemAnon(CMDToolkit.class.getResource("/toolkit/xsd/cmd-envelop.xsd").toURI().toURL()); 
         } catch(Exception e) {
             System.err.println("!ERR: couldn't setup the testing environment!");
@@ -83 +88 @@
     }
     
+    protected boolean xpath(Document doc,String xpath) throws Exception {
+        XPathCompiler xpc   = SaxonUtils.getProcessor().newXPathCompiler();
+        xpc.declareNamespace("cmd","http://www.clarin.eu/cmd/1");
+        XPathExecutable xpe = xpc.compile(xpath);
+        XPathSelector xps   = xpe.load();
+        xps.setContextItem(SaxonUtils.getProcessor().newDocumentBuilder().wrap(doc));
+        return xps.effectiveBooleanValue();
+    }
+    
     protected void printMessages(SchemAnon anon) throws Exception {
         for (Message msg : anon.getMessages()) {
@@ -118 +132 @@
     protected boolean validateCMDSpec(String spec,Source src) throws Exception {
         System.out.println("Validate CMD spec["+spec+"]");
-        return validateCMDSpec.validate(src);
+        boolean res = validateCMDSpec.validate(src);
+        System.out.println("CMD spec["+spec+"]: "+(res?"VALID":"INVALID"));
+        printMessages(validateCMDSpec);
+        return res;
+    }
+    
+    protected boolean validateCMDSpec(String spec) throws Exception {
+        return validateCMDSpec(spec,new StreamSource(new java.io.File(TestCMDToolkit.class.getResource(spec).toURI())));
     }
     
     protected boolean validateCMDRecord(String spec,SchemAnon anon,String rec,Source src) throws Exception {
         System.out.println("Validate CMD record["+rec+"] against spec["+spec+"]");
-        return anon.validate(src);
-    }
-
-    @Test
-    public void valid_Adelheid() throws Exception {
-        System.out.println("DBG: current working directory["+Paths.get("").toAbsolutePath().toString()+"]");
-        
+        boolean res = anon.validate(src);
+        System.out.println("CMD record["+rec+"]: "+(res?"VALID":"INVALID"));
+        printMessages(anon);
+        return res;
+    }
+    
+    protected boolean validateCMDEnvelop(String rec,Source src) throws Exception {
+        System.out.println("Validate envelop CMD rec["+rec+"]");
+        boolean res = validateCMDEnvelop.validate(src);
+        System.out.println("CMD rec["+rec+"] evelop: "+(res?"VALID":"INVALID"));
+        printMessages(validateCMDEnvelop);
+        return res;
+    }
+    
+    protected boolean validateCMDEnvelop(String rec) throws Exception {
+        return validateCMDEnvelop(rec,new StreamSource(new java.io.File(TestCMDToolkit.class.getResource(rec).toURI())));
+    }
+    
+    @Test
+    public void testAdelheid() throws Exception {
         String profile = "/toolkit/Adelheid/profiles/clarin.eu:cr1:p_1311927752306.xml";
         String record  = "/toolkit/Adelheid/records/Adelheid.cmdi";
@@ -138 +172 @@
         // validate the 1.2 profile
         boolean validProfile = validateCMDSpec(profile+" (upgraded)",new DOMSource(upgradedProfile));
-        System.out.println("Upgraded CMD profile["+profile+"]: "+(validProfile?"VALID":"INVALID"));
-        printMessages(validateCMDSpec);
-        
-        // assertions
+        
+        // assertions
+        // the upgraded profile should be a valid CMDI 1.2 profile
         assertTrue(validProfile);
+        // so there should be no errors
         assertEquals(0, countErrors(validateCMDSpec));
         
@@ -154 +188 @@
         // validate the 1.2 record
         boolean validRecord = validateCMDRecord(profile+" (upgraded)",profileAnon,record+" (upgraded)",new DOMSource(upgradedRecord));
-        System.out.println("Upgraded CMD record["+record+"]: "+(validRecord?"VALID":"INVALID"));
-        printMessages(profileAnon);
-        
-        // assertions
+        
+        // assertions
+        // the upgraded record should be a valid CMDI 1.2 record
         assertTrue(validRecord);
+        // so there should be no errors
         assertEquals(0, countErrors(profileAnon));
     }
+
+    @Test
+    public void testTEI() throws Exception {
+        String record  = "/toolkit/TEI/records/sundhed_dsn.teiHeader.ref.xml";
+
+        // upgrade the record from 1.1 to 1.2
+        Document upgradedRecord = upgradeCMDRecord(record);
+        
+        // assertions
+        // the @ref attributes on the elements should stay as they are
+        assertTrue(xpath(upgradedRecord,"//*:author/*:name/@ref"));
+    }
+
+    @Test
+    public void testSuccessor() throws Exception {
+        String validRecord  = "/toolkit/successor/profiles/successor-valid.xml";
+        String invalidRecord  = "/toolkit/successor/profiles/successor-invalid.xml";
+
+        // assertions
+        assertTrue(validateCMDSpec(validRecord));
+        assertFalse(validateCMDSpec(invalidRecord));
+    }
+
+    @Test
+    public void testOLAC() throws Exception {
+        String profile = "/toolkit/OLAC/profiles/OLAC-DcmiTerms.xml";
+        String record  = "/toolkit/OLAC/records/org_rosettaproject-record.xml";
+        
+        // upgrade the profile from 1.1 to 1.2
+        Document upgradedProfile = upgradeCMDSpec(profile);
+        
+        // validate the 1.2 profile
+        boolean validProfile = validateCMDSpec(profile+" (upgraded)",new DOMSource(upgradedProfile));
+        
+        // assertions
+        // the upgraded profile should be a valid CMDI 1.2 profile
+        assertTrue(validProfile);
+        // so there should be no errors
+        assertEquals(0, countErrors(validateCMDSpec));
+        
+        // transform the 1.2 profile into a XSD
+        Document profileSchema = transformCMDSpecInXSD(profile+" (upgraded)",new DOMSource(upgradedProfile));
+        SchemAnon profileAnon = new SchemAnon(new DOMSource(profileSchema));
+        
+        // upgrade the record from 1.1 to 1.2
+        Document upgradedRecord = upgradeCMDRecord(record);
+        
+        // validate the 1.2 record
+        boolean validRecord = validateCMDRecord(profile+" (upgraded)",profileAnon,record+" (upgraded)",new DOMSource(upgradedRecord));
+
+        // assertions
+        assertFalse(validRecord);
+    }
 }

metadata/trunk/toolkit/src/test/resources/toolkit/successor/profiles/successor-valid.xml

@@ -8 +8 @@
         <Description>Description of a tool and/or service(s)
 (adapted from the AnnotationTool profile)</Description>
-        <Status>production</Status>
+        <Status>deprecated</Status>
         <Successor>hdl:123</Successor>
     </Header>