[Gzz-commits] storm/org/nongnu/storm BlockId.java BlockId.test

[Tuukka Hastrup]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Tuukka Hastrup <address@hidden> 03/04/23 13:27:47

Modified files:
        org/nongnu/storm: BlockId.java BlockId.test 

Log message:
        more storm urns testes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/BlockId.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/BlockId.test.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: storm/org/nongnu/storm/BlockId.java
diff -u storm/org/nongnu/storm/BlockId.java:1.12 
storm/org/nongnu/storm/BlockId.java:1.13
--- storm/org/nongnu/storm/BlockId.java:1.12    Tue Apr 22 09:01:21 2003
+++ storm/org/nongnu/storm/BlockId.java Wed Apr 23 13:27:47 2003
@@ -53,12 +53,15 @@
         int dot = uri.lastIndexOf('.');
        int comma = uri.lastIndexOf(',');
 
+       if(!uri.startsWith(PREFIX)
+          || dot < 0 || comma < 0            // URN must contain . and ,
+          || dot - comma != 32 + 1        // SHA1 part must be 32 chars
+          || uri.length() - dot != 39 + 1 // TigerTree part must be 39 chars
+          )
+           throw new IllegalArgumentException("Bad block URN: "+uri);
+
        contentType = uri.substring(PREFIX_LEN, comma);
        checkContentType(contentType);
-
-       if(!uri.startsWith(PREFIX) || dot < 0 || 
-          comma < 0 || dot < comma)
-           throw new IllegalArgumentException("Bad block URN: "+uri);
 
        sha1 = Base32.decode(uri.substring(comma+1, dot));
        tigertree = Base32.decode(uri.substring(dot+1));
Index: storm/org/nongnu/storm/BlockId.test
diff -u storm/org/nongnu/storm/BlockId.test:1.9 
storm/org/nongnu/storm/BlockId.test:1.10
--- storm/org/nongnu/storm/BlockId.test:1.9     Tue Apr 22 09:01:21 2003
+++ storm/org/nongnu/storm/BlockId.test Wed Apr 23 13:27:47 2003
@@ -59,6 +59,31 @@
     assert id != id3
     assert id.hashCode() != id3.hashCode()
 
+def testNullId():
+    """Null id must throw exception"""
+    try: BlockId(None)
+    except java.lang.NullPointerException: pass
+    else: assert 0
+
+def testUnparsable():
+    """Unparsable ids must throw exceptions"""
+
+    try: BlockId("urn:x-storm:1.0:")
+    except java.lang.IllegalArgumentException: pass
+    else: assert 0
+
+    try: BlockId("")
+    except java.lang.IllegalArgumentException: pass
+    else: assert 0
+
+def testMalformed():
+    """Malformed ids must throw exceptions"""
+
+    try: BlockId("urn:x-storm:1.0:,.")
+    except java.lang.IllegalArgumentException: pass
+    else: assert 0
+# XXX test other wrong lengths too
+
 def testSpaces():
     """Spaces in content types must throw exceptions"""
     str = ("urn:x-storm:1.0:%s,"