Swiftdiff options
| author | Joanna Hulboj <joanna.hulboj@isode.com> | 2019-09-19 19:48:44 (GMT) |
|---|---|---|
| committer | Joanna Hulboj <joanna.hulboj@isode.com> | 2019-09-24 10:08:15 (GMT) |
| commit | 23e2766dab6d4a3f6158eca7649cd36b644634d3 (patch) | |
| tree | 1faa4b741b03704e7a70918196310a4453e699a7 /Swiften/Parser/UnitTest/AttributeMapTest.cpp | |
| parent | e58cf7d5d7d3bab330bccf6a098dd476fbf4dc86 (diff) | |
| download | swift-23e2766dab6d4a3f6158eca7649cd36b644634d3.zip swift-23e2766dab6d4a3f6158eca7649cd36b644634d3.tar.bz2 | |
Process attribute and element prefixes
XML (Expat/LibXML) parsing modified to process prefix information.
Prefixes for attributes stored within attributes.
Prefixes for elements passed in additional callback
(only if prefix present).
Test-information:
Unit tests pass on Windows 10 and Ubuntu 18.04.1 LTS.
Change-Id: Ib6b5087feed758c31895f426df6a3c7ea975f248
Diffstat (limited to 'Swiften/Parser/UnitTest/AttributeMapTest.cpp')
| -rw-r--r-- | Swiften/Parser/UnitTest/AttributeMapTest.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Swiften/Parser/UnitTest/AttributeMapTest.cpp b/Swiften/Parser/UnitTest/AttributeMapTest.cpp index 4529eac..d9335c1 100644 --- a/Swiften/Parser/UnitTest/AttributeMapTest.cpp +++ b/Swiften/Parser/UnitTest/AttributeMapTest.cpp | |||
| @@ -15,6 +15,7 @@ class AttributeMapTest : public CppUnit::TestFixture | |||
| 15 | { | 15 | { |
| 16 | CPPUNIT_TEST_SUITE(AttributeMapTest); | 16 | CPPUNIT_TEST_SUITE(AttributeMapTest); |
| 17 | CPPUNIT_TEST(testGetAttribute_Namespaced); | 17 | CPPUNIT_TEST(testGetAttribute_Namespaced); |
| 18 | CPPUNIT_TEST(testGetAttribute_Namespaced_Prefix); | ||
| 18 | CPPUNIT_TEST(testGetBoolAttribute_True); | 19 | CPPUNIT_TEST(testGetBoolAttribute_True); |
| 19 | CPPUNIT_TEST(testGetBoolAttribute_1); | 20 | CPPUNIT_TEST(testGetBoolAttribute_1); |
| 20 | CPPUNIT_TEST(testGetBoolAttribute_False); | 21 | CPPUNIT_TEST(testGetBoolAttribute_False); |
| @@ -34,6 +35,22 @@ class AttributeMapTest : public CppUnit::TestFixture | |||
| 34 | CPPUNIT_ASSERT_EQUAL(std::string("en"), testling.getAttribute("lang", "http://www.w3.org/XML/1998/namespace")); | 35 | CPPUNIT_ASSERT_EQUAL(std::string("en"), testling.getAttribute("lang", "http://www.w3.org/XML/1998/namespace")); |
| 35 | } | 36 | } |
| 36 | 37 | ||
| 38 | void testGetAttribute_Namespaced_Prefix() { | ||
| 39 | AttributeMap testling; | ||
| 40 | testling.addAttribute("lang", "", "prefix", "nl"); | ||
| 41 | testling.addAttribute("lang", "http://www.w3.org/XML/1998/namespace", "prefix", "en"); | ||
| 42 | testling.addAttribute("lang", "", "prefix", "fr"); | ||
| 43 | |||
| 44 | CPPUNIT_ASSERT_EQUAL(std::string("en"), testling.getAttribute("lang", "http://www.w3.org/XML/1998/namespace")); | ||
| 45 | const auto& entries = testling.getEntries(); | ||
| 46 | auto it = std::find_if(entries.begin(), entries.end(), [](const AttributeMap::Entry& e) { | ||
| 47 | return e.getValue() == "en"; | ||
| 48 | }); | ||
| 49 | const bool found = it != entries.end(); | ||
| 50 | CPPUNIT_ASSERT_EQUAL(true, found); | ||
| 51 | CPPUNIT_ASSERT_EQUAL(std::string("prefix"), it->getAttribute().getPrefix()); | ||
| 52 | } | ||
| 53 | |||
| 37 | void testGetBoolAttribute_True() { | 54 | void testGetBoolAttribute_True() { |
| 38 | AttributeMap testling; | 55 | AttributeMap testling; |
| 39 | testling.addAttribute("foo", "", "true"); | 56 | testling.addAttribute("foo", "", "true"); |