[Gnash-commit] /srv/bzr/gnash/trunk r11093: Fix attachSound testcase so the instructions match the behaviour

[Sandro Santilli]

------------------------------------------------------------
revno: 11093
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Fri 2009-06-12 21:35:15 +0200
message:
  Fix attachSound testcase so the instructions match the behaviour
modified:
  testsuite/misc-ming.all/eventSoundTest1-Runner.cpp
  testsuite/misc-ming.all/eventSoundTest1.c

=== modified file 'testsuite/misc-ming.all/eventSoundTest1-Runner.cpp'
--- a/testsuite/misc-ming.all/eventSoundTest1-Runner.cpp        2009-06-10 
14:09:21 +0000
+++ b/testsuite/misc-ming.all/eventSoundTest1-Runner.cpp        2009-06-12 
19:35:15 +0000
@@ -80,14 +80,14 @@
 
        // Make sure you adjust this with the test!
        cerr << "Total frames: " <<  totalFrames << endl;
-       assert (totalFrames == 24);
+       assert (totalFrames == 23);
 
        int numSoundsStarted[] = {
                0, 
                4, // Multiple   (+4 sounds started)
                6, // NoMultiple (+2 sounds started)
         9, // Trimmed    (+3 sounds started)
-        15 // Attached   (+6 sounds started)
+        14 // Attached   (+5 sounds started)
        };
 
        /// Expected success for each test

=== modified file 'testsuite/misc-ming.all/eventSoundTest1.c'
--- a/testsuite/misc-ming.all/eventSoundTest1.c 2009-06-11 15:19:31 +0000
+++ b/testsuite/misc-ming.all/eventSoundTest1.c 2009-06-12 19:35:15 +0000
@@ -34,6 +34,8 @@
 SWFSound setupSounds(const char* filename);
 void runMultipleSoundsTest(SWFMovie mo, SWFSound so, int* frame);
 void runNoMultipleSoundsTest(SWFMovie mo, SWFSound so, int* frame);
+void runTrimmedSoundsTest(SWFMovie mo, SWFSound so, int* frame);
+void runAttachedSoundsTest(SWFMovie mo, SWFSound so, int* frame);
 void pauseForNextTest(SWFMovie mo);
 void endOfTests(SWFMovie mo);
 void printFrameInfo(SWFMovie mo, int i, const char* desc);
@@ -153,7 +155,9 @@
     /// make sure the correct object is notified.
     add_actions(mo, "s2.start(); delete s2;");
 
-    for (i = 0; i < 4; i++)
+    printFrameInfo(mo, 0, frameDesc[0]);
+
+    for (i = 1; i < 4; i++)
     {
         SWFMovie_nextFrame(mo);
         
@@ -163,11 +167,11 @@
         add_actions(mo, "s.start();");
     }
 
+    add_actions(mo, "xcheck_equals(cs, 1);");
+
+    SWFMovie_nextFrame(mo);
+    
     add_actions(mo, "xcheck_equals(cs, 2);");
-
-    SWFMovie_nextFrame(mo);
-    
-    add_actions(mo, "xcheck_equals(cs, 3);");
     
     // Check that Sound.onSoundComplete isn't executed if the Sound is
     // deleted. This only passes currently because onSoundComplete is never
@@ -262,7 +266,6 @@
 runTrimmedSoundsTest(SWFMovie mo, SWFSound so, int* frame)
 {
     SWFSoundInstance so_in;
-    int i;
 
     SWFMovie_nextFrame(mo);
     add_actions(mo,