[z3-checkins] r36391 - in z3/deliverance/trunk/deliverance: . test-data/static

[ianb at codespeak.net]

Author: ianb
Date: Tue Jan  9 23:20:32 2007
New Revision: 36391

Added:
   z3/deliverance/trunk/deliverance/test-data/static/example with spaces.html
      - copied unchanged from r35754, z3/deliverance/trunk/deliverance/test-data/static/example.html
   z3/deliverance/trunk/deliverance/test-data/static/standardrules with spaces.xml
      - copied unchanged from r35754, z3/deliverance/trunk/deliverance/test-data/static/standardrules.xml
   z3/deliverance/trunk/deliverance/test-data/static/xinclude_rules with spaces.xml
      - copied, changed from r35754, z3/deliverance/trunk/deliverance/test-data/static/xinclude_rules.xml
Modified:
   z3/deliverance/trunk/deliverance/test_wsgi.py
Log:
Added tests that include spaces

Copied: z3/deliverance/trunk/deliverance/test-data/static/xinclude_rules with spaces.xml (from r35754, z3/deliverance/trunk/deliverance/test-data/static/xinclude_rules.xml)
==============================================================================
--- z3/deliverance/trunk/deliverance/test-data/static/xinclude_rules.xml	(original)
+++ z3/deliverance/trunk/deliverance/test-data/static/xinclude_rules with spaces.xml	Tue Jan  9 23:20:32 2007
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
  
 <rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
-  <xi:include href="standardrules.xml" />
+  <xi:include href="standardrules%20with%20spaces.xml" />
 
   <replace content="//body" theme="//body" />
 </rules>

Modified: z3/deliverance/trunk/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/trunk/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/trunk/deliverance/test_wsgi.py	Tue Jan  9 23:20:32 2007
@@ -90,6 +90,18 @@
     res2 = app.get('/xinclude_expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
+def do_with_spaces(renderer_type, name):
+    wsgi_app = DeliveranceMiddleware(static_app, 'xinclude_theme.html', 'xinclude_rules.xml',
+                                     renderer_type)
+    app = TestApp(wsgi_app)
+    expected = app.get('/xinclude_expected.html?notheme').body
+    res = app.get('/example%20with%20spaces.html')
+    html_string_compare(res.body, expected)
+    wsgi_app = DeliveranceMiddleware(static_app, 'xinclude_theme.html', 'xinclude_rules%20with%20spaces.xml',
+                                     renderer_type)
+    app = TestApp(wsgi_app)
+    res2 = app.get('/example.html')
+    html_string_compare(res2.body, expected)
 
 def do_nycsr(renderer_type, name):
     wsgi_app = DeliveranceMiddleware(nycsr_app, 'http://codespeak.net/svn/z3/deliverance/trunk/deliverance/test-data/nycsr/nycsr_theme.html','nycsr.xml',
@@ -137,7 +149,7 @@
     html_string_compare(res.body, res2.body)
 
 RENDERER_TYPES = ['py', 'xslt']
-TEST_FUNCS = [ do_url, do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch, do_ajax, do_aggregate ] 
+TEST_FUNCS = [ do_url, do_basic, do_text, do_tasktracker, do_xinclude, do_with_spaces, do_nycsr, do_necoro, do_guidesearch, do_ajax, do_aggregate ] 
 def test_all():
     for renderer_type in RENDERER_TYPES:
         for test_func in TEST_FUNCS: