[Gzz-commits] fenfire ./build.xml org/fenfire/test/test.py or...

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/04/22 07:04:34

Modified files:
        .              : build.xml 
        org/fenfire/test: test.py 
        org/fenfire/view: pagespanlayout.test 

Log message:
        start working towards making tests pass again

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/build.xml.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/test/test.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/pagespanlayout.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/build.xml
diff -u fenfire/build.xml:1.30 fenfire/build.xml:1.31
--- fenfire/build.xml:1.30      Sat Apr 19 11:22:16 2003
+++ fenfire/build.xml   Tue Apr 22 07:04:34 2003
@@ -105,7 +105,7 @@
 
     <target name="rundemo">
        <java classname="org.python.util.jython" fork="true"
-               failonerror="true">
+               failonerror="true" output="/dev/tty">
            <sysproperty key="python.path" value="${pythonpath}"/>
            <sysproperty key="dbg" value="${dbg}"/>
            <sysproperty key="gldbg" value="${gldbg}"/>
@@ -209,4 +209,9 @@
         <pathelement location="${dep}/icu4j.jar"/>
         <pathelement location="${dep}/xerces.jar"/>
     </path>
+
+    <property name="theClassPath" refid="theClassPath"/>
+    <target name="echoclasspath">
+        <echo message="${theClassPath}"/>
+    </target>
 </project>
Index: fenfire/org/fenfire/test/test.py
diff -u fenfire/org/fenfire/test/test.py:1.7 
fenfire/org/fenfire/test/test.py:1.8
--- fenfire/org/fenfire/test/test.py:1.7        Sun Apr  6 06:20:32 2003
+++ fenfire/org/fenfire/test/test.py    Tue Apr 22 07:04:34 2003
@@ -75,11 +75,11 @@
             if hasattr(module, 'tearDown'): module.tearDown()
         except:
             print "failed."
-            exceptions.append({
+            exceptions.append([name, {
                 'exception': sys.exc_info(),
                 'test': test,
                 'testname': name,
-            })
+            }])
         else:
             print "ok."
 
@@ -171,15 +171,26 @@
                except org.fenfire.test.gfx.GLNeeded, e:
                    print "Skipping, needs GL."
 
-            for exc in exceptions:
+            if exceptions:
+                print "Java stack traces:"
+                for name, exc in exceptions:
+                    print 75 * '-'
+                    print name
+                    #exc['exception'][1].printStackTrace()
+            
                 print 75 * '-'
-                traceback.print_exception(*exc['exception'])
-               if isinstance(exc["exception"][1], java.lang.Throwable): 
-                   exc["exception"][1].printStackTrace()
-
-            print 75 * '-'
-            print
-            print "%s test failures." % len(exceptions)
+                print
+
+                print "Python stack traces:"
+                for name, exc in exceptions:
+                    print 75 * '-'
+                    print name
+                    traceback.print_exception(*exc['exception'])
+            
+                print 75 * '-'
+                print
+
+                print "%s test failures." % len(exceptions)
 
             java.lang.System.exit(exceptions != [])
 
Index: fenfire/org/fenfire/view/pagespanlayout.test
diff -u fenfire/org/fenfire/view/pagespanlayout.test:1.2 
fenfire/org/fenfire/view/pagespanlayout.test:1.3
--- fenfire/org/fenfire/view/pagespanlayout.test:1.2    Tue Apr 15 09:58:40 2003
+++ fenfire/org/fenfire/view/pagespanlayout.test        Tue Apr 22 07:04:34 2003
@@ -26,7 +26,7 @@
 import traceback
 import jarray
 
-import java
+import java, org
 
 from org import fenfire
 from org.nongnu import libvob as vob
@@ -42,8 +42,10 @@
 def setUp():
     global sc, enfMaker
 
-    id = 
"urn:x-storm:1.0:application/pdf,6qrwyxinrkbr6znvopuo2rnqc7jjfpqg.ettfngwwbh4ore2hljm4soyipujr42gc7becvgq"
-    sc = alph.impl.PageImageScroll(None, storm.BlockId(id))
+    pool = org.nongnu.storm.impl.TransientPool(java.util.HashSet())
+    myalph = alph.impl.StormAlph(pool)
+    sc = myalph.addFile(java.io.File('../alph/testdata/test1.pdf'), 
'application/pdf')
+    assert sc.getBlockId().getURI() == 
"urn:x-storm:1.0:application/pdf,6qrwyxinrkbr6znvopuo2rnqc7jjfpqg.ettfngwwbh4ore2hljm4soyipujr42gc7becvgq"
     enfMaker = alph.impl.Enfilade1DImpl.Enfilade1DImplMaker()