[Neuclear-develop] neuclear-id/src/test/org/neuclear/id IdentityTests.java,1.1,1.2 NSToolsTest.java,

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id
In directory sc8-pr-cvs1:/tmp/cvs-serv9226/src/test/org/neuclear/id

Modified Files:
	IdentityTests.java NSToolsTest.java SignedMessageTest.java 
Log Message:
Unit testing uncovered further issues with Base32
NSTools is now uptodate as are many other classes. All transactional builders habe been updated.
Well on the way towards full "green" on Junit.

Index: IdentityTests.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/IdentityTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IdentityTests.java	16 Jan 2004 23:42:09 -0000	1.1
--- IdentityTests.java	19 Jan 2004 23:49:45 -0000	1.2
***************
*** 7,12 ****
  import org.neuclear.commons.crypto.CryptoException;
  import org.neuclear.commons.crypto.CryptoTools;
  import org.neuclear.id.builders.IdentityBuilder;
- import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.id.verifier.VerifyingReader;
  import org.neuclear.tests.AbstractObjectCreationTest;
--- 7,12 ----
  import org.neuclear.commons.crypto.CryptoException;
  import org.neuclear.commons.crypto.CryptoTools;
+ import org.neuclear.id.builders.Builder;
  import org.neuclear.id.builders.IdentityBuilder;
  import org.neuclear.id.verifier.VerifyingReader;
  import org.neuclear.tests.AbstractObjectCreationTest;
***************
*** 47,51 ****
      }
  
!     protected NamedObjectBuilder createBuilder() throws NeuClearException {
          return new IdentityBuilder(NAME,getSigner().getPublicKey(NAME),REPOSITORY,SIGNER,LOGGER,RECEIVER);
      }
--- 47,51 ----
      }
  
!     protected Builder createBuilder() throws NeuClearException {
          return new IdentityBuilder(NAME,getSigner().getPublicKey(NAME),REPOSITORY,SIGNER,LOGGER,RECEIVER);
      }
***************
*** 56,60 ****
          assertNotNull(id);
          assertNotNull(id.getName());
!         assertEquals("neu:sha1://",id.getName().substring(0,11));
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())),id.getName().substring(11));
          assertEquals(kp.getPublic(),id.getPublicKey());
--- 56,60 ----
          assertNotNull(id);
          assertNotNull(id.getName());
!         assertEquals("sha1:",id.getName().substring(0,5));
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())),id.getName().substring(11));
          assertEquals(kp.getPublic(),id.getPublicKey());
***************
*** 69,73 ****
          SignedNamedObject obj=VerifyingReader.getInstance().read(elem);
          System.out.println("Name: "+obj.getName());
!         assertEquals("neu:sha1://",obj.getName().substring(0,11));
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())),obj.getName().substring(11,43));
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(obj.getEncoded().getBytes())),obj.getName().substring(obj.getName().length()-32));
--- 69,73 ----
          SignedNamedObject obj=VerifyingReader.getInstance().read(elem);
          System.out.println("Name: "+obj.getName());
!         assertEquals("sha1:",obj.getName().substring(0,5));
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())),obj.getName().substring(11,43));
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(obj.getEncoded().getBytes())),obj.getName().substring(obj.getName().length()-32));
***************
*** 77,81 ****
          assertNotNull(id);
          assertNotNull(id.getName());
!         assertEquals("neu:sha1://",id.getName().substring(0,11));
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())),id.getName().substring(11));
          assertEquals(kp.getPublic(),id.getPublicKey());
--- 77,81 ----
          assertNotNull(id);
          assertNotNull(id.getName());
!         assertEquals("sha1:",id.getName().substring(0,5));
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())),id.getName().substring(11));
          assertEquals(kp.getPublic(),id.getPublicKey());

Index: NSToolsTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/NSToolsTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** NSToolsTest.java	19 Jan 2004 17:55:00 -0000	1.18
--- NSToolsTest.java	19 Jan 2004 23:49:45 -0000	1.19
***************
*** 2,5 ****
--- 2,10 ----
    $Id$
    $Log$
+   Revision 1.19  2004/01/19 23:49:45  pelle
+   Unit testing uncovered further issues with Base32
+   NSTools is now uptodate as are many other classes. All transactional builders habe been updated.
+   Well on the way towards full "green" on Junit.
+ 
    Revision 1.18  2004/01/19 17:55:00  pelle
    Updated the NeuClear ID naming scheme to support various levels of semantics
***************
*** 182,190 ****
          assertValidName("neu://pelle@neuclear.org/abcdefg232Avc");
  
-         assertValidName("neu://help!aasfdasdf3_.-243");
  
-         assertValidName("neu://pelle@help!aasfdasdf3_.-243");
  
-         assertValidName("neu://pelle@neuclear.org!aasfdasdf3_.-243");
          assertValidName("sha1:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
  
--- 187,192 ----
***************
*** 195,198 ****
--- 197,203 ----
          assertInvalidName("neu://test/pelle@help");
          assertInvalidName("neu://test/pelle@help/abcdefg232Avc");
+         assertInvalidName("neu://help!aasfdasdf3_.-243");
+         assertInvalidName("neu://pelle@help!aasfdasdf3_.-243");
+         assertInvalidName("neu://pelle@neuclear.org!aasfdasdf3_.-243");
  
          assertInvalidName("neu://hel-_.p*34)");
***************
*** 214,220 ****
  
      public final void testValidTransaction() throws NeuClearException {
!         assertValidTransaction("sha1:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!7777774l77777oab7777775a7777777t");
!         assertValidTransaction("pet:bill!7777774l77777oab7777775a7777777t");
!         assertValidTransaction("neu://heybob!7777774l77777oab7777775a7777777t");
          assertInvalidTransaction("sha1:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!shoes");
          assertInvalidTransaction("pet:bill!7777774l77777oab7777775a7777777t3");
--- 219,225 ----
  
      public final void testValidTransaction() throws NeuClearException {
!         assertValidTransaction("sha1:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!7777774377777oab7777775a7777777t");
!         assertValidTransaction("pet:bill!7777774277777oab7777775a7777777t");
!         assertValidTransaction("neu://heybob!7777774277777oab7777775a7777777t");
          assertInvalidTransaction("sha1:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!shoes");
          assertInvalidTransaction("pet:bill!7777774l77777oab7777775a7777777t3");
***************
*** 234,239 ****
          assertEquals("neu://hello", NSTools.getSignatoryURI("neu://hello/one"));
          assertEquals("neu://", NSTools.getSignatoryURI("neu://hello"));
!         assertEquals("neu://one@hello", NSTools.getSignatoryURI("neu://one@hello!test"));
!         assertEquals("neu://hello", NSTools.getSignatoryURI("neu://hello!one"));
          assertEquals("neu://", NSTools.getSignatoryURI("neu://"));
  
--- 239,244 ----
          assertEquals("neu://hello", NSTools.getSignatoryURI("neu://hello/one"));
          assertEquals("neu://", NSTools.getSignatoryURI("neu://hello"));
!         assertEquals("neu://one@hello", NSTools.getSignatoryURI("neu://one@hello!aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
!         assertEquals("neu://hello", NSTools.getSignatoryURI("neu://hello!aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
          assertEquals("neu://", NSTools.getSignatoryURI("neu://"));
  
***************
*** 246,256 ****
          assertEquals("/test/@pelle/one", NSTools.name2path("neu://pelle@test/one"));
          assertEquals("/test/@pelle/one/two", NSTools.name2path("neu://pelle@test/one/two"));
!     }
! 
!     public static void testGenerateIDs() {
!         assertTrue(NSTools.isValidName(NSTools.createUniqueTransactionID("neu://bob@test", "neu://neuclear.org")));
!         assertTrue(NSTools.isValidName(NSTools.createUniqueTransactionID("neu://bob@test/one", "neu://neuclear.org")));
!         assertTrue(NSTools.isValidName(NSTools.createUniqueTransactionID("neu://neuclear.org", "neu://bob@neuclear.org")));
!         assertTrue(NSTools.isValidName(NSTools.createUniqueTransactionID("neu://bob@test.org", "neu://neuclear.org/test")));
      }
  
--- 251,257 ----
          assertEquals("/test/@pelle/one", NSTools.name2path("neu://pelle@test/one"));
          assertEquals("/test/@pelle/one/two", NSTools.name2path("neu://pelle@test/one/two"));
! //        assertEquals("/heybob/7777774377777oab7777775a7777777t", NSTools.name2path("neu://heybob!7777774377777oab7777775a7777777t"));
!         assertEquals("/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/7777774377777oab7777775a7777777t", NSTools.name2path("sha1:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!7777774377777oab7777775a7777777t"));
!         assertEquals("/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", NSTools.name2path("sha1:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
      }
  
***************
*** 262,274 ****
          assertNull(NSTools.isHttpScheme("neu://test@neuclear.org"));
          assertNull(NSTools.isHttpScheme("neu://neuclear.org!sdfsdfdsf"));
- 
-     }
- 
-     public static void testGetLocal() throws NeuClearException {
-         assertEquals("test", NSTools.getLocalName("neu://test"));
-         assertEquals("test", NSTools.getLocalName("neu://test@no"));
-         assertEquals("test", NSTools.getLocalName("neu://no/test"));
-         assertEquals("test", NSTools.getLocalName("neu://no!test"));
-         assertEquals("test", NSTools.getLocalName("neu://no@no!test"));
      }
  
--- 263,266 ----

Index: SignedMessageTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/SignedMessageTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SignedMessageTest.java	19 Jan 2004 17:55:00 -0000	1.2
--- SignedMessageTest.java	19 Jan 2004 23:49:45 -0000	1.3
***************
*** 2,6 ****
  
  import org.neuclear.commons.NeuClearException;
! import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.id.builders.SignedMessageBuilder;
  import org.neuclear.tests.AbstractObjectCreationTest;
--- 2,6 ----
  
  import org.neuclear.commons.NeuClearException;
! import org.neuclear.id.builders.Builder;
  import org.neuclear.id.builders.SignedMessageBuilder;
  import org.neuclear.tests.AbstractObjectCreationTest;
***************
*** 28,33 ****
      }
  
!     protected NamedObjectBuilder createBuilder() throws NeuClearException {
!         return new SignedMessageBuilder(getBob(),"neu://alice@test","Test","Hello there");
      }
  }
--- 28,33 ----
      }
  
!     protected Builder createBuilder() throws NeuClearException {
!         return new SignedMessageBuilder("neu://alice@test","Test","Hello there");
      }
  }

[Neuclear-develop] neuclear-id/src/test/org/neuclear/id IdentityTests.java,1.1,1.2 NSToolsTest.java,

[Neuclear-develop] neuclear-id/src/test/org/neuclear/id IdentityTests.java,1.1,1.2 NSToolsTest.java,1.18,1.19 SignedMessageTest.java,1.2,1.3