diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2014-05-09 16:24:44 -0700 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2014-05-09 16:24:44 -0700 |
commit | 41569646f9b5e70e53769e24d5e8efe45c2d24b4 (patch) | |
tree | ac973b8eedc7341793675746c67381d742b7cf36 /tests/parser/driver.cxx | |
parent | 850aca7f66a32f3301795c207926beef5165c45a (diff) |
Move content model enum out of parser and into xml namespace
Diffstat (limited to 'tests/parser/driver.cxx')
-rw-r--r-- | tests/parser/driver.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/parser/driver.cxx b/tests/parser/driver.cxx index 84ab2fa..2afe522 100644 --- a/tests/parser/driver.cxx +++ b/tests/parser/driver.cxx @@ -91,7 +91,7 @@ main () istringstream is ("<root> </root>"); parser p (is, "empty"); - p.next_expect (parser::start_element, "root", parser::empty); + p.next_expect (parser::start_element, "root", content::empty); p.next_expect (parser::end_element); p.next_expect (parser::eof); } @@ -247,7 +247,7 @@ main () parser::receive_default | parser::receive_attributes_event); assert (p.next () == parser::start_element); - p.content (parser::empty); + p.content (content::empty); assert (p.next () == parser::start_attribute); assert (p.next () == parser::characters && p.value () == " x "); assert (p.next () == parser::end_attribute); @@ -261,7 +261,7 @@ main () parser p (is, "empty"); assert (p.next () == parser::start_element); - p.content (parser::empty); + p.content (content::empty); p.next (); assert (false); } @@ -277,7 +277,7 @@ main () parser p (is, "simple"); assert (p.next () == parser::start_element); - p.content (parser::simple); + p.content (content::simple); assert (p.next () == parser::characters && p.value () == " X "); assert (p.next () == parser::end_element); assert (p.next () == parser::eof); @@ -289,7 +289,7 @@ main () parser p (is, "simple"); assert (p.next () == parser::start_element); - p.content (parser::simple); + p.content (content::simple); assert (p.next () == parser::characters && p.value () == " ? "); p.next (); assert (false); @@ -310,7 +310,7 @@ main () assert (p.next () == parser::start_element); p.next_expect (parser::start_namespace_decl); - p.content (parser::simple); + p.content (content::simple); assert (p.next () == parser::characters && p.value () == "123"); p.next_expect (parser::end_namespace_decl); assert (p.next () == parser::end_element); @@ -329,7 +329,7 @@ main () assert (p.next () == parser::start_element); p.next_expect (parser::start_namespace_decl); - p.content (parser::simple); + p.content (content::simple); p.next (); assert (false); } @@ -351,21 +351,21 @@ main () parser::receive_default | parser::receive_attributes_event); assert (p.next () == parser::start_element); // root - p.content (parser::complex); + p.content (content::complex); assert (p.next () == parser::start_attribute); assert (p.next () == parser::characters && p.value () == " x "); assert (p.next () == parser::end_attribute); assert (p.next () == parser::start_element); // nested - p.content (parser::complex); + p.content (content::complex); assert (p.next () == parser::start_element); // inner - p.content (parser::empty); + p.content (content::empty); assert (p.next () == parser::end_element); // inner assert (p.next () == parser::start_element); // inner - p.content (parser::simple); + p.content (content::simple); assert (p.next () == parser::characters && p.value () == " X "); assert (p.next () == parser::end_element); // inner @@ -380,7 +380,7 @@ main () parser p (is, "complex"); assert (p.next () == parser::start_element); - p.content (parser::complex); + p.content (content::complex); assert (p.next () == parser::start_element); assert (p.next () == parser::end_element); p.next (); @@ -413,7 +413,7 @@ main () "</root>"); parser p (is, "element"); - p.next_expect (parser::start_element, "root", parser::complex); + p.next_expect (parser::start_element, "root", content::complex); p.next_expect (parser::start_element, "nested"); assert (p.element () == "X"); |