[Gzz-commits] gzz/lava/test/gzz/storm/util TestVersion.java T...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/01/18 11:32:57

Modified files:
        lava/test/gzz/storm/util: TestVersion.java TestVersion.test 

Log message:
        VersionFormat for the mock Version impl

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/util/TestVersion.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/storm/util/TestVersion.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/lava/test/gzz/storm/util/TestVersion.java
diff -u gzz/lava/test/gzz/storm/util/TestVersion.java:1.1 
gzz/lava/test/gzz/storm/util/TestVersion.java:1.2
--- gzz/lava/test/gzz/storm/util/TestVersion.java:1.1   Sat Jan 18 10:47:44 2003
+++ gzz/lava/test/gzz/storm/util/TestVersion.java       Sat Jan 18 11:32:57 2003
@@ -1,6 +1,7 @@
 //(c):Benja Fallenstein
 package gzz.storm.util;
 import gzz.util.*;
+import java.io.*;
 import java.util.*;
 
 /** A simple mock implementation of Version, for testing.
@@ -59,6 +60,33 @@
 
        public int hashCode() {
            return 138789^diff;
+       }
+    }
+
+    /** A version format for use with TestVersions and TestVersion.Diffs.
+     *  Stores the value/difference as an ASCII number.
+     */ 
+    public static class Format implements VersionFormat {
+       public void writeVersion(OutputStream out, Version v) throws 
IOException {
+           String s = ""+((TestVersion)v).value;
+           out.write(s.getBytes("US-ASCII"));
+       }
+       public void writeDiff(OutputStream out, Version.Diff d) throws 
IOException {
+           String s = ""+((Diff)d).diff;
+           out.write(s.getBytes("US-ASCII"));
+       }
+
+       public Version readVersion(InputStream in) throws IOException {
+           ByteArrayOutputStream bos = new ByteArrayOutputStream();
+           CopyUtil.copy(in, bos);
+           String s = new String(bos.toByteArray(), "US-ASCII");
+           return new TestVersion(Integer.parseInt(s));
+       }
+       public Version.Diff readDiff(InputStream in) throws IOException {
+           ByteArrayOutputStream bos = new ByteArrayOutputStream();
+           CopyUtil.copy(in, bos);
+           String s = new String(bos.toByteArray(), "US-ASCII");
+           return new Diff(Integer.parseInt(s));
        }
     }
 }
Index: gzz/lava/test/gzz/storm/util/TestVersion.test
diff -u gzz/lava/test/gzz/storm/util/TestVersion.test:1.1 
gzz/lava/test/gzz/storm/util/TestVersion.test:1.2
--- gzz/lava/test/gzz/storm/util/TestVersion.test:1.1   Sat Jan 18 10:47:44 2003
+++ gzz/lava/test/gzz/storm/util/TestVersion.test       Sat Jan 18 11:32:57 2003
@@ -6,6 +6,9 @@
 import gzz, java
 
 from gzz.storm.util import TestVersion
+from java.io import ByteArrayInputStream as In
+
+format = TestVersion.Format()
 
 def testSimple():
     v = gzz.storm.util.TestVersion(17)
@@ -34,3 +37,37 @@
     assert not d.isEmpty()
     assert not e.isEmpty()
     assert v.getDiffFrom(v).isEmpty()
+
+
+def ver(v):
+    bos = java.io.ByteArrayOutputStream()
+    format.writeVersion(bos, v)
+    bos.close()
+    return str(java.lang.String(bos.toByteArray()))
+
+    
+def diff(d):
+    bos = java.io.ByteArrayOutputStream()
+    format.writeDiff(bos, d)
+    bos.close()
+    return str(java.lang.String(bos.toByteArray()))
+
+
+def testFormat():
+    v = gzz.storm.util.TestVersion(17)
+    w = gzz.storm.util.TestVersion(44)
+
+    assert ver(v) == '17'
+    assert ver(w) == '44'
+
+    assert diff(w.getDiffFrom(v)) == '27'
+    assert diff(v.getDiffFrom(w)) == '-27'
+
+    assert format.readVersion(In('44')) == w
+    assert format.readVersion(In('-15')).value == -15
+
+    assert format.readDiff(In('12')).diff == 12
+    assert format.readDiff(In('-27')) == v.getDiffFrom(w)
+    assert format.readDiff(In('114')).applyTo(v).value == 131
+
+