diff options
| author | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-05-08 20:30:29 +0000 |
|---|---|---|
| committer | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-05-08 20:30:29 +0000 |
| commit | 6706a3f8ba550701012bee86f6a1d60890437cdf (patch) | |
| tree | fe20f69f221bca98949d159af24882bf01b92364 /tests/test_parse.cpp | |
| parent | 1172d9bc4a1dbb2a16513bd918ade85486f54243 (diff) | |
Deprecated all wildcard functions and parse_wnorm_attribute
git-svn-id: http://pugixml.googlecode.com/svn/trunk@389 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'tests/test_parse.cpp')
| -rw-r--r-- | tests/test_parse.cpp | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/tests/test_parse.cpp b/tests/test_parse.cpp index 461578e..0719e5d 100644 --- a/tests/test_parse.cpp +++ b/tests/test_parse.cpp @@ -357,38 +357,23 @@ TEST(parse_attribute_eol_wconv) CHECK_STRING(doc.child(STR("node")).attribute(STR("id")).value(), STR(" val1 val2 val3 val4 "));
}
-TEST(parse_attribute_wnorm)
+TEST(parse_attribute_variations)
{
xml_document doc;
for (int eol = 0; eol < 2; ++eol)
for (int wconv = 0; wconv < 2; ++wconv)
- {
- unsigned int flags = parse_minimal | parse_wnorm_attribute | (eol ? parse_eol : 0) | (wconv ? parse_wconv_attribute : 0);
- CHECK(doc.load(STR("<node id=' \t\r\rval1 \rval2\r\nval3\nval4\r\r'/>"), flags));
- CHECK_STRING(doc.child(STR("node")).attribute(STR("id")).value(), STR("val1 val2 val3 val4"));
- }
-}
-
-TEST(parse_attribute_variations)
-{
- xml_document doc;
-
- for (int wnorm = 0; wnorm < 2; ++wnorm)
- for (int eol = 0; eol < 2; ++eol)
- for (int wconv = 0; wconv < 2; ++wconv)
- for (int escapes = 0; escapes < 2; ++escapes)
- {
- unsigned int flags = parse_minimal;
-
- flags |= (wnorm ? parse_wnorm_attribute : 0);
- flags |= (eol ? parse_eol : 0);
- flags |= (wconv ? parse_wconv_attribute : 0);
- flags |= (escapes ? parse_escapes : 0);
-
- CHECK(doc.load(STR("<node id='1'/>"), flags));
- CHECK_STRING(doc.child(STR("node")).attribute(STR("id")).value(), STR("1"));
- }
+ for (int escapes = 0; escapes < 2; ++escapes)
+ {
+ unsigned int flags = parse_minimal;
+
+ flags |= (eol ? parse_eol : 0);
+ flags |= (wconv ? parse_wconv_attribute : 0);
+ flags |= (escapes ? parse_escapes : 0);
+
+ CHECK(doc.load(STR("<node id='1'/>"), flags));
+ CHECK_STRING(doc.child(STR("node")).attribute(STR("id")).value(), STR("1"));
+ }
}
TEST(parse_attribute_error)
|