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

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/11/06 12:31:30

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

Log message:
        Fix test

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/TransientPool.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/StormPoolTest.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/lava/gzz/storm/impl/TransientPool.java
diff -u gzz/lava/gzz/storm/impl/TransientPool.java:1.4 
gzz/lava/gzz/storm/impl/TransientPool.java:1.5
--- gzz/lava/gzz/storm/impl/TransientPool.java:1.4      Wed Nov  6 12:17:46 2002
+++ gzz/lava/gzz/storm/impl/TransientPool.java  Wed Nov  6 12:31:30 2002
@@ -17,18 +17,18 @@
 
     protected class TransientBlockOutputStream extends BlockOutputStream {
         protected ByteArrayOutputStream baos;
+       protected Header822 header;
        protected Block block;
 
-       protected TransientBlockOutputStream() {
+       protected TransientBlockOutputStream(Header822 header) {
             super(new ByteArrayOutputStream());
            baos = (ByteArrayOutputStream)out;
+           this.header = header;
         }
         public Block getBlock() { return block; }
         public Header822 getHeader() { return null; }
-       public void close(){
-               Header822 h = new SortedHeader822();
-               h.add("Content-type", "text/plain");
-                block = new TransientBlock(baos.toByteArray(),h);
+       public void close() {
+                block = new TransientBlock(baos.toByteArray(), header);
                blocks.put(block.getId(),block);
        }
     }
@@ -37,7 +37,7 @@
         protected byte[] bytes;
         protected Header822 h;
 
-       protected TransientBlock(byte[] b, Header822 h){
+       protected TransientBlock(byte[] b, Header822 h) {
             bytes = b;
            this.h = h;
        }
@@ -58,11 +58,13 @@
     public void delete(Block b) {}
     public Set getIds() { return null; }
     public BlockOutputStream getBlockOutputStream(String contentType) {
-
-       return new TransientBlockOutputStream();
-
+       Header822 hdr = new UniqueHeader822();
+       hdr.add("Content-Type", contentType);
+       return new TransientBlockOutputStream(hdr);
+    }
+    public BlockOutputStream getBlockOutputStream(Header822 hdr) {
+       return null;
     }
-    public BlockOutputStream getBlockOutputStream(Header822 hdr) { return 
null; }
     public String getDefaultPoolName() { return null; }
     public Set getPoolNames() { return null; }
     public Pointer getPointer(String uri) { return null; }
Index: gzz/lava/test/gzz/storm/StormPoolTest.java
diff -u gzz/lava/test/gzz/storm/StormPoolTest.java:1.3 
gzz/lava/test/gzz/storm/StormPoolTest.java:1.4
--- gzz/lava/test/gzz/storm/StormPoolTest.java:1.3      Tue Nov  5 12:35:44 2002
+++ gzz/lava/test/gzz/storm/StormPoolTest.java  Wed Nov  6 12:31:30 2002
@@ -41,8 +41,6 @@
                char[] array = new char[12];
                isr.read(array);                  
 
-               System.out.println(new String(array));
-
                if(isr.read() != -1)
                        throw new Error("The block contains too much data!");
 
@@ -53,7 +51,7 @@
 
                Header822 h = b.getHeader();
 
-               if(h.get("Content-type").equals("text/plain"))
+               if(!h.get("Content-type").equals("text/plain"))
                        throw new Error("wrong content-type");
        }
 }