[Neuclear-develop] neuclear-id/src/test/org/neuclear/id/builders AuthenticationBuilderTest.java,1.8,1.9 SigningRequestBuilderTest.java,1.11,1.12 IdentityBuilderTest.java,1.12,NONE

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

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

Modified Files:
	AuthenticationBuilderTest.java SigningRequestBuilderTest.java 
Removed Files:
	IdentityBuilderTest.java 
Log Message:
Updated various tests to use the AbstractObjectCreationTest


Index: AuthenticationBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/AuthenticationBuilderTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AuthenticationBuilderTest.java	2 Mar 2004 18:59:12 -0000	1.8
--- AuthenticationBuilderTest.java	3 Mar 2004 23:26:45 -0000	1.9
***************
*** 3,8 ****
--- 3,11 ----
  import org.neuclear.id.auth.AuthenticationTicket;
  import org.neuclear.commons.NeuClearException;
+ import org.neuclear.commons.crypto.signers.NonExistingSignerException;
  import org.neuclear.id.InvalidNamedObjectException;
+ import org.neuclear.id.SignedNamedObject;
  import org.neuclear.tests.AbstractSigningTest;
+ import org.neuclear.tests.AbstractObjectCreationTest;
  import org.neuclear.xml.XMLException;
  
***************
*** 29,32 ****
--- 32,38 ----
  $Id$
  $Log$
+ Revision 1.9  2004/03/03 23:26:45  pelle
+ Updated various tests to use the AbstractObjectCreationTest
+ 
  Revision 1.8  2004/03/02 18:59:12  pelle
  Further cleanups in neuclear-id. Moved everything under id.
***************
*** 76,96 ****
   * Time: 3:28:05 PM
   */
! public final class AuthenticationBuilderTest extends AbstractSigningTest {
      public AuthenticationBuilderTest(final String string) throws NeuClearException, GeneralSecurityException {
          super(string);
      }
  
!     public final void testAuthenticate() throws NeuClearException, XMLException {
!         final AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://users.neuclear.org:8080");
! //        assertEquals(authreq.getSignatory().getName(), "neu://bob@test");
!         try {
!             final AuthenticationTicket auth = (AuthenticationTicket) authreq.convert("neu://bob@test",signer);
!             assertTrue(authreq.isSigned());
! //            assertEquals(auth.getName(), authreq.);
!             assertEquals(auth.getSiteHref(), "http://users.neuclear.org:8080");
!         } catch (InvalidNamedObjectException e) {
!             assertTrue(false);
!         }
  
      }
  }
--- 82,102 ----
   * Time: 3:28:05 PM
   */
! public final class AuthenticationBuilderTest extends AbstractObjectCreationTest {
      public AuthenticationBuilderTest(final String string) throws NeuClearException, GeneralSecurityException {
          super(string);
      }
  
!     protected void verifyObject(SignedNamedObject obj) throws NonExistingSignerException {
!         final AuthenticationTicket auth = (AuthenticationTicket)obj;
!         assertEquals(auth.getSiteHref(), "http://users.neuclear.org:8080");
!     }
  
+     protected Class getRequiredClass() {
+         return AuthenticationTicket.class;
      }
+ 
+     protected Builder createBuilder() throws Exception {
+         return new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://users.neuclear.org:8080");
+     }
+ 
  }

Index: SigningRequestBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/SigningRequestBuilderTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SigningRequestBuilderTest.java	2 Mar 2004 18:59:12 -0000	1.11
--- SigningRequestBuilderTest.java	3 Mar 2004 23:26:45 -0000	1.12
***************
*** 3,9 ****
--- 3,13 ----
  import org.neuclear.id.auth.AuthenticationTicket;
  import org.neuclear.commons.NeuClearException;
+ import org.neuclear.commons.crypto.signers.NonExistingSignerException;
  import org.neuclear.id.InvalidNamedObjectException;
  import org.neuclear.id.SignatureRequest;
+ import org.neuclear.id.SignedNamedObject;
+ import org.neuclear.id.NameResolutionException;
  import org.neuclear.tests.AbstractSigningTest;
+ import org.neuclear.tests.AbstractObjectCreationTest;
  import org.neuclear.xml.XMLException;
  
***************
*** 30,33 ****
--- 34,40 ----
  $Id$
  $Log$
+ Revision 1.12  2004/03/03 23:26:45  pelle
+ Updated various tests to use the AbstractObjectCreationTest
+ 
  Revision 1.11  2004/03/02 18:59:12  pelle
  Further cleanups in neuclear-id. Moved everything under id.
***************
*** 88,117 ****
   * Time: 3:28:05 PM
   */
! public final class SigningRequestBuilderTest extends AbstractSigningTest {
      public SigningRequestBuilderTest(final String string) throws NeuClearException, GeneralSecurityException {
          super(string);
      }
  
!     public final void testSignatureRequest() throws NeuClearException, XMLException {
!         final AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://users.neuclear.org:8080");
!         final SignatureRequestBuilder sigreq = new SignatureRequestBuilder( "neu://bob@test", authreq, "For testing purposes");
! //        assertEquals(sigreq.getSignatory().getName(), "neu://test");
!         try {
!             final SignatureRequest tosign = (SignatureRequest) sigreq.convert("neu://test",signer);
!             assertTrue(sigreq.isSigned());
! 
!             final Builder auth2 = tosign.getUnsigned();
  //            assertEquals(auth2.getSignatory().getName(), "neu://bob@test");
!             assertNotNull(auth2);
!             assertNotNull(auth2.getElement());
!             final AuthenticationTicket auth = (AuthenticationTicket) auth2.convert("neu://bob@test",signer);
!             assertTrue(auth2.isSigned());
  //            assertEquals(auth.getName(), authreq.getName());
!             assertEquals(auth.getSiteHref(), "http://users.neuclear.org:8080");
!         } catch (InvalidNamedObjectException e) {
!             e.printStackTrace();
!             assertTrue(false);
!         }
  
      }
  }
--- 95,125 ----
   * Time: 3:28:05 PM
   */
! public final class SigningRequestBuilderTest extends AbstractObjectCreationTest {
      public SigningRequestBuilderTest(final String string) throws NeuClearException, GeneralSecurityException {
          super(string);
      }
  
!     protected void verifyObject(SignedNamedObject obj) throws Exception  {
!         SignatureRequest tosign=(SignatureRequest) obj;
!         assertNotNull(tosign.getUnsigned());
!         final Builder auth2 = tosign.getUnsigned();
  //            assertEquals(auth2.getSignatory().getName(), "neu://bob@test");
!         assertNotNull(auth2);
!         assertNotNull(auth2.getElement());
!         final AuthenticationTicket auth = (AuthenticationTicket) auth2.convert("neu://bob@test",signer);
!         assertTrue(auth2.isSigned());
  //            assertEquals(auth.getName(), authreq.getName());
!         assertEquals(auth.getSiteHref(), "http://users.neuclear.org:8080");
! 
!     }
  
+     protected Class getRequiredClass() {
+         return SignatureRequest.class;
      }
+ 
+     protected Builder createBuilder() throws Exception {
+         final AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://users.neuclear.org:8080");
+         return new SignatureRequestBuilder( "neu://bob@test", authreq, "For testing purposes");
+     }
+ 
  }

--- IdentityBuilderTest.java DELETED ---