procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Repurpose libxml test for obsolete argument

Browse source 
* test/src/xml-tests.el (libxml-tests): Move half this test for the
recently obsoleted fourth argument to libxml-parse-xml-region...
* test/lisp/xml-tests.el (xml-tests--remove-comments): ...to a new
test here for xml-remove-comments.

* test/src/xml-tests.el (libxml-tests--data-comments-discarded):
Move test data from here...
* test/lisp/xml-tests.el (xml-tests--data-with-comments): ...to here.
This commit is contained in:
Stefan Kangas 2020-09-26 11:27:48 +02:00
parent a3a845b0e0
commit 2dff3ea073
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
test/lisp/xml-tests.el
View file

@ -174,6 +174,27 @@ Parser is called with and without 'symbol-qnames argument.")
:type 'xml-invalid-character)
'(xml-invalid-character #x3FFFFF 3)))))
(defvar xml-tests--data-with-comments
`(;; simple case
("<?xml version=\"1.0\"?><foo baz=\"true\">bar</foo>"
. ((foo ((baz . "true")) "bar")))
;; toplevel comments -- first document child must not get lost
(,(concat "<?xml version=\"1.0\"?><foo>bar</foo><!--comment-1-->"
"<!--comment-2-->")
. ((foo nil "bar")))
(,(concat "<?xml version=\"1.0\"?><!--comment-a--><foo a=\"b\">"
"<bar>blub</bar></foo><!--comment-b--><!--comment-c-->")
. ((foo ((a . "b")) (bar nil "blub")))))
"Alist of XML strings and their expected parse trees for discarded comments.")
(ert-deftest xml-remove-comments ()
(dolist (test xml-tests--data-with-comments)
(erase-buffer)
(insert (car test))
(xml-remove-comments (point-min) (point-max))
(should (equal (cdr test)
(xml-parse-region (point-min) (point-max))))))
;; Local Variables:
;; no-byte-compile: t
;; End:

21
test/src/xml-tests.el
View file

@ -42,20 +42,6 @@
(comment nil "comment-b") (comment nil "comment-c"))))
"Alist of XML strings and their expected parse trees for preserved comments.")
(defvar libxml-tests--data-comments-discarded
`(;; simple case
("<?xml version=\"1.0\"?><foo baz=\"true\">bar</foo>"
. (foo ((baz . "true")) "bar"))
;; toplevel comments -- first document child must not get lost
(,(concat "<?xml version=\"1.0\"?><foo>bar</foo><!--comment-1-->"
"<!--comment-2-->")
. (foo nil "bar"))
(,(concat "<?xml version=\"1.0\"?><!--comment-a--><foo a=\"b\">"
"<bar>blub</bar></foo><!--comment-b--><!--comment-c-->")
. (foo ((a . "b")) (bar nil "blub"))))
"Alist of XML strings and their expected parse trees for discarded comments.")
(ert-deftest libxml-tests ()
"Test libxml."
(when (fboundp 'libxml-parse-xml-region)
@ -64,11 +50,6 @@
(erase-buffer)
(insert (car test))
(should (equal (cdr test)
(libxml-parse-xml-region (point-min) (point-max)))))
(dolist (test libxml-tests--data-comments-discarded)
(erase-buffer)
(insert (car test))
(should (equal (cdr test)
(libxml-parse-xml-region (point-min) (point-max) nil t)))))))
(libxml-parse-xml-region (point-min) (point-max))))))))
;;; libxml-tests.el ends here