[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/testsuite/actionscript.all Boolean.as Dat...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash/testsuite/actionscript.all Boolean.as Dat... |
|
Date: |
Sun, 15 Oct 2006 02:30:56 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 06/10/15 02:30:56
Modified files:
testsuite/actionscript.all: Boolean.as Date.as Global.as
Inheritance.as Makefile.am
MovieClip.as NetConnection.as
Number.as Object.as Selection.as
XML.as XMLNode.as array.as check.as
dejagnu.as delete.as inheritance.as
swf_exists.exp
Log message:
* testsuite/actionscript.all/swf_exists.exp: Use local_exec()
instead of spawn/expect. This works better with batch tests.
* testsuite/actionscript.all/check.as: Add xcheck and
xcheck_equals to handle expected failures.
* testsuite/actionscript.all/dejagnu.as: Add xpass and xfail to
handle expect failures.
* testsuite/actionscript.all/Boolean.as, Date.as, Global.as,
Inheritance.as, MovieClip.as, NetConnection.as, Number.as,
Object.as, Selection.as, array.as, delete.as, inheritance.as:
Use
xcheck and xcheck_equals for tests expected to not work yet.
* testsuite/actionscript.all/XML.as, XMLNode.as: Use xpass and
xfail for tests expected to not work yet.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Boolean.as?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Date.as?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Global.as?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Inheritance.as?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Makefile.am?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/NetConnection.as?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Number.as?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Object.as?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Selection.as?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XMLNode.as?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/check.as?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/dejagnu.as?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/delete.as?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/inheritance.as?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/swf_exists.exp?cvsroot=gnash&r1=1.10&r2=1.11
Patches:
Index: Boolean.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Boolean.as,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Boolean.as 20 Jun 2006 20:45:27 -0000 1.5
+++ Boolean.as 15 Oct 2006 02:30:55 -0000 1.6
@@ -40,7 +40,7 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: Boolean.as,v 1.5 2006/06/20 20:45:27 strk Exp $";
+rcsid="$Id: Boolean.as,v 1.6 2006/10/15 02:30:55 rsavoye Exp $";
#include "check.as"
@@ -56,14 +56,14 @@
check (boolObj.valueof != undefined);
var defaultBool = new Boolean();
-check_equals(defaultBool.toString(), "false");
-check_equals(defaultBool.valueOf(), false);
+xcheck_equals(defaultBool.toString(), "false");
+xcheck_equals(defaultBool.valueOf(), false);
var trueBool = new Boolean(true);
-check_equals(trueBool.toString(), "true");
-check_equals(trueBool.valueOf(), true);
+xcheck_equals(trueBool.toString(), "true");
+xcheck_equals(trueBool.valueOf(), true);
var falseBool = new Boolean(false);
-check_equals(falseBool.toString(), "false");
-check_equals(falseBool.valueOf(), false);
+xcheck_equals(falseBool.toString(), "false");
+xcheck_equals(falseBool.valueOf(), false);
Index: Date.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Date.as,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Date.as 20 Jun 2006 20:45:27 -0000 1.4
+++ Date.as 15 Oct 2006 02:30:55 -0000 1.5
@@ -40,7 +40,7 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: Date.as,v 1.4 2006/06/20 20:45:27 strk Exp $";
+rcsid="$Id: Date.as,v 1.5 2006/10/15 02:30:55 rsavoye Exp $";
#include "check.as"
@@ -50,7 +50,7 @@
check (date);
// test the Date::get method
-check (date.get != undefined);
+xcheck (date.get != undefined);
// test the Date::getday method
check (date.getday != undefined);
@@ -80,7 +80,7 @@
check (date.gettimezoneoffset != undefined);
// test the Date::getutc method
-check (date.getutc != undefined);
+xcheck (date.getutc != undefined);
// test the Date::getutcday method
check (date.getutcday != undefined);
@@ -107,7 +107,7 @@
check (date.getyear != undefined);
// test the Date::set method
-check (date.set != undefined);
+xcheck (date.set != undefined);
// test the Date::setfullyear method
check (date.setfullyear != undefined);
@@ -131,7 +131,7 @@
check (date.settime != undefined);
// test the Date::setutc method
-check (date.setutc != undefined);
+xcheck (date.setutc != undefined);
// test the Date::setutcfullyear method
check (date.setutcfullyear != undefined);
Index: Global.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Global.as,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Global.as 20 Jun 2006 20:45:27 -0000 1.11
+++ Global.as 15 Oct 2006 02:30:55 -0000 1.12
@@ -40,7 +40,7 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: Global.as,v 1.11 2006/06/20 20:45:27 strk Exp $";
+rcsid="$Id: Global.as,v 1.12 2006/10/15 02:30:55 rsavoye Exp $";
#include "check.as"
@@ -55,7 +55,7 @@
// Test parseint with hex
check ( parseInt('0x111') == 273 );
// Test parseint with octal
-check_equals ( parseInt(' 0352'), 352 );
+xcheck_equals (parseInt(' 0352'), 352 );
// Test parseint with 36 base
check ( parseInt('2GA',36) == (10+16*36+2*36*36) );
// Test parseint with base 17 - the 'H' is not part of base 17, only the first
two digits are valid
@@ -80,7 +80,7 @@
check ( unescape('%3A%2F%3F%3D%26') == ':/?=&' );
// All ascii char become the corresponding %NN hex
-check ( escape(':/?=&') == '%3A%2F%3F%3D%26');
+xcheck (escape(':/?=&') == '%3A%2F%3F%3D%26');
// How to test failure of setInterval and success of clearInterval ?
// The problem is that there is no way
Index: Inheritance.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Inheritance.as,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Inheritance.as 20 Jun 2006 20:45:27 -0000 1.5
+++ Inheritance.as 15 Oct 2006 02:30:55 -0000 1.6
@@ -41,7 +41,7 @@
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: Inheritance.as,v 1.5 2006/06/20 20:45:27 strk Exp $";
+rcsid="$Id: Inheritance.as,v 1.6 2006/10/15 02:30:55 rsavoye Exp $";
#include "check.as"
@@ -60,12 +60,12 @@
// functionObject '__proto__' is a reference to
// it's constructor's 'prototype' member.
-check (functionObject.__proto__ == Function.prototype);
-check (functionObject.__proto__.constructor == Function);
+xcheck (functionObject.__proto__ == Function.prototype);
+xcheck (functionObject.__proto__.constructor == Function);
// functionObject.apply should be functionObject.__proto__.apply
-check (functionObject.apply != undefined);
-check (functionObject.apply == Function.prototype.apply);
+xcheck (functionObject.apply != undefined);
+xcheck (functionObject.apply == Function.prototype.apply);
check (functionObject.apply == functionObject.__proto__.apply);
// functionObject is an Object, not functionObject Function,
@@ -122,4 +122,4 @@
// Test the instanceOf operator
check(subInstance instanceOf Sub);
check(subInstance instanceOf Super);
-check(subInstance instanceOf Object);
+xcheck(subInstance instanceOf Object);
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
Index: MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- MovieClip.as 20 Jun 2006 20:45:27 -0000 1.4
+++ MovieClip.as 15 Oct 2006 02:30:55 -0000 1.5
@@ -40,13 +40,13 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: MovieClip.as,v 1.4 2006/06/20 20:45:27 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.5 2006/10/15 02:30:55 rsavoye Exp $";
#include "check.as"
// Get a reference to a MovieClip
var mc = _root;
-check(typeof(mc)=="movieclip");
+xcheck(typeof(mc)=="movieclip");
// Check some references
check(this != undefined);
@@ -58,83 +58,84 @@
check(mc.__proto__ == MovieClip.prototype);
// Check methods existance
-check(mc.attachAudio != undefined);
-check(mc.attachMovie != undefined);
-check(mc.beginFill != undefined);
-check(mc.beginGradientFill != undefined);
-check(mc.clear != undefined);
+xcheck(mc.attachAudio != undefined);
+xcheck(mc.attachMovie != undefined);
+xcheck(mc.beginFill != undefined);
+xcheck(mc.beginGradientFill != undefined);
+xcheck(mc.clear != undefined);
check(mc.createEmptyMovieClip != undefined);
check(mc.createTextField != undefined);
-check(mc.curveTo != undefined);
+xcheck(mc.curveTo != undefined);
// not available ?
//check(mc.duplicateMovieClip == undefined);
-check(mc.endFill != undefined);
+xcheck(mc.endFill != undefined);
check(mc.getBytesLoaded != undefined);
check(mc.getBytesTotal != undefined);
-check(mc.getBounds != undefined);
+xcheck(mc.getBounds != undefined);
check(mc.getDepth != undefined);
-#if OUTPUT_VERSION >= 7
-check(mc.getInstanceAtDepth != undefined);
-check(mc.getNextHighestDepth != undefined);
-check(mc.getSWFVersion != undefined);
-check(mc.getTextSnapshot != undefined);
-#endif
+if (OUTPUT_VERSION >= 7) {
+ xcheck(mc.getInstanceAtDepth != undefined);
+ xcheck(mc.getNextHighestDepth != undefined);
+ xcheck(mc.getSWFVersion != undefined);
+ xcheck(mc.getTextSnapshot != undefined);
+ xcheck(mc.lineStyle != undefined);
+ xcheck(mc.lineTo != undefined);
+ xcheck(mc.loadVariables != undefined);
+ xcheck(mc.localToGlobal != undefined);
+ xcheck(mc.moveTo != undefined);
+ xcheck(mc.setMask != undefined);
+ xcheck(mc.startDrag != undefined);
+ xcheck(mc.stopDrag != undefined);
+ xcheck(mc.unloadMovie != undefined);
+
+ xcheck(mc.enabled != undefined);
+ xcheck(mc.focusEnabled != undefined);
+ xcheck(mc.hitArea != undefined);
+ xcheck(mc.menu != undefined);
+}
-check(mc.getURL != undefined);
-check(mc.globalToLocal != undefined);
+xcheck(mc.getURL != undefined);
+xcheck(mc.globalToLocal != undefined);
check(mc.gotoAndPlay != undefined);
check(mc.gotoAndStop != undefined);
check(mc.hitTest != undefined);
-check(mc.lineStyle != undefined);
-check(mc.lineTo != undefined);
check(mc.loadMovie != undefined);
-check(mc.loadVariables != undefined);
-check(mc.localToGlobal != undefined);
-check(mc.moveTo != undefined);
check(mc.nextFrame != undefined);
check(mc.play != undefined);
check(mc.prevFrame != undefined);
check(mc.removeMovieClip != undefined);
-check(mc.setMask != undefined);
-check(mc.startDrag != undefined);
check(mc.stop != undefined);
-check(mc.stopDrag != undefined);
check(mc.swapDepths != undefined);
-check(mc.unloadMovie != undefined);
// Check property existance
-check(mc.enabled != undefined);
-check(mc.focusEnabled != undefined);
-check(mc.hitArea != undefined);
-check(mc.menu != undefined);
-check(mc.onData != undefined);
-check(mc.onDragOut != undefined);
-check(mc.onDragOver != undefined);
-check(mc.onEnterFrame != undefined);
-check(mc.onKeyDown != undefined);
-check(mc.onKeyUp != undefined);
-check(mc.onKillFocus != undefined);
-check(mc.onLoad != undefined);
-check(mc.onMouseDown != undefined);
-check(mc.onMouseMove != undefined);
-check(mc.onMouseUp != undefined);
-check(mc.onPress != undefined);
-check(mc.onRelease != undefined);
-check(mc.onReleaseOutside != undefined);
-check(mc.onRollOut != undefined);
-check(mc.onRollOver != undefined);
-check(mc.onSetFocus != undefined);
-check(mc.onUnload != undefined);
-check(mc.tabChildren != undefined);
-check(mc.tabEnabled != undefined);
-check(mc.tabIndex != undefined);
-check(mc.trackAsMenu != undefined);
-check(mc.useHandCursor != undefined);
+xcheck(mc.onData != undefined);
+xcheck(mc.onDragOut != undefined);
+xcheck(mc.onDragOver != undefined);
+xcheck(mc.onEnterFrame != undefined);
+xcheck(mc.onKeyDown != undefined);
+xcheck(mc.onKeyUp != undefined);
+xcheck(mc.onKillFocus != undefined);
+xcheck(mc.onLoad != undefined);
+xcheck(mc.onMouseDown != undefined);
+xcheck(mc.onMouseMove != undefined);
+xcheck(mc.onMouseUp != undefined);
+xcheck(mc.onPress != undefined);
+xcheck(mc.onRelease != undefined);
+xcheck(mc.onReleaseOutside != undefined);
+xcheck(mc.onRollOut != undefined);
+xcheck(mc.onRollOver != undefined);
+xcheck(mc.onSetFocus != undefined);
+xcheck(mc.onUnload != undefined);
+xcheck(mc.tabChildren != undefined);
+xcheck(mc.tabEnabled != undefined);
+xcheck(mc.tabIndex != undefined);
+xcheck(mc.trackAsMenu != undefined);
+xcheck(mc.useHandCursor != undefined);
check(mc._alpha != undefined);
check(mc._currentframe != undefined);
check(mc._droptarget != undefined);
@@ -145,9 +146,9 @@
check(mc._y != undefined);
check(mc._ymouse != undefined);
check(mc._yscale != undefined);
-check(mc._lockroot != undefined);
+xcheck(mc._lockroot != undefined);
check(mc._name != undefined);
-check(mc._parent != undefined);
+xcheck(mc._parent != undefined);
check(mc._rotation != undefined);
check(mc._soundbuftime != undefined);
check(mc._target != undefined);
@@ -161,4 +162,4 @@
// Test movieclip creation
var mc2 = createEmptyMovieClip("mc2_mc", 50, 0, 0, 0);
-check(mc2 != undefined);
+xcheck(mc2 != undefined);
Index: NetConnection.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/NetConnection.as,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NetConnection.as 24 Apr 2006 23:05:56 -0000 1.4
+++ NetConnection.as 15 Oct 2006 02:30:55 -0000 1.5
@@ -45,16 +45,16 @@
// test the NetConnection constuctor
if (tmp) {
- trace("PASSED: NetConnection::NetConnection() constructor");
+ pass("NetConnection::NetConnection() constructor");
} else {
- trace("FAILED: NetConnection::NetConnection()");
+ fail("NetConnection::NetConnection()");
}
// test the NetConnection::connect method
if (tmp.connect) {
- trace("PASSED: NetConnection::connect() exists");
+ pass("NetConnection::connect() exists");
} else {
- trace("FAILED: NetConnection::connect() doesn't exist");
+ fail("NetConnection::connect() doesn't exist");
}
// test the NetConnection::connect method
@@ -62,9 +62,9 @@
tmp.connect("rtmp://www.mediacollege.com/flash/media-player/testclip-4sec.flv");
if (tmp.geturl) {
- trace("PASSED: NetConnection::getURL() exists");
+ xpass("NetConnection::getURL() exists");
} else {
- trace("FAILED: NetConnection::getURL() doesn't exist");
+ xfail("NetConnection::getURL() doesn't exist");
}
// Check the see if the URL got parsed right
@@ -77,7 +77,7 @@
&& protocol == "rtmp"
&& host == "www.mediacollege.com"
&& path == "/flash/media-player/testclip-4sec.flv") {
- trace("PASSED: NetConnection::connect() initialized correctly");
+ xpass("NetConnection::connect() initialized correctly");
} else {
- trace("FAILED: NetConnection::connect() didn't initialized correctly");
+ xfail("NetConnection::connect() didn't initialized correctly");
}
Index: Number.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Number.as,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Number.as 5 Oct 2006 14:13:00 -0000 1.3
+++ Number.as 15 Oct 2006 02:30:55 -0000 1.4
@@ -47,7 +47,7 @@
// TODO: test with SWF target != 6 (the only one tested so far)
//
-rcsid="$Id: Number.as,v 1.3 2006/10/05 14:13:00 strk Exp $";
+rcsid="$Id: Number.as,v 1.4 2006/10/15 02:30:55 rsavoye Exp $";
#include "check.as"
@@ -61,5 +61,5 @@
#endif
// but they have the same numeric value
-check_equals ( n1 , 268 );
+xcheck_equals (n1 , 268 );
Index: Object.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Object.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Object.as 4 Oct 2006 14:58:09 -0000 1.9
+++ Object.as 15 Oct 2006 02:30:55 -0000 1.10
@@ -40,7 +40,7 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: Object.as,v 1.9 2006/10/04 14:58:09 strk Exp $";
+rcsid="$Id: Object.as,v 1.10 2006/10/15 02:30:55 rsavoye Exp $";
#include "check.as"
@@ -102,13 +102,13 @@
// add the "len" property
var ret = obj3.addProperty("len", getLen, setLen);
-check_equals(ret, true);
+xcheck_equals(ret, true);
check_equals (obj3.len, undefined);
obj3._len = 3;
-check_equals (obj3.len, 3);
+xcheck_equals (obj3.len, 3);
obj3.len = 5;
-check_equals (obj3._len, 5);
+xcheck_equals (obj3._len, 5);
check_equals (obj3.len, 5);
Index: Selection.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Selection.as,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Selection.as 20 Jun 2006 20:45:27 -0000 1.4
+++ Selection.as 15 Oct 2006 02:30:55 -0000 1.5
@@ -40,7 +40,7 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: Selection.as,v 1.4 2006/06/20 20:45:27 strk Exp $";
+rcsid="$Id: Selection.as,v 1.5 2006/10/15 02:30:55 rsavoye Exp $";
#include "check.as"
@@ -64,4 +64,4 @@
// test the Selection::setfocus method
check (selectionObj.setfocus != undefined);
// test the Selection::set method
-check (selectionObj.set != undefined);
+xcheck (selectionObj.set != undefined);
Index: XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- XML.as 24 Apr 2006 23:05:56 -0000 1.6
+++ XML.as 15 Oct 2006 02:30:55 -0000 1.7
@@ -166,24 +166,24 @@
// fail("XML::load() doesn't work");
// }
if (tmp.parseXML($xml)) {
- pass("XML::parseXML() works");
+ xpass("XML::parseXML() works");
} else {
- fail("XML::parseXML() doesn't work");
+ xfail("XML::parseXML() doesn't work");
}
//
if (tmp.hasChildNodes() == true) {
- pass("XML::hasChildNodes() works");
+ xpass("XML::hasChildNodes() works");
} else {
- fail("XML::hasChildNodes() doesn't work");
+ xfail("XML::hasChildNodes() doesn't work");
}
note(tmp.getBytesLoaded());
note(tmp.getBytesTotal());
if (tmp.getBytesLoaded() > 0) {
- pass("XML::getBytesLoaded() works");
+ xpass("XML::getBytesLoaded() works");
} else {
- fail("XML::getBytesLoaded() doesn't work");
+ xfail("XML::getBytesLoaded() doesn't work");
}
if (tmp.getBytesTotal() > 0) {
Index: XMLNode.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XMLNode.as,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- XMLNode.as 24 Apr 2006 23:05:56 -0000 1.2
+++ XMLNode.as 15 Oct 2006 02:30:55 -0000 1.3
@@ -233,9 +233,9 @@
}
if (node.previousSibling) {
- pass("XMLNode::PreviousSibling with child works");
+ pass("XMLNode::PreviousSibling with child work");
} else {
- fail("XMLNode::PreviousSibling with child doesn't works");
+ fail("XMLNode::PreviousSibling with child doesn't work");
}
var nextnode = new XMLNode;
@@ -268,9 +268,9 @@
trace(node.previousSibling.nodeName);
if (node.previousSibling.nodeName == "fu") {
- pass("XMLNode::PreviousSibling with child works");
+ xpass("XMLNode::PreviousSibling with child works");
} else {
- fail("XMLNode::PreviousSibling with child doesn't works");
+ xfail("XMLNode::PreviousSibling with child doesn't works");
}
var out = node.toString();
Index: array.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- array.as 6 Jul 2006 08:16:31 -0000 1.9
+++ array.as 15 Oct 2006 02:30:55 -0000 1.10
@@ -5,7 +5,7 @@
// Updated with sort functions, and to use check() macro
// by Mike Carlson Feb. 14th, 2006
-rcsid="$Id: array.as,v 1.9 2006/07/06 08:16:31 strk Exp $";
+rcsid="$Id: array.as,v 1.10 2006/10/15 02:30:55 rsavoye Exp $";
#include "check.as"
@@ -68,7 +68,7 @@
check_equals ( a.toString() , "7,7,7,7,7,8,8,8,9,200,200,200,200,551,551" );
a.sort( Array.UNIQUESORT | Array.DESCENDING | Array.NUMERIC);
-check_equals ( a.toString() , "7,7,7,7,7,8,8,8,9,200,200,200,200,551,551" );
+xcheck_equals (a.toString() , "7,7,7,7,7,8,8,8,9,200,200,200,200,551,551" );
// Test multi-parameter constructor, and keep testing sort cases
var trysortarray = new Array("But", "alphabet", "Different", "capitalization");
@@ -132,6 +132,20 @@
check_equals ( c.length, 1001 );
// $Log: array.as,v $
+// Revision 1.10 2006/10/15 02:30:55 rsavoye
+// * testsuite/actionscript.all/swf_exists.exp: Use local_exec()
+// instead of spawn/expect. This works better with batch tests.
+// * testsuite/actionscript.all/check.as: Add xcheck and
+// xcheck_equals to handle expected failures.
+// * testsuite/actionscript.all/dejagnu.as: Add xpass and xfail to
+// handle expect failures.
+// * testsuite/actionscript.all/Boolean.as, Date.as, Global.as,
+// Inheritance.as, MovieClip.as, NetConnection.as, Number.as,
+// Object.as, Selection.as, array.as, delete.as, inheritance.as: Use
+// xcheck and xcheck_equals for tests expected to not work yet.
+// * testsuite/actionscript.all/XML.as, XMLNode.as: Use xpass and
+// xfail for tests expected to not work yet.
+//
// Revision 1.9 2006/07/06 08:16:31 strk
// Added instanceOf test for both new Array() and [...] constructors.
//
Index: check.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/check.as,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- check.as 19 Sep 2006 17:36:33 -0000 1.8
+++ check.as 15 Oct 2006 02:30:55 -0000 1.9
@@ -62,9 +62,11 @@
# undef pass_check
#else
# define pass_check(text) trace("PASSED: "+text)
+# define xpass_check(text) trace("XPASSED: "+text)
#endif
#define fail_check(text) trace("FAILED: "+text)
+#define xfail_check(text) trace("XFAILED: "+text)
//
// Use check(<expression>)
@@ -75,6 +77,12 @@
else fail_check(#expr + \
" [" + __LINE__ + "]" ); \
+#define xcheck(expr) \
+ if ( expr ) xpass_check(#expr + \
+ " [" + __LINE__ + "]" ); \
+ else xfail_check(#expr + \
+ " [" + __LINE__ + "]" ); \
+
//
// Use check_equals(<obtained>, <expected>)
//
@@ -86,6 +94,14 @@
" obtained: " + obt + \
" [" + __LINE__ + "]" ); \
+#define xcheck_equals(obt, exp) \
+ if ( obt == exp ) xpass_check( \
+ #obt + " == " + #exp + \
+ " [" + __LINE__ + "]" ); \
+ else xfail_check("expected: " + #exp + \
+ " obtained: " + obt + \
+ " [" + __LINE__ + "]" ); \
+
trace(rcsid);
trace("SWF" + OUTPUT_VERSION + " - " + System.capabilities.version);
trace("");
Index: dejagnu.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/dejagnu.as,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- dejagnu.as 20 Jun 2006 20:45:27 -0000 1.3
+++ dejagnu.as 15 Oct 2006 02:30:55 -0000 1.4
@@ -50,7 +50,7 @@
// only differ in the types of data displayed. Differnt data for
// different folks works for me as long as the standard keywords are
// used to keep DejaGnu happy.
-rcsid="$Id: dejagnu.as,v 1.3 2006/06/20 20:45:27 strk Exp $";
+rcsid="$Id: dejagnu.as,v 1.4 2006/10/15 02:30:55 rsavoye Exp $";
#include "check.as"
@@ -58,6 +58,8 @@
var passed = 0;
var failed = 0;
+var xpassed = 0;
+var xfailed = 0;
var untest = 0;
var unresolv = 0;
@@ -74,10 +76,12 @@
// These are the four primary test states as required by the POSIX
// testing methodologies standard.
-#define pass(text) passed++; trace("PASSED: " + text)
-#define fail(text) failed++; trace("FAILED: " + text)
-#define untested(text) untest++; trace("UNTESTED: " + text)
-#define unresolved(text) unresolv++; trace("UNRESOLVED: " + text)
+#define pass(text) passed++; trace("PASSED: " + text + " [" + __LINE__ + "]")
+#define fail(text) failed++; trace("FAILED: " + text + " [" + __LINE__ + "]")
+#define xpass(text) xpassed++; trace("XPASSED: " + text + " [" + __LINE__ +
"]")
+#define xfail(text) xfailed++; trace("XFAILED: " + text + " [" + __LINE__ +
"]")
+#define untested(text) untest++; trace("UNTESTED: " + text + " [" + __LINE__ +
"]")
+#define unresolved(text) unresolv++; trace("UNRESOLVED: " + text + " [" +
__LINE__ + "]")
//
#define note(text) trace(text)
@@ -86,6 +90,8 @@
trace("Totals:"); \
trace(" passed: " + passed ); \
trace(" failed: " + failed ); \
+ if (xfailed) trace(" expected failures: " + xfailed); \
+ if (xpassed) trace(" unexpected passes: " + xpassed); \
if (untest) trace(" untested: " + untest); \
if (unresolv) trace(" unresolved: " + unresolv); \
Index: delete.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/delete.as,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- delete.as 20 Jun 2006 20:45:27 -0000 1.2
+++ delete.as 15 Oct 2006 02:30:55 -0000 1.3
@@ -1,10 +1,10 @@
-rcsid="$Id: delete.as,v 1.2 2006/06/20 20:45:27 strk Exp $";
+rcsid="$Id: delete.as,v 1.3 2006/10/15 02:30:55 rsavoye Exp $";
#include "check.as"
var anObject = new Object();
check(anObject != undefined);
-check(delete anObject);
-check(anObject == undefined);
+xcheck(delete anObject);
+xcheck(anObject == undefined);
check(!delete noObject);
Index: inheritance.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/inheritance.as,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- inheritance.as 3 Jul 2006 17:55:34 -0000 1.1
+++ inheritance.as 15 Oct 2006 02:30:55 -0000 1.2
@@ -40,29 +40,29 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: inheritance.as,v 1.1 2006/07/03 17:55:34 strk Exp $";
+rcsid="$Id: inheritance.as,v 1.2 2006/10/15 02:30:55 rsavoye Exp $";
#include "check.as"
var obj = new Object({a:1});
-check_equals(obj.__proto__.constructor, Object);
-check(obj instanceOf Object);
+xcheck_equals(obj.__proto__.constructor, Object);
+xcheck(obj instanceOf Object);
function SubObj1() {}
var sobj1 = new SubObj1();
check_equals(sobj1.__proto__.constructor, SubObj1);
check(SubObj1 instanceOf Function);
-check(Function instanceOf Object);
-check(SubObj1 instanceOf Object);
+xcheck(Function instanceOf Object);
+xcheck(SubObj1 instanceOf Object);
// inheritance chain is NOT subobj1,SubObj1,Function,Object, as the
// above might suggest...
-check(! sobj1 instanceOf Function);
+xcheck(!sobj1 instanceOf Function);
// but still, sobj1 is an instance of Object *and* SubObj1
-check(sobj1 instanceOf Object);
+xcheck(sobj1 instanceOf Object);
check(sobj1 instanceOf SubObj1);
check(SubObj1.prototype != undefined);
Index: swf_exists.exp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/swf_exists.exp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- swf_exists.exp 5 Oct 2006 14:00:10 -0000 1.10
+++ swf_exists.exp 15 Oct 2006 02:30:55 -0000 1.11
@@ -16,22 +16,23 @@
set params "-v "
foreach file [glob ${srcdir}/*.as] {
-foreach swfversion [list 5 6 7] {
+ puts "Executing test case [ file tail ${file} ]"
+ foreach swfversion [list 5 6 7] {
# some tests might do different things when built for different
# SWF target versions.
- exec makeswf -DOUTPUT_VERSION=${swfversion} -v${swfversion} ${file}
+ exec makeswf -I${srcdir} -DOUTPUT_VERSION=${swfversion} -v${swfversion}
${file}
# ready for Ming-0.4 naming of .pp file
#exec rm -f ${file}.pp ${file}.swf.frame0.pp
if [info exists file] {
-# puts "$file exists"
+ # puts "$file exists"
} else {
perror "$file doesn't exist"
return -1
}
-# verbose "The executable is $executable $params ${file}.swf" 2
+ # verbose "The executable is $executable $params ${file}.swf" 2
if ![file exists out.swf] {
perror "The executable, \"$executable\" is missing" 0
return "No source file found"
@@ -41,73 +42,37 @@
# spawn the executable and look for the DejaGnu output messages from the
# test case.
- spawn -noecho -open [open "|./${executable} ${params} out.swf" "r"]
- # spawn ${executable} ${params} out.swf
- expect {
- -re "\[0-9\]\[0-9\]:..:..:${text}\r\n" {
- regsub "\[\n\r\t\]*NOTE: $text\r\n" $expect_out(0,string) "" output
- verbose "$output" 3
- set timetol 0
- exp_continue
- }
- -re "NOTE:\[^\r\n]*\r\n" {
- regsub "\[\n\r\t\]*NOTE: " $expect_out(0,string) "" output
- set output [string range $output 6 end-2]
- verbose "${testid}: $output" 2
- set timetol 0
- exp_continue
- }
- -re "PASSED:\[^\r\n]*\r\n" {
- regsub "\[\n\r\t\]*PASSED: " $expect_out(0,string) "" output
- set output [string range $output 0 end-2]
- pass "${testid}: $output"
- set timetol 0
- exp_continue
- }
- -re "FAILED:\[^\r\n\]*\r\n" {
- regsub "\[\n\r\t\]*FAILED: " $expect_out(0,string) "" output
- set output [string range $output 0 end-2]
- fail "${testid}: $output"
- set timetol 0
- exp_continue
- }
- -re "UNTESTED:\[^\r\n]*\r\n" {
- regsub "\[\n\r\t\]*TESTED: " $expect_out(0,string) "" output
- set output [string range $output 8 end-2]
- untested "${testid}: $output"
- set timetol 0
- exp_continue
- }
- -re "UNRESOLVED:\[^\r\n]*\r\n" {
- regsub "\[\n\r\t\]*UNRESOLVED: " $expect_out(0,string) "" output
- set output [string range $output 8 end-2]
- unresolved "${testid}: $output"
- set timetol 0
- exp_continue
- }
- -re "Totals" {
- verbose "All done" 2
- }
- eof {
- # unresolved "${executable} died prematurely"
- # catch close
- # return "${executable} died prematurely"
- }
- timeout {
- warning "Timed out executing test case"
- if { $timetol <= 2 } {
- incr timetol
- exp_continue
- } else {
- - catch close
- return "Timed out executing test case"
- }
- }
+ verbose "Flash version ${swfversion}"
+ set outp [local_exec "./${executable} ${params} out.swf" "" "" $timeout]
+# print $outp
+
+ # remove the \r part of "\r\n" so we don't break all the patterns
+ # we want to match.
+ regsub -all -- "\r" $outp "" outp
+
+ if {[regexp " XFAILED: .*\n" $outp state]} {
+ regsub -all " XFAILED: *\n" $outp "\\1" outp
+ regsub -all -- "\n" $state "" state
+ xfail "$state"
+ }
+
+ if {[regexp " FAILED: .*\n" $outp state]} {
+ regsub -all "FAILED: *\n" $outp "\\1" outp
+ regsub -all -- "\n" $state "" state
+ fail "$state"
+ }
+ if {[regexp " XPASSED: .*\n" $outp state]} {
+ regsub -all "XPASSED: *\n" $outp "\\1" outp
+ regsub -all -- "\n" $state "" state
+ xpass "$state"
+ }
+ if {[regexp " PASSED: .*\n" $outp state]} {
+ regsub -all "PASSED: *\n" $outp "\\1" outp
+ regsub -all -- "\n" $state "" state
+ pass "$state"
}
- # force a close of the executable to be safe.
- catch close
-}
+ }
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash/testsuite/actionscript.all Boolean.as Dat...,
Rob Savoye <=