2 files changed, 0 insertions, 52 deletions
diff --git a/Swiften b/Swiften
new file mode 160000
+Subproject 8213ba16d0043d2461f4b031c881d61dda5a38c
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/SecurityLabelsCatalogSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/SecurityLabelsCatalogSerializerTest.cpp
deleted file mode 100644
index 3055aca..0000000
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/SecurityLabelsCatalogSerializerTest.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-
-#include "Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.h"
-
-using namespace Swift;
-
-class SecurityLabelsCatalogSerializerTest : public CppUnit::TestFixture
-{
-		CPPUNIT_TEST_SUITE(SecurityLabelsCatalogSerializerTest);
-		CPPUNIT_TEST(testSerialize);
-		CPPUNIT_TEST_SUITE_END();
-
-	public:
-		SecurityLabelsCatalogSerializerTest() {}
-
-		void testSerialize() {
-			SecurityLabelsCatalogSerializer testling;
-			boost::shared_ptr<SecurityLabelsCatalog> catalog(new SecurityLabelsCatalog());
-			catalog->setTo(JID("example.com"));
-			catalog->setName("Default");
-			catalog->setDescription("an example set of labels");
-
-			SecurityLabel securityLabel1;
-			securityLabel1.setDisplayMarking("SECRET");
-			securityLabel1.setForegroundColor("black");
-			securityLabel1.setBackgroundColor("red");
-			securityLabel1.setLabel("<esssecuritylabel xmlns=\"urn:xmpp:sec-label:ess:0\">MQYCAQQGASk=</esssecuritylabel>");
-			catalog->addLabel(securityLabel1);
-
-			SecurityLabel securityLabel2;
-			securityLabel2.setDisplayMarking("CONFIDENTIAL");
-			securityLabel2.setForegroundColor("black");
-			securityLabel2.setBackgroundColor("navy");
-			securityLabel2.setLabel("<esssecuritylabel xmlns=\"urn:xmpp:sec-label:ess:0\">MQMGASk=</esssecuritylabel>");
-			catalog->addLabel(securityLabel2);
-
-			CPPUNIT_ASSERT_EQUAL(String(
-				"<catalog desc=\"an example set of labels\" name=\"Default\" to=\"example.com\" xmlns=\"urn:xmpp:sec-label:catalog:0\">"
-					"<securitylabel xmlns=\"urn:xmpp:sec-label:0\">"
-						"<displaymarking bgcolor=\"red\" fgcolor=\"black\">SECRET</displaymarking>"
-						"<label><esssecuritylabel xmlns=\"urn:xmpp:sec-label:ess:0\">MQYCAQQGASk=</esssecuritylabel></label>"
-					"</securitylabel>"
-					"<securitylabel xmlns=\"urn:xmpp:sec-label:0\">"
-						"<displaymarking bgcolor=\"navy\" fgcolor=\"black\">CONFIDENTIAL</displaymarking>"
-						"<label><esssecuritylabel xmlns=\"urn:xmpp:sec-label:ess:0\">MQMGASk=</esssecuritylabel></label>"
-					"</securitylabel>"
-				"</catalog>"), testling.serialize(catalog));
-		}
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(SecurityLabelsCatalogSerializerTest);