[Neuclear-develop] neuclear-id/src/java/org/neuclear/tests AbstractObjectCreationTest.java,1.5,1.6

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

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

Modified Files:
	AbstractObjectCreationTest.java 
Log Message:
Updated Asset and Asset Builder with semi fully featured functionality.
It now has Issuer, Service etc.

Index: AbstractObjectCreationTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/tests/AbstractObjectCreationTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractObjectCreationTest.java	3 Mar 2004 23:26:44 -0000	1.5
--- AbstractObjectCreationTest.java	2 Apr 2004 16:59:04 -0000	1.6
***************
*** 2,6 ****
  
  import org.neuclear.commons.NeuClearException;
- import org.neuclear.commons.crypto.signers.NonExistingSignerException;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.builders.Builder;
--- 2,5 ----
***************
*** 8,11 ****
--- 7,11 ----
  
  import java.security.GeneralSecurityException;
+ import java.security.PublicKey;
  
  /**
***************
*** 22,38 ****
  
      public void testCreateObject() throws Exception, XMLException {
!         Builder builder=createBuilder();
          assertNotNull(builder);
! //        assertTrue(NSTools.isNamedObject(builder.getElement()));
!         SignedNamedObject obj=builder.convert(NAME,getSigner());
          assertNotNull(obj);
!         assertEquals(getRequiredClass(),obj.getClass());
          verifyObject(obj);
      }
  
      protected abstract void verifyObject(SignedNamedObject obj) throws Exception;
      protected abstract Class getRequiredClass();
      protected abstract Builder createBuilder() throws Exception;
  
!     public static final String NAME="test";
  }
--- 22,54 ----
  
      public void testCreateObject() throws Exception, XMLException {
!         Builder builder = createBuilder();
! //        System.out.println(builder.asXML());
          assertNotNull(builder);
!         SignedNamedObject obj = builder.convert(NAME, getSigner());
          assertNotNull(obj);
!         assertEquals(getRequiredClass(), obj.getClass());
          verifyObject(obj);
      }
  
+     protected void assertEquals(byte a[], byte b[]) {
+         if (a == null && b == null)
+             return;
+         assertFalse("neither is null", a == null || b == null);
+         assertEquals("same length", a.length, b.length);
+         for (int i = 0; i < a.length; i++)
+             assertEquals("content same", a[i], b[i]);
+     }
+ 
+     protected void assertEqualPublicKeys(PublicKey a, PublicKey b) {
+         assertEquals(a.getClass(), b.getClass());
+         assertEquals(a.getEncoded(), b.getEncoded());
+     }
+ 
      protected abstract void verifyObject(SignedNamedObject obj) throws Exception;
+ 
      protected abstract Class getRequiredClass();
+ 
      protected abstract Builder createBuilder() throws Exception;
  
!     public static final String NAME = "neu://test";
  }