[Gzz-commits] gzz ./Makefile ./TODO test/testutil.py test/gzz...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/11/10 18:08:55

Modified files:
        .              : Makefile TODO 
        test           : testutil.py 
        test/gzz/view  : cellvobfactory.test renderscene.test 
Added files:
        test/gzz/view  : MockViewContext.java 

Log message:
        Fix the Python-subclassing-test failures for me: As long as my JVM 
chokes, use a Java class as the mock instead of a Jython one.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.209&tr2=1.210&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.382&tr2=1.383&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/testutil.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/MockViewContext.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/cellvobfactory.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/renderscene.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/Makefile
diff -u gzz/Makefile:1.209 gzz/Makefile:1.210
--- gzz/Makefile:1.209  Sat Nov  9 15:19:25 2002
+++ gzz/Makefile        Sun Nov 10 18:08:55 2002
@@ -498,7 +498,7 @@
        python2.2 $(GZZ_DEPENDS)/ly.py lava/gzz/impl/
        $(JAVAC) $(DEBUG) -d $(CLASSDIR) $(LAVASRC)
 test-lava:
-       $(GLLIB) $(JYTHON) test/testutil.py $(DBG) lava/test/
+       $(GLLIB) $(JYTHON) test/testutil.py $(DBG) $(wildcard ./lava/test/)
 test-lava-junit:
        $(JAVA) -Dzdir=$(Z_DIR) junit.textui.TestRunner gzz.TestLava
 
Index: gzz/TODO
diff -u gzz/TODO:1.382 gzz/TODO:1.383
--- gzz/TODO:1.382      Sat Nov  9 15:19:25 2002
+++ gzz/TODO    Sun Nov 10 18:08:55 2002
@@ -40,14 +40,7 @@
            - sane exception if ../mstmpimg isn't found
        - web page update: CVS link is broken
     benja:
-       - fix testRenderScene
-       - unit tests that check that Gzz.py really starts
-         the client.
-         FOR BOTH AWT AND GL.
-         Must also check some pixels of the resulting graphics.
-         Absolutely necessary to avoid breakage of one or the other system.
-         Should be easily generalizable so we can make tests
-         for all demos as well.
+       - Check graphics in client starting unit tests
        + PEG asynch ms blocks
            + asynch xu links?
     humppake:
Index: gzz/test/gzz/view/cellvobfactory.test
diff -u gzz/test/gzz/view/cellvobfactory.test:1.4 
gzz/test/gzz/view/cellvobfactory.test:1.5
--- gzz/test/gzz/view/cellvobfactory.test:1.4   Fri Nov  1 14:53:53 2002
+++ gzz/test/gzz/view/cellvobfactory.test       Sun Nov 10 18:08:55 2002
@@ -8,7 +8,7 @@
 
 import gzz
 from gzz.impl import ModularSpace
-from gzz.view import CellVobFactory, TextCellContentView, ViewContext
+from gzz.view import CellVobFactory, TextCellContentView, ViewContext, 
MockViewContext
 from gzz.vob import *
 from test.tools.gfx import *
 from test.tools import tools
@@ -20,22 +20,6 @@
 tv = TextCellContentView(win.getGraphicsAPI().getTextStyle(
                "sans", 0, 20))
 
-class VC(ViewContext):
-    def getAccursed(self):
-       return cell
-    
-    def getCellContentView(self):
-       return tv
-
-    def getCursorColors(self, cell):
-       return None
-
-    def isMarked(self, cell):
-       return 0
-    
-    def getCursorOffset(self, *args):
-       return 0
-
 bgc = (0, 0, 255)
 
 def checkbox(x, y, w, h, color):
@@ -57,7 +41,8 @@
     box = vs.orthoBoxCS(0, "A", 0, 100, 100, 1, 1, 200, 50)
     
     cvf = CellVobFactory()
-    context = VC()
+    context = MockViewContext()
+    context.c, context.ccv = cell, tv
     cvf.place(cell, vs, box, context)
 
     render(vs)
Index: gzz/test/gzz/view/renderscene.test
diff -u gzz/test/gzz/view/renderscene.test:1.3 
gzz/test/gzz/view/renderscene.test:1.4
--- gzz/test/gzz/view/renderscene.test:1.3      Tue Oct 29 16:21:26 2002
+++ gzz/test/gzz/view/renderscene.test  Sun Nov 10 18:08:55 2002
@@ -21,41 +21,28 @@
 """
 
 import gzz, java
+from gzz.zzutil.Ids import *
 from test.tools.tools import *
 from test.tools.gfx import *
 
 space = gzz.impl.ModularSpace(*spaceArgList())
 
-class VC(gzz.view.ViewContext):
-    def __init__(self, cell, cv, ccv):
-        self.cell, self.cv, self.ccv = (cell, cv, ccv)
-    
-    def getAccursed(self):
-       return self.cell
-    
-    def getCellView(self):
-        return self.cv
-    
-    def getCellContentView(self):
-       return self.ccv
-
-    def getCursorColors(self, cell):
-       return None
-
-    def isMarked(self, cell):
-       return 0
-    
-    def getCursorOffset(self, *args):
-       return 0
-
-
 def testRenderScene():
     view = gzz.view.RowColView(0)
     cellview = gzz.view.CellVobFactory()
     contentview = 
gzz.view.TextCellContentView(win.getGraphicsAPI().getTextStyle(
                                       "sans", 0, 20))
 
-    vc = VC(space.getHomeCell(), cellview, contentview)
-
-    view.render(getvs(), 0, vc)
+    vc = gzz.view.MockViewContext()
+    vc.v = view
+    vc.cv = cellview
+    vc.ccv = contentview
+    vc.c = space.getHomeCell()
+    vc.d = [space.getDim(d) for d in [d_1, d_2, d_3]]
+
+    try:
+        view.render(getvs(), 0, vc)
+    except java.lang.Throwable, t:
+        t.printStackTrace()
+        raise t
 
Index: gzz/test/testutil.py
diff -u gzz/test/testutil.py:1.34 gzz/test/testutil.py:1.35
--- gzz/test/testutil.py:1.34   Fri Nov  8 15:54:55 2002
+++ gzz/test/testutil.py        Sun Nov 10 18:08:55 2002
@@ -217,6 +217,7 @@
         pass
     if len(test) == 0:
        test = ['test/']
+    sys.path.extend(test)
     class Starter(java.lang.Runnable):
        def run(self):
            try: