Some test improvements.

test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java

@@ -271,18 +271,29 @@ public void subtestStateTransition( MsnStatusEnum newStatus)
         //events have been generated.
         PresenceStatusEventCollector statusEventCollector
             = new PresenceStatusEventCollector();
+        ContactPresenceEventCollector contactStatusEventCollector
+            = new ContactPresenceEventCollector(fixture.userID1, newStatus);
         operationSetPresence1.addProviderPresenceStatusListener(
             statusEventCollector);
+        operationSetPresence2.addContactPresenceStatusListener(
+            contactStatusEventCollector);
 
         //change the status
         operationSetPresence1.publishPresenceStatus(newStatus, null);
         pauseAfterStateChanges();
 
-        //test event notification.
+        //test provider event notification.
         statusEventCollector.waitForPresEvent(10000);
+        
+        // wait for status change in other provider
+        // as later its not actually queryed but the last received 
+        // status is returned
+        contactStatusEventCollector.waitForEvent(10000);
 
         operationSetPresence1.removeProviderPresenceStatusListener(
             statusEventCollector);
+        operationSetPresence2.removeContactPresenceStatusListener(
+            contactStatusEventCollector);
 
         assertEquals("Events dispatched during an event transition.",
                      1, statusEventCollector.collectedPresEvents.size());
@@ -743,7 +754,10 @@ public void waitForEvent(long waitFor)
             synchronized(this)
             {
                 if(collectedEvents.size() > 0)
+                {
+                    logger.trace("Change already received. " + collectedEvents);
                     return;
+                }
 
                 try{
                     wait(waitFor);

test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetBasicInstantMessaging.java

@@ -199,6 +199,16 @@ public void prepareContactList()
      */
     public void firstTestReceiveMessage()
     {
+        ContactGroup rootGroup
+            = ((OperationSetPersistentPresence)opSetPresence2).getServerStoredContactListRoot();
+
+        logger.debug("=========== Server Stored Contact List =================");
+
+        logger.debug("rootGroup="+rootGroup.getGroupName()
+                     +" rootGroup.childContacts="+rootGroup.countContacts()
+                     + "rootGroup.childGroups="+rootGroup.countSubgroups()
+                     + "Printing rootGroupContents=\n"+rootGroup.toString());
+        
         String body = "This is an IM coming from the tester agent"
             + " on " + new Date().toString();
 
@@ -434,7 +444,10 @@ public void waitForEvent(long waitFor)
             {
 
                 if(collectedEvents.size() > 0)
+                {
+                    logger.trace("ImEvent already received. " + collectedEvents);
                     return;
+                }
 
                 try{
                     wait(waitFor);

test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java

@@ -443,7 +443,8 @@ public void postTestSubscribe()
                 newStatus = YahooStatusEnum.BUSY;
             
             // query it again for the status
-            contactPresEvtCollector.collectedEvents.clear();
+            contactPresEvtCollector = new ContactPresenceEventCollector(
+                    fixture.userID2, newStatus);
             operationSetPresence1.addContactPresenceStatusListener(
                 contactPresEvtCollector);
 
@@ -725,7 +726,10 @@ public void waitForEvent(long waitFor)
             synchronized(this)
             {
                 if(collectedEvents.size() > 0)
+                {
+                    logger.trace("Event already received. " + collectedEvents);
                     return;
+                }
 
                 try{
                     wait(waitFor);