Revision: 86962ad1ff47
Author: Jean Deruelle <[email protected]>
Date: Fri May 2 16:09:44 2014 UTC
Log: Update Issue 133
Add non regression test reproducing the issue.
http://code.google.com/p/sipservlets/source/detail?r=86962ad1ff47
Modified:
/sip-servlets-impl/.classpath
/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java
=======================================
--- /sip-servlets-impl/.classpath Tue Aug 21 23:53:09 2012 UTC
+++ /sip-servlets-impl/.classpath Fri May 2 16:09:44 2014 UTC
@@ -1,37 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="src" path="src/main/resources"
excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="var"
path="M2_REPO/javax/sip/jain-sip-api/1.2.0/jain-sip-api-1.2.0.jar"
sourcepath="M2_REPO/javax/sip/jain-sip-api/1.2.0/jain-sip-api-1.2.0-sources.jar">
- <attributes>
- <attribute
value="jar:file:/home/jean/.m2/repository/javax/sip/jain-sip-api/1.2.0/jain-sip-api-1.2.0-javadoc.jar!/"
name="javadoc_location"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var"
path="M2_REPO/javax/sip/jain-sip-ri/1.2.X-SNAPSHOT/jain-sip-ri-1.2.X-SNAPSHOT.jar"
sourcepath="M2_REPO/javax/sip/jain-sip-ri/1.2.X-SNAPSHOT/jain-sip-ri-1.2.X-SNAPSHOT-sources.jar">
- <attributes>
- <attribute
value="jar:file:/home/jean/.m2/repository/javax/sip/jain-sip-ri/1.2.X-SNAPSHOT/jain-sip-ri-1.2.X-SNAPSHOT-javadoc.jar!/"
name="javadoc_location"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var"
path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"
sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="src" path="/sip-servlets-spec"/>
- <classpathentry kind="src" path="/sip-servlets-core-api"/>
- <classpathentry kind="src" path="/sip-servlets-jruby"/>
- <classpathentry kind="src" path="/sip-servlets-client"/>
- <classpathentry kind="src" path="/sip-servlets-annotations"/>
- <classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"
sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar">
- <attributes>
- <attribute
value="jar:file:/home/jean/.m2/repository/log4j/log4j/1.2.16/log4j-1.2.16-javadoc.jar!/"
name="javadoc_location"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var"
path="M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5.jar"/>
- <classpathentry kind="var"
path="M2_REPO/dnsjava/dnsjava/2.1.0/dnsjava-2.1.0.jar"/>
- <classpathentry kind="var"
path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/net/java/stun4j/stun4j/1.0.MOBICENTS/stun4j-1.0.MOBICENTS.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/ha/javax/sip/mobicents-jain-sip-ha-core/1.5.0-SNAPSHOT/mobicents-jain-sip-ha-core-1.5.0-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/javax/sip/mobicents-jain-sip-ext/1.3.0-SNAPSHOT/mobicents-jain-sip-ext-1.3.0-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.0.Final/jboss-servlet-api_3.0_spec-1.0.0.Final.jar"/>
+ <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src"
path="src/main/resources"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/sip/jain-sip-api/1.2.0/jain-sip-api-1.2.0.jar"
sourcepath="M2_REPO/javax/sip/jain-sip-api/1.2.0/jain-sip-api-1.2.0-sources.jar">
+ <attributes>
+ <attribute name="javadoc_location"
value="jar:file:/home/jean/.m2/repository/javax/sip/jain-sip-api/1.2.0/jain-sip-api-1.2.0-javadoc.jar!/"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var"
path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"
sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="src" path="/sip-servlets-spec"/>
+ <classpathentry kind="src" path="/sip-servlets-core-api"/>
+ <classpathentry kind="src" path="/sip-servlets-jruby"/>
+ <classpathentry kind="src" path="/sip-servlets-client"/>
+ <classpathentry kind="src" path="/sip-servlets-annotations"/>
+ <classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"
sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar">
+ <attributes>
+ <attribute name="javadoc_location"
value="jar:file:/home/jean/.m2/repository/log4j/log4j/1.2.16/log4j-1.2.16-javadoc.jar!/"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/dnsjava/dnsjava/2.1.0/dnsjava-2.1.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/net/java/stun4j/stun4j/1.0.MOBICENTS/stun4j-1.0.MOBICENTS.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mobicents/ha/javax/sip/mobicents-jain-sip-ha-core/1.5.0-SNAPSHOT/mobicents-jain-sip-ha-core-1.5.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mobicents/javax/sip/mobicents-jain-sip-ext/1.3.0-SNAPSHOT/mobicents-jain-sip-ext-1.3.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.0.Final/jboss-servlet-api_3.0_spec-1.0.0.Final.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jain-sip"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
=======================================
---
/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java
Tue Apr 29 16:48:24 2014 UTC
+++
/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java
Fri May 2 16:09:44 2014 UTC
@@ -504,6 +504,11 @@
sipServletRequest.getInitialRemotePort();
sipServletRequest.getInitialTransport();
}
+ String testMultipleReasonHeaders =
ce.getServletContext().getInitParameter("testMultipleReasonHeaders");
+ if(testMultipleReasonHeaders != null) {
+
sipServletRequest.addHeader("Reason", "SIP ;cause=200 ;text=\"Call
completed elsewhere\"");
+
sipServletRequest.addHeader("Reason", "Q.850 ;cause=16 ;text=\"Terminated\"");
+ }
// test for
http://code.google.com/p/sipservlets/issues/detail?id=31
Parameterable paramVia = null;
try {
=======================================
---
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java
Fri Apr 25 19:15:17 2014 UTC
+++
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java
Fri May 2 16:09:44 2014 UTC
@@ -25,6 +25,7 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.ListIterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
@@ -35,8 +36,10 @@
import javax.sip.header.AuthorizationHeader;
import javax.sip.header.ContactHeader;
import javax.sip.header.FromHeader;
+import javax.sip.header.Header;
import javax.sip.header.ProxyAuthenticateHeader;
import javax.sip.header.ProxyAuthorizationHeader;
+import javax.sip.header.ReasonHeader;
import javax.sip.header.ToHeader;
import javax.sip.header.UserAgentHeader;
import javax.sip.header.ViaHeader;
@@ -995,6 +998,31 @@
Thread.sleep(TIMEOUT);
assertTrue(receiver.getByeReceived());
}
+
+ // https://code.google.com/p/sipservlets/issues/detail?id=216
+ public void testShootistMutlipleReasonHeaders() throws Exception {
+ receiverProtocolObjects =new ProtocolObjects(
+ "sender", "gov.nist", TRANSPORT, AUTODIALOG, null, null,
null);
+
+ receiver = new TestSipListener(5080, 5070,
receiverProtocolObjects, false);
+ receiver.setProvisionalResponsesToSend(new ArrayList<Integer>());
+ SipProvider senderProvider = receiver.createProvider();
+
+ senderProvider.addSipListener(receiver);
+
+ receiverProtocolObjects.start();
+ tomcat.startTomcat();
+ deployApplication("testMultipleReasonHeaders", "true");
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.getByeReceived());
+ ListIterator<Header> listIt =
receiver.getInviteRequest().getHeaders(ReasonHeader.NAME);
+ int i = 0;
+ while (listIt.hasNext()) {
+ listIt.next();
+ i++;
+ }
+ assertEquals(2, i);
+ }
@Override
@After
--
---
You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.