[Neuclear-develop] neuclear-id/src/test/org/neuclear/id IdentityTests.java,1.2,1.3

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

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

Modified Files:
	IdentityTests.java 
Log Message:
Further updates to unit tests

Index: IdentityTests.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/IdentityTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IdentityTests.java	19 Jan 2004 23:49:45 -0000	1.2
--- IdentityTests.java	20 Jan 2004 17:39:13 -0000	1.3
***************
*** 7,10 ****
--- 7,11 ----
  import org.neuclear.commons.crypto.CryptoException;
  import org.neuclear.commons.crypto.CryptoTools;
+ import org.neuclear.commons.crypto.signers.NonExistingSignerException;
  import org.neuclear.id.builders.Builder;
  import org.neuclear.id.builders.IdentityBuilder;
***************
*** 26,30 ****
   */
  public class IdentityTests extends AbstractObjectCreationTest {
!     private static final String NAME = "neu://alice@test";
      private static final String REPOSITORY = "http://repository.neuclear.org";
      private static final String SIGNER = "http://localhost:11870/Signer";
--- 27,31 ----
   */
  public class IdentityTests extends AbstractObjectCreationTest {
!     private static final String NAME = "neu://test";
      private static final String REPOSITORY = "http://repository.neuclear.org";
      private static final String SIGNER = "http://localhost:11870/Signer";
***************
*** 36,44 ****
      }
  
!     protected void verifyObject(SignedNamedObject obj) {
          assertTrue(obj instanceof Identity);
          Identity id=(Identity) obj;
  //        assertEquals(id.getLogger(),LOGGER);
!         assertEquals(id.getName(),NAME);
          assertEquals(id.getRepository(),REPOSITORY);
          assertEquals(id.getSigner(),SIGNER);
--- 37,46 ----
      }
  
!     protected void verifyObject(SignedNamedObject obj) throws NonExistingSignerException {
          assertTrue(obj instanceof Identity);
          Identity id=(Identity) obj;
+         assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(signer.getPublicKey(NAME).getEncoded())),obj.getName().substring(5,37));
  //        assertEquals(id.getLogger(),LOGGER);
! //        assertEquals(id.getName());
          assertEquals(id.getRepository(),REPOSITORY);
          assertEquals(id.getSigner(),SIGNER);
***************
*** 57,61 ****
          assertNotNull(id.getName());
          assertEquals("sha1:",id.getName().substring(0,5));
!         assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())),id.getName().substring(11));
          assertEquals(kp.getPublic(),id.getPublicKey());
  
--- 59,63 ----
          assertNotNull(id.getName());
          assertEquals("sha1:",id.getName().substring(0,5));
!         assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())),id.getName().substring(5));
          assertEquals(kp.getPublic(),id.getPublicKey());
  
***************
*** 70,74 ****
          System.out.println("Name: "+obj.getName());
          assertEquals("sha1:",obj.getName().substring(0,5));
!         assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())),obj.getName().substring(11,43));
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(obj.getEncoded().getBytes())),obj.getName().substring(obj.getName().length()-32));
  
--- 72,76 ----
          System.out.println("Name: "+obj.getName());
          assertEquals("sha1:",obj.getName().substring(0,5));
!         assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())),obj.getName().substring(5,37));
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(obj.getEncoded().getBytes())),obj.getName().substring(obj.getName().length()-32));
  
***************
*** 78,82 ****
          assertNotNull(id.getName());
          assertEquals("sha1:",id.getName().substring(0,5));
!         assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())),id.getName().substring(11));
          assertEquals(kp.getPublic(),id.getPublicKey());
  
--- 80,84 ----
          assertNotNull(id.getName());
          assertEquals("sha1:",id.getName().substring(0,5));
!         assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())),id.getName().substring(5));
          assertEquals(kp.getPublic(),id.getPublicKey());