Update of /project/cxml/cvsroot/cxml/xml/sax-tests In directory common-lisp.net:/tmp/cvs-serv1642/xml/sax-tests Modified Files: tests.lisp Log Message: parse-string in parse-rod umbenannt und exportiert Date: Thu Dec 29 00:18:09 2005 Author: dlichteblau Index: cxml/xml/sax-tests/tests.lisp diff -u cxml/xml/sax-tests/tests.lisp:1.1.1.2 cxml/xml/sax-tests/tests.lisp:1.2 --- cxml/xml/sax-tests/tests.lisp:1.1.1.2 Sun Mar 13 19:02:11 2005 +++ cxml/xml/sax-tests/tests.lisp Thu Dec 29 00:18:07 2005 @@ -1,7 +1,7 @@ (in-package :sax-tests) (defun first-start-element-event (string) - (let ((events (xml::parse-string string (make-instance 'event-collecting-handler)))) + (let ((events (cxml:parse-rod string (make-instance 'event-collecting-handler)))) (find :start-element events :key #'car))) @@ -17,7 +17,7 @@ (deftest attribute-uniqueness-1 (handler-case - (xml::parse-string "<x xmlns:a='http://example.com' xmlns:b='http://example.com' a:a='1' b:a='1'/>") + (cxml:parse-rod "<x xmlns:a='http://example.com' xmlns:b='http://example.com' a:a='1' b:a='1'/>") (error () t) (:no-error (&rest junk) (declare (ignore junk)) @@ -26,7 +26,7 @@ (deftest attribute-uniqueness-2 (handler-case - (xml::parse-string "<x xmlns:a='http://example.com' xmlns='http://example.com' a:a='1' a='1'/>") + (cxml:parse-rod "<x xmlns:a='http://example.com' xmlns='http://example.com' a:a='1' a='1'/>") (error () nil) (:no-error (&rest junk) (declare (ignore junk)) @@ -36,7 +36,7 @@ (deftest attribute-uniqueness-3 (let ((sax:*namespace-processing* nil)) (handler-case - (xml::parse-string "<x xmlns:a='http://example.com' xmlns:b='http://example.com' a:a='1' b:a='1'/>") + (cxml:parse-rod "<x xmlns:a='http://example.com' xmlns:b='http://example.com' a:a='1' b:a='1'/>") (error () nil) (:no-error (&rest junk) (declare (ignore junk)) @@ -46,7 +46,7 @@ ;;; Namespace undeclaring (deftest undeclare-default-namespace-1 - (let* ((evts (xml::parse-string "<x xmlns='http://example.com'><y xmlns='' a='1'/></x>" + (let* ((evts (cxml:parse-rod "<x xmlns='http://example.com'><y xmlns='' a='1'/></x>" (make-instance 'event-collecting-handler))) (start-elt-events (remove :start-element evts :test (complement #'eql) :key #'car)) (evt1 (first start-elt-events)) @@ -59,7 +59,7 @@ (deftest undeclare-other-namespace (handler-case - (xml::parse-string "<x:x xmlns:x='http://example.com'><x:y xmlns:x='' a='1'/></x:x>") + (cxml:parse-rod "<x:x xmlns:x='http://example.com'><x:y xmlns:x='' a='1'/></x:x>") (error () t) (:no-error (&rest junk) (declare (ignore junk)) @@ -71,7 +71,7 @@ (deftest pi-names-are-ncnames-when-namespace-processing-1 (handler-case - (xml::parse-string "<?a:b c?><x/>") + (cxml:parse-rod "<?a:b c?><x/>") (error () t) (:no-error (&rest junk) (declare (ignore junk)) @@ -81,7 +81,7 @@ (deftest pi-names-are-ncnames-when-namespace-processing-2 (let ((sax:*namespace-processing* nil)) (handler-case - (xml::parse-string "<?a:b c?><x/>") + (cxml:parse-rod "<?a:b c?><x/>") (error () nil) (:no-error (&rest junk) (declare (ignore junk)) @@ -90,7 +90,7 @@ (deftest entity-names-are-ncnames-when-namespace-processing-1 (handler-case - (xml::parse-string "<!DOCTYPE x [ <!ENTITY y:z 'foo'> ]><x>&y:z;</x>") + (cxml:parse-rod "<!DOCTYPE x [ <!ENTITY y:z 'foo'> ]><x>&y:z;</x>") (error () t) (:no-error (&rest junk) (declare (ignore junk)) @@ -99,7 +99,7 @@ (deftest entity-names-are-ncnames-when-namespace-processing-2 (handler-case - (xml::parse-string "<!DOCTYPE x [ <!ENTITY y:z 'foo'> ]><x/>") + (cxml:parse-rod "<!DOCTYPE x [ <!ENTITY y:z 'foo'> ]><x/>") (error () t) (:no-error (&rest junk) (declare (ignore junk)) @@ -109,7 +109,7 @@ (deftest entity-names-are-ncnames-when-namespace-processing-3 (let ((sax:*namespace-processing* nil)) (handler-case - (xml::parse-string "<!DOCTYPE x [ <!ENTITY y:z 'foo'> ]><x>&y:z;</x>") + (cxml:parse-rod "<!DOCTYPE x [ <!ENTITY y:z 'foo'> ]><x>&y:z;</x>") (error () nil) (:no-error (&rest junk) (declare (ignore junk)) @@ -119,7 +119,7 @@ (deftest entity-names-are-ncnames-when-namespace-processing-4 (let ((sax:*namespace-processing* nil)) (handler-case - (xml::parse-string "<!DOCTYPE x [ <!ENTITY y:z 'foo'> ]><x/>") + (cxml:parse-rod "<!DOCTYPE x [ <!ENTITY y:z 'foo'> ]><x/>") (error () nil) (:no-error (&rest junk) (declare (ignore junk)) @@ -259,7 +259,7 @@ (deftest redefine-xml-namespace-1 (handler-case - (xml::parse-string "<x xmlns:xml='http://www.w3.org/XML/1998/namespace'/>") + (cxml:parse-rod "<x xmlns:xml='http://www.w3.org/XML/1998/namespace'/>") (error () nil) (:no-error (&rest junk) (declare (ignore junk)) @@ -268,7 +268,7 @@ (deftest redefine-xml-namespace-2 (handler-case - (xml::parse-string "<x xmlns:xml='http://example.com/wrong-uri'/>") + (cxml:parse-rod "<x xmlns:xml='http://example.com/wrong-uri'/>") (error () t) (:no-error (&rest junk) (declare (ignore junk)) @@ -277,7 +277,7 @@ (deftest redefine-xml-namespace-3 (handler-case - (xml::parse-string "<x xmlns:wrong='http://www.w3.org/XML/1998/namespace'/>") + (cxml:parse-rod "<x xmlns:wrong='http://www.w3.org/XML/1998/namespace'/>") (error () t) (:no-error (&rest junk) (declare (ignore junk)) @@ -286,7 +286,7 @@ (deftest redefine-xml-namespace-4 (handler-case - (xml::parse-string "<x xmlns:wrong='http://www.w3.org/XML/1998/namespace'/>") + (cxml:parse-rod "<x xmlns:wrong='http://www.w3.org/XML/1998/namespace'/>") (error () t) (:no-error (&rest junk) (declare (ignore junk)) @@ -295,7 +295,7 @@ (deftest redefine-xmlns-namespace-1 (handler-case - (xml::parse-string "<x xmlns:xmlns='http://www.w3.org/2000/xmlns/'/>") + (cxml:parse-rod "<x xmlns:xmlns='http://www.w3.org/2000/xmlns/'/>") (error () t) (:no-error (&rest junk) (declare (ignore junk)) @@ -304,7 +304,7 @@ (deftest redefine-xmlns-namespace-2 (handler-case - (xml::parse-string "<x xmlns:xmlns='http://example.com/wrong-ns'/>") + (cxml:parse-rod "<x xmlns:xmlns='http://example.com/wrong-ns'/>") (error () t) (:no-error (&rest junk) (declare (ignore junk)) @@ -313,7 +313,7 @@ (deftest redefine-xmlns-namespace-3 (handler-case - (xml::parse-string "<x xmlns:wrong='http://www.w3.org/2000/xmlns/'/>") + (cxml:parse-rod "<x xmlns:wrong='http://www.w3.org/2000/xmlns/'/>") (error () t) (:no-error (&rest junk) (declare (ignore junk)) @@ -322,11 +322,9 @@ (deftest redefine-xmlns-namespace-4 (handler-case - (xml::parse-string "<x xmlns='http://www.w3.org/2000/xmlns/'/>") + (cxml:parse-rod "<x xmlns='http://www.w3.org/2000/xmlns/'/>") (error () t) (:no-error (&rest junk) (declare (ignore junk)) nil)) t) - -