[mobicents] r15847 committed - Update Issue 2210...

[mobicents]

Revision: 15847
Author: vladimir.ralev
Date: Fri Dec 17 06:16:08 2010
Log: Update Issue 2210
Accommodate into a complex testcase
http://code.google.com/p/mobicents/source/detail?r=15847
Modified:
  
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/composition/SpeedDialLocationServiceStaticServerAddressTest.java

=======================================
---  
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/composition/SpeedDialLocationServiceStaticServerAddressTest.java	 
Thu Oct 28 13:12:24 2010
+++  
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/composition/SpeedDialLocationServiceStaticServerAddressTest.java	 
Fri Dec 17 06:16:08 2010
@@ -16,8 +16,11 @@
  */
 package org.mobicents.servlet.sip.testsuite.composition;

+import java.util.ListIterator;
+
 import javax.sip.SipProvider;
 import javax.sip.address.SipURI;
+import javax.sip.header.ViaHeader;

 import org.apache.catalina.connector.Connector;
 import org.apache.log4j.Logger;
@@ -195,11 +198,11 @@
        }

        public void testSpeedDialLocationServiceCalleeSendBye() throws 
Exception {
-               sender = new TestSipListener(5080, 5070, senderProtocolObjects, 
false);
+               sender = new TestSipListener(5080, 5005, senderProtocolObjects, 
false);
                sender.setRecordRoutingProxyTesting(true);
                SipProvider senderProvider = sender.createProvider();

-		receiver = new TestSipListener(5090, 5070, receiverProtocolObjects,  
false);
+		receiver = new TestSipListener(5090, 5005, receiverProtocolObjects,  
false);
                receiver.setRecordRoutingProxyTesting(true);
                SipProvider receiverProvider = receiver.createProvider();

@@ -233,6 +236,13 @@
                Thread.sleep(7000);
                receiver.sendInDialogSipRequest("BYE", null, null, null, null, 
null);
                Thread.sleep(7000);
+               int count = 0;
+		ListIterator viaHeaders =  
sender.getInviteRequest().getHeaders(ViaHeader.NAME);
+               while(viaHeaders.hasNext()) {viaHeaders.next(); count++;}
+		assertEquals(3, count); // must see exactly 3 via headers in the  
callee->caller direction
+		assertTrue(ipBalancer.sipMessageWithoutRetrans.size()<=27); // More than  
26 messages means the something that should be bypassing is going through it
+		assertTrue(receiver.isAckReceived()); // is the ACK working in the  
callee->caller direction
+		assertTrue(sender.isAckReceived()); // is the ACK working in the  
caller->callee direction
                assertTrue(receiver.getOkToByeReceived());
                assertTrue(sender.getByeReceived());
        }