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
@@ -9,18 +9,19 @@
 
 #include <Swiften/Parser/AttributeMap.h>
 
 using namespace Swift;
 
 class AttributeMapTest : public CppUnit::TestFixture
 {
         CPPUNIT_TEST_SUITE(AttributeMapTest);
         CPPUNIT_TEST(testGetAttribute_Namespaced);
+        CPPUNIT_TEST(testGetAttribute_Namespaced_Prefix);
         CPPUNIT_TEST(testGetBoolAttribute_True);
         CPPUNIT_TEST(testGetBoolAttribute_1);
         CPPUNIT_TEST(testGetBoolAttribute_False);
         CPPUNIT_TEST(testGetBoolAttribute_0);
         CPPUNIT_TEST(testGetBoolAttribute_Invalid);
         CPPUNIT_TEST(testGetBoolAttribute_UnknownWithDefaultTrue);
         CPPUNIT_TEST(testGetBoolAttribute_UnknownWithDefaultFalse);
         CPPUNIT_TEST_SUITE_END();
 
@@ -28,18 +29,34 @@ class AttributeMapTest : public CppUnit::TestFixture
         void testGetAttribute_Namespaced() {
             AttributeMap testling;
             testling.addAttribute("lang", "", "nl");
             testling.addAttribute("lang", "http://www.w3.org/XML/1998/namespace", "en");
             testling.addAttribute("lang", "", "fr");
 
             CPPUNIT_ASSERT_EQUAL(std::string("en"), testling.getAttribute("lang", "http://www.w3.org/XML/1998/namespace"));
         }
 
+        void testGetAttribute_Namespaced_Prefix() {
+            AttributeMap testling;
+            testling.addAttribute("lang", "", "prefix", "nl");
+            testling.addAttribute("lang", "http://www.w3.org/XML/1998/namespace", "prefix", "en");
+            testling.addAttribute("lang", "", "prefix", "fr");
+
+            CPPUNIT_ASSERT_EQUAL(std::string("en"), testling.getAttribute("lang", "http://www.w3.org/XML/1998/namespace"));
+            const auto& entries = testling.getEntries();
+            auto it = std::find_if(entries.begin(), entries.end(), [](const AttributeMap::Entry& e) {
+                return e.getValue() == "en";
+            });
+            const bool found = it != entries.end();
+            CPPUNIT_ASSERT_EQUAL(true, found);
+            CPPUNIT_ASSERT_EQUAL(std::string("prefix"), it->getAttribute().getPrefix());
+        }
+
         void testGetBoolAttribute_True() {
             AttributeMap testling;
             testling.addAttribute("foo", "", "true");
 
             CPPUNIT_ASSERT(testling.getBoolAttribute("foo"));
         }
 
         void testGetBoolAttribute_1() {
             AttributeMap testling;