From fae1b7a4eafbd9872d2447eab011bdf9aab97645 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Fri, 16 Jan 2015 00:43:18 +0100 Subject: Working on XMLParser (still lot work in progress) --- test/core/common/UtilsTest.cpp | 14 ++++++++++++++ test/core/parser/ParserStackTest.cpp | 7 +++---- test/plugins/xml/XmlParserTest.cpp | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/core/common/UtilsTest.cpp b/test/core/common/UtilsTest.cpp index 66458b2..53beb79 100644 --- a/test/core/common/UtilsTest.cpp +++ b/test/core/common/UtilsTest.cpp @@ -40,5 +40,19 @@ TEST(Utils, trim) ASSERT_EQ("hello world", Utils::trim("hello world")); } +TEST(Utils, split) +{ + ASSERT_EQ(std::vector({"ab"}), Utils::split("ab", '.')); + ASSERT_EQ(std::vector({"a", ""}), Utils::split("a.", '.')); + ASSERT_EQ(std::vector({"", ""}), Utils::split(".", '.')); + ASSERT_EQ(std::vector({"a", "b"}), Utils::split("a.b", '.')); + ASSERT_EQ(std::vector({"a", "b"}), Utils::split("a.b", '.')); + ASSERT_EQ(std::vector({"a", "b", "c"}), + Utils::split("a.b.c", '.')); + ASSERT_EQ(std::vector({"", "a", "b", "c"}), + Utils::split(".a.b.c", '.')); + ASSERT_EQ(std::vector({"", "a", "be", "c", ""}), + Utils::split(".a.be.c.", '.')); +} } diff --git a/test/core/parser/ParserStackTest.cpp b/test/core/parser/ParserStackTest.cpp index 08c0548..ed57260 100644 --- a/test/core/parser/ParserStackTest.cpp +++ b/test/core/parser/ParserStackTest.cpp @@ -39,7 +39,7 @@ class TestHandler : public Handler { public: using Handler::Handler; - void start(const Variant::mapType &args) override { startCount++; } + void start(Variant::mapType &args) override { startCount++; } void end() override { endCount++; } @@ -48,10 +48,9 @@ public: void child(std::shared_ptr handler) override { childCount++; } }; -static Handler *createTestHandler(const ParserContext &ctx, std::string name, - State state, State parentState, bool isChild) +static Handler *createTestHandler(const HandlerData &data) { - return new TestHandler(ctx, name, state, parentState, isChild); + return new TestHandler(data); } static const std::multimap TEST_HANDLERS{ diff --git a/test/plugins/xml/XmlParserTest.cpp b/test/plugins/xml/XmlParserTest.cpp index c47fd6a..fd13cb9 100644 --- a/test/plugins/xml/XmlParserTest.cpp +++ b/test/plugins/xml/XmlParserTest.cpp @@ -51,7 +51,7 @@ const char *TEST_DATA = "\n" "\n" " \n" - " \n" + " \n" " \n" " \n" " \n" -- cgit v1.2.3