[xiph-commits] r12892 - trunk/xspf/testcase

[sping at svn.xiph.org]

Author: sping
Date: 2007-04-22 16:45:22 -0700 (Sun, 22 Apr 2007)
New Revision: 12892

Modified:
   trunk/xspf/testcase/schema_test.sh
Log:
Compact Relax NG schema integrated (using RNV)


Modified: trunk/xspf/testcase/schema_test.sh
===================================================================
--- trunk/xspf/testcase/schema_test.sh	2007-04-22 23:44:37 UTC (rev 12891)
+++ trunk/xspf/testcase/schema_test.sh	2007-04-22 23:45:22 UTC (rev 12892)
@@ -6,16 +6,21 @@
 # 2007-03-03
 # -----------------------------------------------------------------------------
 
+
+
 # -----------------------------------------------------------------------------
 # Config
 # -----------------------------------------------------------------------------
 SCHEMA_PATH="../../../websites/xspf.org/validation"
+RNC_FILE="${SCHEMA_PATH}/xspf-1_0.5.rnc"
 RNG_FILE="${SCHEMA_PATH}/xspf-1_0.5.rng"
-XSD_FILE="${SCHEMA_PATH}/xspf-1_0.2.xsd"
+XSD_FILE="${SCHEMA_PATH}/xspf-1_0.2.xsd"
 PASS_FILES="for_version_1/pass/*.xspf"
 FAIL_FILES="for_version_1/fail/*.xspf"
 LOG_FILE="schema_test_log.txt"
 
+
+
 # -----------------------------------------------------------------------------
 # Cygwin or Unix?
 # -----------------------------------------------------------------------------
@@ -24,39 +29,82 @@
 else
 	XML_STARLET=xmlstarlet
 fi
+RNV=./rnv
 
+
+
 # -----------------------------------------------------------------------------
 # Reset log
 # -----------------------------------------------------------------------------
 rm ${LOG_FILE} &> /dev/null
 
+
+
 # -----------------------------------------------------------------------------
-# Version
+# RNV version
 # -----------------------------------------------------------------------------
+echo "== RNV version ==" >> ${LOG_FILE}
+${RNV} -v 2>> ${LOG_FILE}
+echo "" >> ${LOG_FILE}
+
+
+
+# -----------------------------------------------------------------------------
+# XMLStarlet version
+# -----------------------------------------------------------------------------
 echo "== XMLStarlet version ==" >> ${LOG_FILE}
 ${XML_STARLET} --version >> ${LOG_FILE}
 echo "" >> ${LOG_FILE}
 
+
+
 # -----------------------------------------------------------------------------
+# Test RNC
+# -----------------------------------------------------------------------------
+echo "== Relax NG Compact - Should have failed ==" >> ${LOG_FILE}
+for i in ${FAIL_FILES}; do
+	if ${RNV} ${RNC_FILE} $i &>/dev/null ; then
+		echo $i >> ${LOG_FILE}
+	fi
+done
+echo "" >> ${LOG_FILE}
+
+echo "== Relax NG Compact - Should have passed ==" >> ${LOG_FILE}
+for i in ${PASS_FILES}; do
+	if ! ${RNV} ${RNC_FILE} $i &>/dev/null ; then
+		echo $i >> ${LOG_FILE}
+	fi
+done
+echo "" >> ${LOG_FILE}
+
+
+
+# -----------------------------------------------------------------------------
 # Test RNG
 # -----------------------------------------------------------------------------
-echo "== RNG - Should have failed ==" >> ${LOG_FILE}
-${XML_STARLET} validate --list-good --relaxng ${RNG_FILE} ${FAIL_FILES} >> ${LOG_FILE}
+echo "== Relax NG XML - Should have failed ==" >> ${LOG_FILE}
+${XML_STARLET} validate --err --list-good --relaxng ${RNG_FILE} ${FAIL_FILES} 1>> ${LOG_FILE} 2>> /dev/null
 echo "" >> ${LOG_FILE}
-echo "== RNG - Should have passed ==" >> ${LOG_FILE}
-${XML_STARLET} validate --list-bad --relaxng ${RNG_FILE} ${PASS_FILES} >> ${LOG_FILE}
+
+echo "== Relax NG XML - Should have passed ==" >> ${LOG_FILE}
+${XML_STARLET} validate --err --list-bad --relaxng ${RNG_FILE} ${PASS_FILES} 1>> ${LOG_FILE} 2>> /dev/null
 echo "" >> ${LOG_FILE}
 
+
+
 # -----------------------------------------------------------------------------
 # Test XSD
 # -----------------------------------------------------------------------------
-echo "== XSD - Should have failed ==" >> ${LOG_FILE}
-${XML_STARLET} validate --list-good --xsd ${XSD_FILE} ${FAIL_FILES} >> ${LOG_FILE}
+echo "== W3C XML Schema - Should have failed ==" >> ${LOG_FILE}
+${XML_STARLET} validate --err --list-good --xsd ${XSD_FILE} ${FAIL_FILES} 1>> ${LOG_FILE} 2>> /dev/null
 echo "" >> ${LOG_FILE}
-echo "== XSD - Should have passed ==" >> ${LOG_FILE}
-${XML_STARLET} validate --list-bad --xsd ${XSD_FILE} ${PASS_FILES}
-# >> ${LOG_FILE}
 
+echo "== W3C XML Schema - Should have passed ==" >> ${LOG_FILE}
+${XML_STARLET} validate --err --list-bad --xsd ${XSD_FILE} ${PASS_FILES} 1>> ${LOG_FILE} 2>> /dev/null
+# echo "" >> ${LOG_FILE}
+
+
+
 # -----------------------------------------------------------------------------
 # Show log
 # -----------------------------------------------------------------------------