From b211c02c53f3ed38c7d124d6a74f22ee17df7063 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Fri, 6 Feb 2015 16:40:42 +0100 Subject: Removed childHandler, added "*" notation --- test/core/parser/ParserStackTest.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'test/core/parser/ParserStackTest.cpp') diff --git a/test/core/parser/ParserStackTest.cpp b/test/core/parser/ParserStackTest.cpp index 7ffcf3a..3a0decb 100644 --- a/test/core/parser/ParserStackTest.cpp +++ b/test/core/parser/ParserStackTest.cpp @@ -52,8 +52,7 @@ static const ParserState Document = ParserStateBuilder().parent(&None).elementHandler(TestHandler::create); static const ParserState Body = ParserStateBuilder() .parent(&Document) - .elementHandler(TestHandler::create) - .childHandler(TestHandler::create); + .elementHandler(TestHandler::create); static const ParserState Empty = ParserStateBuilder().parent(&Document).elementHandler(TestHandler::create); static const ParserState Special = @@ -63,13 +62,18 @@ static const ParserState Arguments = .parent(&None) .elementHandler(TestHandler::create) .arguments({Argument::Int("a"), Argument::String("b")}); +static const ParserState BodyChildren = + ParserStateBuilder() + .parent(&Body) + .elementHandler(TestHandler::create); static const std::multimap TestHandlers{ {"document", &Document}, {"body", &Body}, {"empty", &Empty}, {"special", &Special}, - {"arguments", &Arguments}}; + {"arguments", &Arguments}, + {"*", &BodyChildren}}; } TEST(ParserStack, simpleTest) @@ -101,7 +105,7 @@ TEST(ParserStack, simpleTest) s.start("inner", {}); EXPECT_EQ("inner", s.currentCommandName()); - EXPECT_EQ(&ParserStates::Body, &s.currentState()); + EXPECT_EQ(&ParserStates::BodyChildren, &s.currentState()); s.end(); EXPECT_EQ(3, startCount); EXPECT_EQ(1, endCount); -- cgit v1.2.3