[Gzz-commits] alph/org/nongnu/alph/xml SpanReader.java serial...

[Matti Katila]

CVSROOT:        /cvsroot/alph
Module name:    alph
Branch:         
Changes by:     Matti Katila <address@hidden>   03/06/17 11:18:33

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

Log message:
        some tests which definitely not pass :/

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/SpanReader.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/serialization.test.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: alph/org/nongnu/alph/xml/SpanReader.java
diff -u alph/org/nongnu/alph/xml/SpanReader.java:1.9 
alph/org/nongnu/alph/xml/SpanReader.java:1.10
--- alph/org/nongnu/alph/xml/SpanReader.java:1.9        Wed Jun 11 13:50:18 2003
+++ alph/org/nongnu/alph/xml/SpanReader.java    Tue Jun 17 11:18:33 2003
@@ -37,7 +37,7 @@
 
 public class SpanReader extends org.xml.sax.helpers.DefaultHandler  {
     public static boolean dbg = false;
-    private static void pa(String s) { System.out.println(s); }
+    private static void pa(String s) { System.out.println("SpanReader:: "+s); }
 
     public Alph alph;
 
@@ -70,8 +70,8 @@
            String t = attributes.getValue("t");
            spans.add(new org.nongnu.alph.impl.URN5TextSpan(b, o, t));
        } else if(qName.equals("fts")) {
-           String t = attributes.getValue("t");
-           spans.add(new org.nongnu.alph.impl.FakeTextSpan(t));
+            String t = attributes.getValue("t");
+            spans.add(new org.nongnu.alph.impl.FakeTextSpan(t));
        } else if(qName.equals("ps")) {
            String b = attributes.getValue("b");
            int s = Integer.parseInt(attributes.getValue("s"));
Index: alph/org/nongnu/alph/xml/serialization.test
diff -u alph/org/nongnu/alph/xml/serialization.test:1.11 
alph/org/nongnu/alph/xml/serialization.test:1.12
--- alph/org/nongnu/alph/xml/serialization.test:1.11    Wed Jun 11 13:54:46 2003
+++ alph/org/nongnu/alph/xml/serialization.test Tue Jun 17 11:18:33 2003
@@ -1,3 +1,4 @@
+# -*-python-*-
 # 
 # Copyright (c) 2003, Tuomas J. Lukka and Benja Fallenstein
 # This file is part of Alph.
@@ -139,6 +140,42 @@
     assert sp.getText() == "foo&bar"
 
     assert SpanSerializer().span2xml(sp) == str
+
+def testFakeScandinavic():
+    """See that reading/writing fake spans works with scandinavic alphabets.
+    """
+    SpanReader.dbg = 1
+    r = SpanReader(TestAlph())
+
+    eq = chr(196) + chr(197)
+    s = java.lang.String(eq)
+    assert 1 == java.lang.Character.isDefined(s.charAt(0))
+    
+    str = """<fts t="%s"/>""" % eq
+    parseString(str, r)
+    sp = r.getSpans()[0]
+    assert sp.getScrollId() == ""
+    assert sp.offset() == 0
+    print '*****', eq,'',sp.getText()
+    assert sp.getText() == eq
+
+    assert SpanSerializer().span2xml(sp) == str
+
+def testFakeScandic2():
+    """Fake span with scandinavian alphabets - test 2
+    """
+    SpanReader.dbg = 1
+    r = SpanReader(TestAlph())
+    str = """<fts t="säiliö"/>"""
+    s = java.lang.String('ä')
+    assert 1 == java.lang.Character.isDefined(s.charAt(0))
+    print '\nChar is ', s.charAt(0)
+    print '\nGoing to parse'
+    parseString(str, r)
+    print '\nGet spans'
+    sp = r.getSpans()[0]
+    assert sp.getText() == 'säiliö'
+    
 
 def testReturn():
     str = SpanSerializer().span2xml(alph.impl.FakeTextSpan('a\nb'))