[Laszlo-checkins] r12349 - in openlaszlo/trunk: WEB-INF/lps/server/bin test/lfc/perf test/smoke

[hqm@openlaszlo.org]

Author: hqm
Date: 2009-01-07 14:17:17 -0800 (Wed, 07 Jan 2009)
New Revision: 12349

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/bin/convert_laszlo.pl
   openlaszlo/trunk/test/lfc/perf/reporter.lzx
   openlaszlo/trunk/test/smoke/regression.lzl
Log:
Change 20090107-hqm-K by hqm at badtzmaru.home on 2009-01-07 17:03:24 EST
    in /Users/hqm/openlaszlo/trunk3
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary:  update conversion script and test case for deprecated urlEscape method

New Features:

Bugs Fixed: LPP-7582

Technical Reviewer: ptw
QA Reviewer: (pending)
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:
    
+ replace lz.Browser.urlEscape with encodeURIComponent

+ add transform to conversion script to do this 

Tests:

smokecheck



Modified: openlaszlo/trunk/WEB-INF/lps/server/bin/convert_laszlo.pl
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/bin/convert_laszlo.pl	2009-01-07 22:04:50 UTC (rev 12348)
+++ openlaszlo/trunk/WEB-INF/lps/server/bin/convert_laszlo.pl	2009-01-07 22:17:17 UTC (rev 12349)
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Copyright 2008 Laszlo Systems.  Use according to license terms.
+# Copyright 2008, 2009 Laszlo Systems.  Use according to license terms.
 #
 # convert_laszlo_4.2.pl
 # Helps to convert 4.1 lzx programs (and potentially lzs) to
@@ -95,6 +95,7 @@
 $xform{states}=1;       # transform apply=" -> applied="
 $xform{applycall}=0;    # transform state.apply()/remove() -> setAttribute('applied', true|false)
 $xform{proxymethods}=1; # transform Lz.setCanvasAttribute()/callMethod() -> lz.embed.* 
+$xform{urlescape}=1;    # transform lz.embed.urlEscape() -> encodeURIComponent
 
 ##
 # Other global variables
@@ -354,6 +355,16 @@
         s/Lz.(setCanvasAttribute|callMethod)/lz.embed.$1/g;
     }
 
+    #### transform urlEscape
+    #
+    # lz.Browser.urlEscape() -> encodeURIComponent
+    # lz.Browser.urlUnescape() -> decodeURIComponent
+
+    if ($xform{urlescape}) {
+        s/lz.Browser.urlEscape/encodeURIComponent/g;
+        s/lz.Browser.urlUnescape/decodeURIComponent/g;
+    }
+
     debugln(3, "   EMIT CONTENT: " . $_);
     print $FH $_;
     $_ = $save;

Modified: openlaszlo/trunk/test/lfc/perf/reporter.lzx
===================================================================
--- openlaszlo/trunk/test/lfc/perf/reporter.lzx	2009-01-07 22:04:50 UTC (rev 12348)
+++ openlaszlo/trunk/test/lfc/perf/reporter.lzx	2009-01-07 22:17:17 UTC (rev 12349)
@@ -1,5 +1,5 @@
 <library>
-    <!-- Copyright 2006-2008 Laszlo Systems --> 
+    <!-- Copyright 2006-2009 Laszlo Systems --> 
 
     <node id="reporter"> 
         <method name="sendLogData" args="suitename">
@@ -12,27 +12,27 @@
           
            var serverURL = base + "/test/lfc/perf/reporter.jsp";
            var buildid = canvas.lpsbuild.split(" ")[0];
-           var browserInfo = lz.Browser.urlEscape(lz.Browser.getVersion());
+           var browserInfo = encodeURIComponent(lz.Browser.getVersion());
            for (var k in timingMeters) {
                var meter = timingMeters[k];
                // Debug.write("k %w", k);
                // Debug.write("meter %w", meter);
                var mean = meter.calcMean(); 
-               var query = "testname="+lz.Browser.urlEscape(meter.name)
-                 + "&suitename=" + lz.Browser.urlEscape(suitename)
-                 + "&duration=" + lz.Browser.urlEscape(mean) 
-                 + "&count=" + lz.Browser.urlEscape(meter.count)
-                 + "&min=" + lz.Browser.urlEscape(meter.min)
-                 + "&max=" + lz.Browser.urlEscape(meter.max)
-                 + "&uncertainty=" + lz.Browser.urlEscape(meter.calcUncertainty())
-                 + "&suiteName=" + lz.Browser.urlEscape(suitename)
-                 + "&runtime=" + lz.Browser.urlEscape(canvas.runtime) 
-                 + "&debug=" + lz.Browser.urlEscape($debug)
-                 + "&buildid=" + lz.Browser.urlEscape(buildid) 
-                 + "&builddate=" + lz.Browser.urlEscape(canvas.lpsbuilddate)
+               var query = "testname="+encodeURIComponent(meter.name)
+                 + "&suitename=" + encodeURIComponent(suitename)
+                 + "&duration=" + encodeURIComponent(mean) 
+                 + "&count=" + encodeURIComponent(meter.count)
+                 + "&min=" + encodeURIComponent(meter.min)
+                 + "&max=" + encodeURIComponent(meter.max)
+                 + "&uncertainty=" + encodeURIComponent(meter.calcUncertainty())
+                 + "&suiteName=" + encodeURIComponent(suitename)
+                 + "&runtime=" + encodeURIComponent(canvas.runtime) 
+                 + "&debug=" + encodeURIComponent($debug)
+                 + "&buildid=" + encodeURIComponent(buildid) 
+                 + "&builddate=" + encodeURIComponent(canvas.lpsbuilddate)
                  + "&browserinfo=" + browserInfo
-                 + "&branch=" + lz.Browser.urlEscape("branches-wafflecone"); 
-                 query += "&debug=" + lz.Browser.urlEscape($debug)                  
+                 + "&branch=" + encodeURIComponent("branches-wafflecone"); 
+                 query += "&debug=" + encodeURIComponent($debug)                  
                 // Debug.write("sendLogData", query);
                 var completeURL = serverURL + "?" + query;
                 

Modified: openlaszlo/trunk/test/smoke/regression.lzl
===================================================================
--- openlaszlo/trunk/test/smoke/regression.lzl	2009-01-07 22:04:50 UTC (rev 12348)
+++ openlaszlo/trunk/test/smoke/regression.lzl	2009-01-07 22:17:17 UTC (rev 12349)
@@ -1,6 +1,6 @@
 <library>
 <!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2008 Laszlo Systems, Inc.  All Rights Reserved.              *
+* Copyright 2001-2009 Laszlo Systems, Inc.  All Rights Reserved.              *
 * Use is subject to license terms.                                            *
 * X_LZ_COPYRIGHT_END ****************************************************** -->
     <include href="lzunit/lzunit.lzx" />
@@ -917,7 +917,7 @@
                 <![CDATA[
                         var d = "A!@#$%^&*() c"; 
                         
-                        assertEquals(d, lz.Browser.urlUnescape(lz.Browser.urlEscape(d)))
+                        assertEquals(d, decodeURIComponent(encodeURIComponent(d)))
                 ]]>
                 </method>
                 <method name="addTests">