[Gnash-commit] [SCM] Gnash branch, master, updated. ee0fee39a0f1a96cb776f844e3e9189c14e3accc

[Benjamin Wolsey]

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  ee0fee39a0f1a96cb776f844e3e9189c14e3accc (commit)
       via  1b860b08833b7fb3033309f6c76a7fefffb68ff3 (commit)
       via  9411c6ff0376edfd0d4040c0f4eeaa2f51302a43 (commit)
       via  87336da1d9fe59a340eebde4409d1d758a8a01f5 (commit)
      from  5f8ad987f08b41cb5c5e5243394d08be806642cb (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=ee0fee39a0f1a96cb776f844e3e9189c14e3accc


commit ee0fee39a0f1a96cb776f844e3e9189c14e3accc
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Nov 25 12:04:56 2010 +0100

    Tests pass.

diff --git a/testsuite/misc-ming.all/red5test.as 
b/testsuite/misc-ming.all/red5test.as
index 11f26fd..e9a6117 100644
--- a/testsuite/misc-ming.all/red5test.as
+++ b/testsuite/misc-ming.all/red5test.as
@@ -132,14 +132,14 @@ test5 = function(nc)
 
     nc.onStatus = function(obj) {
         check_equals(typeof(obj), "object");
-        xcheck(obj.hasOwnProperty("application"));
+        check(obj.hasOwnProperty("application"));
         check(obj.hasOwnProperty("level"));
         check(obj.hasOwnProperty("code"));
-        xcheck(obj.hasOwnProperty("description"));
-        xcheck_equals(obj.application, 
"org.red5.server.service.MethodNotFoundException");
+        check(obj.hasOwnProperty("description"));
+        check_equals(obj.application, 
"org.red5.server.service.MethodNotFoundException");
         check_equals(obj.level, "error");
         check_equals(obj.code, "NetConnection.Call.Failed");
-        xcheck_equals(obj.description, "Method nonexistentfunc with arguments 
[hello, null] not found");
+        check_equals(obj.description, "Method nonexistentfunc with arguments 
[hello, null] not found");
         endOfTest();
     };
 

http://git.savannah.gnu.org/cgit//commit/?id=1b860b08833b7fb3033309f6c76a7fefffb68ff3


commit 1b860b08833b7fb3033309f6c76a7fefffb68ff3
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Nov 25 12:04:30 2010 +0100

    Send reply from server rather than making our own.

diff --git a/libcore/asobj/NetConnection_as.cpp 
b/libcore/asobj/NetConnection_as.cpp
index 35ebc24..cfcab49 100644
--- a/libcore/asobj/NetConnection_as.cpp
+++ b/libcore/asobj/NetConnection_as.cpp
@@ -1298,8 +1298,19 @@ RTMPConnection::handleInvoke(const boost::uint8_t* 
payload,
     }
 
     if (method ==  "_error") {
-        _nc.notifyStatus(NetConnection_as::CALL_FAILED);
+
+        as_value arg;
+
+        amf::Reader rd(payload, end, getGlobal(_nc.owner()));
+        // TODO: use all args and check the order! We currently only use
+        // the last one!
+        while (rd(arg)) {
+            log_debug("Value: %s", arg);
+        }
+
         log_error( "rtmp server sent error");
+
+        callMethod(&_nc.owner(), NSV::PROP_ON_STATUS, arg);
         return;
     }
     

http://git.savannah.gnu.org/cgit//commit/?id=9411c6ff0376edfd0d4040c0f4eeaa2f51302a43


commit 9411c6ff0376edfd0d4040c0f4eeaa2f51302a43
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Nov 25 12:03:38 2010 +0100

    Test failed call.

diff --git a/testsuite/misc-ming.all/red5test.as 
b/testsuite/misc-ming.all/red5test.as
index 9918c33..11f26fd 100644
--- a/testsuite/misc-ming.all/red5test.as
+++ b/testsuite/misc-ming.all/red5test.as
@@ -26,7 +26,7 @@ stop();
 
 endOfTest = function()
 {
-    totals(29);
+    totals(38);
     trace("ENDOFTEST");
     play();
 };
@@ -116,11 +116,36 @@ test4 = function(nc)
         check_equals(arg[3], undefined);
         check_equals(arg[4], null);
 
-        endOfTest();
+        test5(nc);
     };
     nc.call("echo", o, new Date(0), new String(), {}, undefined, null);
 };
 
+test5 = function(nc)
+{
+    note("Running test 5");
+    o = {};
+    o.onResult = function(arg)
+    {
+        fail("onResult called when call failed");
+    };
+
+    nc.onStatus = function(obj) {
+        check_equals(typeof(obj), "object");
+        xcheck(obj.hasOwnProperty("application"));
+        check(obj.hasOwnProperty("level"));
+        check(obj.hasOwnProperty("code"));
+        xcheck(obj.hasOwnProperty("description"));
+        xcheck_equals(obj.application, 
"org.red5.server.service.MethodNotFoundException");
+        check_equals(obj.level, "error");
+        check_equals(obj.code, "NetConnection.Call.Failed");
+        xcheck_equals(obj.description, "Method nonexistentfunc with arguments 
[hello, null] not found");
+        endOfTest();
+    };
+
+    nc.call("nonexistentfunc", o, "hello", null);
+};
+
 runtests = function(nc)
 {
     test1(nc);
@@ -134,7 +159,7 @@ ncrtmp.statuses = new Array();
 ncrtmp.onStatus = function()
 {
     this.statuses.push(arguments);
-    note('NetConnection.onStatus called with args: '+dumpObject(arguments));
+    note('NetConnection.onStatus called with args: ' + dumpObject(arguments));
     lastStatusArgs = ncrtmp.statuses[ncrtmp.statuses.length-1];
     if ((lastStatusArgs[0].level == "status") && (lastStatusArgs[0].code == 
"NetConnection.Connect.Success")) {
         pass("RTMP connection - status Success");

http://git.savannah.gnu.org/cgit//commit/?id=87336da1d9fe59a340eebde4409d1d758a8a01f5


commit 87336da1d9fe59a340eebde4409d1d758a8a01f5
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Nov 25 11:49:33 2010 +0100

    Tabs to spaces.

diff --git a/testsuite/misc-ming.all/red5test.as 
b/testsuite/misc-ming.all/red5test.as
index b87ccd0..9918c33 100644
--- a/testsuite/misc-ming.all/red5test.as
+++ b/testsuite/misc-ming.all/red5test.as
@@ -1,11 +1,11 @@
 // This test relies on a default deploy of red5 on localhost
 //
 // Build with:
-//     makeswf -n network -o red5test.swf ../Dejagnu.swf red5test.as 
../actionscript.all/dejagnu_so_fini.as
+//        makeswf -n network -o red5test.swf ../Dejagnu.swf red5test.as 
../actionscript.all/dejagnu_so_fini.as
 // Run with:
-//     firefox red5test.swf
+//        firefox red5test.swf
 // Or:
-//     gnash red5test.swf
+//        gnash red5test.swf
 //
 //
 
@@ -103,20 +103,20 @@ test4 = function(nc)
     o = {};
     o.onResult = function(arg)
     {
-       check_equals(arguments.length, 1);
-       check_equals(typeof(arg), "object");
-       check(arg.hasOwnProperty("length"));
-       check_equals(arg.length, 5);
+        check_equals(arguments.length, 1);
+        check_equals(typeof(arg), "object");
+        check(arg.hasOwnProperty("length"));
+        check_equals(arg.length, 5);
 
-       // It's a date.
-       check_equals(arg[0].__proto__, Date.prototype);
+        // It's a date.
+        check_equals(arg[0].__proto__, Date.prototype);
 
-       check_equals(arg[1], null);
-       check_equals(typeof(arg[2]), "object");
-       check_equals(arg[3], undefined);
-       check_equals(arg[4], null);
+        check_equals(arg[1], null);
+        check_equals(typeof(arg[2]), "object");
+        check_equals(arg[3], undefined);
+        check_equals(arg[4], null);
 
-       endOfTest();
+        endOfTest();
     };
     nc.call("echo", o, new Date(0), new String(), {}, undefined, null);
 };

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

Summary of changes:
 libcore/asobj/NetConnection_as.cpp  |   13 +++++++-
 testsuite/misc-ming.all/red5test.as |   57 +++++++++++++++++++++++++----------
 2 files changed, 53 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Gnash