[Neuclear-develop] neuclear-id/src/test-cactus/org/neuclear/id/auth AuthenticationServletTest.java,1.1,1.2

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

Update of /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/auth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4486/src/test-cactus/org/neuclear/id/auth

Modified Files:
	AuthenticationServletTest.java 
Log Message:
Split Identity into Signatory and Identity class.
Identity remains a signed named object and will in the future just be used for self declared information.
Signatory now contains the PublicKey etc and is NOT a signed object.

Index: AuthenticationServletTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/auth/AuthenticationServletTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AuthenticationServletTest.java	2 Mar 2004 18:59:13 -0000	1.1
--- AuthenticationServletTest.java	1 Apr 2004 23:19:51 -0000	1.2
***************
*** 1,28 ****
  package org.neuclear.id.auth;
  
  import org.apache.cactus.ServletTestCase;
  import org.apache.cactus.WebRequest;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
- import org.neuclear.commons.crypto.signers.TestCaseSigner;
- import org.neuclear.commons.crypto.signers.JCESigner;
  import org.neuclear.commons.crypto.Base64;
! import org.neuclear.xml.XMLException;
! import org.neuclear.id.builders.AuthenticationTicketBuilder;
! import org.neuclear.id.builders.SignatureRequestBuilder;
! import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.SignatureRequest;
! import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.id.verifier.VerifyingReader;
! import org.neuclear.id.signers.SigningServlet;
! import org.neuclear.id.signers.DemoSigningServlet;
  import org.xml.sax.SAXException;
  
  import javax.servlet.ServletException;
- import java.security.GeneralSecurityException;
- import java.io.IOException;
  import java.io.ByteArrayInputStream;
! 
! import com.meterware.httpunit.WebForm;
  
  /*
--- 1,23 ----
  package org.neuclear.id.auth;
  
+ import com.meterware.httpunit.WebForm;
  import org.apache.cactus.ServletTestCase;
  import org.apache.cactus.WebRequest;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
  import org.neuclear.commons.crypto.Base64;
! import org.neuclear.commons.crypto.signers.JCESigner;
! import org.neuclear.commons.crypto.signers.TestCaseSigner;
  import org.neuclear.id.SignatureRequest;
! import org.neuclear.id.SignedNamedObject;
! import org.neuclear.id.resolver.Resolver;
  import org.neuclear.id.verifier.VerifyingReader;
! import org.neuclear.xml.XMLException;
  import org.xml.sax.SAXException;
  
  import javax.servlet.ServletException;
  import java.io.ByteArrayInputStream;
! import java.io.IOException;
! import java.security.GeneralSecurityException;
  
  /*
***************
*** 46,49 ****
--- 41,49 ----
  $Id$
  $Log$
+ Revision 1.2  2004/04/01 23:19:51  pelle
+ Split Identity into Signatory and Identity class.
+ Identity remains a signed named object and will in the future just be used for self declared information.
+ Signatory now contains the PublicKey etc and is NOT a signed object.
+ 
  Revision 1.1  2004/03/02 18:59:13  pelle
  Further cleanups in neuclear-id. Moved everything under id.
***************
*** 79,84 ****
          assertEquals(request.getContentType(), "application/x-www-form-urlencoded");
          assertEquals(request.getMethod(), "POST");
!         config.setInitParameter("serviceid","neu://test");
!         config.setInitParameter("title","cactustest");
          AuthenticationServlet servlet = new AuthenticationServlet();
          servlet.init(config);
--- 79,84 ----
          assertEquals(request.getContentType(), "application/x-www-form-urlencoded");
          assertEquals(request.getMethod(), "POST");
!         config.setInitParameter("serviceid", "neu://test");
!         config.setInitParameter("title", "cactustest");
          AuthenticationServlet servlet = new AuthenticationServlet();
          servlet.init(config);
***************
*** 102,107 ****
          assertEquals(sigreq.getUnsigned().getElement().getName(), "AuthenticationTicket");
          assertEquals(sigreq.getUserid(), "neu://bob@test");
!         assertEquals(NSResolver.resolveIdentity("neu://bob@test").getSigner(), forms[0].getAction());
      }
      JCESigner signer;
  
--- 102,108 ----
          assertEquals(sigreq.getUnsigned().getElement().getName(), "AuthenticationTicket");
          assertEquals(sigreq.getUserid(), "neu://bob@test");
!         assertEquals(Resolver.resolveIdentity("neu://bob@test").getSigner(), forms[0].getAction());
      }
+ 
      JCESigner signer;