[Gzz-commits] alph/org/nongnu/alph/xml serialization.test

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/alph
Module name:    alph
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/26 05:21:11

Modified files:
        org/nongnu/alph/xml: serialization.test 

Log message:
        Now we have span serialization.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/serialization.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: alph/org/nongnu/alph/xml/serialization.test
diff -u alph/org/nongnu/alph/xml/serialization.test:1.2 
alph/org/nongnu/alph/xml/serialization.test:1.3
--- alph/org/nongnu/alph/xml/serialization.test:1.2     Wed Mar 26 05:17:54 2003
+++ alph/org/nongnu/alph/xml/serialization.test Wed Mar 26 05:21:11 2003
@@ -4,23 +4,37 @@
 import java
 import javax
 
+#########
+# Helper classes
+
 class Ts(alph.TextSpan):
-    def __init__(self, id, s, e):
-       print "TS: ",id,s,e
-       self.id = id
+    def __init__(self, sb, s, e):
+       print "TS: ",sb,s,e
+       self.sb = sb
        self.s = s
        self.e = e
+    def offset(self):
+       return self.s
+    def length(self):
+       return self.e-self.s
+    def getScrollBlock(self):
+       return self.sb
 
 class Sb(alph.TextScrollBlock):
     def __init__(self, id):
        self.id = id
     def getSpan(self, s, e):
-       return Ts(self.id, s, e)
+       return Ts(self, s, e)
+    def getID(self):
+       return self.id
 
 class Fact(SpanReader.ScrollBlockFactory):
     def getScrollBlock(self, id):
        return Sb(id)
 
+#########
+# Helper methods
+
 def getParser():
     return javax.xml.parsers.SAXParserFactory.newInstance().newSAXParser()
 
@@ -28,12 +42,17 @@
     p = getParser()
     p.parse(java.io.StringBufferInputStream(string), handler)
 
+###########
+# Actual tests
 
 def testParseSpan():
     r = SpanReader()
     r.scrollBlockFactory = Fact()
-    parseString("""<ts b="X" s="5" e="10"/>""", r)
+    str = """<ts b="X" s="5" e="10"/>"""
+    parseString(str, r)
     sp = r.getSpans()[0]
-    failUnlessEqual(sp.id, "X")
+    failUnlessEqual(sp.sb.id, "X")
     failUnlessEqual(sp.s, 5)
     failUnlessEqual(sp.e, 10)
+
+    failUnlessEqual(SpanSerializer().span2xml(sp), str)