do not insist on getting state change events for call participants when they get created, because we might have missed them.

test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicTelephonySipImpl.java

@@ -136,8 +136,8 @@ public void testCreateCancelCall()
             = new CallParticipantStateEventCollector(
                 participantAtP2, CallParticipantState.INCOMING_CALL);
 
-        stateCollectorForPp1.waitForEvent(10000);
-        stateCollectorForPp2.waitForEvent(10000);
+        stateCollectorForPp1.waitForEvent(10000, true);
+        stateCollectorForPp2.waitForEvent(10000, true);
 
         assertSame("participantAtP1.getCall"
                    , participantAtP1.getCall(), callAtP1);
@@ -154,6 +154,7 @@ public void testCreateCancelCall()
                     , CallParticipantState.INCOMING_CALL
                     , participantAtP2.getState());
 
+
         //test whether caller/callee info is properly distributed in case
         //the server is said to support it.
         if(Boolean.getBoolean("accounts.sip.PRESERVE_PARTICIPANT_INFO"))
@@ -201,7 +202,6 @@ public void testCreateCancelCall()
                          + "display name."
                          , expectedParticipant2DisplayName
                          , participantAtP2.getDisplayName());
-
         }
 
         //we'll now try to cancel the call
@@ -366,8 +366,8 @@ public void testCreateRejectCall()
             = new CallParticipantStateEventCollector(
                 participantAtP2, CallParticipantState.INCOMING_CALL);
 
-        stateCollectorForPp1.waitForEvent(10000);
-        stateCollectorForPp2.waitForEvent(10000);
+        stateCollectorForPp1.waitForEvent(10000, true);
+        stateCollectorForPp2.waitForEvent(10000, true);
 
         assertSame("participantAtP1.getCall"
                    , participantAtP1.getCall(), callAtP1);
@@ -384,6 +384,7 @@ public void testCreateRejectCall()
                     , CallParticipantState.INCOMING_CALL
                     , participantAtP2.getState());
 
+
         //test whether caller/callee info is properly distributed in case
         //the server is said to support it.
         if(Boolean.getBoolean("accounts.sip.PRESERVE_PARTICIPANT_INFO"))
@@ -891,10 +892,10 @@ public void participantStateChanged(CallParticipantChangeEvent event)
                 logger.debug(
                     "Collected evt("+collectedEvents.size()+")= "+event);
 
-                this.collectedEvents.add(event);
                 if(((CallParticipantState)event.getNewValue())
                     .equals(awaitedState))
                 {
+                    this.collectedEvents.add(event);
                     notifyAll();
                 }
             }
@@ -1036,9 +1037,9 @@ public void callStateChanged(CallChangeEvent event)
                 logger.debug(
                     "Collected evt("+collectedEvents.size()+")= "+event);
 
-                this.collectedEvents.add(event);
                 if(((CallState)event.getNewValue()).equals(awaitedState))
                 {
+                    this.collectedEvents.add(event);
                     notifyAll();
                 }
             }