From 6940aa0e6837f9d83f9b5c5b37d4fd7747c95c67 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Sun, 11 Jan 2015 13:53:15 +0100 Subject: Forward declaring Rtti stuff for fewer dependencies in the Rtti.hpp header --- test/core/model/DocumentTest.cpp | 14 ++++---- test/core/model/NodeTest.cpp | 1 + test/plugins/css/CSSParserTest.cpp | 62 ++++++++++++++++++------------------ test/plugins/html/DemoOutputTest.cpp | 2 ++ 4 files changed, 42 insertions(+), 37 deletions(-) (limited to 'test') diff --git a/test/core/model/DocumentTest.cpp b/test/core/model/DocumentTest.cpp index 2d53dcd..d11bb78 100644 --- a/test/core/model/DocumentTest.cpp +++ b/test/core/model/DocumentTest.cpp @@ -20,6 +20,8 @@ #include +#include + #include #include @@ -47,7 +49,7 @@ TEST(Document, testDocumentConstruction) ASSERT_FALSE(root.isNull()); ASSERT_EQ("book", root->getDescriptor()->getName()); ASSERT_TRUE(root->hasField()); - ASSERT_EQ(2, root->getField().size()); + ASSERT_EQ(2U, root->getField().size()); // get foreword (paragraph) { Rooted foreword = root->getField()[0]; @@ -55,7 +57,7 @@ TEST(Document, testDocumentConstruction) ASSERT_EQ("paragraph", foreword->getDescriptor()->getName()); // it should contain one text node ASSERT_TRUE(foreword->hasField()); - ASSERT_EQ(1, foreword->getField().size()); + ASSERT_EQ(1U, foreword->getField().size()); // which in turn should have a primitive content field containing the // right text. { @@ -63,7 +65,7 @@ TEST(Document, testDocumentConstruction) ASSERT_FALSE(text.isNull()); ASSERT_EQ("text", text->getDescriptor()->getName()); ASSERT_TRUE(text->hasField()); - ASSERT_EQ(1, text->getField().size()); + ASSERT_EQ(1U, text->getField().size()); ASSERT_TRUE(text->getField()[0]->isa(typeOf())); Variant content = text->getField()[0].cast()->getContent(); @@ -77,14 +79,14 @@ TEST(Document, testDocumentConstruction) ASSERT_EQ("section", section->getDescriptor()->getName()); // it should contain one paragraph ASSERT_TRUE(section->hasField()); - ASSERT_EQ(1, section->getField().size()); + ASSERT_EQ(1U, section->getField().size()); { Rooted par = section->getField()[0]; ASSERT_FALSE(par.isNull()); ASSERT_EQ("paragraph", par->getDescriptor()->getName()); // it should contain one text node ASSERT_TRUE(par->hasField()); - ASSERT_EQ(1, par->getField().size()); + ASSERT_EQ(1U, par->getField().size()); // which in turn should have a primitive content field containing // the // right text. @@ -93,7 +95,7 @@ TEST(Document, testDocumentConstruction) ASSERT_FALSE(text.isNull()); ASSERT_EQ("text", text->getDescriptor()->getName()); ASSERT_TRUE(text->hasField()); - ASSERT_EQ(1, text->getField().size()); + ASSERT_EQ(1U, text->getField().size()); ASSERT_TRUE( text->getField()[0]->isa(typeOf())); Variant content = diff --git a/test/core/model/NodeTest.cpp b/test/core/model/NodeTest.cpp index 3bfa31b..7300d0c 100644 --- a/test/core/model/NodeTest.cpp +++ b/test/core/model/NodeTest.cpp @@ -18,6 +18,7 @@ #include +#include #include #include diff --git a/test/plugins/css/CSSParserTest.cpp b/test/plugins/css/CSSParserTest.cpp index 29e6055..ca21e79 100644 --- a/test/plugins/css/CSSParserTest.cpp +++ b/test/plugins/css/CSSParserTest.cpp @@ -48,10 +48,10 @@ TEST(CSSParser, testParseSelectors) Rooted root = instance.parse(data, ctx).cast(); // we expect three children of the root node overall. - ASSERT_EQ(3, root->getEdges().size()); + ASSERT_EQ(3U, root->getEdges().size()); // get all "A" children, which should be two. std::vector> children = root->getChildren("A"); - ASSERT_EQ(2, children.size()); + ASSERT_EQ(2U, children.size()); // assert A Rooted A = children[0]; ASSERT_EQ("A", A->getName()); @@ -59,75 +59,75 @@ TEST(CSSParser, testParseSelectors) PseudoSelector select{"true", false}; ASSERT_EQ(select, A->getPseudoSelector()); } - ASSERT_EQ(2, A->getEdges().size()); + ASSERT_EQ(2U, A->getEdges().size()); ASSERT_FALSE(A->isAccepting()); - ASSERT_EQ(0, A->getRuleSet()->getRules().size()); + ASSERT_EQ(0U, A->getRuleSet()->getRules().size()); { // assert A > B std::vector> Achildren = A->getChildren(SelectionOperator::DIRECT_DESCENDANT, "B"); - ASSERT_EQ(1, Achildren.size()); + ASSERT_EQ(1U, Achildren.size()); Rooted B = Achildren[0]; ASSERT_EQ("B", B->getName()); { PseudoSelector select{"true", false}; ASSERT_EQ(select, B->getPseudoSelector()); } - ASSERT_EQ(0, B->getEdges().size()); + ASSERT_EQ(0U, B->getEdges().size()); ASSERT_TRUE(B->isAccepting()); - ASSERT_EQ(0, B->getRuleSet()->getRules().size()); + ASSERT_EQ(0U, B->getRuleSet()->getRules().size()); // assert A B:r Achildren = A->getChildren(SelectionOperator::DESCENDANT, "B"); - ASSERT_EQ(1, Achildren.size()); + ASSERT_EQ(1U, Achildren.size()); Rooted Br = Achildren[0]; ASSERT_EQ("B", Br->getName()); { PseudoSelector select{"r", false}; ASSERT_EQ(select, Br->getPseudoSelector()); } - ASSERT_EQ(0, Br->getEdges().size()); + ASSERT_EQ(0U, Br->getEdges().size()); ASSERT_TRUE(Br->isAccepting()); - ASSERT_EQ(0, Br->getRuleSet()->getRules().size()); + ASSERT_EQ(0U, Br->getRuleSet()->getRules().size()); } // assert C#a children = root->getChildren("C"); - ASSERT_EQ(1, children.size()); + ASSERT_EQ(1U, children.size()); Rooted C = children[0]; ASSERT_EQ("C", C->getName()); { PseudoSelector select{"has_id", {"a"}, false}; ASSERT_EQ(select, C->getPseudoSelector()); } - ASSERT_EQ(1, C->getEdges().size()); + ASSERT_EQ(1U, C->getEdges().size()); ASSERT_FALSE(C->isAccepting()); - ASSERT_EQ(0, C->getRuleSet()->getRules().size()); + ASSERT_EQ(0U, C->getRuleSet()->getRules().size()); { // assert C#a A[bla=\"blub\"] std::vector> Cchildren = C->getChildren(SelectionOperator::DESCENDANT, "A"); - ASSERT_EQ(1, Cchildren.size()); + ASSERT_EQ(1U, Cchildren.size()); Rooted A = Cchildren[0]; ASSERT_EQ("A", A->getName()); { PseudoSelector select{"has_value", {"bla", "blub"}, false}; ASSERT_EQ(select, A->getPseudoSelector()); } - ASSERT_EQ(0, A->getEdges().size()); + ASSERT_EQ(0U, A->getEdges().size()); ASSERT_TRUE(A->isAccepting()); - ASSERT_EQ(0, A->getRuleSet()->getRules().size()); + ASSERT_EQ(0U, A->getRuleSet()->getRules().size()); } // assert A::g(4,2,3) children = root->getChildren("A"); - ASSERT_EQ(2, children.size()); + ASSERT_EQ(2U, children.size()); Rooted Ag = children[1]; ASSERT_EQ("A", Ag->getName()); { PseudoSelector select{"g", {Variant(4), Variant(2), Variant(3)}, true}; ASSERT_EQ(select, Ag->getPseudoSelector()); } - ASSERT_EQ(0, Ag->getEdges().size()); + ASSERT_EQ(0U, Ag->getEdges().size()); ASSERT_TRUE(Ag->isAccepting()); - ASSERT_EQ(0, Ag->getRuleSet()->getRules().size()); + ASSERT_EQ(0U, Ag->getRuleSet()->getRules().size()); } TEST(CSSParser, testParseCSS) @@ -159,10 +159,10 @@ TEST(CSSParser, testParseCSS) instance.parse(reader, ctx).cast(); // we expect three children of the root node overall. - ASSERT_EQ(3, root->getEdges().size()); + ASSERT_EQ(3U, root->getEdges().size()); // get all "A" children, which should be two. std::vector> children = root->getChildren("A"); - ASSERT_EQ(2, children.size()); + ASSERT_EQ(2U, children.size()); // assert A /* * A { @@ -184,11 +184,11 @@ TEST(CSSParser, testParseCSS) PseudoSelector select{"true", false}; ASSERT_EQ(select, A->getPseudoSelector()); } - ASSERT_EQ(0, A->getEdges().size()); + ASSERT_EQ(0U, A->getEdges().size()); ASSERT_TRUE(A->isAccepting()); { Rooted ruleSet = A->getRuleSet(); - ASSERT_EQ(2, ruleSet->getRules().size()); + ASSERT_EQ(2U, ruleSet->getRules().size()); Variant v = ruleSet->getRules()["ident1"]; ASSERT_TRUE(v.isString()); ASSERT_EQ("val4", v.asString()); @@ -209,11 +209,11 @@ TEST(CSSParser, testParseCSS) PseudoSelector select{"select", {"a", "b"}, false}; ASSERT_EQ(select, Aselect->getPseudoSelector()); } - ASSERT_EQ(0, Aselect->getEdges().size()); + ASSERT_EQ(0U, Aselect->getEdges().size()); ASSERT_TRUE(Aselect->isAccepting()); { Rooted ruleSet = Aselect->getRuleSet(); - ASSERT_EQ(1, ruleSet->getRules().size()); + ASSERT_EQ(1U, ruleSet->getRules().size()); Variant v = ruleSet->getRules()["ident3"]; ASSERT_TRUE(v.isString()); ASSERT_EQ("val3", v.asString()); @@ -227,7 +227,7 @@ TEST(CSSParser, testParseCSS) * } */ children = root->getChildren("B"); - ASSERT_EQ(1, children.size()); + ASSERT_EQ(1U, children.size()); Rooted B = children[0]; ASSERT_EQ("B", B->getName()); @@ -235,12 +235,12 @@ TEST(CSSParser, testParseCSS) PseudoSelector select{"true", false}; ASSERT_EQ(select, B->getPseudoSelector()); } - ASSERT_EQ(1, B->getEdges().size()); + ASSERT_EQ(1U, B->getEdges().size()); ASSERT_FALSE(B->isAccepting()); - ASSERT_EQ(0, B->getRuleSet()->getRules().size()); + ASSERT_EQ(0U, B->getRuleSet()->getRules().size()); children = B->getChildren("A"); - ASSERT_EQ(1, children.size()); + ASSERT_EQ(1U, children.size()); Rooted BA = children[0]; ASSERT_EQ("A", BA->getName()); @@ -248,11 +248,11 @@ TEST(CSSParser, testParseCSS) PseudoSelector select{"true", false}; ASSERT_EQ(select, BA->getPseudoSelector()); } - ASSERT_EQ(0, BA->getEdges().size()); + ASSERT_EQ(0U, BA->getEdges().size()); ASSERT_TRUE(BA->isAccepting()); { Rooted ruleSet = BA->getRuleSet(); - ASSERT_EQ(2, ruleSet->getRules().size()); + ASSERT_EQ(2U, ruleSet->getRules().size()); Variant v = ruleSet->getRules()["ident1"]; ASSERT_TRUE(v.isString()); ASSERT_EQ("val1", v.asString()); diff --git a/test/plugins/html/DemoOutputTest.cpp b/test/plugins/html/DemoOutputTest.cpp index 5b2758d..ddd8f1c 100644 --- a/test/plugins/html/DemoOutputTest.cpp +++ b/test/plugins/html/DemoOutputTest.cpp @@ -23,6 +23,8 @@ #include +#include + #include #include -- cgit v1.2.3