[Gzz-commits] libvob ./Makefile test/vob/api/vobcoorder.test ...

[Benja Fallenstein]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Benja Fallenstein <address@hidden>      03/05/15 13:19:03

Modified files:
        .              : Makefile 
        test/vob/api   : vobcoorder.test vobmatcher.test 
        test/vob/memory: partition.test 
        test/vob/util  : priorityqueue.test 
Added files:
        .              : test.py 
Removed files:
        test           : testutil.py 

Log message:
        Use our normal test framework here also

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/Makefile.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/api/vobcoorder.test.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/api/vobmatcher.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/memory/partition.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/util/priorityqueue.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: libvob/Makefile
diff -u libvob/Makefile:1.35 libvob/Makefile:1.36
--- libvob/Makefile:1.35        Mon Apr 28 16:55:19 2003
+++ libvob/Makefile     Thu May 15 13:19:03 2003
@@ -82,17 +82,19 @@
 runjython: 
        $(GLLIB) $(JYTHON) $(DBG)
 
+TEST=.
+
 test:: test-awt test-gl
 
 test-awt::  # Use: make test TEST=test/gzz/vob/vobmatcher.test, to run a 
single test.
-       $(GLLIB) $(JYTHON) test/testutil.py -f GL $(DBG) $(TEST)
+       $(GLLIB) $(JYTHON) test.py -f GL $(DBG) $(TEST)
 test-gl::
-       $(GLLIB) $(JYTHON) test/testutil.py -Dvob.api=gl -f AWT $(DBG) jni 
$(TEST)
+       $(GLLIB) $(JYTHON) test.py -Dvob.api=gl -f AWT $(DBG) jni $(TEST)
 
 testbugs-awt::
-       $(GLLIB) $(JYTHON) test/testutil.py -f \* $(DBG) $(TEST)
+       $(GLLIB) $(JYTHON) test.py -f \* $(DBG) $(TEST)
 testbugs-gl::
-       $(GLLIB) $(JYTHON) test/testutil.py -Dvob.api=gl -f \* $(DBG) jni 
$(TEST)
+       $(GLLIB) $(JYTHON) test.py -Dvob.api=gl -f \* $(DBG) jni $(TEST)
 
 bench-gl::
        $(GLLIB) $(JYTHON) bench/mark.py -Dvob.api=gl $(DBG) $(BENCH)
Index: libvob/test/vob/api/vobcoorder.test
diff -u libvob/test/vob/api/vobcoorder.test:1.11 
libvob/test/vob/api/vobcoorder.test:1.12
--- libvob/test/vob/api/vobcoorder.test:1.11    Fri Apr 25 08:43:16 2003
+++ libvob/test/vob/api/vobcoorder.test Thu May 15 13:19:03 2003
@@ -22,15 +22,18 @@
 
 from __future__ import nested_scopes
 
+import vob
 
 from java.awt import Color
 from test.tools.gfx import *
 
 from jarray import zeros
 
-vs = getvs()
-c = vs.coords
-tmpsize = zeros(2, 'f')
+def setUp():
+    global vs, c, tmpsize
+    vs = getvs()
+    c = vs.coords
+    tmpsize = zeros(2, 'f')
 
 def testTransform():
 
Index: libvob/test/vob/api/vobmatcher.test
diff -u libvob/test/vob/api/vobmatcher.test:1.2 
libvob/test/vob/api/vobmatcher.test:1.3
--- libvob/test/vob/api/vobmatcher.test:1.2     Tue Mar 11 08:57:54 2003
+++ libvob/test/vob/api/vobmatcher.test Thu May 15 13:19:03 2003
@@ -21,7 +21,7 @@
 # 
 
 
-import java
+import java, vob
 
 def testMany():
     v = vob.impl.DefaultVobMatcher()
Index: libvob/test/vob/memory/partition.test
diff -u libvob/test/vob/memory/partition.test:1.1 
libvob/test/vob/memory/partition.test:1.2
--- libvob/test/vob/memory/partition.test:1.1   Wed Mar 26 13:13:25 2003
+++ libvob/test/vob/memory/partition.test       Thu May 15 13:19:03 2003
@@ -25,7 +25,9 @@
 from org.nongnu import libvob as vob
 import java
 
-pool = vob.memory.MemoryPartitioner(500)
+def setUp():
+    global pool
+    pool = vob.memory.MemoryPartitioner(500)
 
 class Reserver(vob.memory.MemoryConsumer):
     def __init__(self):
Index: libvob/test/vob/util/priorityqueue.test
diff -u libvob/test/vob/util/priorityqueue.test:1.2 
libvob/test/vob/util/priorityqueue.test:1.3
--- libvob/test/vob/util/priorityqueue.test:1.2 Tue Mar 11 08:57:54 2003
+++ libvob/test/vob/util/priorityqueue.test     Thu May 15 13:19:03 2003
@@ -21,7 +21,7 @@
 # 
 
 
-import java
+import java, vob
 
 def testBasicSort():
     q = vob.util.PriorityQueue()