[Gzz-commits] libvob test/vob/gl/glvobcoorder.test test/vob/v...

[Asko Soukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Asko Soukka <address@hidden>    03/04/08 11:26:10

Modified files:
        test/vob/gl    : glvobcoorder.test 
        test/vob/vobs  : textvob.test 
Added files:
        test/vob/vobs  : pinstub.test 
        org/nongnu/libvob/vobs: PinStub.java 

Log message:
        pinstub

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/gl/glvobcoorder.test.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/vobs/pinstub.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/vobs/textvob.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/vobs/PinStub.java?rev=1.1

Patches:
Index: libvob/test/vob/gl/glvobcoorder.test
diff -u libvob/test/vob/gl/glvobcoorder.test:1.10 
libvob/test/vob/gl/glvobcoorder.test:1.11
--- libvob/test/vob/gl/glvobcoorder.test:1.10   Tue Apr  1 08:55:38 2003
+++ libvob/test/vob/gl/glvobcoorder.test        Tue Apr  8 11:26:10 2003
@@ -243,21 +243,6 @@
     putThings()
     checkAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
 
-#test distorted outside (should not be drawn)
-#normally without distortion this should be drawn
-    from org.nongnu.libvob.gl import PaperMill
-    paper = PaperMill.getInstance().getPaper(57)
-    pq = GLRen.createPaperQuad(paper, 0, 0, 1, 1, 1)
-    cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
-    cs_d = c.distort(cs, 0, 0, 1, 1, 1, 0.1) 
-    cs_clip = c.affine(0, 0, 10, 100, 100, 0, 0, 100)
-    cs_cull = c.cull(cs_d, cs_clip)
-    vs.map.clear()
-    vs.map.put(vob.vobs.SolidBackdropVob(Color.red))
-    vs.map.put(pq, cs_cull, 0)
-    render(vs)
-    checkAvgColor(10, 10, 80, 80, (255, 0, 0), delta=50)
-
 #test same area (should be drawn)
     cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
     cs_clip = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
@@ -282,10 +267,23 @@
     putThings()
     checkNotAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
 
+#test findBoundingBox bugfix (should be drawn)
+    cs_box = c.orthoBox(0, 0, 0, 0, 200, 100, 1, 2)
+    cs_clip = c.orthoBox(0, 0, 100, 0, 100, 100, 1, 1)
+    cs_cull = c.cull(cs_box, cs_clip)
+
+    putThings()
+    checkNotAvgColor(0, 0, 200, 200, (255, 0, 0), delta=50)
+
 ##test distorted inside (should be drawn)
+#normally without distortion this should not be drawn
+    from org.nongnu.libvob.gl import PaperMill
+    paper = PaperMill.getInstance().getPaper(57)
+    pq = GLRen.createPaperQuad(paper, 0, 0, 1, 1, 1)
+
     cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
-    cs_d = c.distort(cs, 0, 0, 1, 1, 1, 0.1) 
-    cs_clip = c.affine(0, 0, 10, 90, 100, 0, 0, 100)
+    cs_d = c.distort(cs, 0, 0, 1, 1, 0.1, 1) 
+    cs_clip = c.affine(0, 0, 110, 110, 10, 0, 0, 10)
     cs_cull = c.cull(cs_d, cs_clip)
 
     vs.map.clear()
@@ -293,15 +291,7 @@
     vs.map.put(pq, cs_cull, 0)
     render(vs)
 
-    checkNotAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
-
-#test findBoundingBox bugfix (should be drawn)
-    cs_box = c.orthoBox(0, 0, 0, 0, 200, 100, 1, 2)
-    cs_clip = c.orthoBox(0, 0, 100, 0, 100, 100, 1, 1)
-    cs_cull = c.cull(cs_box, cs_clip)
-
-    putThings()
-    checkNotAvgColor(0, 0, 200, 200, (255, 0, 0), delta=50)
+    checkNotAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)    
        
 def testInterpolateType():
     """Test that cses of different types get interpolated
@@ -317,7 +307,5 @@
     checkInterp(vs, vs2, interp , 0, cs1, [0, 1, 0], [0, 2, 0])
     checkInterp(vs, vs2, interp , 1, cs1, [0, 1, 0], [-1, 0, 0])
     checkInterp(vs, vs2, interp , .5, cs1, [0, 1, 0], [-.5, 1, 0])
-
-    
 
 # : vim: set syntax=python :
Index: libvob/test/vob/vobs/textvob.test
diff -u libvob/test/vob/vobs/textvob.test:1.2 
libvob/test/vob/vobs/textvob.test:1.3
--- libvob/test/vob/vobs/textvob.test:1.2       Sun Mar 23 12:53:11 2003
+++ libvob/test/vob/vobs/textvob.test   Tue Apr  8 11:26:10 2003
@@ -46,7 +46,7 @@
     failUnlessApprox(4, sty3.getWidth("xx", 1), 10)
 
 def testStyleScaling():
-    """Tests scaling by height.
+    """Test scaling by height.
     """
     for height in range (0, 100):
        scale = sty1.getScaleByHeight(height)
@@ -64,7 +64,7 @@
     """
 
 def testWH():
-    """Tests that TextVob is drawn with the width and height
+    """Test that TextVob is drawn with the width and height
     that it claims with getWidth() and getHeight().
     """
     text_scale = 0