diff options
Diffstat (limited to 'test/plugins')
| -rw-r--r-- | test/plugins/css/CSSParserTest.cpp | 16 | ||||
| -rw-r--r-- | test/plugins/xml/XmlParserTest.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/plugins/css/CSSParserTest.cpp b/test/plugins/css/CSSParserTest.cpp index 6499375..3ea3a19 100644 --- a/test/plugins/css/CSSParserTest.cpp +++ b/test/plugins/css/CSSParserTest.cpp @@ -186,11 +186,11 @@ TEST(CSSParser, testParseCSS) { Rooted<RuleSet> ruleSet = A->getRuleSet(); ASSERT_EQ(2, ruleSet->getRules().size()); - variant::Variant v = ruleSet->getRules()["ident1"]; - ASSERT_EQ(variant::Variant::Type::STRING, v.getType()); + Variant v = ruleSet->getRules()["ident1"]; + ASSERT_EQ(Variant::Type::STRING, v.getType()); ASSERT_EQ("val4", v.asString()); v = ruleSet->getRules()["ident2"]; - ASSERT_EQ(variant::Variant::Type::STRING, v.getType()); + ASSERT_EQ(Variant::Type::STRING, v.getType()); ASSERT_EQ("val2", v.asString()); } /* @@ -211,8 +211,8 @@ TEST(CSSParser, testParseCSS) { Rooted<RuleSet> ruleSet = Aselect->getRuleSet(); ASSERT_EQ(1, ruleSet->getRules().size()); - variant::Variant v = ruleSet->getRules()["ident3"]; - ASSERT_EQ(variant::Variant::Type::STRING, v.getType()); + Variant v = ruleSet->getRules()["ident3"]; + ASSERT_EQ(Variant::Type::STRING, v.getType()); ASSERT_EQ("val3", v.asString()); } /* @@ -250,11 +250,11 @@ TEST(CSSParser, testParseCSS) { Rooted<RuleSet> ruleSet = BA->getRuleSet(); ASSERT_EQ(2, ruleSet->getRules().size()); - variant::Variant v = ruleSet->getRules()["ident1"]; - ASSERT_EQ(variant::Variant::Type::STRING, v.getType()); + Variant v = ruleSet->getRules()["ident1"]; + ASSERT_EQ(Variant::Type::STRING, v.getType()); ASSERT_EQ("val1", v.asString()); v = ruleSet->getRules()["ident2"]; - ASSERT_EQ(variant::Variant::Type::STRING, v.getType()); + ASSERT_EQ(Variant::Type::STRING, v.getType()); ASSERT_EQ("val2", v.asString()); } } diff --git a/test/plugins/xml/XmlParserTest.cpp b/test/plugins/xml/XmlParserTest.cpp index 7dc8c24..39b1a9d 100644 --- a/test/plugins/xml/XmlParserTest.cpp +++ b/test/plugins/xml/XmlParserTest.cpp @@ -36,7 +36,7 @@ TEST(XmlParser, mismatchedTagException) p.parse("<document>\n</document2>", ctx); } catch (ParserException ex) { - ASSERT_EQ(2, ex.line); + ASSERT_EQ(2U, ex.pos.line); hadException = true; } ASSERT_TRUE(hadException); |