[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-74-g75f6692

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  75f66923c34e36913bb88f5ac0ac4745f1d70fd2 (commit)
      from  94a88f8cb5ebbfa2896ec176a8c0cc91dd3ed9ad (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=75f66923c34e36913bb88f5ac0ac4745f1d70fd2


commit 75f66923c34e36913bb88f5ac0ac4745f1d70fd2
Author: Sandro Santilli <address@hidden>
Date:   Thu Feb 17 12:35:02 2011 +0100

    Add another test for GETURL tag and '_level.coverart' target. Still doesn't 
reproduce #32506

diff --git a/testsuite/misc-ming.all/loading/loadMovieTest.c 
b/testsuite/misc-ming.all/loading/loadMovieTest.c
index e1cc53a..23128c6 100644
--- a/testsuite/misc-ming.all/loading/loadMovieTest.c
+++ b/testsuite/misc-ming.all/loading/loadMovieTest.c
@@ -87,17 +87,23 @@ add_clip(SWFMovie mo, char* file, char* name,
        /* "Click" handler */
        snprintf(action,  1023,
                "%s.onPress = function () { "
-               "  if ( Key.isDown(Key.SHIFT) ) { "
+               "  if ( _root.clicks < 3 ) {"
+               "    coverart.loadMovie('%s');"
+               "    _level0.loadMethod = 'MovieClip.loadMovie';" 
+               "  } else if ( _root.clicks < 6 ) {"
                "    loadMovie('%s', '/coverart');" /* Uses GETURL tag */
                "    _level0.loadMethod = 'GETURL, target:/coverart';"
+               "  } else if ( _root.clicks < 9 ) {"
+               "    loadMovie('%s', '_level0.coverart');" /* Uses GETURL */
+               "    _level0.loadMethod = 'GETURL, target:_level0.coverart';"
                "  } else {"
-               "    coverart.loadMovie('%s');"
-               "    _level0.loadMethod = 'MovieClip.loadMovie';" 
+               "    _root.note('You are not supposed to be clicking anymore');"
+               "    return;"
                "  }"
                " _level0.expectLoaded = '%s';" 
                " note('Wait for the image to appear on the right. Then click 
on it.');"
                "};"
-               , name, url, url, fname);
+               , name, url, url, url, fname);
 
        ac = compileSWFActionCode(action);
 
@@ -160,18 +166,18 @@ add_coverart(SWFMovie mo, int x, int y)
                "  } else if ( _root.clicks < 7 ) {"
                "    _root.check_equals(_root.loadMethod, "
                "         'GETURL, target:/coverart');" 
+               "  } else if ( _root.clicks < 10 ) {"
+               "    _root.check_equals(_root.loadMethod, "
+               "         'GETURL, target:_level0.coverart');" 
                "  }"
 
-               "  if ( _root.clicks < 3 ) {"
-               "    _root.note('Click on the '+"
-               "      _root.imagenames[_root.clicks]+' image.');"
-               "  }"
-               "  else if ( _root.clicks < 6 ) {"
-               "    _root.note('SHIFT-Click on the '+"
-               "      _root.imagenames[_root.clicks-3]+' image.');"
+               "  if ( _root.clicks < 9 ) {"
+               "    _root.note(Math.floor(_root.clicks/3)+'.'+"
+               "    _root.clicks%%3+': Click on the '+"
+               "      _root.imagenames[_root.clicks%%3]+' image.');"
                "  } else {"
                "    _root.note('The test is over');"
-               "    _root.totals(44, '"__FILE__"');"
+               "    _root.totals(65, '"__FILE__"');"
                "    _root.END_OF_TEST = true;"
                "  }"
                "};"
@@ -344,7 +350,7 @@ main(int argc, char** argv)
        add_actions(mo,
                "_root.imagenames = ['first','second','third'];"
                "_root.clicks = 0;"
-               "note('Click on the '+_root.imagenames[_root.clicks]+' 
image.');"
+               "note('0.0: Click on the '+_root.imagenames[_root.clicks]+' 
image.');"
                "_level0.expectLoaded = 'loadMovieTest.swf';" 
                // TODO: add self-contained tests after each load
                //       like for the DragAndDropTest.as movie
diff --git a/testsuite/misc-ming.all/loading/loadMovieTestRunner.cpp 
b/testsuite/misc-ming.all/loading/loadMovieTestRunner.cpp
index 12e78c4..957c780 100644
--- a/testsuite/misc-ming.all/loading/loadMovieTestRunner.cpp
+++ b/testsuite/misc-ming.all/loading/loadMovieTestRunner.cpp
@@ -90,7 +90,7 @@ waitForLoad(MovieClip* from)
 }
 
 void
-clickCycle(MovieClip* coverart, bool withShift)
+clickCycle(MovieClip* coverart)
 {
 
        URL mediaURL(MEDIADIR"/");
@@ -104,14 +104,12 @@ clickCycle(MovieClip* coverart, bool withShift)
        tester->movePointerTo(80, 80);
        check(tester->isMouseOverMouseEntity());
 
-       if ( withShift ) tester->pressKey(key::SHIFT);
        tester->pressMouseButton();
 
        coverart = waitForLoad(coverart);
        check_equals(coverart->get_root()->url(), lynchURL.str());
 
        tester->depressMouseButton();
-       if ( withShift ) tester->releaseKey(key::SHIFT);
 
        // Check scribbling on the lynch
        checkScribbling();
@@ -126,9 +124,7 @@ clickCycle(MovieClip* coverart, bool withShift)
        tester->movePointerTo(280, 80);
        check(tester->isMouseOverMouseEntity());
 
-       if ( withShift ) tester->pressKey(key::SHIFT);
        tester->click();
-       if ( withShift ) tester->releaseKey(key::SHIFT);
 
        coverart = waitForLoad(coverart);
 
@@ -150,9 +146,7 @@ clickCycle(MovieClip* coverart, bool withShift)
        tester->movePointerTo(480, 80);
        check(tester->isMouseOverMouseEntity());
 
-       if ( withShift ) tester->pressKey(key::SHIFT);
        tester->click();
-       if ( withShift ) tester->releaseKey(key::SHIFT);
 
        coverart = waitForLoad(coverart);
 
@@ -199,8 +193,9 @@ main(int /*argc*/, char** /*argv*/)
        // Check scribbling on the empty canvas
        checkScribbling();
 
-       clickCycle(coverart, false);
-       clickCycle(coverart, true);
+       clickCycle(coverart);
+       clickCycle(coverart);
+       clickCycle(coverart);
 
        // Consistency checking
        VM& vm = getVM(*getObject(root));

-----------------------------------------------------------------------

Summary of changes:
 testsuite/misc-ming.all/loading/loadMovieTest.c    |   32 ++++++++++++--------
 .../misc-ming.all/loading/loadMovieTestRunner.cpp  |   13 ++-----
 2 files changed, 23 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
Gnash