[Gnash-commit] /srv/bzr/gnash/trunk r11402: Daily fix for testsuite mess-ups.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 11402 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2009-08-10 12:14:40 +0200
message:
  Daily fix for testsuite mess-ups.
  
  The classes.all testsuite is still a mess, doesn't distinguish enough
  between AS2 and AS3, and consequently still fails.
modified:
  libcore/asobj/NetConnection_as.cpp
  libcore/asobj/flash/media/Camera_as.cpp
  libcore/asobj/flash/net/SharedObject_as.cpp
  libcore/swf/DefineScalingGridTag.cpp
  testsuite/actionscript.all/Camera.as
  testsuite/actionscript.all/Microphone.as
  testsuite/libnet.all/Makefile.am

=== modified file 'libcore/asobj/NetConnection_as.cpp'
--- a/libcore/asobj/NetConnection_as.cpp        2009-08-08 03:21:12 +0000
+++ b/libcore/asobj/NetConnection_as.cpp        2009-08-10 08:58:18 +0000
@@ -850,7 +850,7 @@
        || (url.protocol() != "rtmpt")
        || (url.protocol() != "rtmpts")
        || (url.protocol() != "https")
-       || (url.protocol() == "http")) {
+       || (url.protocol() != "http")) {
         IF_VERBOSE_ASCODING_ERRORS(
                 log_aserror("NetConnection.connect(%s): invalid connection "
                             "protocol", url);

=== modified file 'libcore/asobj/flash/media/Camera_as.cpp'
--- a/libcore/asobj/flash/media/Camera_as.cpp   2009-08-07 19:56:42 +0000
+++ b/libcore/asobj/flash/media/Camera_as.cpp   2009-08-10 09:19:01 +0000
@@ -47,6 +47,7 @@
 as_value camera_setmotionlevel(const fn_call& fn);
 as_value camera_setquality(const fn_call& fn);
 as_value camera_setLoopback(const fn_call& fn);
+as_value camera_setCursor(const fn_call& fn);
 as_value camera_setKeyFrameInterval(const fn_call& fn);
 
 as_value camera_activitylevel(const fn_call& fn);
@@ -99,8 +100,7 @@
     o.init_member("setMode", gl->createFunction(camera_setmode));
     o.init_member("setMotionLevel", gl->createFunction(camera_setmotionlevel));
     o.init_member("setQuality", gl->createFunction(camera_setquality));
-// setCursor is not in the specs for Camera (as2 or 3)
-//    o.init_member("setCursor", gl->createFunction(camera_setCursor));
+    o.init_member("setCursor", gl->createFunction(camera_setCursor));
     o.init_member("setLoopback", gl->createFunction(camera_setLoopback));
     o.init_member("setKeyFrameInterval",
             gl->createFunction(camera_setKeyFrameInterval));
@@ -678,6 +678,13 @@
 }
 
 as_value
+camera_setCursor(const fn_call& /*fn*/)
+{
+    LOG_ONCE(log_unimpl("Camera.setCursor"));
+    return as_value();
+}
+
+as_value
 camera_setKeyFrameInterval(const fn_call& fn)
 {
     boost::intrusive_ptr<camera_as_object> ptr = ensureType<camera_as_object>
@@ -685,7 +692,7 @@
     
     int numargs = fn.nargs;
     if (numargs > 1) {
-        log_error("%s: Too many arguments", __FUNCTION__);
+        log_error("%s: Too many arguments", "Camera.setKeyFrameInterval");
     } else {
         ptr->set_loopback(fn.arg(0).to_int());
     }

=== modified file 'libcore/asobj/flash/net/SharedObject_as.cpp'
--- a/libcore/asobj/flash/net/SharedObject_as.cpp       2009-08-08 03:21:12 
+0000
+++ b/libcore/asobj/flash/net/SharedObject_as.cpp       2009-08-10 06:54:44 
+0000
@@ -872,13 +872,16 @@
     // So we have to make sure the NetCnnection object we get
     // passed is already had the URI specified to connect to.
     if (fn.nargs > 1) {
-       const as_value& uri = fn.arg(1);
-       const VM& vm = getVM(fn);
-       const std::string& uriStr = uri.to_string_versioned(vm.getSWFVersion());
+#if 0
+        const as_value& uri = fn.arg(1);
+        const VM& vm = getVM(fn);
+        const std::string& uriStr = 
uri.to_string_versioned(vm.getSWFVersion());
+#endif
     }
     
     boost::intrusive_ptr<NetConnection_as> nc =
-       boost::dynamic_pointer_cast<NetConnection_as>(                          
                     fn.arg(0).to_object(*getGlobal(fn)));
+       boost::dynamic_pointer_cast<NetConnection_as>(
+            fn.arg(0).to_object(*getGlobal(fn)));
 
     // This is always set without validification.fooc->setURI(uriStr);
     string str = nc->getURI();

=== modified file 'libcore/swf/DefineScalingGridTag.cpp'
--- a/libcore/swf/DefineScalingGridTag.cpp      2009-07-27 20:30:40 +0000
+++ b/libcore/swf/DefineScalingGridTag.cpp      2009-08-10 06:55:00 +0000
@@ -28,8 +28,8 @@
 namespace SWF {
 
 void
-DefineScalingGridTag::loader(SWFStream& in, TagType tag, movie_definition& md,
-        const RunResources& r)
+DefineScalingGridTag::loader(SWFStream& in, TagType /*tag*/,
+        movie_definition& /*md*/, const RunResources& /*r*/)
 {
     in.ensureBytes(2);
     boost::uint16_t id = in.read_u16();

=== modified file 'testsuite/actionscript.all/Camera.as'
--- a/testsuite/actionscript.all/Camera.as      2009-08-07 19:56:42 +0000
+++ b/testsuite/actionscript.all/Camera.as      2009-08-10 09:26:19 +0000
@@ -32,19 +32,22 @@
 
 //trace("NOTE: System.capabilities.hasVideoEncoder:  " + 
System.capabilities.hasVideoEncoder);
 
-/*
- This is not the proper way to construct a camera object. According to the
- livedoc the constructor for Camera is Camera.get(). Flashplayer ignores
- the call to new Camera.
- test the Camera constuctor
-check(Camera);
+// This is not the proper way to construct a camera object. According to the
+// livedoc a camera should be retrieved using Camera.get(). The constructor
+// returns an object with camera functions.
+
+//test the Camera constuctor
+check_equals(typeof(Camera), "function");
+
 var cameraObj = new Camera;
 check(cameraObj);
 var cameraObj2 = new Camera();
 check(cameraObj2);
 check(cameraObj != cameraObj2);
 check_equals(typeof(cameraObj), 'object');
-*/
+check_equals(typeof(cameraObj.setCursor), "function");
+check_equals(typeof(cameraObj.setKeyFrameInterval), "function");
+check_equals(typeof(cameraObj.setLoopback), "function");
 
 // These properties are never present before Camera.get() is called.
 check(!Camera.prototype.hasOwnProperty("activityLevel"));
@@ -109,15 +112,14 @@
 check_equals(Camera.setMode, undefined);
 check_equals(Camera.setMotionLevel, undefined);
 check_equals(Camera.setQuality, undefined);
+check_equals(Camera.setCursor, undefined);
 
-// test Camera::setMode
 check_equals ( typeof(cam.setMode), 'function' );
-
-// test Camera::setMotionLevel
 check_equals ( typeof(cam.setMotionLevel), 'function' );
-
-// test Camrea::setQuality
 check_equals ( typeof(cam.setQuality), 'function');
+check_equals ( typeof(cam.setCursor), 'function');
+check_equals ( typeof(cam.setKeyFrameInterval), 'function');
+check_equals ( typeof(cam.setLoopback), 'function');
 
 // check properties
 check_equals ( typeof(cam.activityLevel), 'number' );
@@ -130,7 +132,7 @@
 check_equals ( typeof(cam.motionTimeout), 'number');
 check_equals ( typeof(cam.muted), 'boolean');
 check_equals ( typeof(cam.name), 'string');
-xcheck_equals ( typeof(cam.names), 'undefined');
+check_equals ( typeof(cam.names), 'undefined');
 check_equals ( typeof(cam.quality), 'number');
 check_equals ( typeof(cam.width), 'number');
 

=== modified file 'testsuite/actionscript.all/Microphone.as'
--- a/testsuite/actionscript.all/Microphone.as  2009-08-07 19:56:42 +0000
+++ b/testsuite/actionscript.all/Microphone.as  2009-08-10 07:18:06 +0000
@@ -55,18 +55,12 @@
 check(!Microphone.prototype.hasOwnProperty("silenceTimeOut"));
 check(!Microphone.prototype.hasOwnProperty("useEchoSuppression"));
 
-/*
-There is no such thing as 'new Microphone'. If you ever want to get a new
-Microphone object, the proper call is f = Microphone.get()
-*/
-//f = new Microphone;
+f = new Microphone;
 
-// Called with new, Microphone returns an object with static
-// properties.
-//check_equals(typeof(f), 'object');
-//check_equals(typeof(f.setGain), 'function')
-//check_equals(typeof(f.gain), 'undefined')
-//check_equals(typeof(f.rate), 'undefined')
+check_equals(typeof(f), 'object');
+check_equals(typeof(f.setGain), 'function')
+check_equals(typeof(f.gain), 'undefined')
+check_equals(typeof(f.rate), 'undefined')
 
 // Still not present
 check(!Microphone.prototype.hasOwnProperty("get"));

=== modified file 'testsuite/libnet.all/Makefile.am'
--- a/testsuite/libnet.all/Makefile.am  2009-07-31 14:19:05 +0000
+++ b/testsuite/libnet.all/Makefile.am  2009-08-10 08:13:25 +0000
@@ -37,6 +37,7 @@
         -I$(top_srcdir)/libnet \
         -I$(top_srcdir)/libamf \
         -I$(top_srcdir)/libbase \
+        -I$(top_srcdir)/libltdl \
         -I$(top_srcdir)/cygnal \
         -I$(top_srcdir)/libcore \
         -DLOCALEDIR=\"$(localedir)\" \