From 2ebeeff1709086c334ef64a4ffd0d0d8b3c2f769 Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Tue, 6 Oct 2009 15:14:49 +0000 Subject: [PATCH] Return tha failing tests and fix them - a problem removing user from group. --- .../impl/protocol/msn/ServerStoredContactListMsnImpl.java | 4 +++- .../protocol/msn/TestOperationSetBasicInstantMessaging.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/msn/ServerStoredContactListMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/ServerStoredContactListMsnImpl.java index 60f35a720..7792900ec 100644 --- a/src/net/java/sip/communicator/impl/protocol/msn/ServerStoredContactListMsnImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/msn/ServerStoredContactListMsnImpl.java @@ -547,7 +547,9 @@ public void removeGroup(ContactGroupMsnImpl groupToRemove) for (int i = 0; i < contacts.length; i++) { logger.trace("removing contact from group " + contacts[i]); - msnProvider.getMessenger().removeFriend(contacts[i].getEmail(), false); + + msnProvider.getMessenger().removeFriend(contacts[i].getEmail(), + groupToRemove.getSourceGroup().getGroupId()); } // wait max seconds or the last removed contact diff --git a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetBasicInstantMessaging.java b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetBasicInstantMessaging.java index 1996af4be..1b02f244c 100644 --- a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetBasicInstantMessaging.java +++ b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetBasicInstantMessaging.java @@ -147,8 +147,8 @@ public static Test suite() //the following 2 need to be run in the specified order. suite.addTest(new TestOperationSetBasicInstantMessaging( "firstTestReceiveMessage")); -// suite.addTest(new TestOperationSetBasicInstantMessaging( -// "thenTestSendMessage")); + suite.addTest(new TestOperationSetBasicInstantMessaging( + "thenTestSendMessage")); return suite; }