[Neuclear-develop] neuclear-id/src/test/org/neuclear/id IdentityTests.java,1.4,1.5 NeuClearBenchmark.java,1.3,1.4 SignedMessageTest.java,1.3,1.4

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

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

Modified Files:
	IdentityTests.java NeuClearBenchmark.java 
	SignedMessageTest.java 
Log Message:
Updated various tests to use the AbstractObjectCreationTest


Index: IdentityTests.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/IdentityTests.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IdentityTests.java	18 Feb 2004 00:14:36 -0000	1.4
--- IdentityTests.java	3 Mar 2004 23:26:44 -0000	1.5
***************
*** 7,10 ****
--- 7,11 ----
  import org.neuclear.commons.crypto.CryptoException;
  import org.neuclear.commons.crypto.CryptoTools;
+ import org.neuclear.commons.crypto.Base32;
  import org.neuclear.commons.crypto.signers.NonExistingSignerException;
  import org.neuclear.id.builders.Builder;
***************
*** 27,31 ****
   */
  public class IdentityTests extends AbstractObjectCreationTest {
-     private static final String NAME = "neu://test";
      private static final String SIGNER = "http://localhost:11870/Signer";
  
--- 28,31 ----
***************
*** 34,49 ****
      }
  
!     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);
- //        assertEquals(id.getReceiver(),RECEIVER);
          assertNotNull(id.getPublicKey());
      }
  
      protected Builder createBuilder() throws NeuClearException {
          return new IdentityBuilder(getSigner().getPublicKey(NAME),SIGNER,null,null);
--- 34,52 ----
      }
  
!     protected void verifyObject(SignedNamedObject obj) throws CryptoException {
          assertTrue(obj instanceof Identity);
          Identity id=(Identity) obj;
!         assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(signer.getPublicKey(NAME).getEncoded())),
!                 obj.getName().substring(5,37));
!         assertEquals(new String(CryptoTools.digest(signer.getPublicKey(NAME).getEncoded())),
!                 new String(Base32.decode(obj.getName().substring(5,37))));
          assertEquals(id.getSigner(),SIGNER);
          assertNotNull(id.getPublicKey());
      }
  
+     protected Class getRequiredClass() {
+         return Identity.class;
+     }
+ 
      protected Builder createBuilder() throws NeuClearException {
          return new IdentityBuilder(getSigner().getPublicKey(NAME),SIGNER,null,null);
***************
*** 60,63 ****
--- 63,67 ----
  
      }
+ 
      public void testEmbedded() throws NoSuchAlgorithmException, XMLSecurityException, CryptoException, NameResolutionException, InvalidNamedObjectException{
          KeyPair kp=CryptoTools.createTinyKeyPair();

Index: NeuClearBenchmark.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/NeuClearBenchmark.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NeuClearBenchmark.java	2 Mar 2004 18:59:12 -0000	1.3
--- NeuClearBenchmark.java	3 Mar 2004 23:26:44 -0000	1.4
***************
*** 69,74 ****
          } catch (InvalidNamedObjectException e) {
              e.printStackTrace();  //To change body of catch statement use Options | File Templates.
-         } catch (NameResolutionException e) {
-             e.printStackTrace();  //To change body of catch statement use Options | File Templates.
          }
      }
--- 69,72 ----

Index: SignedMessageTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/SignedMessageTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SignedMessageTest.java	19 Jan 2004 23:49:45 -0000	1.3
--- SignedMessageTest.java	3 Mar 2004 23:26:44 -0000	1.4
***************
*** 28,31 ****
--- 28,35 ----
      }
  
+     protected Class getRequiredClass() {
+         return SignedMessage.class;
+     }
+ 
      protected Builder createBuilder() throws NeuClearException {
          return new SignedMessageBuilder("neu://alice@test","Test","Hello there");