[Gzz-commits] gzz/lava gzz/storm/impl/DirPool.java gzz/storm/...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/12/30 07:27:45

Modified files:
        lava/gzz/storm/impl: DirPool.java ZipPool.java 
        lava/test/gzz/storm: StormPoolTest.java 
        lava/test/gzz/storm/impl: DirPool.test TransientPool.test 
                                  ZipPool.test 

Log message:
        More testing, fix: A block can be added twice to a pool...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/DirPool.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/ZipPool.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/StormPoolTest.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/impl/DirPool.test.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/impl/TransientPool.test.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/impl/ZipPool.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gzz/lava/gzz/storm/impl/DirPool.java
diff -u gzz/lava/gzz/storm/impl/DirPool.java:1.14 
gzz/lava/gzz/storm/impl/DirPool.java:1.15
--- gzz/lava/gzz/storm/impl/DirPool.java:1.14   Sun Dec 29 15:02:49 2002
+++ gzz/lava/gzz/storm/impl/DirPool.java        Mon Dec 30 07:27:45 2002
@@ -62,9 +62,9 @@
     protected class FileBlockOutputStream extends AbstractBlockOutputStream {
        protected File tempFile;
 
-       protected FileBlockOutputStream(Header822 header, File tempFile) 
+       protected FileBlockOutputStream(Header822 header, File tempFile) 
                                                         throws IOException {
-            super(new BufferedOutputStream(new FileOutputStream(tempFile)), 
+            super(new BufferedOutputStream(new FileOutputStream(tempFile)),
                  header);
            this.tempFile = tempFile;
         }
Index: gzz/lava/gzz/storm/impl/ZipPool.java
diff -u gzz/lava/gzz/storm/impl/ZipPool.java:1.8 
gzz/lava/gzz/storm/impl/ZipPool.java:1.9
--- gzz/lava/gzz/storm/impl/ZipPool.java:1.8    Sun Dec 22 22:20:59 2002
+++ gzz/lava/gzz/storm/impl/ZipPool.java        Mon Dec 30 07:27:45 2002
@@ -119,6 +119,9 @@
        }
 
        public void add(Block b) throws IOException {
+           String name = "b_" + 
gzz.util.HexUtil.byteArrToHex(b.getId().getBytes());
+           if(file.getEntry(name) != null) return;
+
            byte[] bytes = CopyUtil.readBytes(b.getRawInputStream());
            changeZipFile(null, bytes, b.getId());
        }
Index: gzz/lava/test/gzz/storm/StormPoolTest.java
diff -u gzz/lava/test/gzz/storm/StormPoolTest.java:1.12 
gzz/lava/test/gzz/storm/StormPoolTest.java:1.13
--- gzz/lava/test/gzz/storm/StormPoolTest.java:1.12     Sat Nov 16 00:59:46 2002
+++ gzz/lava/test/gzz/storm/StormPoolTest.java  Mon Dec 30 07:27:45 2002
@@ -68,6 +68,15 @@
            throw new Error("wrong content-type");
     }
 
+    /** Test adding the same block to a pool twice.
+     */
+    public void testAddTwice(StormPool pool) throws IOException {
+       BlockOutputStream bos = pool.getBlockOutputStream("text/plain");
+       bos.close();
+
+       pool.add(bos.getBlock());
+    }
+
     /** Test creating a block with our own header.
      */
     public void testOwnHeader(StormPool pool) throws IOException {
Index: gzz/lava/test/gzz/storm/impl/DirPool.test
diff -u gzz/lava/test/gzz/storm/impl/DirPool.test:1.7 
gzz/lava/test/gzz/storm/impl/DirPool.test:1.8
--- gzz/lava/test/gzz/storm/impl/DirPool.test:1.7       Sat Nov 16 00:59:46 2002
+++ gzz/lava/test/gzz/storm/impl/DirPool.test   Mon Dec 30 07:27:45 2002
@@ -18,21 +18,15 @@
 
 import java, gzz
 
-dir = gzz.util.TempFileUtil.tmpFile(java.io.File("."));
-dir.mkdir();
+directory = gzz.util.TempFileUtil.tmpFile(java.io.File("."));
+directory.mkdir();
 
 s = gzz.storm.StormPoolTest()
-p = gzz.storm.impl.DirPool(dir)
+p = gzz.storm.impl.DirPool(directory)
 
-def testNewBlock(): s.testNewBlock(p)
-def testOwnHeader(): s.testOwnHeader(p)
-def testIdsNotNull(): s.testIdsNotNull(p)
-def testAddRemoveId(): s.testAddRemoveId(p)
-def testDelete(): s.testDelete(p)
-def testBlockId(): s.testBlockId(p)
-def testAddBlock(): s.testAddBlock(p)
-def testAddBlock00(): s.testAddBlock00(p)
-def testGetNonexistent(): s.testGetNonexistent(p)
+for name in dir(gzz.storm.StormPoolTest):
+    if name.startswith("test"):
+       exec "def %s(): s.%s(p)" % (name, name)
 
 def testGetBlockWithBadId():
     """
@@ -42,7 +36,7 @@
 
     id = gzz.storm.BlockId('storm:block:01' + 40*'A')
        
-    file = java.io.File(dir, "b_01" + 40*"A")
+    file = java.io.File(directory, "b_01" + 40*"A")
     f = open(file.getPath(), 'w')
     f.write("Content-Type: text/plain\r\n\r\nFOO");
     f.close()
@@ -58,5 +52,5 @@
         assert 0, "Id not checked"
 
 def tearDown():
-    gzz.util.TempFileUtil.deltree(dir)
+    gzz.util.TempFileUtil.deltree(directory)
 
Index: gzz/lava/test/gzz/storm/impl/TransientPool.test
diff -u gzz/lava/test/gzz/storm/impl/TransientPool.test:1.7 
gzz/lava/test/gzz/storm/impl/TransientPool.test:1.8
--- gzz/lava/test/gzz/storm/impl/TransientPool.test:1.7 Sat Nov 16 00:59:46 2002
+++ gzz/lava/test/gzz/storm/impl/TransientPool.test     Mon Dec 30 07:27:45 2002
@@ -21,12 +21,6 @@
 s = gzz.storm.StormPoolTest()
 p = gzz.storm.impl.TransientPool()
 
-def testNewBlock(): s.testNewBlock(p)
-def testOwnHeader(): s.testOwnHeader(p)
-def testIdsNotNull(): s.testIdsNotNull(p)
-def testAddRemoveId(): s.testAddRemoveId(p)
-def testDelete(): s.testDelete(p)
-def testBlockId(): s.testBlockId(p)
-def testAddBlock(): s.testAddBlock(p)
-def testAddBlock00(): s.testAddBlock00(p)
-def testGetNonexistent(): s.testGetNonexistent(p)
+for name in dir(gzz.storm.StormPoolTest):
+    if name.startswith("test"):
+       exec "def %s(): s.%s(p)" % (name, name)
Index: gzz/lava/test/gzz/storm/impl/ZipPool.test
diff -u gzz/lava/test/gzz/storm/impl/ZipPool.test:1.4 
gzz/lava/test/gzz/storm/impl/ZipPool.test:1.5
--- gzz/lava/test/gzz/storm/impl/ZipPool.test:1.4       Tue Dec 17 10:48:35 2002
+++ gzz/lava/test/gzz/storm/impl/ZipPool.test   Mon Dec 30 07:27:45 2002
@@ -28,15 +28,9 @@
 s = gzz.storm.StormPoolTest()
 p = gzz.storm.impl.ZipPool(zipfile)
 
-def testNewBlock(): s.testNewBlock(p)
-def testOwnHeader(): s.testOwnHeader(p)
-def testIdsNotNull(): s.testIdsNotNull(p)
-def testAddRemoveId(): s.testAddRemoveId(p)
-def testDelete(): s.testDelete(p)
-def testBlockId(): s.testBlockId(p)
-def testAddBlock(): s.testAddBlock(p)
-def testAddBlock00(): s.testAddBlock00(p)
-def testGetNonexistent(): s.testGetNonexistent(p)
+for name in dir(gzz.storm.StormPoolTest):
+    if name.startswith("test"):
+       exec "def %s(): s.%s(p)" % (name, name)
 
 #def testGetBlockWithBadId():
 #    """