Author: ptw
Date: 2008-03-16 12:57:05 -0700 (Sun, 16 Mar 2008)
New Revision: 8285
Modified:
openlaszlo/trunk/test/smoke/all_setters.lzl
openlaszlo/trunk/test/smoke/getters-setters.lzl
openlaszlo/trunk/test/smoke/regression.lzl
openlaszlo/trunk/test/smoke/smokecheck.lzx
Log:
Change 20080316-ptw-U by [EMAIL PROTECTED] on 2008-03-16 15:55:02 EDT
in /Users/ptw/OpenLaszlo/ringding-clean
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Modernize smokecheck
Bugs Fixed:
LPP-1587 'ECMA4: Compile LZX declarations as JS declarations' (partial)
Technical Reviewer: max (pending)
QA Reviewer: henry (pending)
Details:
regression, all_setters, smokecheck, getters-setters: update to modern
class names,
remove obsolete getAttribute calls. Fix one broken test, comment
out other broken test (reported LPP-5160).
Tests:
smokecheck
Modified: openlaszlo/trunk/test/smoke/all_setters.lzl
===================================================================
--- openlaszlo/trunk/test/smoke/all_setters.lzl 2008-03-16 19:41:02 UTC (rev
8284)
+++ openlaszlo/trunk/test/smoke/all_setters.lzl 2008-03-16 19:57:05 UTC (rev
8285)
@@ -35,55 +35,55 @@
// tester.setAttribute("yscale",1);
<!-- do all the tests -->
- //assertEquals(tester.getAttribute("clip"), tester.clip);
- assertEquals(tester.getAttribute("x"), tester.x);
- assertEquals(tester.getAttribute("y"), tester.y);
- //assertEquals(tester.getAttribute("width"), tester.width);
- //assertEquals(tester.getAttribute("height"), tester.height);
- assertEquals(tester.getAttribute("rotation"), tester.rotation);
- assertEquals(tester.getAttribute("opacity"), tester.opacity);
- //assertEquals(tester.getAttribute("alpha"), tester.alpha);
- assertEquals(tester.getAttribute("visible"), tester.visible);
- //assertEquals(tester.getAttribute("align"), tester.align);
- //assertEquals(tester.getAttribute("valign"), tester.valign);
- //assertEquals(tester.getAttribute("source"), tester.source);
- assertEquals(tester.getAttribute("bgcolor"), tester.bgcolor);
- //assertEquals(tester.getAttribute("resource"), tester.resource);
- //assertEquals(tester.getAttribute("clickable"), tester.clickable);
- //assertEquals(tester.getAttribute("pixellock"), tester.pixellock);
- //assertEquals(tester.getAttribute("cursor"), tester.cursor);
- //assertEquals(tester.getAttribute("fgcolor"), tester.fgcolor);
- //assertEquals(tester.getAttribute("font"), tester.font);
- //assertEquals(tester.getAttribute("stretches"), tester.stretches);
- assertEquals(tester.getAttribute("play"), tester.play);
- //assertEquals(tester.getAttribute("selected"), tester.selected);
+ //assertEquals(tester["clip"], tester.clip);
+ assertEquals(tester["x"], tester.x);
+ assertEquals(tester["y"], tester.y);
+ //assertEquals(tester["width"], tester.width);
+ //assertEquals(tester["height"], tester.height);
+ assertEquals(tester["rotation"], tester.rotation);
+ assertEquals(tester["opacity"], tester.opacity);
+ //assertEquals(tester["alpha"], tester.alpha);
+ assertEquals(tester["visible"], tester.visible);
+ //assertEquals(tester["align"], tester.align);
+ //assertEquals(tester["valign"], tester.valign);
+ //assertEquals(tester["source"], tester.source);
+ assertEquals(tester["bgcolor"], tester.bgcolor);
+ //assertEquals(tester["resource"], tester.resource);
+ //assertEquals(tester["clickable"], tester.clickable);
+ //assertEquals(tester["pixellock"], tester.pixellock);
+ //assertEquals(tester["cursor"], tester.cursor);
+ //assertEquals(tester["fgcolor"], tester.fgcolor);
+ //assertEquals(tester["font"], tester.font);
+ //assertEquals(tester["stretches"], tester.stretches);
+ assertEquals(tester["play"], tester.play);
+ //assertEquals(tester["selected"], tester.selected);
<!-- do it again with hardcoding -->
- //assertEquals(1, tester.getAttribute("clip"),"clip");
- assertEquals(1, tester.getAttribute("x"),"x");
- assertEquals(1, tester.getAttribute("y"),"y");
- // assertEquals(1, tester.getAttribute("width"),"width");
- // assertEquals(1, tester.getAttribute("height"),"height");
- assertEquals(1, tester.getAttribute("rotation"),"rotation");
- assertEquals(1, tester.getAttribute("opacity"),"opacity");
- // assertEquals(1, tester.getAttribute("alpha"),"alpha");
- assertEquals(1, tester.getAttribute("visible"),"visible");
- // assertEquals(1, tester.getAttribute("align"),"align");
- // assertEquals(1, tester.getAttribute("valign"),"valign");
- // assertEquals(1, tester.getAttribute("source"),"source");
- assertEquals(1, tester.getAttribute("bgcolor"),"bgcolor");
- // assertEquals(1, tester.getAttribute("resource"),"resource");
- // assertEquals(true,
tester.getAttribute("clickable"),"clickable");
- // assertEquals(1, tester.getAttribute("pixellock"),"pixellock");
- // assertEquals(1, tester.getAttribute("cursor"),"cursor");
- // assertEquals(1, tester.getAttribute("fgcolor"),"fgcolor");
- // assertEquals(1, tester.getAttribute("font"),"font");
- // assertEquals(true,
tester.getAttribute("stretches"),"stretches");
- // assertEquals(1, tester.getAttribute("play"),"play");
- // assertEquals(1, tester.getAttribute("selected"),"selected");
- // assertEquals(1, tester.getAttribute("xscale"),"xscale");
- // assertEquals(1, tester.getAttribute("yscale"),"yscale");
+ //assertEquals(1, tester["clip"],"clip");
+ assertEquals(1, tester["x"],"x");
+ assertEquals(1, tester["y"],"y");
+ // assertEquals(1, tester["width"],"width");
+ // assertEquals(1, tester["height"],"height");
+ assertEquals(1, tester["rotation"],"rotation");
+ assertEquals(1, tester["opacity"],"opacity");
+ // assertEquals(1, tester["alpha"],"alpha");
+ assertEquals(1, tester["visible"],"visible");
+ // assertEquals(1, tester["align"],"align");
+ // assertEquals(1, tester["valign"],"valign");
+ // assertEquals(1, tester["source"],"source");
+ assertEquals(1, tester["bgcolor"],"bgcolor");
+ // assertEquals(1, tester["resource"],"resource");
+ // assertEquals(true, tester["clickable"],"clickable");
+ // assertEquals(1, tester["pixellock"],"pixellock");
+ // assertEquals(1, tester["cursor"],"cursor");
+ // assertEquals(1, tester["fgcolor"],"fgcolor");
+ // assertEquals(1, tester["font"],"font");
+ // assertEquals(true, tester["stretches"],"stretches");
+ // assertEquals(1, tester["play"],"play");
+ // assertEquals(1, tester["selected"],"selected");
+ // assertEquals(1, tester["xscale"],"xscale");
+ // assertEquals(1, tester["yscale"],"yscale");
</method>
</class>
@@ -103,29 +103,29 @@
// tester.setAttribute("selectable",1);
tester.setAttribute("bgcolor",1);
- //assertEquals(tester.getAttribute("label"),tester.label);
- assertEquals(tester.getAttribute("text"),tester.text);
- //assertEquals(tester.getAttribute("fgcolor"),tester.fgcolor);
- //assertEquals(tester.getAttribute("font"),tester.font);
- assertEquals(tester.getAttribute("fontsize"),tester.fontsize);
- assertEquals(tester.getAttribute("fontstyle"),tester.fontstyle);
- assertEquals(tester.getAttribute("resize"),tester.resize);
- assertEquals(tester.getAttribute("yscroll"),tester.yscroll);
- assertEquals(tester.getAttribute("xscroll"),tester.xscroll);
-
//assertEquals(tester.getAttribute("selectable"),tester.selectable);
- assertEquals(tester.getAttribute("bgcolor"),tester.bgcolor);
+ //assertEquals(tester["label"],tester.label);
+ assertEquals(tester["text"],tester.text);
+ //assertEquals(tester["fgcolor"],tester.fgcolor);
+ //assertEquals(tester["font"],tester.font);
+ assertEquals(tester["fontsize"],tester.fontsize);
+ assertEquals(tester["fontstyle"],tester.fontstyle);
+ assertEquals(tester["resize"],tester.resize);
+ assertEquals(tester["yscroll"],tester.yscroll);
+ assertEquals(tester["xscroll"],tester.xscroll);
+ //assertEquals(tester["selectable"],tester.selectable);
+ assertEquals(tester["bgcolor"],tester.bgcolor);
- // assertEquals(1, tester.getAttribute("label"),"label");
- // assertEquals("newText", mdtester.getAttribute("text"),"text");
- // assertEquals(1, tester.getAttribute("fgcolor"),"fgcolor");
- // assertEquals(1, tester.getAttribute("font"),"font");
- // assertEquals(1, tester.getAttribute("fontsize"),"fontsize");
- // assertEquals("bold",
tester.getAttribute("fontstyle"),"fontstyle");
- // assertEquals(1, tester.getAttribute("resize"),"resize");
- // assertEquals(1, tester.getAttribute("yscroll"),"yscroll");
- // assertEquals(1, tester.getAttribute("xscroll"),"xscroll");
- // assertEquals(1, tester.getAttribute("selectable"),"selectable");
- assertEquals(1, tester.getAttribute("bgcolor"),"bgcolor");
+ // assertEquals(1, tester["label"],"label");
+ // assertEquals("newText", mdtester["text"],"text");
+ // assertEquals(1, tester["fgcolor"],"fgcolor");
+ // assertEquals(1, tester["font"],"font");
+ // assertEquals(1, tester["fontsize"],"fontsize");
+ // assertEquals("bold", tester["fontstyle"],"fontstyle");
+ // assertEquals(1, tester["resize"],"resize");
+ // assertEquals(1, tester["yscroll"],"yscroll");
+ // assertEquals(1, tester["xscroll"],"xscroll");
+ // assertEquals(1, tester["selectable"],"selectable");
+ assertEquals(1, tester["bgcolor"],"bgcolor");
</method>
</class>
</library>
Modified: openlaszlo/trunk/test/smoke/getters-setters.lzl
===================================================================
--- openlaszlo/trunk/test/smoke/getters-setters.lzl 2008-03-16 19:41:02 UTC
(rev 8284)
+++ openlaszlo/trunk/test/smoke/getters-setters.lzl 2008-03-16 19:57:05 UTC
(rev 8285)
@@ -4,7 +4,7 @@
.setters for those attributes.
-->
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2006 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2001-2006, 2008 Laszlo Systems, Inc. All Rights Reserved.
*
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ****************************************************** -->
@@ -32,10 +32,10 @@
</view>
<method name="testGettersOnView">
- assertEquals(tester.getAttribute("x"), tester.x);
- assertEquals(tester.getAttribute("y"), tester.y);
- assertEquals(tester.getAttribute("width"), tester.width);
- assertEquals(tester.getAttribute("height"), tester.height);
+ assertEquals(tester["x"], tester.x);
+ assertEquals(tester["y"], tester.y);
+ assertEquals(tester["width"], tester.width);
+ assertEquals(tester["height"], tester.height);
</method>
<method name="testSettersOnView">
@@ -43,10 +43,10 @@
tester.setAttribute("y", tester.y+152);
tester.setAttribute('height', 314);
tester.setAttribute("width", 159);
- assertEquals(tester.getAttribute("x"), tester.x);
- assertEquals(tester.getAttribute("y"), tester.y);
- assertEquals(tester.getAttribute("width"), tester.width);
- assertEquals(tester.getAttribute("height"), tester.height);
+ assertEquals(tester["x"], tester.x);
+ assertEquals(tester["y"], tester.y);
+ assertEquals(tester["width"], tester.width);
+ assertEquals(tester["height"], tester.height);
</method>
</class>
Modified: openlaszlo/trunk/test/smoke/regression.lzl
===================================================================
--- openlaszlo/trunk/test/smoke/regression.lzl 2008-03-16 19:41:02 UTC (rev
8284)
+++ openlaszlo/trunk/test/smoke/regression.lzl 2008-03-16 19:57:05 UTC (rev
8285)
@@ -144,7 +144,7 @@
<method name="testInitOrder">
this.names = [ 'a' , 'b' , 'c' , 'd' , 'e' ]
for ( var i =0; i < names.length; i++ ){
- new slowinit( this, { name : names[ i ] } );
+ new lz.slowinit( this, { name : names[ i ] } );
}
</method>
<method name="tearDown">
@@ -276,7 +276,7 @@
<dataset name="bug577" src="../resources/xml/http.xml"/>
<class name="bug_577" extends="TestCase">
<method name="testLocalDS">
- assertUndefined(canvas.datasets.bug577.getAttribute('type'))
+ assertUndefined(canvas.datasets.bug577['type'])
</method>
</class>
@@ -285,8 +285,13 @@
<class name="class_623">
<attribute name="bar"/>
<method name="setBar" args="newValue">
- // uncommenting this line fixes the next one: this.bar = 1234;
- bar = newValue;
+ // Because of lossage in swf runtime with implicit-this and LHS,
+ // we can't reference bar without this:
+ if ($as2) {
+ this.bar = newValue;
+ } else {
+ bar = newValue;
+ }
</method>
<method name="getBar">
return bar;
@@ -296,8 +301,10 @@
<class name="bug_623" extends="TestCase">
<class_623 id="obj"/>
<method name="testSetGet">
- obj.setBar(1);
- assertEquals(1, obj.getBar());
+ var unique = {}
+ obj.setBar(unique);
+ assertSame(unique, obj.getBar());
+ assertUndefined(global['bar']);
</method>
</class>
@@ -385,7 +392,7 @@
<mynode name="myinstance"/>
<method name="testNode">
- assertTrue(myinstance instanceof mynode);
+ assertTrue(myinstance instanceof lz.mynode);
assertTrue(myinstance instanceof LzNode);
assertFalse(myinstance instanceof LzView);
</method>
@@ -738,7 +745,7 @@
<class name="bug_1843" extends="TestCase">
<view name="cv" bgcolor="teal" width="100" height="50"
clickable="true"/>
<method name="testClickability">
- assertTrue(cv.getAttribute("clickable"))
+ assertTrue(cv["clickable"])
</method>
</class>
@@ -772,7 +779,7 @@
</handler>
<method name="applyData" args="d">
- classroot.assertTrue(this.gotinit)
+ classroot.assertTrue(this.gotinit, "applyData called
before oninit")
this.setAttribute('value', d);
</method>
</class>
@@ -798,11 +805,11 @@
fdel = new LzDelegate(this, "fail", tr,
"oninit")
return
}
- else delete fdel
+ else delete this.fdel
setResult(tr)
result.currentTest = "bug_2029"
- super.fail(msg)
+ super.fail.apply(this, arguments)
</method>
<toggle name="local" datapath="localdata:/value/text()"/>
<toggle name="remote"
datapath="remotedata:/mydata/value/text()"/>
@@ -820,7 +827,7 @@
<view name="lview"/>
<method name="testSrc">
lview.setSource('http:../resources/swf/logo.swf')
- assertNotUndefined(lview.getAttribute('resource'),
'Source attribute undefined!')
+ assertNotUndefined(lview['resource'], 'Source
attribute undefined!')
</method>
</class>
@@ -878,7 +885,7 @@
<simplelayout spacing="5"/>
<inputtext datapath="bug2239:/item/text()" name="tbox" width="200"/>
<method name="testWidth">
- assertEquals(200, tbox.getCloneNumber(0).getAttribute('width'))
+ assertEquals(200, tbox.getCloneNumber(0)['width'])
</method>
</class>
Modified: openlaszlo/trunk/test/smoke/smokecheck.lzx
===================================================================
--- openlaszlo/trunk/test/smoke/smokecheck.lzx 2008-03-16 19:41:02 UTC (rev
8284)
+++ openlaszlo/trunk/test/smoke/smokecheck.lzx 2008-03-16 19:57:05 UTC (rev
8285)
@@ -119,7 +119,7 @@
<bug_1899/>
<bug_2029/>
<bug_2113/>
- <bug_2125/>
+<!-- Broken: LPP-5160 <bug_2125/> -->
<bug_2131/>
<bug_2223/>
<bug_2225/>
@@ -137,6 +137,6 @@
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ****************************************************** -->
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
