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

[David Lichteblau]

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

Modified Files:
	domtest.lisp xmlconf.lisp 
Log Message:
sink reorganization

Date: Thu Dec 29 00:11:42 2005
Author: dlichteblau

Index: cxml/test/domtest.lisp
diff -u cxml/test/domtest.lisp:1.15 cxml/test/domtest.lisp:1.16
--- cxml/test/domtest.lisp:1.15	Tue Dec 27 21:01:17 2005
+++ cxml/test/domtest.lisp	Thu Dec 29 00:11:38 2005
@@ -680,7 +680,7 @@
 			      (dom:get-attribute member "href"))))
 		   (unless (or (runes:rod= (dom:tag-name member) #"metadata")
 			       (member href *bad-tests* :test 'equal))
-		     (format t "~&~D/~D ~A~%" i #+nil n 808 href)
+		     (format t "~&~D/~D ~A~%" i n href)
 		     (let ((lisp (slurp-test
 				  (merge-pathnames href test-directory))))
 		       (when verbose


Index: cxml/test/xmlconf.lisp
diff -u cxml/test/xmlconf.lisp:1.11 cxml/test/xmlconf.lisp:1.12
--- cxml/test/xmlconf.lisp:1.11	Tue Dec 27 02:35:16 2005
+++ cxml/test/xmlconf.lisp	Thu Dec 29 00:11:38 2005
@@ -54,9 +54,10 @@
               (merge-pathnames output sub-directory)))))
 
 (defun serialize-document (document)
-  (map 'vector #'char-code
-       (with-output-to-string (s)
-         (cxml:unparse-document document s :canonical 2))))
+  (dom:map-document (cxml:make-octet-vector-sink :canonical 2)
+		    document
+		    :include-doctype :canonical-notations
+		    :include-default-values t))
 
 (defun file-contents (pathname)
   (with-open-file (s pathname :element-type '(unsigned-byte 8))