[Gzz-commits] libvob org/nongnu/libvob/util/ColorUtil.java te...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/11 08:57:54

Modified files:
        org/nongnu/libvob/util: ColorUtil.java 
        test           : testutil.py 
        test/tools     : gfx.py 
        test/vob/api   : vobcoorder.test vobmatcher.test 
        test/vob/util  : imagesize.test priorityqueue.test 
Added files:
        org/nongnu/libvob/util: SaveImage.java __init__$py.class 
                                dbg$py.class saveimage.py 
        org/nongnu/libvob/vobs: TestSpotVob.java 
        test/vob/util  : modularspace.png 

Log message:
        NONTRIVIAL AWT TESTS PASS

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/util/SaveImage.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/util/__init__$py.class?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/util/dbg$py.class?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/util/saveimage.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/util/ColorUtil.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/vobs/TestSpotVob.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/testutil.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/tools/gfx.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/api/vobcoorder.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/api/vobmatcher.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/util/modularspace.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/util/imagesize.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/util/priorityqueue.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/util/ColorUtil.java
diff -u libvob/org/nongnu/libvob/util/ColorUtil.java:1.1 
libvob/org/nongnu/libvob/util/ColorUtil.java:1.2
--- libvob/org/nongnu/libvob/util/ColorUtil.java:1.1    Sun Mar  9 08:13:14 2003
+++ libvob/org/nongnu/libvob/util/ColorUtil.java        Tue Mar 11 08:57:53 2003
@@ -26,7 +26,6 @@
  * Written by Tuomas Lukka
  */
 package org.nongnu.libvob.util;
-import org.nongnu.libvob.*;
 import java.util.*;
 import java.awt.*;
 
@@ -34,7 +33,7 @@
  */
 
 public final class ColorUtil {
-public static final String rcsid = "$Id: ColorUtil.java,v 1.1 2003/03/09 
13:13:14 tjl Exp $";
+public static final String rcsid = "$Id: ColorUtil.java,v 1.2 2003/03/11 
13:57:53 tjl Exp $";
 
     public static Color[] fadingColors_line(int n) {
        Color[] res = new Color[n];
Index: libvob/test/testutil.py
diff -u libvob/test/testutil.py:1.3 libvob/test/testutil.py:1.4
--- libvob/test/testutil.py:1.3 Tue Mar 11 08:35:00 2003
+++ libvob/test/testutil.py     Tue Mar 11 08:57:54 2003
@@ -70,7 +70,7 @@
         file = "testfail_"+name+".png"
         print "Saving result of graphical test to ", file
         s = gfx.win.getSize()
-        gzz.util.saveimage.save(file,
+        vob.util.saveimage.save(file,
             gfx.win.readPixels(0, 0, s.width, s.height),
             s.width, s.height
             )
Index: libvob/test/tools/gfx.py
diff -u libvob/test/tools/gfx.py:1.3 libvob/test/tools/gfx.py:1.4
--- libvob/test/tools/gfx.py:1.3        Tue Mar 11 06:24:29 2003
+++ libvob/test/tools/gfx.py    Tue Mar 11 08:57:54 2003
@@ -82,7 +82,7 @@
 def getAvgColor(x, y, w, h):
     
     colors = win.readPixels(x, y, w, h)
-    color = gzz.util.ColorUtil.avgColor(colors)
+    color = vob.util.ColorUtil.avgColor(colors)
     return [c*255 for c in color.getComponents(None)]
 
 def checkAvgColor(x, y, w, h, color, delta=10):
@@ -126,7 +126,7 @@
        for i in range(0, len(src), 3):
            vs.map.clear()
            vs.map.put(vob.vobs.SolidBackdropVob(Color.red))
-           d = TestSpotVob(src[i], src[i+1], src[i+2])
+           d = vob.vobs.TestSpotVob(src[i], src[i+1], src[i+2])
            vs.map.put(d, cs)
            render(vs)
            checkNotAvgColor(
Index: libvob/test/vob/api/vobcoorder.test
diff -u libvob/test/vob/api/vobcoorder.test:1.1 
libvob/test/vob/api/vobcoorder.test:1.2
--- libvob/test/vob/api/vobcoorder.test:1.1     Tue Mar 11 08:32:17 2003
+++ libvob/test/vob/api/vobcoorder.test Tue Mar 11 08:57:54 2003
@@ -22,9 +22,6 @@
 
 
 
-from gzz.vob import *
-from gzz.vob.impl import *
-from gzz.vob.vobs import *
 from java.awt import Color
 from test.tools.gfx import *
 
Index: libvob/test/vob/api/vobmatcher.test
diff -u libvob/test/vob/api/vobmatcher.test:1.1 
libvob/test/vob/api/vobmatcher.test:1.2
--- libvob/test/vob/api/vobmatcher.test:1.1     Tue Mar 11 08:32:17 2003
+++ libvob/test/vob/api/vobmatcher.test Tue Mar 11 08:57:54 2003
@@ -21,11 +21,10 @@
 # 
 
 
-import gzz
 import java
 
 def testMany():
-    v = gzz.vob.impl.DefaultVobMatcher()
+    v = vob.impl.DefaultVobMatcher()
 
     keys = {}
 
Index: libvob/test/vob/util/imagesize.test
diff -u libvob/test/vob/util/imagesize.test:1.2 
libvob/test/vob/util/imagesize.test:1.3
--- libvob/test/vob/util/imagesize.test:1.2     Tue Mar 11 08:35:00 2003
+++ libvob/test/vob/util/imagesize.test Tue Mar 11 08:57:54 2003
@@ -24,7 +24,7 @@
 from java.io import File
 
 def testReadImage():
-    s = vob.util.ImageSize.readSize(File("test/gzz/util/modularspace.png"))
+    s = vob.util.ImageSize.readSize(File("test/vob/util/modularspace.png"))
 
     failIfEqual(s, None)
     failUnlessEqual(s.width, 730)
Index: libvob/test/vob/util/priorityqueue.test
diff -u libvob/test/vob/util/priorityqueue.test:1.1 
libvob/test/vob/util/priorityqueue.test:1.2
--- libvob/test/vob/util/priorityqueue.test:1.1 Tue Mar 11 08:32:17 2003
+++ libvob/test/vob/util/priorityqueue.test     Tue Mar 11 08:57:54 2003
@@ -21,10 +21,10 @@
 # 
 
 
-import gzz, java
+import java
 
 def testBasicSort():
-    q = gzz.util.PriorityQueue()
+    q = vob.util.PriorityQueue()
     q.add("A", 5)
     q.add("B", 3)
     q.add("C", 8)
@@ -39,7 +39,7 @@
     """Test the changing of the priority of an existing job
     """
 
-    q = gzz.util.PriorityQueue()
+    q = vob.util.PriorityQueue()
 
     A, B, C, D, E = "A", "B", "C", "D", "E"