[Gnash-commit] /srv/bzr/gnash/trunk r10111: Improve the test and adapt conclusions.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10111
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Sun 2008-10-26 01:46:45 +0200
message:
  Improve the test and adapt conclusions.
modified:
  testsuite/misc-ming.all/LoadVarsTest.c

=== modified file 'testsuite/misc-ming.all/LoadVarsTest.c'
--- a/testsuite/misc-ming.all/LoadVarsTest.c    2008-10-25 23:05:27 +0000
+++ b/testsuite/misc-ming.all/LoadVarsTest.c    2008-10-25 23:46:45 +0000
@@ -108,8 +108,7 @@
 
        /// What happens when load fails?
        //
-       /// Both onData and onLoad are called *independently*. That is,
-       /// neither is called from the default implementation of the other.
+       /// The onLoad method is called from the default implementation of 
onData.
        
        SWFMovie_nextFrame(mo);
 
@@ -141,6 +140,24 @@
                        "'onLoad called with boolean argument false'");
        add_actions(mo, "l.onLoad = olB;");
 
+    /// Both onData and onLoad
+       add_actions(mo, "l.onLoad = ourLoad;"
+            "l.onData = ourData;"
+                       "loadString = '';"
+            "dataString = '';"
+                       "e = l.load('fail');");
+       check_equals(mo, "e", "true");
+       add_actions(mo, "stop();");
+
+       SWFMovie_nextFrame(mo);
+               
+       check_equals(mo, "loadString",
+                       "''");
+       xcheck_equals(mo, "dataString",
+                       "'onData called with undefined argument undefined'");
+       add_actions(mo, "l.onLoad = olB;");
+    add_actions(mo, "l.onData = odatB;");
+
        /// What happens when load succeeds?
        //
        /// Both methods are called separately.
@@ -178,7 +195,7 @@
 
     /// decode is called from onData (i.e. it's called when we overwrite
     /// onLoad, not onData).
-    check_equals(mo, "decodeCalled", "1");
+    xcheck_equals(mo, "decodeCalled", "1");
     // check_equals is too braindead to do this without escaping.
        xcheck_equals(mo, "escape(decodeString)",
                        
"'decode%20called%20with%20string%20argument%20v2%5Fvar1%3D"
@@ -186,7 +203,7 @@
 
        /// End of tests.
 
-       add_actions(mo, "totals(12);");
+       add_actions(mo, "totals(15);");
        add_actions(mo, "stop();");
 
        /*****************************************************