[cxml-cvs] CVS update: cxml/test/utf8domtest.diff cxml/test/domtest.lisp cxml/test/xmlconf.lisp

[David Lichteblau]

Update of /project/cxml/cvsroot/cxml/test
In directory common-lisp.net:/tmp/cvs-serv17375/test

Modified Files:
	domtest.lisp xmlconf.lisp 
Added Files:
	utf8domtest.diff 
Log Message:
utf8-dom fixes.
recoding nach utf-8 jetzt der default.

Date: Tue Dec 27 02:35:16 2005
Author: dlichteblau



Index: cxml/test/domtest.lisp
diff -u cxml/test/domtest.lisp:1.13 cxml/test/domtest.lisp:1.14
--- cxml/test/domtest.lisp:1.13	Tue Dec 27 01:21:37 2005
+++ cxml/test/domtest.lisp	Tue Dec 27 02:35:16 2005
@@ -175,7 +175,8 @@
 (defun read-members (&optional (directory *directory*))
   (let* ((pathname (merge-pathnames "build/dom2-interfaces.xml" directory))
          (builder (rune-dom:make-dom-builder))
-         (library (dom:document-element (cxml:parse-file pathname builder)))
+         (library (dom:document-element
+		   (cxml:parse-file pathname builder :recode nil)))
          (methods '())
          (fields '()))
     (do-child-elements (interface library :name "interface")
@@ -584,7 +585,8 @@
   (catch 'give-up
     (let* ((builder (rune-dom:make-dom-builder))
            (cxml::*validate* nil)         ;dom1.dtd is buggy
-           (test (dom:document-element (cxml:parse-file pathname builder)))
+           (test (dom:document-element
+		  (cxml:parse-file pathname builder :recode nil)))
            title
            (bindings '())
            (code '()))
@@ -631,7 +633,8 @@
   (setf name (runes:rod-string name))
   (cxml:parse-file
    (make-pathname :name name :type "xml" :defaults *files-directory*)
-   (rune-dom:make-dom-builder)))
+   (rune-dom:make-dom-builder)
+   :recode nil))
 
 (defparameter *bad-tests*
     '("hc_elementnormalize2.xml"
@@ -656,7 +659,7 @@
 	     (let* ((all-tests (merge-pathnames "alltests.xml" test-directory))
 		    (builder (rune-dom:make-dom-builder))
 		    (suite (dom:document-element
-			    (cxml:parse-file all-tests builder)))
+			    (cxml:parse-file all-tests builder :recode nil)))
 		    (*files-directory*
 		     (merge-pathnames "files/" test-directory)))
 	       (do-child-elements (member suite)


Index: cxml/test/xmlconf.lisp
diff -u cxml/test/xmlconf.lisp:1.10 cxml/test/xmlconf.lisp:1.11
--- cxml/test/xmlconf.lisp:1.10	Tue Dec 27 01:21:37 2005
+++ cxml/test/xmlconf.lisp	Tue Dec 27 02:35:16 2005
@@ -77,7 +77,7 @@
 (defun run-all-tests (directory)
   (let* ((pathname (merge-pathnames "xmlconf.xml" directory))
          (builder (rune-dom:make-dom-builder))
-         (xmlconf (cxml:parse-file pathname builder))
+         (xmlconf (cxml:parse-file pathname builder :recode nil))
          (ntried 0)
          (nfailed 0)
          (nskipped 0)
@@ -125,6 +125,7 @@
   (let ((document (apply #'cxml:parse-file
                          pathname
                          (rune-dom:make-dom-builder)
+			 :recode nil
                          args)))
     (cond
       ((null output)
@@ -161,7 +162,10 @@
        (handler-case
            (progn
              (format t " [validating:]")
-             (cxml:parse-file pathname (rune-dom:make-dom-builder) :validate t)
+             (cxml:parse-file pathname
+			      (rune-dom:make-dom-builder)
+			      :recode nil
+			      :validate t)
              (error "validity error not detected")
              nil)
          (cxml:validity-error ()
@@ -174,7 +178,10 @@
   (handler-case
       (progn
          (format t " [not validating:]")
-	(cxml:parse-file pathname (rune-dom:make-dom-builder) :validate nil)
+	(cxml:parse-file pathname
+			 (rune-dom:make-dom-builder)
+			 :recode nil
+			 :validate nil)
 	(error "well-formedness violation not detected")
       nil)
     (cxml:well-formedness-violation ()
@@ -183,7 +190,10 @@
   (handler-case
       (progn
 	(format t " [validating:]")
-	(cxml:parse-file pathname (rune-dom:make-dom-builder) :validate t)
+	(cxml:parse-file pathname
+			 (rune-dom:make-dom-builder)
+			 :recode nil
+			 :validate t)
 	(error "well-formedness violation not detected")
       nil)
     (cxml:well-formedness-violation ()