[Gnash-commit] /srv/bzr/gnash/trunk r9810: More tests for ColorTransform.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9810
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2008-09-22 15:13:25 +0200
message:
  More tests for ColorTransform.
modified:
  testsuite/actionscript.all/ColorTransform.as
  testsuite/actionscript.all/Transform.as
    ------------------------------------------------------------
    revno: 9806.1.2
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Mon 2008-09-22 14:52:45 +0200
    message:
      More tests for ColorTransform.
    modified:
      testsuite/actionscript.all/ColorTransform.as
      testsuite/actionscript.all/Transform.as

=== modified file 'testsuite/actionscript.all/ColorTransform.as'
--- a/testsuite/actionscript.all/ColorTransform.as      2008-09-22 11:41:47 
+0000
+++ b/testsuite/actionscript.all/ColorTransform.as      2008-09-22 12:52:45 
+0000
@@ -85,10 +85,34 @@
 
 xcheck_equals (c.toString(), "(redMultiplier=NaN, greenMultiplier=3, 
blueMultiplier=NaN, alphaMultiplier=1, redOffset=NaN, greenOffset=NaN, 
blueOffset=NaN, alphaOffset=456)");
 
+// Only 8 or more arguments are valid.
+c = new ColorTransform(0, 2, 3);
+xcheck_equals (c.toString(), "(redMultiplier=1, greenMultiplier=1, 
blueMultiplier=1, alphaMultiplier=1, redOffset=0, greenOffset=0, blueOffset=0, 
alphaOffset=0)");
+
+c = new ColorTransform(0, 2, 3, 4);
+xcheck_equals (c.toString(), "(redMultiplier=1, greenMultiplier=1, 
blueMultiplier=1, alphaMultiplier=1, redOffset=0, greenOffset=0, blueOffset=0, 
alphaOffset=0)");
+
+c = new ColorTransform(0, 2, 3, 4, 5, 6, 7);
+xcheck_equals (c.toString(), "(redMultiplier=1, greenMultiplier=1, 
blueMultiplier=1, alphaMultiplier=1, redOffset=0, greenOffset=0, blueOffset=0, 
alphaOffset=0)");
+
+c = new ColorTransform(0, 2, 3, 4, 5, 6, 7, 8);
+xcheck_equals (c.toString(), "(redMultiplier=0, greenMultiplier=2, 
blueMultiplier=3, alphaMultiplier=4, redOffset=5, greenOffset=6, blueOffset=7, 
alphaOffset=8)");
+
+c = new ColorTransform(0, 2, 3, 4, 5, 6, 7, 8, 9);
+xcheck_equals (c.toString(), "(redMultiplier=0, greenMultiplier=2, 
blueMultiplier=3, alphaMultiplier=4, redOffset=5, greenOffset=6, blueOffset=7, 
alphaOffset=8)");
+
+// Check object type strictness.
+
+o = { redMultiplier:2, greenMultiplier:3, blueMultiplier:3, alphaMultiplier:0, 
redOffset:3, greenOffset:4, blueOffset:3, alphaOffset:3 };
+o.toString = ColorTransform.toString;
+check_equals(o.toString(), "[object Object]");
+
+
+
 //-------------------------------------------------------------
 // END OF TEST
 //-------------------------------------------------------------
 
-totals(29);
+totals(35);
 
 #endif // OUTPUT_VERSION >= 8

=== modified file 'testsuite/actionscript.all/Transform.as'
--- a/testsuite/actionscript.all/Transform.as   2008-09-20 12:29:25 +0000
+++ b/testsuite/actionscript.all/Transform.as   2008-09-22 12:52:45 +0000
@@ -69,6 +69,32 @@
 //check_equals(t.concatenatedMatrix.toString(), "(a=1, b=0, c=0, d=1, tx=0, 
ty=0)");
 //check_equals(t.pixelBounds.toString(), "(x=-2, y=48, w=804, h=804)");
 
+/// transform.colorTransform
+
+mcx = _root.createEmptyMovieClip("mcx", getNextHighestDepth());
+xcheck_equals(mcx.transform.colorTransform.toString(), "(redMultiplier=1, 
greenMultiplier=1, blueMultiplier=1, alphaMultiplier=1, redOffset=0, 
greenOffset=0, blueOffset=0, alphaOffset=0)");
+
+mcx._alpha = 23;
+xcheck_equals(mcx.transform.colorTransform.toString(), "(redMultiplier=1, 
greenMultiplier=1, blueMultiplier=1, alphaMultiplier=0.2265625, redOffset=0, 
greenOffset=0, blueOffset=0, alphaOffset=0)");
+
+mcx._alpha = -203;
+xcheck_equals(mcx.transform.colorTransform.toString(), "(redMultiplier=1, 
greenMultiplier=1, blueMultiplier=1, alphaMultiplier=-2.02734375, redOffset=0, 
greenOffset=0, blueOffset=0, alphaOffset=0)");
+
+mcx._alpha = -99;
+xcheck_equals(mcx.transform.colorTransform.toString(), "(redMultiplier=1, 
greenMultiplier=1, blueMultiplier=1, alphaMultiplier=-0.98828125, redOffset=0, 
greenOffset=0, blueOffset=0, alphaOffset=0)");
+
+mcx._alpha = 13000;
+xcheck_equals(mcx.transform.colorTransform.toString(), "(redMultiplier=1, 
greenMultiplier=1, blueMultiplier=1, alphaMultiplier=-128, redOffset=0, 
greenOffset=0, blueOffset=0, alphaOffset=0)");
+
+r = new ColorTransform(2, 3, 4, 5, 5, -5, 5, -5);
+mcx.transform.colorTransform = r;
+xcheck_equals(mcx.transform.colorTransform.toString(), "(redMultiplier=2, 
greenMultiplier=3, blueMultiplier=4, alphaMultiplier=5, redOffset=5, 
greenOffset=-5, blueOffset=5, alphaOffset=-5)");
+
+r = new ColorTransform(0, 1, 1, 1, 0, 0, 255, 0);
+mcx.transform.colorTransform = r;
+xcheck_equals(mcx.transform.colorTransform.toString(), "(redMultiplier=0, 
greenMultiplier=1, blueMultiplier=1, alphaMultiplier=1, redOffset=0, 
greenOffset=0, blueOffset=255, alphaOffset=0)");
+
+
 
 // Tricks with the flash package:
 flash.geom.Matrix = undefined;
@@ -168,5 +194,5 @@
 xcheck_equals(mcOld.transform.matrix.toString(), "(a=4, b=0.300000011920929, 
c=0.300000011920929, d=1, tx=1, ty=0)");
 
 
-totals(56);
+totals(63);
 #endif