gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] /srv/bzr/gnash/trunk r12255: Make it easier to use the te


From: Benjamin Wolsey
Subject: [Gnash-commit] /srv/bzr/gnash/trunk r12255: Make it easier to use the tests for debugging as well as testing.
Date: Thu, 17 Jun 2010 10:41:01 +0200
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 12255 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2010-06-17 10:41:01 +0200
message:
  Make it easier to use the tests for debugging as well as testing.
modified:
  testsuite/misc-ming.all/ActionOrderTest3.c
  testsuite/misc-ming.all/ActionOrderTest4.c
  testsuite/misc-ming.all/ActionOrderTest5.c
=== modified file 'testsuite/misc-ming.all/ActionOrderTest3.c'
--- a/testsuite/misc-ming.all/ActionOrderTest3.c        2010-06-17 06:08:49 
+0000
+++ b/testsuite/misc-ming.all/ActionOrderTest3.c        2010-06-17 07:44:01 
+0000
@@ -34,7 +34,17 @@
     SWFMovie_setRate (mo, 12.0);
 
     add_actions(mo,
-            "if (!_global.hasOwnProperty('arr')) { _global.arr = []; };");
+            "if (!_global.hasOwnProperty('arr')) { _global.arr = []; };"
+            "_global.ch = function(a, b) {"
+            "   trace(a);"
+            "   if (typeof(b)=='undefined' || (typeof(b)=='boolean' && b)) {"
+            "       _global.arr.push(a);"
+            "   };"
+            "};"
+            "this.onEnterFrame = function() { "
+            "   _global.ch('onEnterFrame', false);"
+            "};"
+            );
 
     SWFMovie_nextFrame(mo);
 
@@ -58,7 +68,7 @@
     SWFDisplayItem_setName(it, "Segments");
     // Set static unload handler
     SWFDisplayItem_addAction(it,
-        newSWFAction("_global.arr.push('static unload: ' + this.c);"),
+        newSWFAction("_global.ch('static unload: ' + this.c);"),
         SWFACTION_UNLOAD);
 
     // Frame 2
@@ -73,7 +83,7 @@
     SWFDisplayItem_setName(it, "Segments");
     // Set static unload handler
     SWFDisplayItem_addAction(it,
-        newSWFAction("_global.arr.push('static unload: ' + this.c);"),
+        newSWFAction("_global.ch('static unload: ' + this.c);"),
         SWFACTION_UNLOAD);
 
     SWFMovieClip_nextFrame(mc3);
@@ -103,13 +113,13 @@
         "if( !_global.Bug ) {"
         "   _global.Bug = function () {"
         "       this.onUnload = function() { "
-        "           _global.arr.push('dynamic unload: ' + this.c);"
+        "           _global.ch('dynamic unload: ' + this.c);"
         "       }; "
         "       this.onLoad = function() { "
-        "           _global.arr.push('dynamic load: ' + this.c);"
+        "           _global.ch('dynamic load: ' + this.c);"
         "       }; "
         "       this.c = _global.c;"
-        "       _global.arr.push('ctor: ' + _global.c);"
+        "       _global.ch('ctor: ' + _global.c);"
         "       _global.c++;"
         "   };"
         "};"
@@ -121,13 +131,13 @@
     ac = newSWFAction("Object.registerClass('Segments_Name',Bug);");
     initac = newSWFInitAction_withId(ac, 1);
     SWFMovie_add(mo, (SWFBlock)initac);
-    add_actions(mo, "_global.arr.push('Frame ' + "
+    add_actions(mo, "_global.ch('Frame ' + "
                             "_level0._currentframe + ' actions: ' "
                             "+ _level0.mc.Segments.c);");
 
     // Frame 2 of the main timeline
     SWFMovie_nextFrame(mo);
-    add_actions(mo, "_global.arr.push('Frame ' + "
+    add_actions(mo, "_global.ch('Frame ' + "
                             "_level0._currentframe + ' actions: ' "
                             "+ _level0.mc.Segments.c);");
     
@@ -137,6 +147,7 @@
         "        gotoAndPlay(2);"
         "   }"
         "   else {"
+        "      delete this.onEnterFrame;"
         "      gotoAndPlay(4);"
         "   };"
         );
@@ -172,6 +183,8 @@
 
     SWFMovie_nextFrame(mo);
     add_actions(mo, "totals(25); stop();");
+    
+    SWFMovie_nextFrame(mo);
 
     // SWF_END 
     SWFMovie_save(mo, OUTPUT_FILENAME);

=== modified file 'testsuite/misc-ming.all/ActionOrderTest4.c'
--- a/testsuite/misc-ming.all/ActionOrderTest4.c        2010-06-17 06:10:02 
+0000
+++ b/testsuite/misc-ming.all/ActionOrderTest4.c        2010-06-17 07:44:01 
+0000
@@ -34,7 +34,17 @@
     SWFMovie_setRate (mo, 12.0);
 
     add_actions(mo,
-            "if (!_global.hasOwnProperty('arr')) { _global.arr = []; };");
+            "if (!_global.hasOwnProperty('arr')) { _global.arr = []; };"
+            "_global.ch = function(a, b) {"
+            "   trace(a);"
+            "   if (typeof(b)=='undefined' || (typeof(b)=='boolean' && b)) {"
+            "       _global.arr.push(a);"
+            "   };"
+            "};"
+            "this.onEnterFrame = function() { "
+            "   _global.ch('onEnterFrame', false);"
+            "};"
+            );
 
     SWFMovie_nextFrame(mo);
 
@@ -58,7 +68,7 @@
     SWFDisplayItem_setName(it, "Segments");
     // Set static load handler
     SWFDisplayItem_addAction(it,
-        newSWFAction("_global.arr.push('static load: ' + this.c);"),
+        newSWFAction("_global.ch('static load: ' + this.c);"),
         SWFACTION_ONLOAD);
 
     // Frame 2
@@ -73,7 +83,7 @@
     SWFDisplayItem_setName(it, "Segments");
     // Set static load handler
     SWFDisplayItem_addAction(it,
-        newSWFAction("_global.arr.push('static load: ' + this.c);"),
+        newSWFAction("_global.ch('static load: ' + this.c);"),
         SWFACTION_ONLOAD);
 
     SWFMovieClip_nextFrame(mc3);
@@ -103,13 +113,13 @@
         "if( !_global.Bug ) {"
         "   _global.Bug = function () {"
         "       this.onUnload = function() { "
-        "           _global.arr.push('dynamic unload: ' + this.c);"
+        "           _global.ch('dynamic unload: ' + this.c);"
         "       }; "
         "       this.onLoad = function() { "
-        "           _global.arr.push('dynamic load: ' + this.c);"
+        "           _global.ch('dynamic load: ' + this.c);"
         "       }; "
         "       this.c = _global.c;"
-        "       _global.arr.push('ctor: ' + _global.c);"
+        "       _global.ch('ctor: ' + _global.c);"
         "       _global.c++;"
         "   };"
         "};"
@@ -121,13 +131,13 @@
     ac = newSWFAction("Object.registerClass('Segments_Name',Bug);");
     initac = newSWFInitAction_withId(ac, 1);
     SWFMovie_add(mo, (SWFBlock)initac);
-    add_actions(mo, "_global.arr.push('Frame ' + "
+    add_actions(mo, "_global.ch('Frame ' + "
                             "_level0._currentframe + ' actions: ' "
                             "+ _level0.mc.Segments.c);");
 
     // Frame 2 of the main timeline
     SWFMovie_nextFrame(mo);
-    add_actions(mo, "_global.arr.push('Frame ' + "
+    add_actions(mo, "_global.ch('Frame ' + "
                             "_level0._currentframe + ' actions: ' "
                             "+ _level0.mc.Segments.c);");
     
@@ -137,6 +147,7 @@
         "        gotoAndPlay(2);"
         "   }"
         "   else {"
+        "      delete this.onEnterFrame;"
         "      gotoAndPlay(4);"
         "   };"
         );
@@ -172,6 +183,8 @@
 
     SWFMovie_nextFrame(mo);
     add_actions(mo, "totals(26); stop();");
+    
+    SWFMovie_nextFrame(mo);
 
     // SWF_END 
     SWFMovie_save(mo, OUTPUT_FILENAME);

=== modified file 'testsuite/misc-ming.all/ActionOrderTest5.c'
--- a/testsuite/misc-ming.all/ActionOrderTest5.c        2010-06-17 06:11:04 
+0000
+++ b/testsuite/misc-ming.all/ActionOrderTest5.c        2010-06-17 07:44:01 
+0000
@@ -34,7 +34,17 @@
     SWFMovie_setRate (mo, 12.0);
 
     add_actions(mo,
-            "if (!_global.hasOwnProperty('arr')) { _global.arr = []; };");
+            "if (!_global.hasOwnProperty('arr')) { _global.arr = []; };"
+            "_global.ch = function(a, b) {"
+            "   trace(a);"
+            "   if (typeof(b)=='undefined' || (typeof(b)=='boolean' && b)) {"
+            "       _global.arr.push(a);"
+            "   };"
+            "};"
+            "this.onEnterFrame = function() { "
+            "   _global.ch('onEnterFrame', false);"
+            "};"
+            );
 
     SWFMovie_nextFrame(mo);
 
@@ -95,13 +105,13 @@
         "if( !_global.Bug ) {"
         "   _global.Bug = function () {"
         "       this.onUnload = function() { "
-        "           _global.arr.push('dynamic unload: ' + this.c);"
+        "           _global.ch('dynamic unload: ' + this.c);"
         "       }; "
         "       this.onLoad = function() { "
-        "           _global.arr.push('dynamic load: ' + this.c);"
+        "           _global.ch('dynamic load: ' + this.c);"
         "       }; "
         "       this.c = _global.c;"
-        "       _global.arr.push('ctor: ' + _global.c);"
+        "       _global.ch('ctor: ' + _global.c);"
         "       _global.c++;"
         "   };"
         "};"
@@ -113,13 +123,13 @@
     ac = newSWFAction("Object.registerClass('Segments_Name',Bug);");
     initac = newSWFInitAction_withId(ac, 1);
     SWFMovie_add(mo, (SWFBlock)initac);
-    add_actions(mo, "_global.arr.push('Frame ' + "
+    add_actions(mo, "_global.ch('Frame ' + "
                             "_level0._currentframe + ' actions: ' "
                             "+ _level0.mc.Segments.c);");
 
     // Frame 2 of the main timeline
     SWFMovie_nextFrame(mo);
-    add_actions(mo, "_global.arr.push('Frame ' + "
+    add_actions(mo, "_global.ch('Frame ' + "
                             "_level0._currentframe + ' actions: ' "
                             "+ _level0.mc.Segments.c);");
     
@@ -129,6 +139,7 @@
         "        gotoAndPlay(2);"
         "   }"
         "   else {"
+        "      delete this.onEnterFrame;"
         "      gotoAndPlay(4);"
         "   };"
         );
@@ -160,6 +171,8 @@
 
     SWFMovie_nextFrame(mo);
     add_actions(mo, "totals(21); stop();");
+    
+    SWFMovie_nextFrame(mo);
 
     // SWF_END 
     SWFMovie_save(mo, OUTPUT_FILENAME);


reply via email to

[Prev in Thread] Current Thread [Next in Thread]