[Neuclear-develop] neuclear-id/src/test-cactus/org/neuclear/receiver ReceiverServletTest.java,1.4,1.5

[<pe...@us...>]

Update of /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv4750/src/test-cactus/org/neuclear/receiver

Modified Files:
	ReceiverServletTest.java 
Log Message:
The ReceiverServletTest now passes.
Add first stab at a SigningServletTest which currently doesnt pass.

Index: ReceiverServletTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/receiver/ReceiverServletTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ReceiverServletTest.java	12 Dec 2003 12:32:54 -0000	1.4
--- ReceiverServletTest.java	12 Dec 2003 15:12:50 -0000	1.5
***************
*** 7,10 ****
--- 7,11 ----
  import org.neuclear.commons.crypto.signers.JCESigner;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
+ import org.neuclear.commons.crypto.Base64;
  import org.neuclear.id.builders.AuthenticationTicketBuilder;
  import org.neuclear.xml.XMLException;
***************
*** 39,42 ****
--- 40,47 ----
  $Id$
  $Log$
+ Revision 1.5  2003/12/12 15:12:50  pelle
+ The ReceiverServletTest now passes.
+ Add first stab at a SigningServletTest which currently doesnt pass.
+ 
  Revision 1.4  2003/12/12 12:32:54  pelle
  Working on getting the SOAPServletTest working under cactus
***************
*** 70,75 ****
          AuthenticationTicket ticket = (AuthenticationTicket) builder.sign(signer);
          theRequest.setContentType("application/x-www-form-urlencoded");
!         String b64 = XMLSecTools.encodeElementBase64(builder.getElement());
!         theRequest.addParameter("neuclear-request", b64, WebRequest.POST_METHOD);
          theRequest.setURL("http://users.neuclear.org", "/test", "/Receiver",
                  null, null);
--- 75,80 ----
          AuthenticationTicket ticket = (AuthenticationTicket) builder.sign(signer);
          theRequest.setContentType("application/x-www-form-urlencoded");
!         String b64 =Base64.encode(ticket.getEncoded().getBytes());
!         theRequest.addParameter("neuclear-request", b64, "POST");
          theRequest.setURL("http://users.neuclear.org", "/test", "/Receiver",
                  null, null);
***************
*** 77,80 ****
--- 82,87 ----
  
      public void testReceiveBase64() throws ServletException, IOException {
+         assertEquals(request.getContentType(), "application/x-www-form-urlencoded");
+         assertEquals(request.getMethod(),"POST");
          ReceiverServlet servlet = new ReceiverServlet();
          MockReceiver receiver = new MockReceiver();
***************
*** 91,103 ****
          AuthenticationTicket ticket = (AuthenticationTicket) builder.sign(signer);
          theRequest.setContentType("text/xml");
-         theRequest.addHeader("SOAPAction:","/Receive");
          theRequest.setURL("http://users.neuclear.org", "/test", "/Service",
                  null, null);
!        ByteArrayOutputStream bos=new ByteArrayOutputStream();
!        SOAPTools.createSoapRequestString(bos,ticket.getEncoded());
!        theRequest.setUserData(new ByteArrayInputStream(bos.toByteArray()));
       }
  
      public void testReceiveSOAP() throws ServletException, IOException {
          ReceiverServlet servlet = new ReceiverServlet();
          MockReceiver receiver = new MockReceiver();
--- 98,109 ----
          AuthenticationTicket ticket = (AuthenticationTicket) builder.sign(signer);
          theRequest.setContentType("text/xml");
          theRequest.setURL("http://users.neuclear.org", "/test", "/Service",
                  null, null);
!        theRequest.setUserData(new ByteArrayInputStream(ticket.getEncoded().getBytes()));
       }
  
      public void testReceiveSOAP() throws ServletException, IOException {
+         assertEquals(request.getContentType(), "text/xml");
+         assertEquals(request.getMethod(),"POST");
          ReceiverServlet servlet = new ReceiverServlet();
          MockReceiver receiver = new MockReceiver();