Fixing tests of receive authorization requests.

test/net/java/sip/communicator/slick/protocol/icq/IcqTesterAgent.java

@@ -1160,7 +1160,9 @@ public void deleteBuddy(String screenname)
                 break;
         }
 
-        evtCollector.waitForRemovedBuddy(10000);
+        if(isDeleted)
+            evtCollector.waitForRemovedBuddy(10000);
+
         joustSimBuddyList.removeLayoutListener(evtCollector);
     }
 
@@ -1170,9 +1172,6 @@ public void addBuddy(String screenname)
         MutableBuddyList joustSimBuddyList
             = (MutableBuddyList)conn.getSsiService().getBuddyList();
 
-        LayoutEventCollector evtCollector = new LayoutEventCollector();
-        joustSimBuddyList.addLayoutListener(evtCollector);
-
         List grList = joustSimBuddyList.getGroups();
 
         Iterator iter = grList.iterator();
@@ -1197,8 +1196,13 @@ public void addBuddy(String screenname)
 
         ((MutableGroup)grList.get(0)).addBuddy(screenname);
 
-        evtCollector.waitForANewBuddy(10000);
-        joustSimBuddyList.removeLayoutListener(evtCollector);
+        Object lock = new Object();
+        synchronized(lock){
+            try{
+                lock.wait(5000);
+            }
+            catch (Exception ex){}
+        }
     }
 
     /**
@@ -1321,8 +1325,6 @@ public SnacCommand genSnacCommand(SnacPacket packet)
         {
             int command = packet.getCommand();
 
-            // auth reply
-//            if (command == 0x001b)
             // auth request
             if (command == 25)
             {
@@ -1384,8 +1386,6 @@ public void handleResponse(SnacResponseEvent e)
 
                         String uinToAskForAuth = buddyItem.getName();
 
-                        logger.trace("finding buddy : " + uinToAskForAuth);
-
                         Vector buddiesToBeAdded = new Vector();
 
                         BuddyAwaitingAuth newBuddy = new BuddyAwaitingAuth(
@@ -1394,7 +1394,7 @@ public void handleResponse(SnacResponseEvent e)
 
                         CreateItemsCmd addCMD = new CreateItemsCmd(buddiesToBeAdded);
 
-                        logger.trace("Adding buddy as awaiting authorization");
+                        logger.trace("Adding buddy as awaiting authorization " + uinToAskForAuth);
 
                         MutableBuddyList joustSimBuddyList
                             = (MutableBuddyList)conn.getSsiService().getBuddyList();
@@ -1404,7 +1404,7 @@ public void handleResponse(SnacResponseEvent e)
 
                         conn.getSsiService().sendSnac(addCMD);
 
-                        evtCollector.waitForANewBuddy(15000);
+                        evtCollector.waitForANewBuddy(20000);
                         joustSimBuddyList.removeLayoutListener(evtCollector);
 
                         logger.trace("Finished - Adding buddy as awaiting authorization");

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

@@ -1191,7 +1191,7 @@ public void postTestReceiveAuthorizatinonRequest()
         // check have we received authorization request?
         assertTrue("Error adding buddy not recieved or the buddy(" +
                        fixture.ourAccountID +
-                       ") doesn't require authorization",
+                       ") doesn't require authorization 1",
                        fixture.testerAgent.getAuthCmdFactory().isErrorAddingReceived);
 
         assertTrue("We haven't received any authorization request ",
@@ -1253,7 +1253,7 @@ public void postTestReceiveAuthorizatinonRequest()
         // check have we received authorization request?
         assertTrue("Error adding buddy not recieved or the buddy(" +
                               fixture.ourAccountID +
-                              ") doesn't require authorization",
+                              ") doesn't require authorization 2",
                               fixture.testerAgent.getAuthCmdFactory().isErrorAddingReceived);
 
        assertTrue("We haven't received any authorization request ",