Menu
▾
▴
[Neuclear-develop] neuclear-id/src/test/org/neuclear/id NSToolsTest.java,1.11,1.12
|
From: <pe...@us...> - 2003-12-06 00:17:07
|
Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id
In directory sc8-pr-cvs1:/tmp/cvs-serv4604/src/test/org/neuclear/id
Modified Files:
NSToolsTest.java
Log Message:
Updated various areas in NSTools.
Updated URI Validation in particular to support new expanded format
Updated createUniqueID and friends to be a lot more unique and more efficient.
In CryptoTools updated getRandom() to finally use a SecureRandom.
Changed CryptoTools.getFormatURLSafe to getBase36 because that is what it really is.
Index: NSToolsTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/NSToolsTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** NSToolsTest.java 21 Nov 2003 04:45:17 -0000 1.11
--- NSToolsTest.java 6 Dec 2003 00:17:04 -0000 1.12
***************
*** 2,5 ****
--- 2,12 ----
$Id$
$Log$
+ Revision 1.12 2003/12/06 00:17:04 pelle
+ Updated various areas in NSTools.
+ Updated URI Validation in particular to support new expanded format
+ Updated createUniqueID and friends to be a lot more unique and more efficient.
+ In CryptoTools updated getRandom() to finally use a SecureRandom.
+ Changed CryptoTools.getFormatURLSafe to getBase36 because that is what it really is.
+
Revision 1.11 2003/11/21 04:45:17 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 20,24 ****
Revision 1.8 2003/10/23 22:02:36 pelle
Moved some certificates to live status at http://repository.neuclear.org
! Updated NSTools.url2path to support neuids with @ signs.
Revision 1.7 2003/10/22 23:11:43 pelle
--- 27,31 ----
Revision 1.8 2003/10/23 22:02:36 pelle
Moved some certificates to live status at http://repository.neuclear.org
! Updated NSTools.name2path to support neuids with @ signs.
Revision 1.7 2003/10/22 23:11:43 pelle
***************
*** 107,110 ****
--- 114,118 ----
import junit.framework.TestCase;
import org.neuclear.commons.NeuClearException;
+ import org.neuclear.commons.crypto.CryptoTools;
***************
*** 116,119 ****
--- 124,130 ----
public NSToolsTest(final String name) {
super(name);
+ CryptoTools.createRandomID();//Initialises the Random number generator to not scew times in the generateID test
+
+
}
***************
*** 127,149 ****
public final void testValidName() throws NeuClearException {
- assertValidName("/");
assertValidName("neu://");
! assertValidName("/help");
! assertValidName("neu://help");
! assertValidName("neu://help/abcdefg232Avc");
! assertValidName("/help/abcdefg232Avc");
! assertValidName("neu://pelle@help");
assertValidName("neu://pelle@help/abcdefg232Avc");
assertValidName("neu://pelle@neuclear.org");
assertValidName("neu://pelle@neuclear.org/abcdefg232Avc");
! assertValidName("/help/abcd_efg.-232Avc/");
assertInvalidName("neu:/");
assertInvalidName("neu://pelle@");
assertInvalidName("neu://test/pelle@help");
assertInvalidName("neu://test/pelle@help/abcdefg232Avc");
assertInvalidName("neu");
assertInvalidName("");
--- 138,178 ----
public final void testValidName() throws NeuClearException {
assertValidName("neu://");
! assertValidName("neu://hel-_.p");
! assertValidName("neu://help/ab-c_defg232Avc");
! assertValidName("neu://pelle.user-guy_type@help");
assertValidName("neu://pelle@help/abcdefg232Avc");
assertValidName("neu://pelle@neuclear.org");
assertValidName("neu://pelle@neuclear.org/abcdefg232Avc");
!
! 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:/");
assertInvalidName("neu://pelle@");
+ assertInvalidName("neu://pelle@/test");
+ assertInvalidName("neu://@test");
assertInvalidName("neu://test/pelle@help");
assertInvalidName("neu://test/pelle@help/abcdefg232Avc");
+ assertInvalidName("neu://hel-_.p*34)");
+ assertInvalidName("neu://help/ab-c_d.efg232Avc");
+
+ assertInvalidName("neu://pelle.user-g!uy_type@help");
+ assertInvalidName("neu://pelle@help/ab.cdefg232Avc");
+
+ assertInvalidName("/");
+ assertInvalidName("/help");
+ assertInvalidName("/help/abcdefg232Avc");
+ assertInvalidName("/help/abcd_efg.-232Avc/");
+
assertInvalidName("neu");
assertInvalidName("");
***************
*** 161,185 ****
assertEquals("neu://hello", NSTools.getParentNSURI("neu://one@hello"));
assertEquals("neu://one@hello", NSTools.getParentNSURI("neu://one@hello/test"));
! assertEquals("neu://hello", NSTools.getParentNSURI("/hello/one"));
assertEquals("neu://", NSTools.getParentNSURI("neu://hello"));
! assertEquals("neu://", NSTools.getParentNSURI("/hello"));
assertEquals("neu://", NSTools.getParentNSURI("neu://"));
- assertEquals("neu://", NSTools.getParentNSURI("/"));
}
! public static void testURL2Path() {
! assertEquals("/", NSTools.url2path("neu://"));
! assertEquals("/", NSTools.url2path("/"));
! assertEquals("/test", NSTools.url2path("neu://test"));
! assertEquals("/test", NSTools.url2path("/test"));
! assertEquals("/test/@pelle", NSTools.url2path("neu://pelle@test"));
! assertEquals("/test/@pelle", NSTools.url2path("/pelle@test"));
! assertEquals("/test/@pelle/one", NSTools.url2path("neu://pelle@test/one"));
! assertEquals("/test/@pelle/one", NSTools.url2path("/pelle@test/one"));
! assertEquals("/test/@pelle/one/two", NSTools.url2path("neu://pelle@test/one/two"));
! assertEquals("/test/@pelle/one/two", NSTools.url2path("/pelle@test/one/two"));
!
}
}
--- 190,214 ----
assertEquals("neu://hello", NSTools.getParentNSURI("neu://one@hello"));
assertEquals("neu://one@hello", NSTools.getParentNSURI("neu://one@hello/test"));
! assertEquals("neu://hello", NSTools.getParentNSURI("neu://hello/one"));
assertEquals("neu://", NSTools.getParentNSURI("neu://hello"));
! assertEquals("neu://one@hello", NSTools.getParentNSURI("neu://one@hello!test"));
! assertEquals("neu://hello", NSTools.getParentNSURI("neu://hello!one"));
assertEquals("neu://", NSTools.getParentNSURI("neu://"));
}
! public static void testURL2Path() throws InvalidNamedObject {
! assertEquals("/", NSTools.name2path("neu://"));
! assertEquals("/test", NSTools.name2path("neu://test"));
! assertEquals("/test/@pelle", NSTools.name2path("neu://pelle@test"));
! 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")));
+ }
}
|
