[Osaas-commits] r36 - in trunk: . server/test

[scm-commit@wald.intevation.org]

Author: bh
Date: 2007-12-10 14:48:01 +0100 (Mon, 10 Dec 2007)
New Revision: 36

Modified:
   trunk/ChangeLog
   trunk/server/test/test_formparser.py
Log:
* server/test/test_formparser.py
(FormParsingTests.test_convert_form_urlencoded): percent-escape
the colons in the test data.  Java does that.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-08-31 14:47:02 UTC (rev 35)
+++ trunk/ChangeLog	2007-12-10 13:48:01 UTC (rev 36)
@@ -1,3 +1,9 @@
+2007-12-10  Bernhard Herzog  <bh at intevation.de>
+
+	* server/test/test_formparser.py
+	(FormParsingTests.test_convert_form_urlencoded): percent-escape
+	the colons in the test data.  Java does that.
+
 2007-08-31  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
 
 	* README.txt: Fixed URL for developer list.

Modified: trunk/server/test/test_formparser.py
===================================================================
--- trunk/server/test/test_formparser.py	2007-08-31 14:47:02 UTC (rev 35)
+++ trunk/server/test/test_formparser.py	2007-12-10 13:48:01 UTC (rev 36)
@@ -20,7 +20,10 @@
 class FormParsingTests(unittest.TestCase, support.AttributeTestMixin):
 
     def test_convert_form_urlencoded(self):
-        formdata = "&".join(["user=karl", "responsetime=2007-06-01T12:14:16Z",
+        # In the test data in this test case, the colons are
+        # percent-escaped as well, because Java does it that way.
+        formdata = "&".join(["user=karl",
+                             "responsetime=2007-06-01T12%3A14%3A16Z",
                              "wmsidextern=example.com%2Fcgi-bin%2Ffridawms",
                              "wmsidintern=localhost%2Fcgi-bin%2Fmyfrida",
                              "requeststring=VERSION=1.1.1%26REQUEST=GetMap"
@@ -28,7 +31,7 @@
                              "%26WIDTH=460%26HEIGHT=348"
                              "%26EXCEPTIONS=application%2Fvnd.ogc.se_xml"
                              "%26BGCOLOR=0xffffff%26BBOX=0.0,0.0,460.0,348.0"
-                             "%26LAYERS=gewaesser%26STYLES=%26SRS=EPSG:4326"
+                             "%26LAYERS=gewaesser%26STYLES=%26SRS=EPSG%3A4326"
                              "%26SERVICE=WMS"])
         self.check_attributes(parse_formdata(formdata),
                               user="karl",