2 new revisions:
Revision: d86cc11eedfb
Author: Jean Deruelle <[email protected]>
Date: Mon Aug 13 12:41:35 2012
Log: Backport to master fix regression in test suite...
http://code.google.com/p/sipservlets/source/detail?r=d86cc11eedfb
Revision: 66393b97222a
Author: Jean Deruelle <[email protected]>
Date: Mon Aug 13 13:03:26 2012
Log: Backport to master...
http://code.google.com/p/sipservlets/source/detail?r=66393b97222a
==============================================================================
Revision: d86cc11eedfb
Author: Jean Deruelle <[email protected]>
Date: Mon Aug 13 12:41:35 2012
Log: Backport to master fix regression in test suite
(cherry picked from commit 4b0850b3dabf87e88f5acd4173c6f653d95a294a)
http://code.google.com/p/sipservlets/source/detail?r=d86cc11eedfb
Modified:
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootmeSipServletTest.java
=======================================
---
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
Wed Aug 1 07:09:12 2012
+++
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
Mon Aug 13 12:41:35 2012
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications Copyright 2012.
+ * and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -1649,8 +1649,11 @@
ackRequest.addLast(h);
}
if(!sendSubsequentRequestsThroughSipProvider) {
+ logger.info("Sending ACK through
dialog " + ackRequest);
responseDialog.sendAck(ackRequest);
+ this.dialog = responseDialog;
} else {
+ logger.info("Sending ACK through
provider " + ackRequest);
sipProvider.sendRequest(ackRequest);
}
ackSent = true;
=======================================
---
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootmeSipServletTest.java
Fri Jun 8 03:02:41 2012
+++
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootmeSipServletTest.java
Mon Aug 13 12:41:35 2012
@@ -359,7 +359,7 @@
//request.setHeader(sender.protocolObjects.headerFactory.createHeader("Contact", "sip:[email protected]"));
sender.sendRequet(request);
- Thread.sleep(TIMEOUT);
+ Thread.sleep(TIMEOUT*2);
assertTrue(sender.isAckSent());
assertTrue(sender.getOkToByeReceived());
}
==============================================================================
Revision: 66393b97222a
Author: Jean Deruelle <[email protected]>
Date: Mon Aug 13 13:03:26 2012
Log: Backport to master
fix regression test in the testsuite
(cherry picked from commit 0b3e026d5744d720ba03bb6fe02c8a6ba798fb4a)
http://code.google.com/p/sipservlets/source/detail?r=66393b97222a
Modified:
/sip-servlets-test-suite/applications/proxy-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ProxySipServlet.java
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/ParallelProxyWithRecordRouteTest.java
=======================================
---
/sip-servlets-test-suite/applications/proxy-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ProxySipServlet.java
Fri May 25 12:26:03 2012
+++
/sip-servlets-test-suite/applications/proxy-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ProxySipServlet.java
Mon Aug 13 13:03:26 2012
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications Copyright 2012.
+ * and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -381,6 +381,9 @@
if(from.contains("unique-location-urn-route")) {
SipFactory sipFactory = (SipFactory)
getServletContext().getAttribute(SIP_FACTORY);
URI uri1 = sipFactory.createAddress("sip:receiver@" + host
+ ":5057").getURI();
+ if(from.contains("tcp")) {
+ ((SipURI)uri1).setTransportParam("tcp");
+ }
request.pushRoute((SipURI)uri1);
}
@@ -410,6 +413,9 @@
if(from.contains("unique-location-urn-route")) {
SipFactory sipFactory = (SipFactory)
getServletContext().getAttribute(SIP_FACTORY);
URI uri1 = sipFactory.createAddress("sip:receiver@" + host
+ ":5057").getURI();
+ if(from.contains("tcp")) {
+ ((SipURI)uri1).setTransportParam("tcp");
+ }
request.pushRoute((SipURI)uri1);
}
=======================================
---
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/ParallelProxyWithRecordRouteTest.java
Fri May 25 12:26:03 2012
+++
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/ParallelProxyWithRecordRouteTest.java
Mon Aug 13 13:03:26 2012
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications Copyright 2012.
+ * and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -154,7 +154,7 @@
public void testProxyRecordRoutePushRouteTCP() {
this.shootme.init(STACK_NAME, "tcp");
this.cutme.init("tcp");
- this.shootist.init("unique-location-urn-route-uri1",false,
"tcp");
+ this.shootist.init("unique-location-urn-route-tcp-uri1",false,
"tcp");
for (int q = 0; q < 20; q++) {
if (shootist.ended == false && cutme.canceled == false)
try {