Revision: 15617
Author: vladimir.ralev
Date: Fri Dec  3 04:59:07 2010
Log: Update Issue 2182

Testcase
http://code.google.com/p/mobicents/source/detail?r=15617

Modified:
/trunk/servers/sip-servlets/sip-servlets-test-suite/applications/subscriber-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/SubscriberSipServlet.java /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/subsnotify/SubscriberSipServletTest.java

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/subscriber-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/SubscriberSipServlet.java Thu Aug 5 05:53:25 2010 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/subscriber-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/SubscriberSipServlet.java Fri Dec 3 04:59:07 2010
@@ -24,6 +24,7 @@
 import javax.mail.Header;
 import javax.mail.MessagingException;
 import javax.mail.Multipart;
+import javax.mail.internet.MimeMultipart;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.sip.ServletTimer;
@@ -182,7 +183,7 @@
                                sipServletRequest.send();
                        }
                }
-               if(getServletContext().getInitParameter("testMultipart") != 
null) {
+               if(getServletContext().getInitParameter("testMultipart") != 
null ) {
                        Multipart multipart = (Multipart) request.getContent();
                        try {
                                int count = multipart.getCount();
@@ -196,6 +197,27 @@
                                        Header header = (Header) 
headers.nextElement();
logger.info("body part 0 's headers: name = " + header.getName() + ", value = " + header.getValue());
                                }
+                       } catch (MessagingException e) {
+                               logger.error("couldn't get count ", e);
+ SipServletResponse sipServletResponse = request.createResponse(SipServletResponse.SC_SERVER_INTERNAL_ERROR);
+                               sipServletResponse.send();
+                               return;
+                       }
+               }
+ if(getServletContext().getInitParameter("testMimeMultipartWhitespaces") != null) {
+                       MimeMultipart multipart = (MimeMultipart) 
request.getContent();
+                       try {
+ BodyPart bodyPart = multipart.getBodyPart("<[email protected]>");
+                               int count = multipart.getCount();
+                               logger.info("mulitpart count " + count);
+                               sendMessage(request.getSession(), "" + count);
+ logger.info("body part 0 's content type " + bodyPart.getContentType());
+                               logger.info("body part 0 's content " + 
bodyPart.getContent());
+                               Enumeration headers = bodyPart.getAllHeaders();
+                               while (headers.hasMoreElements()) {
+                                       Header header = (Header) 
headers.nextElement();
+ logger.info("body part 0 's headers: name = " + header.getName() + ", value = " + header.getValue());
+                               }
                        } catch (MessagingException e) {
                                logger.error("couldn't get count ", e);
SipServletResponse sipServletResponse = request.createResponse(SipServletResponse.SC_SERVER_INTERNAL_ERROR);
@@ -235,7 +257,7 @@
                        } catch (IOException e) {
logger.error("Unexpected exception while sending the INVITE request",e);
                        }
- } else if (ce.getServletContext().getInitParameter("testMultipart") == null){ + } else if (ce.getServletContext().getInitParameter("testMultipart") == null && ce.getServletContext().getInitParameter("testMimeMultipartWhitespaces") == null){ SipFactory sipFactory = (SipFactory)ce.getServletContext().getAttribute(SIP_FACTORY); SipApplicationSession sipApplicationSession = sipFactory.createApplicationSession(); TimerService timerService = (TimerService)ce.getServletContext().getAttribute(TIMER_SERVICE);
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/subsnotify/SubscriberSipServletTest.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/subsnotify/SubscriberSipServletTest.java Fri Dec 3 04:59:07 2010
@@ -143,6 +143,43 @@
                assertTrue(receiver.getAllMessagesContent().size() > 0);
                assertTrue(receiver.getAllMessagesContent().contains("3"));
        }
+
+       // http://code.google.com/p/mobicents/issues/detail?id=2182
+ public void testSipServletsReceiveNotifyMimeMultipartWhitespace() throws Exception { + deployApplication("testMimeMultipartWhitespaces", "testMimeMultipartWhitespaces");
+               String fromName = "sender";
+               String fromSipAddress = "sip-servlets.com";
+               SipURI fromAddress = 
receiverProtocolObjects.addressFactory.createSipURI(
+                               fromName, fromSipAddress);
+
+               String toUser = "receiver";
+               String toSipAddress = "sip-servlets.com";
+               SipURI toAddress = 
receiverProtocolObjects.addressFactory.createSipURI(
+                               toUser, toSipAddress);
+
+ String content = "--1A713B7EE42ABF467A11E416\r\n" + "Content-Type: application/pidf+xml\r\n"
+               + "Content-ID: <[email protected]>\r\n" + 
"\r\n"
+               + "<presence xmlns=\"urn:ietf:params:xml:ns:pidf\"\r\n"
+               + "xmlns:gp=\"urn:ietf:params:xml:ns:pidf:geopriv10\"\r\n"
+               + 
"xmlns:ca=\"urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr\"\r\n"
+ + "xmlns:gml=\"http://www.opengis.net/gml\"\r\n"; + "entity=\"pres:www.telecomsys.com\">\r\n" + + "<tuple id=\"TCS_SLDB\">\r\n" + "<status>\r\n" + "<gp:geopriv>\r\n" + "<gp:location-info>\r\n" + + "<gml:Point xmlns:gml=\"http://www.opengis.net/gml\"; srsName=\"urn:ogc:def:crs:EPSG::4326\">\r\n" + + "<gml:pos>30.8686739957541 -97.0195399766783</gml:pos>\r\n" + "</gml:Point>\r\n"
+               + "</gp:location-info>\r\n" + "<gp:usage-rules>\r\n"
+ + "<gp:retransmission-allowed>yes</gp:retransmission-allowed>\r\n" + "</gp:usage-rules>\r\n" + + "<gp:method>Derived</gp:method>\r\n" + "<gp:provided-by>www.telecomsys.com</gp:provided-by>\r\n" + + "</gp:geopriv>\r\n" + "</status>\r\n" + "<timestamp>2010-05-17T17:20:55Z</timestamp>\r\n"
+               + "</tuple>\r\n" + "</presence>\r\n" + 
"--1A713B7EE42ABF467A11E416\r\n"
+               + "Content-Type: application/sdp\r\n" + "\r\n" + "v=0\r\n"
+ + "o=user1 53655765 2353687637 IN IP4 10.15.90.101\r\n" + "s=-\r\n" + "c=IN IP4 10.15.90.101\r\n" + + "t=0 0\r\n" + "m=audio 6001 RTP/AVP 0\r\n" + "a=rtpmap:0 PCMU/8000\r\n"; + receiver.sendSipRequest(Request.NOTIFY, fromAddress, toAddress, content, null, false, new String[] {ContentTypeHeader.NAME, SubscriptionStateHeader.NAME, EventHeader.NAME}, new String[]{"multipart/related;type=\"application/rlmi+xml\";boundary=\"1A713B7EE42ABF467A11E416\"", "pending", "presence"}, true);
+               Thread.sleep(TIMEOUT);
+               assertEquals(200, receiver.getFinalResponseStatus());
+               assertTrue(receiver.getAllMessagesContent().size() > 0);
+               assertTrue(receiver.getAllMessagesContent().contains("2"));
+       }

        @Override
        protected void tearDown() throws Exception {

Reply via email to