Author: hqm
Date: 2006-11-08 14:57:32 -0800 (Wed, 08 Nov 2006)
New Revision: 2446
Modified:
openlaszlo/branches/legals/WEB-INF/lps/templates/app-console.xslt
openlaszlo/branches/legals/lps/components/lztest/lztestmanager.lzx
openlaszlo/branches/legals/test/smoke/lzunit-test.lzl
Log:
Change 20061108-hqm-c by [EMAIL PROTECTED] on 2006-11-08 17:38:44 EST
in /cygdrive/c/users/hqm/openlaszlo/branches/legals
Summary: fix lztest to run tests in proper object context
New Features:
Bugs Fixed:
Technical Reviewer: ben, ptw (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
Also:
+ commented out portion of lzunit test which will not work in
DHTML due difference in error accounting
+ fix to DHTML app console wrapper to display debugger when canvas debug is true
Tests:
Modified: openlaszlo/branches/legals/WEB-INF/lps/templates/app-console.xslt
===================================================================
--- openlaszlo/branches/legals/WEB-INF/lps/templates/app-console.xslt
2006-11-08 22:09:26 UTC (rev 2445)
+++ openlaszlo/branches/legals/WEB-INF/lps/templates/app-console.xslt
2006-11-08 22:57:32 UTC (rev 2446)
@@ -14,6 +14,7 @@
doctype-system="http://www.w3.org/TR/html4/loose.dtd"/>
<xsl:param name="lps"><xsl:value-of select="/*/request/@lps"/></xsl:param>
+ <xsl:param name="debug"><xsl:value-of select="(/*/info/@debug = 'true') or
(/canvas/@debug = 'true')"/></xsl:param>
<xsl:param name="lzruntime" select="@runtime"/>
<xsl:param name="appinfo"><xsl:value-of
select="/*/console_appinfo/text()"/></xsl:param>
<xsl:param name="assets"><xsl:value-of
select="/*/request/@lps"/>/lps/assets</xsl:param>
@@ -62,7 +63,7 @@
-->
<xsl:param name="containerheight">
<xsl:choose>
- <xsl:when test="/*/info/@debug = 'true' and /canvas/@runtime =
'dhtml'">auto</xsl:when>
+ <xsl:when test="$debug = 'true' and /canvas/@runtime =
'dhtml'">auto</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$canvasheight"/>
</xsl:otherwise>
@@ -121,9 +122,8 @@
<xsl:choose>
<xsl:when test="@runtime = 'dhtml'">
-
<xsl:choose>
- <xsl:when test="/*/info/@debug = 'true'">
+ <xsl:when test="$debug = 'true'" >
<div id="dhtml-debugger-application">
<iframe id="dhtml-application"
src="{/canvas/request/@url}?lzt=html{/canvas/request/@query_args}"
Modified: openlaszlo/branches/legals/lps/components/lztest/lztestmanager.lzx
===================================================================
--- openlaszlo/branches/legals/lps/components/lztest/lztestmanager.lzx
2006-11-08 22:09:26 UTC (rev 2445)
+++ openlaszlo/branches/legals/lps/components/lztest/lztestmanager.lzx
2006-11-08 22:57:32 UTC (rev 2446)
@@ -154,7 +154,7 @@
suiteObj.curtest = testcase;
var testcaseObj = suiteObj.tests[testcase];
suiteObj.results[testcase] = "pre";
- testcaseObj();
+ testcaseObj.apply(suiteObj);
if (suiteObj.results[testcase] == "pre") {
suiteObj.results[testcase] = "pass";
suiteObj.passedtests += 1;
@@ -235,7 +235,7 @@
LzTestManager.assertNotSame = function(expected, actual, message) {
if (expected === actual) {
var msg = "NotSame " + msg + " expected anything but " + expected + ",
got ", actual;
- LzTestManager.failAssertion.fail(msg);
+ LzTestManager.failAssertion(msg);
}
}
Modified: openlaszlo/branches/legals/test/smoke/lzunit-test.lzl
===================================================================
--- openlaszlo/branches/legals/test/smoke/lzunit-test.lzl 2006-11-08
22:09:26 UTC (rev 2445)
+++ openlaszlo/branches/legals/test/smoke/lzunit-test.lzl 2006-11-08
22:57:32 UTC (rev 2446)
@@ -614,6 +614,9 @@
// These tests only work if debugging is enabled
if (Debug) {
+
+ /* *** the code below is commented out because these are hard errors
in DHTML JS ***
+
expectedError.expectedMatch = "flooglesnort";
// TODO: [2002-11-16 ptw] below currently signals two errors
undefined.flooglesnort;
@@ -649,7 +652,10 @@
expectedError.expectedMatch = "undefined property";
nonFunction[undefined] = 'this is an error';
assertEquals(12, expectedErrors, "Total number of expected errors");
+ */
}
+
+
]]>
</method>
</class>
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
