Revision: 15853
Author: vladimir.ralev
Date: Fri Dec 17 07:07:41 2010
Log: Update Issue 2210
Cleanup and more checks
http://code.google.com/p/mobicents/source/detail?r=15853

Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java /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-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java Fri Dec 17 05:56:48 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java Fri Dec 17 07:07:41 2010
@@ -695,13 +695,6 @@
                } catch (ParseException pe) {
logger.error("A problem occured while setting the via branch while proxying a request", pe);
                }
-
- RouteHeader routeHeader = (RouteHeader) clonedRequest.getHeader(RouteHeader.NAME);
-               if(routeHeader != null) {
-                       
if(!sipApplicationDispatcher.isRouteExternal(routeHeader)) {
-                               //clonedRequest.removeFirst(RouteHeader.NAME);
-                       }
-               }

                String transport = JainSipUtils.findTransport(clonedRequest);
SipProvider sipProvider =sipFactoryImpl.getSipNetworkInterfaceManager().findMatchingListeningPoint(
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java Thu Nov 18 01:08:56 2010 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java Fri Dec 17 07:07:41 2010
@@ -28,6 +28,7 @@
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -74,6 +75,7 @@
 import javax.sip.header.SubscriptionStateHeader;
 import javax.sip.header.ToHeader;
 import javax.sip.header.ViaHeader;
+import javax.sip.message.Message;
 import javax.sip.message.Request;
 import javax.sip.message.Response;

@@ -89,6 +91,9 @@

 public class TestSipListener implements SipListener {
        private static final String TO_TAG = "5432";
+
+       public List<Request> allRequests = new LinkedList<Request>();
+       public List<Response> allResponses = new LinkedList<Response>();

private static final String PLAIN_UTF8_CONTENT_SUBTYPE = "plain;charset=UTF-8";

@@ -339,9 +344,10 @@
                        logger.error("Processing aborted");
                        return ;
                }
+

                Request request = requestReceivedEvent.getRequest();
-
+               allRequests.add(request);
                if(firstRequest == null) firstRequest = request;
                ServerTransaction serverTransactionId = requestReceivedEvent
                                .getServerTransaction();
@@ -1303,6 +1309,7 @@
                        return ;
                }
                Response response = (Response) 
responseReceivedEvent.getResponse();
+               allResponses.add(response);
                if(response.getStatusCode() == 491) numberOf491s++;
RecordRouteHeader recordRouteHeader = (RecordRouteHeader)response.getHeader(RecordRouteHeader.NAME);
                if(!recordRoutingProxyTesting && recordRouteHeader != null) {
=======================================
--- /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 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/composition/SpeedDialLocationServiceStaticServerAddressTest.java Fri Dec 17 07:07:41 2010
@@ -21,6 +21,7 @@
 import javax.sip.SipProvider;
 import javax.sip.address.SipURI;
 import javax.sip.header.ViaHeader;
+import javax.sip.message.Response;

 import org.apache.catalina.connector.Connector;
 import org.apache.log4j.Logger;
@@ -239,12 +240,26 @@
                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());
+               assertTrue(sender.getByeReceived());
+
+               for(Response message : sender.allResponses) {
+                       if(message.getStatusCode()>200) {
+                               fail("We don't expect errors. This is error: " 
+ message);
+                       }
+               }
+               for(Response message : receiver.allResponses) {
+                       if(message.getStatusCode()>200) {
+                               fail("We don't expect errors. This is error: " 
+ message);
+                       }
+               }
        }

        public void testCancelSpeedDialLocationService() throws Exception {

Reply via email to