[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2245-gd7ed49c |
|
Date: |
Sat, 26 Dec 2015 14:32:25 +0000 |
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 d7ed49c65aea5af9f49edae512fe152c22e2cc45 (commit)
from 4c03566dab0b7a30f716afe1c90d80a6d5139519 (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=d7ed49c65aea5af9f49edae512fe152c22e2cc45
commit d7ed49c65aea5af9f49edae512fe152c22e2cc45
Author: Nutchanon Wetchasit <address@hidden>
Date: Sat Dec 26 15:29:35 2015 +0100
Add more automated ExternalInterface callback registration test cases.
diff --git a/testsuite/misc-mtasc.all/extcomm.as
b/testsuite/misc-mtasc.all/extcomm.as
index 0a71b94..4f455cd 100644
--- a/testsuite/misc-mtasc.all/extcomm.as
+++ b/testsuite/misc-mtasc.all/extcomm.as
@@ -26,9 +26,24 @@ import flash.external.*;
class ExternalCommTest
{
+ var testVariable = "Variable in this";
+
// Entry point
public static function main(mc:MovieClip):Void
{
+ var app:ExternalCommTest;
+
+ app = new ExternalCommTest(mc);
+ }
+
+ public function ExternalCommTest(mc:MovieClip)
+ {
+ var obj:Object;
+
+ obj = new Object();
+ obj.testVariable = "Variable in obj";
+ _root.testVariable = "Variable in _root";
+
// ExternalInterface should be available
check(ExternalInterface.available);
@@ -43,16 +58,83 @@ class ExternalCommTest
// Registering callback shouldn't fail
check(
- ExternalInterface.addCallback("script_call", mc,
+ ExternalInterface.addCallback("script_call", obj,
function(arg1, arg2):String
{
// This function should be called
check(true);
check_equals(arg1, "Hello");
check_equals(arg2, "World");
+
+ // `this` should point to
user-specified object
+ check_equals(this.testVariable,
"Variable in obj");
+
return "Too";
}
)
);
+
+ // Invalid callback registrations should fail
+ check(!ExternalInterface.addCallback("invalid_reg1", mc, null));
+ check(!ExternalInterface.addCallback("invalid_reg2", mc,
undefined));
+ check(!ExternalInterface.addCallback("invalid_reg3", null,
null));
+ check(!ExternalInterface.addCallback("invalid_reg4", null,
undefined));
+ check(!ExternalInterface.addCallback("invalid_reg5", undefined,
null));
+ check(!ExternalInterface.addCallback("invalid_reg6", undefined,
undefined));
+
+ // Registering callbacks with no `this` instance shouldn't fail
+ check(
+ ExternalInterface.addCallback("script_nothis1", null,
+ function():Void
+ {
+ // `this` should be an "undefined"
object like one in
+ // a function called via
`function.call(null)`
+ xcheck_equals(typeof(this), "object");
+ check(this == undefined);
+ check(this == null);
+ check(this !== undefined);
+ xcheck(this !== null);
+ xcheck_equals("" + this, "undefined");
+ }
+ )
+ );
+ check(
+ ExternalInterface.addCallback("script_nothis2",
undefined,
+ function():Void
+ {
+ // `this` should be an "undefined"
object like one in
+ // a function called via
`function.call(undefined)`
+ xcheck_equals(typeof(this), "object");
+ check(this == undefined);
+ check(this == null);
+ check(this !== undefined);
+ xcheck(this !== null);
+ xcheck_equals("" + this, "undefined");
+ }
+ )
+ );
+
+ // Registering another ordinary callback shouldn't fail
+ check(
+ ExternalInterface.addCallback("script_longarglist", mc,
+ function(arg1:String, arg2:String, arg3:String,
+ arg4:String, arg5:String, arg6:String,
+ arg7:String, arg8:String,
arg9:String):String
+ {
+ // Long argument list should be passed
correctly
+ check_equals(arg1, "The");
+ check_equals(arg2, "quick");
+ check_equals(arg3, "brown");
+ check_equals(arg4, "fox");
+ check_equals(arg5, "jumps");
+ check_equals(arg6, "over");
+ check_equals(arg7, "the");
+ check_equals(arg8, "lazy");
+ check_equals(arg9, "dog");
+
+ return "Pangram";
+ }
+ )
+ );
}
}
diff --git a/testsuite/misc-mtasc.all/extcommtests-runner.sh
b/testsuite/misc-mtasc.all/extcommtests-runner.sh
index 334ef9c..c71cd6d 100644
--- a/testsuite/misc-mtasc.all/extcommtests-runner.sh
+++ b/testsuite/misc-mtasc.all/extcommtests-runner.sh
@@ -20,6 +20,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
+#
+# Original author: Nutchanon Wetchasit <address@hidden>
+#
+# The generated test runner checks Gnash for:
+# * ExternalInterface.addCallback() issues (bug #37223)
+# <https://savannah.gnu.org/bugs/?37223>
+#
# Usage:
# ./extcommtests-runner.sh <builddir> <srcdir> <swf>
#
@@ -77,7 +84,9 @@ READTIMEOUT=5
# Test counts
TESTED=0
FAILED=0
+XFAILED=0
PASSED=0
+XPASSED=0
# check_equals(\$op1, \$op2, \$msg)
# Equality checker and counter
@@ -146,19 +155,61 @@ check_error \$? "Failed to open a named pipe:
\$PIPE2PLAYER"
"${top_builddir}/gui/gnash" -r 0 -t ${timeout} -vv -F 3:4 "${swf}" >
"\$LOGFILE" 2>&1 &
GNASHPID=\$!
-# Read for callback registration statement
+# Read for script_call callback registration statement
read_timeout LINE \$READTIMEOUT <&3
check_equals \
"\$LINE" \
'<invoke name="addMethod"
returntype="xml"><arguments><string>script_call</string></arguments></invoke>' \
- "Gnash should properly register an ExternalInterface callback"
+ "Gnash should properly register script_call ExternalInterface callback"
+
+# Read for script_nothis1 callback registration statement
+read_timeout LINE \$READTIMEOUT <&3
+check_equals \
+ "\$LINE" \
+ '<invoke name="addMethod"
returntype="xml"><arguments><string>script_nothis1</string></arguments></invoke>'
\
+ "Gnash should properly register script_nothis1 ExternalInterface
callback"
+
+# Read for script_nothis2 callback registration statement
+read_timeout LINE \$READTIMEOUT <&3
+check_equals \
+ "\$LINE" \
+ '<invoke name="addMethod"
returntype="xml"><arguments><string>script_nothis2</string></arguments></invoke>'
\
+ "Gnash should properly register script_nothis2 ExternalInterface
callback"
+
+# Read for script_longarglist callback registration statement
+read_timeout LINE \$READTIMEOUT <&3
+check_equals \
+ "\$LINE" \
+ '<invoke name="addMethod"
returntype="xml"><arguments><string>script_longarglist</string></arguments></invoke>'
\
+ "Gnash should properly register script_longarglist ExternalInterface
callback"
-# Call the callback
+# Call the script_call callback
echo '<invoke name="script_call"
returntype="xml"><arguments><string>Hello</string><string>World</string></arguments></invoke>'
>&4
# Read for callback return value statement
read_timeout LINE \$READTIMEOUT <&3
-check_equals "\$LINE" '<string>Too</string>' "Gnash should return a correct
value from ExternalInterface callback"
+check_equals "\$LINE" '<string>Too</string>' "Gnash should return a correct
value from script_call ExternalInterface callback"
+
+# Call the script_nothis1 callback
+echo '<invoke name="script_nothis1"
returntype="xml"><arguments></arguments></invoke>' >&4
+
+# Read for callback return value statement
+read_timeout LINE \$READTIMEOUT <&3
+check_equals "\$LINE" '<undefined/>' "Gnash should return a correct value from
script_nothis1 ExternalInterface callback"
+
+# Call the script_nothis2 callback
+echo '<invoke name="script_nothis2"
returntype="xml"><arguments></arguments></invoke>' >&4
+
+# Read for callback return value statement
+read_timeout LINE \$READTIMEOUT <&3
+check_equals "\$LINE" '<undefined/>' "Gnash should return a correct value from
script_nothis2 ExternalInterface callback"
+
+# Call the script_longarglist callback
+echo '<invoke name="script_longarglist"
returntype="xml"><arguments><string>The</string><string>quick</string><string>brown</string><string>fox</string><string>jumps</string><string>over</string><string>the</string><string>lazy</string><string>dog</string></arguments></invoke>'
>&4
+
+# Read for callback return value statement
+read_timeout LINE \$READTIMEOUT <&3
+check_equals "\$LINE" '<string>Pangram</string>' "Gnash should return a
correct value from script_longarglist ExternalInterface callback"
# Close pipes
exec 3<&-
@@ -178,14 +229,22 @@ exec 5< "\$LOGFILE"
PLAYERPASSED=\`grep "TRACE: PASSED:" <&5 | wc -l\`
exec 5<&-
exec 5< "\$LOGFILE"
+PLAYERXPASSED=\`grep "TRACE: XPASSED:" <&5 | wc -l\`
+exec 5<&-
+exec 5< "\$LOGFILE"
PLAYERFAILED=\`grep "TRACE: FAILED:" <&5 | wc -l\`
exec 5<&-
+exec 5< "\$LOGFILE"
+PLAYERXFAILED=\`grep "TRACE: XFAILED:" <&5 | wc -l\`
+exec 5<&-
PASSED=\`expr "\$PASSED" + "\$PLAYERPASSED"\`
+XPASSED=\`expr "\$XPASSED" + "\$PLAYERXPASSED"\`
FAILED=\`expr "\$FAILED" + "\$PLAYERFAILED"\`
-TESTED=\`expr "\$TESTED" + "\$PLAYERPASSED" + "\$PLAYERFAILED"\`
+XFAILED=\`expr "\$XFAILED" + "\$PLAYERXFAILED"\`
+TESTED=\`expr "\$TESTED" + "\$PLAYERPASSED" + "\$PLAYERXPASSED" +
"\$PLAYERFAILED" + "\$PLAYERXFAILED"\`
# Check for total number of test run
-check_totals "8" "There should be 8 tests run"
+check_totals "45" "There should be 45 tests run"
# Remove temporary files
rm "\$LOGFILE"
-----------------------------------------------------------------------
Summary of changes:
testsuite/misc-mtasc.all/extcomm.as | 84 ++++++++++++++++++++++-
testsuite/misc-mtasc.all/extcommtests-runner.sh | 71 +++++++++++++++++--
2 files changed, 148 insertions(+), 7 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2245-gd7ed49c,
Sandro Santilli <=