[ff-cvs] alph ./test.py org/nongnu/alph/xml/SpanSerializ...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/alph
Module name:    alph
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/09/12 07:04:34

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

Log message:
        Arch changes: 1) test name lookup, 2) imagespan serialization 
correction, humppake take note

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

Patches:
Index: alph/org/nongnu/alph/xml/SpanSerializer.java
diff -u alph/org/nongnu/alph/xml/SpanSerializer.java:1.11 
alph/org/nongnu/alph/xml/SpanSerializer.java:1.12
--- alph/org/nongnu/alph/xml/SpanSerializer.java:1.11   Mon Sep  8 08:28:30 2003
+++ alph/org/nongnu/alph/xml/SpanSerializer.java        Fri Sep 12 07:04:33 2003
@@ -63,11 +63,6 @@
                        "ps b=\""+s.getScrollId()+
                        "\" s=\""+s.offset()+
                        "\" e=\""+(s.offset()+s.length())+"\"/>";
-       } else if(s0 instanceof ImageSpan) {
-           ImageSpan s = (ImageSpan)s0;
-           return "<" + (namespace == null ? "" : 
-                                             namespace+":") +
-                       "is b=\""+s.getScrollId()+"\"/>";
        } else if(s0 instanceof PageImageSpan) { 
            PageImageSpan s = (PageImageSpan)s0;
            java.awt.Point p = s.getLocation();
@@ -79,6 +74,13 @@
                        "\" x=\""+p.x+"\" y=\""+p.y+
                        "\" w=\""+d.width+
                        "\" h=\""+d.height+"\"/>";
+       // ImageSpan has to be *after* PageImageSpan as it's 
+       // a superclass
+       } else if(s0 instanceof ImageSpan) {
+           ImageSpan s = (ImageSpan)s0;
+           return "<" + (namespace == null ? "" : 
+                                             namespace+":") +
+                       "is b=\""+s.getScrollId()+"\"/>";
        } else {
            throw new Error("Don't know how to serialize "+s0+" yet");
        }
Index: alph/org/nongnu/alph/xml/serialization.test
diff -u alph/org/nongnu/alph/xml/serialization.test:1.14 
alph/org/nongnu/alph/xml/serialization.test:1.15
--- alph/org/nongnu/alph/xml/serialization.test:1.14    Wed Aug 13 01:33:15 2003
+++ alph/org/nongnu/alph/xml/serialization.test Fri Sep 12 07:04:34 2003
@@ -203,7 +203,7 @@
     s.addSpan(span)
     str = s.get()
 
-    assert str == '<alph><pis 
b="urn:x-storm:1.0:application/pdf,6qrwyxinrkbr6znvopuo2rnqc7jjfpqg.ettfngwwbh4ore2hljm4soyipujr42gc7becvgq"
 p="1" x="70" y="30" w="40" h="45"/></alph>'
+    assert str == '<alph><pis 
b="urn:x-storm:1.0:application/pdf,6qrwyxinrkbr6znvopuo2rnqc7jjfpqg.ettfngwwbh4ore2hljm4soyipujr42gc7becvgq"
 p="1" x="70" y="30" w="40" h="45"/></alph>',str
 
     r = SpanReader(salph)
     
Index: alph/test.py
diff -u alph/test.py:1.2 alph/test.py:1.3
--- alph/test.py:1.2    Thu Jun  5 13:41:43 2003
+++ alph/test.py        Fri Sep 12 07:04:33 2003
@@ -122,6 +122,8 @@
     """
 
     def addTests(list, dirname, names):
+       if dirname[0] in [',', '{']: return
+       if len(dirname) > 2 and dirname[2] in [',', '{']: return
         names = [n for n in names if fnmatch.fnmatch(n, '*.test')]
         names = [os.path.join(dirname, name) for name in names]
         list.extend(names)