2 files changed, 18 insertions, 0 deletions
diff --git a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
index 16f2745..ca74dbb 100644
--- a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
@@ -8,6 +8,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
+#include <Swiften/Base/foreach.h>
 #include "Swift/Controllers/Roster/RosterController.h"
 #include "Swift/Controllers/UnitTest/MockMainWindowFactory.h"
 // #include "Swiften/Elements/Payload.h"
diff --git a/Swift/Controllers/Roster/UnitTest/RosterTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
index cbef787..4444e8a 100644
--- a/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
@@ -21,6 +21,7 @@ class RosterTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST(testRemoveSecondContact);
 		CPPUNIT_TEST(testRemoveSecondContactSameBare);
 		CPPUNIT_TEST(testApplyPresenceLikeMUC);
+		CPPUNIT_TEST(testReSortLikeMUC);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
@@ -117,6 +118,22 @@ class RosterTest : public CppUnit::TestFixture {
 
 		}
 
+		void testReSortLikeMUC() {
+			JID jid4a("a@b/c");
+			JID jid4b("a@b/d");
+			JID jid4c("a@b/e");
+			roster_->addContact(jid4a, JID(), "Bird", "group1", "");
+			roster_->addContact(jid4b, JID(), "Cookie", "group2", "");
+			roster_->addContact(jid4b, JID(), "Ernie", "group1", "");
+			roster_->getGroup("group1")->setManualSort("2");
+			roster_->getGroup("group2")->setManualSort("1");
+			GroupRosterItem* root = roster_->getRoot();
+			const std::vector<RosterItem*> kids = root->getDisplayedChildren();
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), kids.size());
+			CPPUNIT_ASSERT_EQUAL(std::string("group2"), kids[0]->getDisplayName());
+			CPPUNIT_ASSERT_EQUAL(std::string("group1"), kids[1]->getDisplayName());
+		}
+
 	private:
 		Roster *roster_;
 		JID jid1_;