Trying to fix jabber failing tests MessageDeliveredFailed. Yahoo tests add some wait when clearing lists and some dump.

2 files changed, 14 insertions, 4 deletions

diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicInstantMessaging.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicInstantMessaging.java
index 58f9081..7ed4e85 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicInstantMessaging.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicInstantMessaging.java
@@ -149,6 +149,9 @@ public class TestOperationSetBasicInstantMessaging
                                 "firstTestReceiveMessage"));
         suite.addTest(new TestOperationSetBasicInstantMessaging(
                                 "thenTestSendMessage"));
+        // reporting to be last. we do not care is the message received or not
+        suite.addTest(new TestOperationSetBasicInstantMessaging(
+                                "reportingSendFunMessages"));
 
         return suite;
     }
@@ -318,6 +321,7 @@ public class TestOperationSetBasicInstantMessaging
         assertTrue( "No messages received by the tester agent"
                     , imEvtCollector2.collectedEvents.size() > 0);
         
+        
         assertFalse( "Message was unable to deliver !", 
             imEvtCollector2.collectedEvents.get(0) 
             instanceof MessageDeliveryFailedEvent);
@@ -480,7 +484,7 @@ public class TestOperationSetBasicInstantMessaging
      * A method that would simply send messages to a group of people so that
      * they would get notified that tests are being run.
      */
-    public void testSendFunMessages()
+    public void reportingSendFunMessages()
     {
         String hostname = "";
 
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
index 4114a8f..2ead9e6 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
@@ -347,6 +347,8 @@ public class TestOperationSetPresence
     {
         logger.debug("Testing Subscription and Subscription Event Dispatch.");
 
+        dumplists();
+        
         SubscriptionEventCollector subEvtCollector
             = new SubscriptionEventCollector();
         operationSetPresence1.addSubsciptionListener(subEvtCollector);
@@ -452,8 +454,6 @@ public class TestOperationSetPresence
         {
             // happens if the user is already subscribed
         }
-        
-        dumplists();
     }
 
     /**
@@ -542,12 +542,18 @@ public class TestOperationSetPresence
     {
         logger.debug("Clear the two lists before tests");
 
+        // wait a moment if any event hes left from the previous tests
+        Object o = new Object();
+        synchronized(o)
+        {
+            o.wait(2000);
+        }
+        
         // wait for a moment
         // give time the impl to get the lists
         logger.debug("start clearing");
         fixture.clearProvidersLists();
         
-        Object o = new Object();
         synchronized(o)
         {
             o.wait(3000);