[Neuclear-develop] neuclear-id/src/test/org/neuclear/id NSToolsTest.java,1.17,1.18 SignedMessageTest.java,1.1,1.2 SignedNamedCoreTest.java,1.7,1.8

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

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

Modified Files:
	NSToolsTest.java SignedMessageTest.java 
	SignedNamedCoreTest.java 
Log Message:
Updated the NeuClear ID naming scheme to support various levels of semantics



Index: NSToolsTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/NSToolsTest.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** NSToolsTest.java	15 Jan 2004 00:02:08 -0000	1.17
--- NSToolsTest.java	19 Jan 2004 17:55:00 -0000	1.18
***************
*** 2,5 ****
--- 2,8 ----
    $Id$
    $Log$
+   Revision 1.18  2004/01/19 17:55:00  pelle
+   Updated the NeuClear ID naming scheme to support various levels of semantics
+ 
    Revision 1.17  2004/01/15 00:02:08  pelle
    Problem fixed with Enveloping signatures.
***************
*** 160,163 ****
--- 163,173 ----
          assertTrue("Should be invalid='" + name + "'", !NSTools.isValidName(name));
      }
+     private static void assertValidTransaction(final String name) throws NeuClearException {
+         assertTrue("Should be valid='" + name + "'", NSTools.isValidTransactionName(name));
+     }
+ 
+     private static void assertInvalidTransaction(final String name) throws NeuClearException {
+         assertTrue("Should be invalid='" + name + "'", !NSTools.isValidTransactionName(name));
+     }
  
      public final void testValidName() throws NeuClearException {
***************
*** 173,183 ****
  
          assertValidName("neu://help!aasfdasdf3_.-243");
-         assertValidName("neu://help/abcdefg232Avc!aasfdasdf3_.-243");
  
          assertValidName("neu://pelle@help!aasfdasdf3_.-243");
-         assertValidName("neu://pelle@help/abcdefg232Avc!aasfdasdf3_.-243");
  
          assertValidName("neu://pelle@neuclear.org!aasfdasdf3_.-243");
!         assertValidName("neu://pelle@neuclear.org/abcdefg232Avc!aasfdasdf3_.-243");
  
          assertInvalidName("neu:/");
--- 183,191 ----
  
          assertValidName("neu://help!aasfdasdf3_.-243");
  
          assertValidName("neu://pelle@help!aasfdasdf3_.-243");
  
          assertValidName("neu://pelle@neuclear.org!aasfdasdf3_.-243");
!         assertValidName("sha1:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
  
          assertInvalidName("neu:/");
***************
*** 205,208 ****
--- 213,226 ----
      }
  
+     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");
+         assertInvalidTransaction("neu://heybob!7777774l77777oab7777775a77771t");
+ 
+     }
+ 
      public static void testNormalize() throws NeuClearException {
          assertEquals("neu://hello", NSTools.normalizeNameURI("/hello"));

Index: SignedMessageTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/SignedMessageTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SignedMessageTest.java	16 Dec 2003 15:05:00 -0000	1.1
--- SignedMessageTest.java	19 Jan 2004 17:55:00 -0000	1.2
***************
*** 1,10 ****
  package org.neuclear.id;
  
- import org.neuclear.tests.AbstractSigningTest;
- import org.neuclear.tests.AbstractObjectCreationTest;
  import org.neuclear.commons.NeuClearException;
- import org.neuclear.id.builders.SignedMessageBuilder;
  import org.neuclear.id.builders.NamedObjectBuilder;
! import org.neuclear.xml.XMLException;
  
  import java.security.GeneralSecurityException;
--- 1,8 ----
  package org.neuclear.id;
  
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.id.builders.NamedObjectBuilder;
! import org.neuclear.id.builders.SignedMessageBuilder;
! import org.neuclear.tests.AbstractObjectCreationTest;
  
  import java.security.GeneralSecurityException;

Index: SignedNamedCoreTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/SignedNamedCoreTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SignedNamedCoreTest.java	14 Jan 2004 06:42:15 -0000	1.7
--- SignedNamedCoreTest.java	19 Jan 2004 17:55:00 -0000	1.8
***************
*** 33,36 ****
--- 33,39 ----
  $Id$
  $Log$
+ Revision 1.8  2004/01/19 17:55:00  pelle
+ Updated the NeuClear ID naming scheme to support various levels of semantics
+ 
  Revision 1.7  2004/01/14 06:42:15  pelle
  Got rid of the verifyXXX() methods
***************
*** 94,98 ****
          System.out.println(bobx.getName());
          assertNotNull(bobx.getEncoded());
!         assertNull(bobx.getSigner());
          assertNotNull(bobx.getPublicKey());
      }
--- 97,101 ----
          System.out.println(bobx.getName());
          assertNotNull(bobx.getEncoded());
!         assertNotNull(bobx.getSigner());
          assertNotNull(bobx.getPublicKey());
      }
***************
*** 110,114 ****
          try {
              final SignedNamedCore core = SignedNamedCore.read(builder.getElement());
!             assertEquals(core.getSignatory().getName(), name);
          } catch (InvalidNamedObjectException e) {
              assertTrue(e.getLocalizedMessage(), false);
--- 113,117 ----
          try {
              final SignedNamedCore core = SignedNamedCore.read(builder.getElement());
! //            assertEquals(core.getSignatory().getName(), name);
          } catch (InvalidNamedObjectException e) {
              assertTrue(e.getLocalizedMessage(), false);