[Gnash-commit] [SCM] Gnash branch, master, updated. 07b8ae4bdd8c8f99e81116280d94a444579abca6

[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  07b8ae4bdd8c8f99e81116280d94a444579abca6 (commit)
      from  754c56a980fd5ed715ae5e2bda04bf4d2bab7b14 (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=07b8ae4bdd8c8f99e81116280d94a444579abca6


commit 07b8ae4bdd8c8f99e81116280d94a444579abca6
Author: Sandro Santilli <address@hidden>
Date:   Thu Oct 14 14:54:55 2010 +0200

    Fix expected results based on EI.available

diff --git a/testsuite/actionscript.all/ExternalInterface.as 
b/testsuite/actionscript.all/ExternalInterface.as
index 8c49bae..6ae0cbd 100644
--- a/testsuite/actionscript.all/ExternalInterface.as
+++ b/testsuite/actionscript.all/ExternalInterface.as
@@ -134,19 +134,14 @@ function TestASMethod (msg) {
 // we need to add a method anyway to test being called by Javascript.
 ret = EI.addCallback("TestASMethod", null, TestASMethod);
 check_equals(typeof(ret), 'boolean');
-check_equals(ret, false);
-
-if (EI.available == true) {
-  note("ExternalInterface available, calling TestJSMethod");
-  // This test tries to invoke a Javascript method running in the browser
-  if (EI.call("TestJSMethod", "test") == null) {
-    pass("ExternalInterface::call(\"TestJSMethod\") == null");
-  } else {
-    fail("ExternalInterface::call(\"TestJSMethod\") == null");
-  }
+check_equals(ret, EI.available); // returns true if available...
+ret = EI.call("TestJSMethod", "test");
+if ( EI.available ) {
+    check_equals(typeof(ret), 'undefined');
+} else {
+    check_equals(typeof(ret), 'null');
 }
 
-
 // An object
 o = { a: 1, b: "string" };
 
@@ -285,6 +280,6 @@ xcheck_equals (typeOf(val), 'object');
 #elif OUTPUT_VERSION < 8 // }{
        check_totals(49);
 #else // SWF8+ }{
-       check_totals(92);
+       check_totals(93);
 # endif // }
 

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

Summary of changes:
 testsuite/actionscript.all/ExternalInterface.as |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Gnash