fixed bugs in test cases

geishatokyo-lightning · Dec 14, 2011 · d44fc01 · d44fc01
1 parent 6e3537b
commit d44fc01
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/lightning_core/test/testcssanim.py b/lightning_core/test/testcssanim.py
@@ -186,7 +186,7 @@ def assert_frame(frame, index, sx,sy, wx,wy, tx,ty, ctf, visible):
             self.assertAlmostEqual(frame.wy, wy)
             self.assertAlmostEqual(frame.tx, tx)
             self.assertAlmostEqual(frame.ty, ty)
-            self.assertAlmostEqual(frame.ctf, ctf)
+            self.assertEqual(frame.ctf, ctf)
             self.assertAlmostEqual(frame.visible, visible)
 
         self.assertEqual(len(self.anim_table), 1)
@@ -210,7 +210,7 @@ def assert_frame(frame, key, sx,sy, wx,wy, tx,ty, ctf, depth, visible):
             self.assertAlmostEqual(frame.wy, wy)
             self.assertAlmostEqual(frame.tx, tx)
             self.assertAlmostEqual(frame.ty, ty)
-            self.assertAlmostEqual(frame.ctf, ctf)
+            self.assertEqual(frame.ctf, ctf)
             self.assertEqual(frame.depth, depth)
             self.assertAlmostEqual(frame.visible, visible)
 

diff --git a/lightning_core/test/testparser.py b/lightning_core/test/testparser.py
@@ -665,10 +665,19 @@ def test_colortrans_only_alpha(self):
 
     def test__get_pixel_vals(self):
         self.assertAlmostEqual(PUtil.get_pixel_vals(200), 10)
-        self.assertAlmostEqual(PUtil.get_pixel_vals(200,300,400), [10,15,20])
+        vals = PUtil.get_pixel_vals(200,300,400)
+        self.assertAlmostEqual(vals[0], 10)
+        self.assertAlmostEqual(vals[1], 15)
+        self.assertAlmostEqual(vals[2], 20)
         self.assertAlmostEqual(len(PUtil.get_pixel_vals(200,None, 400)), 3)
-        self.assertAlmostEqual(PUtil.get_pixel_vals(200, 0, 400), [10, 0,20])
-        self.assertAlmostEqual(PUtil.get_pixel_vals(200,None, 400), [10,None,20])
+        vals = PUtil.get_pixel_vals(200,0,400)
+        self.assertAlmostEqual(vals[0], 10)
+        self.assertAlmostEqual(vals[1], 0)
+        self.assertAlmostEqual(vals[2], 20)
+        vals = PUtil.get_pixel_vals(200,None,400)
+        self.assertAlmostEqual(vals[0], 10)
+        self.assertEqual(vals[1], None)
+        self.assertAlmostEqual(vals[2], 20)
 
     def test__convert_color_as_tuple(self):
         elm1 = {'red':100, 'green':0, 'blue':256}