[Neuclear-develop] neuclear-id/src/test/org/neuclear/id/builders IdentityBuilderTest.java,1.11,1.12

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

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

Modified Files:
	IdentityBuilderTest.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: IdentityBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/IdentityBuilderTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** IdentityBuilderTest.java	20 Jan 2004 20:28:24 -0000	1.11
--- IdentityBuilderTest.java	18 Feb 2004 00:14:34 -0000	1.12
***************
*** 3,7 ****
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.signers.PublicKeySource;
! import org.neuclear.id.NSTools;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.tests.AbstractSigningTest;
--- 3,7 ----
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.signers.PublicKeySource;
! import org.neuclear.id.Identity;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.tests.AbstractSigningTest;
***************
*** 31,34 ****
--- 31,38 ----
  $Id$
  $Log$
+ Revision 1.12  2004/02/18 00:14:34  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.11  2004/01/20 20:28:24  pelle
  Fixed final issues highlighted by unit tests. Really just a bunch of smaller stuff.
***************
*** 98,111 ****
          if (getSigner().canSignFor(name)) {
              final IdentityBuilder id = new IdentityBuilder(
!                     name,
                      ((PublicKeySource) getSigner()).getPublicKey(name),
-                     "http://repository.neuclear.org",
                      "http://users.neuclear.org:8080/Signer",
!                     "http://logger.neuclear.org",
!                     "mailto:pe...@ne...");
  
!             assertEquals("neu://test", NSTools.getSignatoryURI(id.getName()));
              final SignedNamedObject sec = id.convert(name,getSigner());
              assertNotNull(sec);
  //            assertEquals(id.getName(), sec.getName());
  
--- 102,117 ----
          if (getSigner().canSignFor(name)) {
              final IdentityBuilder id = new IdentityBuilder(
! 
                      ((PublicKeySource) getSigner()).getPublicKey(name),
                      "http://users.neuclear.org:8080/Signer",
!                     null,null);
  
! //            assertEquals("neu://test", NSTools.getSignatoryURI(id.getName()));
              final SignedNamedObject sec = id.convert(name,getSigner());
              assertNotNull(sec);
+             assertTrue(sec instanceof Identity);
+             final Identity idd=(Identity) sec;
+             assertEquals(((PublicKeySource) getSigner()).getPublicKey(name),idd.getPublicKey());
+             assertEquals("http://users.neuclear.org:8080/Signer",idd.getSigner());
  //            assertEquals(id.getName(), sec.getName());