[Neuclear-develop] neuclear-pay/src/test-cactus/org/neuclear/asset/receiver/servlet AssetControllerServletTest.java,1.4,1.5

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

Update of /cvsroot/neuclear/neuclear-pay/src/test-cactus/org/neuclear/asset/receiver/servlet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5208/src/test-cactus/org/neuclear/asset/receiver/servlet

Modified Files:
	AssetControllerServletTest.java 
Log Message:
Fixed Exchange tests and Cactus tests working on web app.

Index: AssetControllerServletTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test-cactus/org/neuclear/asset/receiver/servlet/AssetControllerServletTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AssetControllerServletTest.java	1 Apr 2004 23:18:34 -0000	1.4
--- AssetControllerServletTest.java	14 Apr 2004 23:51:13 -0000	1.5
***************
*** 6,16 ****
  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.auth.AuthenticationServlet;
- import org.neuclear.id.resolver.Resolver;
  import org.neuclear.id.verifier.VerifyingReader;
  import org.neuclear.xml.XMLException;
--- 6,18 ----
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
+ import org.neuclear.commons.crypto.Base32;
  import org.neuclear.commons.crypto.Base64;
+ import org.neuclear.commons.crypto.CryptoTools;
  import org.neuclear.commons.crypto.signers.JCESigner;
+ import org.neuclear.commons.crypto.signers.NonExistingSignerException;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
  import org.neuclear.id.SignatureRequest;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.auth.AuthenticationServlet;
  import org.neuclear.id.verifier.VerifyingReader;
  import org.neuclear.xml.XMLException;
***************
*** 42,45 ****
--- 44,50 ----
  $Id$
  $Log$
+ Revision 1.5  2004/04/14 23:51:13  pelle
+ Fixed Exchange tests and Cactus tests working on web app.
+ 
  Revision 1.4  2004/04/01 23:18:34  pelle
  Split Identity into Signatory and Identity class.
***************
*** 72,75 ****
--- 77,84 ----
      }
  
+     protected String getPublicKeyName(String alias) throws NonExistingSignerException {
+         return Base32.encode(CryptoTools.digest(signer.getPublicKey(alias).getEncoded()));
+     }
+ 
      public void beginAuthReq(WebRequest theRequest) throws GeneralSecurityException, NeuClearException, XMLException {
          theRequest.setContentType("application/x-www-form-urlencoded");
***************
*** 102,109 ****
          assertTrue(obj instanceof SignatureRequest);
          SignatureRequest sigreq = (SignatureRequest) obj;
!         assertEquals(sigreq.getSignatory().getName(), "neu://test");
          assertEquals(sigreq.getUnsigned().getElement().getName(), "AuthenticationTicket");
!         assertEquals(sigreq.getUserid(), "neu://bob@test");
!         assertEquals(Resolver.resolveIdentity("neu://bob@test").getSigner(), forms[0].getAction());
      }
  
--- 111,117 ----
          assertTrue(obj instanceof SignatureRequest);
          SignatureRequest sigreq = (SignatureRequest) obj;
!         assertEquals(getPublicKeyName("neu://test"), sigreq.getSignatory().getName());
          assertEquals(sigreq.getUnsigned().getElement().getName(), "AuthenticationTicket");
!         assertEquals("http://localhost:11870/Signer", forms[0].getAction());
      }