[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29773] branches/soc-2010-leifandersen: 1.

[Leif Andersen]

Revision: 29773
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29773
Author:   leifandersen
Date:     2010-06-28 18:31:34 +0200 (Mon, 28 Jun 2010)

Log Message:
-----------
1.  Added more tests.

2.  Updated the render test operator so that it searches for PIL in the same folder as the test .blend files themselves.

Modified Paths:
--------------
    branches/soc-2010-leifandersen/release/scripts/op/tests_render.py

Added Paths:
-----------
    branches/soc-2010-leifandersen/tests/render/compo_idmask_cubes.blend
    branches/soc-2010-leifandersen/tests/render/compo_map_uv.blend
    branches/soc-2010-leifandersen/tests/render/compo_map_uv_cubes.blend
    branches/soc-2010-leifandersen/tests/render/compo_map_zcombine_cubes.blend
    branches/soc-2010-leifandersen/tests/render/composite_image.blend
    branches/soc-2010-leifandersen/tests/render/composite_layers.blend
    branches/soc-2010-leifandersen/tests/render/displace.blend
    branches/soc-2010-leifandersen/tests/render/piltest.py
    branches/soc-2010-leifandersen/tests/render/render/compo_idmask_cubes.blend.png
    branches/soc-2010-leifandersen/tests/render/render/compo_map_uv.blend.png
    branches/soc-2010-leifandersen/tests/render/render/compo_map_uv_cubes.blend.png
    branches/soc-2010-leifandersen/tests/render/render/compo_map_zcombine_cubes.blend.blend.png
    branches/soc-2010-leifandersen/tests/render/render/composite_image.blend.blend.png
    branches/soc-2010-leifandersen/tests/render/render/composite_layers.blend.png
    branches/soc-2010-leifandersen/tests/render/render/displace.blend.png

Removed Paths:
-------------
    branches/soc-2010-leifandersen/tests/piltest.py

Modified: branches/soc-2010-leifandersen/release/scripts/op/tests_render.py
===================================================================
--- branches/soc-2010-leifandersen/release/scripts/op/tests_render.py	2010-06-28 16:07:21 UTC (rev 29772)
+++ branches/soc-2010-leifandersen/release/scripts/op/tests_render.py	2010-06-28 16:31:34 UTC (rev 29773)
@@ -8,8 +8,8 @@
 PILTEST_PY = "piltest.py"
 
 # Probably will be rewritten in C
-def compare_image(image1, image2):
-    command = PYTHON_BIN + " " + PILTEST_PY + " " + image1 + " " + image2
+def compare_image(image1, image2, directory):
+    command = PYTHON_BIN + " " + os.path.join(directory, PILTEST_PY) + " " + image1 + " " + image2
     print(os.system(command))
 
 def render(path):
@@ -40,7 +40,7 @@
         (directory, filename) = os.path.split(self.properties.filepath)
         image1 = os.path.join(directory,"render",(filename + ".png"))
         image2 = render(self.properties.filepath)
-        compare_image(image1, image2)
+        compare_image(image1, image2, directory)
         return {'FINISHED'}
 
     def invoke(self, context, event):
@@ -64,7 +64,7 @@
     def execute(self, context):
         (directory, filename) = os.path.split(self.properties.filepath)
         for file in os.listdir(directory):
-            if file != 'output' and file != 'render' and file != 'anim':
+            if file != 'output' and file != 'render' and file != 'anim' and file != 'piltest.py':
                 bpy.ops.tests.render(filepath=self.properties.filepath)
         return {'FINISHED'}
 

Deleted: branches/soc-2010-leifandersen/tests/piltest.py
===================================================================
--- branches/soc-2010-leifandersen/tests/piltest.py	2010-06-28 16:07:21 UTC (rev 29772)
+++ branches/soc-2010-leifandersen/tests/piltest.py	2010-06-28 16:31:34 UTC (rev 29773)
@@ -1,43 +0,0 @@
-import Image
-import unittest
-import sys
-
-class TestImage(unittest.TestCase):
-    def setUp(self):
-        pass
-
-    def test_image(self):
-        if len(sys.argv) < 3:
-            self.fail("Please don't use this script")
-        image_path1 = sys.argv[1]
-        image_path2 = sys.argv[2]
-        im1 = Image.open(image_path1)
-        im2 = Image.open(image_path2)
-
-        im1_red = im1_green = im1_blue = im2_red = im2_green = im2_blue = 0
-
-        self.assertEquals(im1.size, im2.size)
-        for i in range(0, im1.size[0]):
-            for j in range(0, im1.size[1]):
-                im1_red+=im1.getpixel((i,j))[0]
-                im1_green+=im1.getpixel((i,j))[1]
-                im1_blue+=im1.getpixel((i,j))[2]
-                im2_red+=im2.getpixel((i,j))[0]
-                im2_green+=im2.getpixel((i,j))[1]
-                im2_blue+=im2.getpixel((i,j))[2]
-
-        im_red = abs(im1_red-im2_red)
-        im_green = abs(im1_green-im2_green)
-        im_blue = abs(im1_blue-im2_blue)
-
-        if im_red > 100 or im_green > 100 or im_blue > 100:
-            self.fail("Images are too different")
-
-
-def suite():
-    return unittest.TestSuite([
-unittest.TestLoader().loadTestsFromTestCase(TestImage),
-])
-
-if __name__ == "__main__":
-    unittest.TextTestRunner(verbosity=2).run(suite())

Added: branches/soc-2010-leifandersen/tests/render/compo_idmask_cubes.blend
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/compo_idmask_cubes.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/soc-2010-leifandersen/tests/render/compo_map_uv.blend
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/compo_map_uv.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/soc-2010-leifandersen/tests/render/compo_map_uv_cubes.blend
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/compo_map_uv_cubes.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/soc-2010-leifandersen/tests/render/compo_map_zcombine_cubes.blend
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/compo_map_zcombine_cubes.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/soc-2010-leifandersen/tests/render/composite_image.blend
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/composite_image.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/soc-2010-leifandersen/tests/render/composite_layers.blend
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/composite_layers.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/soc-2010-leifandersen/tests/render/displace.blend
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/displace.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Copied: branches/soc-2010-leifandersen/tests/render/piltest.py (from rev 29750, branches/soc-2010-leifandersen/tests/piltest.py)
===================================================================
--- branches/soc-2010-leifandersen/tests/render/piltest.py	                        (rev 0)
+++ branches/soc-2010-leifandersen/tests/render/piltest.py	2010-06-28 16:31:34 UTC (rev 29773)
@@ -0,0 +1,43 @@
+import Image
+import unittest
+import sys
+
+class TestImage(unittest.TestCase):
+    def setUp(self):
+        pass
+
+    def test_image(self):
+        if len(sys.argv) < 3:
+            self.fail("Please don't use this script")
+        image_path1 = sys.argv[1]
+        image_path2 = sys.argv[2]
+        im1 = Image.open(image_path1)
+        im2 = Image.open(image_path2)
+
+        im1_red = im1_green = im1_blue = im2_red = im2_green = im2_blue = 0
+
+        self.assertEquals(im1.size, im2.size)
+        for i in range(0, im1.size[0]):
+            for j in range(0, im1.size[1]):
+                im1_red+=im1.getpixel((i,j))[0]
+                im1_green+=im1.getpixel((i,j))[1]
+                im1_blue+=im1.getpixel((i,j))[2]
+                im2_red+=im2.getpixel((i,j))[0]
+                im2_green+=im2.getpixel((i,j))[1]
+                im2_blue+=im2.getpixel((i,j))[2]
+
+        im_red = abs(im1_red-im2_red)
+        im_green = abs(im1_green-im2_green)
+        im_blue = abs(im1_blue-im2_blue)
+
+        if im_red > 100 or im_green > 100 or im_blue > 100:
+            self.fail("Images are too different")
+
+
+def suite():
+    return unittest.TestSuite([
+unittest.TestLoader().loadTestsFromTestCase(TestImage),
+])
+
+if __name__ == "__main__":
+    unittest.TextTestRunner(verbosity=2).run(suite())

Added: branches/soc-2010-leifandersen/tests/render/render/compo_idmask_cubes.blend.png
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/render/compo_idmask_cubes.blend.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/soc-2010-leifandersen/tests/render/render/compo_map_uv.blend.png
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/render/compo_map_uv.blend.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/soc-2010-leifandersen/tests/render/render/compo_map_uv_cubes.blend.png
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/render/compo_map_uv_cubes.blend.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/soc-2010-leifandersen/tests/render/render/compo_map_zcombine_cubes.blend.blend.png
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/render/compo_map_zcombine_cubes.blend.blend.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/soc-2010-leifandersen/tests/render/render/composite_image.blend.blend.png
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/render/composite_image.blend.blend.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/soc-2010-leifandersen/tests/render/render/composite_layers.blend.png
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/render/composite_layers.blend.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/soc-2010-leifandersen/tests/render/render/displace.blend.png
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-leifandersen/tests/render/render/displace.blend.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream