[Neuclear-develop] neuclear-id/src/test/org/neuclear/id testid.xml,NONE,1.1 IdentityTests.java,1.3,1.4 NSToolsTest.java,1.19,1.20

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

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

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

--- NEW FILE: testid.xml ---
<Identity>
    <Repository>
        http://talk.org/repository
    </Repository>
    <Target href="mailto:pe...@ne..." type="inbox"/>
    <Allow></Allow>
</Identity>
Index: IdentityTests.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/IdentityTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IdentityTests.java	20 Jan 2004 17:39:13 -0000	1.3
--- IdentityTests.java	18 Feb 2004 00:14:36 -0000	1.4
***************
*** 28,35 ****
  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";
-     private static final String LOGGER = "http://logger.neuclear.org";
-     private static final String RECEIVER = "mailto:pe...@ne...";
  
      public IdentityTests(String string) throws NeuClearException, GeneralSecurityException {
--- 28,32 ----
***************
*** 43,47 ****
  //        assertEquals(id.getLogger(),LOGGER);
  //        assertEquals(id.getName());
!         assertEquals(id.getRepository(),REPOSITORY);
          assertEquals(id.getSigner(),SIGNER);
  //        assertEquals(id.getReceiver(),RECEIVER);
--- 40,44 ----
  //        assertEquals(id.getLogger(),LOGGER);
  //        assertEquals(id.getName());
! //        assertEquals(id.getRepository(),REPOSITORY);
          assertEquals(id.getSigner(),SIGNER);
  //        assertEquals(id.getReceiver(),RECEIVER);
***************
*** 50,54 ****
  
      protected Builder createBuilder() throws NeuClearException {
!         return new IdentityBuilder(NAME,getSigner().getPublicKey(NAME),REPOSITORY,SIGNER,LOGGER,RECEIVER);
      }
  
--- 47,51 ----
  
      protected Builder createBuilder() throws NeuClearException {
!         return new IdentityBuilder(getSigner().getPublicKey(NAME),SIGNER,null,null);
      }
  

Index: NSToolsTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/NSToolsTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** NSToolsTest.java	19 Jan 2004 23:49:45 -0000	1.19
--- NSToolsTest.java	18 Feb 2004 00:14:36 -0000	1.20
***************
*** 2,5 ****
--- 2,9 ----
    $Id$
    $Log$
+   Revision 1.20  2004/02/18 00:14:36  pelle
+   Many, many clean ups. I've readded Targets in a new method.
+   Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
    Revision 1.19  2004/01/19 23:49:45  pelle
    Unit testing uncovered further issues with Base32
***************
*** 142,150 ****
  
  import junit.framework.TestCase;
- import org.dom4j.DocumentHelper;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.CryptoTools;
- import org.neuclear.id.builders.IdentityBuilder;
- import org.neuclear.xml.xmlsec.XMLSecurityException;
  
  
--- 146,151 ----
***************
*** 265,277 ****
      }
  
-     public static void testIsNamedObject() throws NeuClearException, XMLSecurityException {
- //        AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("neu://test", "neu://neuclear.org", "http://neuclear.org");
- //        assertTrue(NSTools.isNamedObject(builder.getElement()));
- //        assertTrue(NSTools.isNamedObject(new SignatureRequestBuilder("neu://neuclear.org", "neu://bob@test", builder, "Test").getElement()));
-         assertTrue(NSTools.isNamedObject(new IdentityBuilder("neu://test", Identity.getRootPK()).getElement()));
-         assertFalse(NSTools.isNamedObject(DocumentHelper.createElement("test")));
-         assertFalse(NSTools.isNamedObject(null));
- 
  
-     }
  }
\ No newline at end of file
--- 266,269 ----