[Gzz-commits] fenfire/org/fenfire test/test.py util/RDFUtil.j...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/05/11 12:10:21

Modified files:
        org/fenfire/test: test.py 
        org/fenfire/util: RDFUtil.java 
        org/fenfire/view: papercanvas2d.test 

Log message:
        Failing graphical test

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/test/test.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/RDFUtil.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/papercanvas2d.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/test/test.py
diff -u fenfire/org/fenfire/test/test.py:1.10 
fenfire/org/fenfire/test/test.py:1.11
--- fenfire/org/fenfire/test/test.py:1.10       Tue Apr 22 09:09:09 2003
+++ fenfire/org/fenfire/test/test.py    Sun May 11 12:10:21 2003
@@ -44,6 +44,7 @@
 import re
 import traceback
 import org.fenfire.util.dbg
+import vob
 
 def test(module):
     tests = [test for test in dir(module) if test.startswith('test')]
@@ -51,9 +52,10 @@
 
     for test in tests:
         fn = getattr(module, test)
+       rawname = '%s.%s' % (module.__name__, test)
 
         if not fn.__doc__:
-            name = '%s.%s' % (module.__name__, test)
+            name = rawname
         else:
             lines = fn.__doc__.split('\n')
             if lines[0] == '':
@@ -70,6 +72,7 @@
             continue
 
         try:
+           org.fenfire.test.gfx._didRender = 0
             if hasattr(module, 'setUp'): module.setUp()
             fn()
             if hasattr(module, 'tearDown'): module.tearDown()
@@ -80,6 +83,17 @@
                 'test': test,
                 'testname': name,
             }])
+           if org.fenfire.test.gfx._didRender:
+               print "SAVING IMAGE\n"
+               file = "testfail_"+rawname+".png"
+               print "Saving result of graphical test to ", file
+               s = org.fenfire.test.gfx.win.getSize()
+               vob.putil.saveimage.save(file,
+                   org.fenfire.test.gfx.win.
+                       readPixels(0, 0, s.width, s.height),
+                   s.width, s.height
+                   )
+            
         else:
             print "ok."
 
Index: fenfire/org/fenfire/util/RDFUtil.java
diff -u fenfire/org/fenfire/util/RDFUtil.java:1.10 
fenfire/org/fenfire/util/RDFUtil.java:1.11
--- fenfire/org/fenfire/util/RDFUtil.java:1.10  Thu May  8 09:22:07 2003
+++ fenfire/org/fenfire/util/RDFUtil.java       Sun May 11 12:10:21 2003
@@ -19,10 +19,11 @@
        Object obj = Nodes.N();
        fen.graph.add(obj, RDF.type, type);
 
-       if(dbg) p("N: "+fen+" "+fen.graph+" "+fen.constgraph+
-         " "+obj+" "+type);
-
-       if (!isNodeType(fen, obj, type)) throw new Error("Impossible!");
+       if(dbg) {
+           p("N: "+fen+" "+fen.graph+" "+fen.constgraph+
+             " "+obj+" "+type);
+           if (!isNodeType(fen, obj, type)) throw new Error("Impossible!");
+       }
 
        return obj;
 
Index: fenfire/org/fenfire/view/papercanvas2d.test
diff -u fenfire/org/fenfire/view/papercanvas2d.test:1.2 
fenfire/org/fenfire/view/papercanvas2d.test:1.3
--- fenfire/org/fenfire/view/papercanvas2d.test:1.2     Thu May  8 09:38:57 2003
+++ fenfire/org/fenfire/view/papercanvas2d.test Sun May 11 12:10:21 2003
@@ -5,15 +5,29 @@
 from org.nongnu import alph
 from org.nongnu import storm
 
-from org.fenfire.vocab import SPATIAL, PAPER
+from org.fenfire.vocab import SPATIAL, PAPER, PP
 
 ff.test.gfx.needGL()
 
+from org.fenfire.test.gfx import *
+
+class DummyMill(vob.gl.PaperMill):
+    def __init__(self, pap):
+       self.pap = pap
+    def getPaper(self, seed):
+       return self.pap
+
 def testRenderClick():
+    """Test that rendering a canvas works right and
+    that we get a click.
+    """
+
+    # Create the fen, set up data
+
     fen = ff.test.fen.newFen()
     con = ff.util.AlphContent(fen)
 
-    nodec = ff.swamp.Nodes.N()
+    nodec = ff.util.RDFUtil.N(fen, PP.Paper)
     node1 = ff.swamp.Nodes.N()
     node2 = ff.swamp.Nodes.N()
 
@@ -29,4 +43,34 @@
     ff.util.RDFUtil.setInt(fen, node2, SPATIAL.coordX, 200)
     ff.util.RDFUtil.setInt(fen, node2, SPATIAL.coordY, 500)
 
-    vs = ff.test.gfx.getvs()
+
+    # Create the view structure
+    vs = getvs()
+
+    textnodeview = ff.view.TextNodeView(
+       fen.txtfunc, 
+       vs.gfxapi.getTextStyle("Sans", 0, 16),
+       1)
+
+
+    canvasView2D = ff.view.CanvasView2D(fen, textnodeview)
+
+    paperView2D = ff.view.PaperView2D(None, canvasView2D)
+    paperView2D.paperMill = DummyMill(
+       vob.gl.SpecialPapers.solidPaper(java.awt.Color.yellow))
+
+    irregu2D = ff.view.IrregularViewportView2D(paperView2D)
+
+    # Finally, create the vobscene
+    vs.put(SolidBackdropVob(Color.black))
+
+    box2screen = vs.orthoBoxCS(0, "b2s", 0, 100, 100, 1, 1, 300, 300)
+    box2plane = vs.orthoBoxCS(0, "b2p", 0, 0, 0, .5, .5, 300, 300)
+    
+    irregu2D.render(vs, nodec, box2screen, box2screen, box2plane)
+
+    render(vs)
+
+    checkAvgColor(50, 50, 10, 10, (0, 0, 0), 5)
+    checkAvgColor(150, 150, 10, 10, (255, 255, 0), 5)
+    checkAvgColor(450, 450, 10, 10, (0, 0, 0), 5)