[Gnash-commit] /srv/bzr/gnash/trunk r10355: More tests for initObj properties.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10355
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Wed 2008-11-26 10:06:38 +0100
message:
  More tests for initObj properties.
modified:
  libcore/character.cpp
  testsuite/misc-ming.all/attachMovieLoopingTest.c

=== modified file 'libcore/character.cpp'
--- a/libcore/character.cpp     2008-11-25 16:13:14 +0000
+++ b/libcore/character.cpp     2008-11-26 09:06:38 +0000
@@ -957,10 +957,8 @@
 {
        // Translate to the -180 .. 180 range
        rot = std::fmod (rot, 360.0);
-       if (rot > 180.0)
-               rot -= 360.0;
-       else if (rot < -180.0)
-               rot += 360.0;
+       if (rot > 180.0) rot -= 360.0;
+       else if (rot < -180.0) rot += 360.0;
 
        //log_debug("_rotation: %d", rot);
 
@@ -974,7 +972,7 @@
        }
 
        SWFMatrix m = getMatrix();
-        m.set_rotation(rotation);
+    m.set_rotation(rotation);
        setMatrix(m); // we update the cache ourselves
 
        _rotation = rot;

=== modified file 'testsuite/misc-ming.all/attachMovieLoopingTest.c'
--- a/testsuite/misc-ming.all/attachMovieLoopingTest.c  2008-11-24 16:56:33 
+0000
+++ b/testsuite/misc-ming.all/attachMovieLoopingTest.c  2008-11-26 09:06:38 
+0000
@@ -113,10 +113,14 @@
             "           trace('hello redsquare'); "
             "           if (counter > 0) {"
             "               xcheck_equals(this._x, counter * 70);"
+            "               xcheck_equals(Math.round(this._xscale), 99);"
+            "               xcheck_equals(Math.round(this._yscale), "
+            "                       Math.round((10 * counter +5) / 60 * 100));"
             "                  xcheck_equals(this._height, 10 * counter + 5); "
             "                  xcheck_equals(this.aProperty, 6); "
             "           } else {"
             "               check_equals(this._x, 0);"
+            "               check_equals(this._xscale, 100);"
             "               xcheck_equals(this._height, 60.1);"
             "                  check_equals(this.aProperty, undefined); "
             "           };"
@@ -129,6 +133,7 @@
                "if ( counter < 4 ) {"
                "       if ( counter > 0 ) { "
                "               initObj.aProperty = 6;"
+               "               initObj._xscale = 99;"
                "               initObj._x = 70*counter;"
                "               initObj._height = 10*counter + 5; "
                "               attachMovie('redsquare', "
@@ -146,7 +151,7 @@
                "       counter++;"
                "       note('Next counter is '+counter);"
                "} else {"
-               "       totals(16); stop();"
+               "       totals(23); stop();"
                "}"
                );