[Gzz-commits] alph ./Makefile org/nongnu/alph/impl/urn5textsp...

[Benja Fallenstein]

CVSROOT:        /cvsroot/alph
Module name:    alph
Changes by:     Benja Fallenstein <address@hidden>      03/05/15 11:48:42

Modified files:
        .              : Makefile 
        org/nongnu/alph/impl: urn5textspan.test 
        org/nongnu/alph/xml: serialization.test 
Added files:
        .              : dbg.py test.py 
Removed files:
        test           : testutil.py 

Log message:
        use test script from storm to get java stack traces &c

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/dbg.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/test.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/Makefile.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/urn5textspan.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/serialization.test.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: alph/Makefile
diff -u alph/Makefile:1.12 alph/Makefile:1.13
--- alph/Makefile:1.12  Mon Apr 28 05:10:01 2003
+++ alph/Makefile       Thu May 15 11:48:42 2003
@@ -14,6 +14,8 @@
 JAVAC=javac
 JAVA=java
 
+TEST=.
+
 
 ifeq (,$(JYTHONPATH))
  JYTHONPATH=.:$(ALPH_DEPENDS)/jythonlib.jar:$(ALPH_DEPENDS)/pythonlib.jar
@@ -37,7 +39,7 @@
        $(JAVAC) $(DEBUG) -d $(CLASSDIR) $(RAWSRC) 
 
 test:
-       $(JYTHON) test/testutil.py $(TEST)
+       $(JYTHON) test.py $(TEST)
 
 tags::
        ctags -R
Index: alph/org/nongnu/alph/impl/urn5textspan.test
diff -u alph/org/nongnu/alph/impl/urn5textspan.test:1.2 
alph/org/nongnu/alph/impl/urn5textspan.test:1.3
--- alph/org/nongnu/alph/impl/urn5textspan.test:1.2     Tue Apr 22 02:30:24 2003
+++ alph/org/nongnu/alph/impl/urn5textspan.test Thu May 15 11:48:42 2003
@@ -1,7 +1,9 @@
 import alph
 import java
 
-U5T = alph.impl.URN5TextSpan
+def setUp():
+    global U5T
+    U5T = alph.impl.URN5TextSpan
 
 def testEquals():
     """Test that equality works right
Index: alph/org/nongnu/alph/xml/serialization.test
diff -u alph/org/nongnu/alph/xml/serialization.test:1.7 
alph/org/nongnu/alph/xml/serialization.test:1.8
--- alph/org/nongnu/alph/xml/serialization.test:1.7     Fri Apr 25 11:33:56 2003
+++ alph/org/nongnu/alph/xml/serialization.test Thu May 15 11:48:42 2003
@@ -55,11 +55,11 @@
     str = """<ts b="X" s="5" e="10"/>"""
     parseString(str, r)
     sp = r.getSpans()[0]
-    failUnlessEqual(sp.sb.id, "X")
-    failUnlessEqual(sp.s, 5)
-    failUnlessEqual(sp.e, 10)
+    assert sp.sb.id == "X"
+    assert sp.s == 5
+    assert sp.e == 10
 
-    failUnlessEqual(SpanSerializer().span2xml(sp), str)
+    assert SpanSerializer().span2xml(sp) == str
 
 def testMultiple():
     """See that multiple span readings work right.
@@ -68,24 +68,24 @@
     str = """<alph><ts b="X" s="5" e="10"/><ts b="Y" s="7" e="8"/></alph>"""
     parseString(str, r)
     list = r.getSpans()
-    failUnlessEqual(list.size(), 2)
+    assert list.size() == 2
 
-    failUnlessEqual(
+    assert (
        SpanSerializer.serialize(
-           alph.impl.Enfilade1DImpl.Enfilade1DImplMaker().makeEnfilade(list)),
-       str
+           alph.impl.Enfilade1DImpl.Enfilade1DImplMaker().makeEnfilade(list))
+       == str
     )
 
 
     parseString(str, r)
     list = r.getSpans()
-    failUnlessEqual(list.size(), 4)
+    assert list.size() == 4
     r.clear()
     list = r.getSpans()
-    failUnlessEqual(list.size(), 0)
+    assert list.size() == 0
     parseString(str, r)
     list = r.getSpans()
-    failUnlessEqual(list.size(), 2)
+    assert list.size() == 2
 
 def testURN5():
     """See that reading and writing URN-5 spans works
@@ -94,11 +94,11 @@
     str = """<uts b="Q" o="5" t="foo&amp;bar"/>"""
     parseString(str, r)
     sp = r.getSpans()[0]
-    failUnlessEqual(sp.getScrollId(), "Q")
-    failUnlessEqual(sp.offset(), 5)
-    failUnlessEqual(sp.getText(), "foo&bar")
+    assert sp.getScrollId() == "Q"
+    assert sp.offset() == 5
+    assert sp.getText() == "foo&bar"
 
-    failUnlessEqual(SpanSerializer().span2xml(sp), str)
+    assert SpanSerializer().span2xml(sp) == str
 
 def testFake():
     """See that reading/writing fake spans works.
@@ -108,11 +108,11 @@
     parseString(str, r)
 
     sp = r.getSpans()[0]
-    failUnlessEqual(sp.getScrollId(), "")
-    failUnlessEqual(sp.offset(), 0)
-    failUnlessEqual(sp.getText(), "foo&bar")
+    assert sp.getScrollId() == ""
+    assert sp.offset() == 0
+    assert sp.getText() == "foo&bar"
 
-    failUnlessEqual(SpanSerializer().span2xml(sp), str)
+    assert SpanSerializer().span2xml(sp) == str
 
 def testPageImageSpan():
     pool = storm.impl.TransientPool(java.util.HashSet())