[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] alph ./Makefile org/nongnu/alph/xml/SpanReader....
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] alph ./Makefile org/nongnu/alph/xml/SpanReader.... |
Date: |
Wed, 26 Mar 2003 05:17:54 -0500 |
CVSROOT: /cvsroot/alph
Module name: alph
Changes by: Tuomas J. Lukka <address@hidden> 03/03/26 05:17:54
Modified files:
. : Makefile
org/nongnu/alph/xml: SpanReader.java SpanSerializer.java
serialization.test
test : testutil.py
Log message:
testing... and the tests FOUND A BUG\!
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/Makefile.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/SpanReader.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/SpanSerializer.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/serialization.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/test/testutil.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: alph/Makefile
diff -u alph/Makefile:1.3 alph/Makefile:1.4
--- alph/Makefile:1.3 Wed Mar 26 04:39:17 2003
+++ alph/Makefile Wed Mar 26 05:17:54 2003
@@ -1,4 +1,4 @@
-all: java
+all: java test
STORMCLASSDIR=../storm/CLASSES
Index: alph/org/nongnu/alph/xml/SpanReader.java
diff -u alph/org/nongnu/alph/xml/SpanReader.java:1.1
alph/org/nongnu/alph/xml/SpanReader.java:1.2
--- alph/org/nongnu/alph/xml/SpanReader.java:1.1 Wed Mar 26 04:39:48 2003
+++ alph/org/nongnu/alph/xml/SpanReader.java Wed Mar 26 05:17:54 2003
@@ -3,11 +3,16 @@
package org.nongnu.alph.xml;
import org.nongnu.alph.*;
+import java.util.ArrayList;
+import java.util.List;
+
/** A simple span serializer / deserializer.
* Just takes a sequence of spans and adds them to a list.
*/
public class SpanReader extends org.xml.sax.helpers.DefaultHandler {
+ public static boolean dbg = true;
+ private static void pa(String s) { System.out.println(s); }
public interface ScrollBlockFactory {
ScrollBlock getScrollBlock(String id);
@@ -21,14 +26,15 @@
public void startElement(String uri, String localName, String qName,
org.xml.sax.Attributes attributes) {
- if(localName.equals("ts")) {
- String b = attributes.getValue("s");
+ if(dbg) pa("Se: '"+uri+"' '"+localName+"' '"+qName+"'");
+ if(qName.equals("ts")) {
+ String b = attributes.getValue("b");
int s = Integer.parseInt(attributes.getValue("s"));
int e = Integer.parseInt(attributes.getValue("e"));
- spans.add((TextScrollBlock)(scrollBlockFactory.getScrollBlock(b))
+ spans.add(((TextScrollBlock)(scrollBlockFactory.getScrollBlock(b)))
. getSpan(s, e));
} else {
- throw new Error("Unknown element "+localName);
+ throw new Error("Unknown element '"+localName+"'");
}
}
public void endElement(String uri, String localName, String qName) {
Index: alph/org/nongnu/alph/xml/SpanSerializer.java
diff -u alph/org/nongnu/alph/xml/SpanSerializer.java:1.1
alph/org/nongnu/alph/xml/SpanSerializer.java:1.2
--- alph/org/nongnu/alph/xml/SpanSerializer.java:1.1 Wed Mar 26 04:39:48 2003
+++ alph/org/nongnu/alph/xml/SpanSerializer.java Wed Mar 26 05:17:54 2003
@@ -13,12 +13,13 @@
public String span2xml(Span s0) {
if(s0 instanceof TextSpan) {
TextSpan s = (TextSpan)s0;
- return "<" + (namespace == null ? "" : ns+":") +
+ return "<" + (namespace == null ? "" :
+ namespace+":") +
"ts b=\""+s.getScrollBlock().getID()+
"\" s=\""+s.offset()+
"\" e=\""+(s.offset()+s.length())+"\"/>";
} else {
- throw new Error("Don't know how to serialize "+s+" yet");
+ 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.1
alph/org/nongnu/alph/xml/serialization.test:1.2
--- alph/org/nongnu/alph/xml/serialization.test:1.1 Wed Mar 26 04:39:48 2003
+++ alph/org/nongnu/alph/xml/serialization.test Wed Mar 26 05:17:54 2003
@@ -1,4 +1,39 @@
+from org.nongnu import alph
from org.nongnu.alph.xml import *
-def testFoo():
- print "HEI"
+import java
+import javax
+
+class Ts(alph.TextSpan):
+ def __init__(self, id, s, e):
+ print "TS: ",id,s,e
+ self.id = id
+ self.s = s
+ self.e = e
+
+class Sb(alph.TextScrollBlock):
+ def __init__(self, id):
+ self.id = id
+ def getSpan(self, s, e):
+ return Ts(self.id, s, e)
+
+class Fact(SpanReader.ScrollBlockFactory):
+ def getScrollBlock(self, id):
+ return Sb(id)
+
+def getParser():
+ return javax.xml.parsers.SAXParserFactory.newInstance().newSAXParser()
+
+def parseString(string, handler):
+ p = getParser()
+ p.parse(java.io.StringBufferInputStream(string), handler)
+
+
+def testParseSpan():
+ r = SpanReader()
+ r.scrollBlockFactory = Fact()
+ parseString("""<ts b="X" s="5" e="10"/>""", r)
+ sp = r.getSpans()[0]
+ failUnlessEqual(sp.id, "X")
+ failUnlessEqual(sp.s, 5)
+ failUnlessEqual(sp.e, 10)
Index: alph/test/testutil.py
diff -u alph/test/testutil.py:1.1 alph/test/testutil.py:1.2
--- alph/test/testutil.py:1.1 Wed Mar 26 04:39:17 2003
+++ alph/test/testutil.py Wed Mar 26 05:17:54 2003
@@ -195,7 +195,7 @@
args = sys.argv[1:]
test = args
if len(test) == 0:
- test = ['.']
+ test = ['org']
# sys.path.extend(test)
try:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] alph ./Makefile org/nongnu/alph/xml/SpanReader....,
Tuomas J. Lukka <=