[z3-checkins] r34052 - in z3/deliverance/branches/packaged/deliverance: . test-data test-data/wsgiurl test-data/wsgiurl/foo test-data/wsgiurl/foo/bar
ltucker at codespeak.net
ltucker at codespeak.net
Thu Nov 2 00:30:08 CET 2006
Author: ltucker
Date: Thu Nov 2 00:30:05 2006
New Revision: 34052
Added:
z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/
z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/
z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/
z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url.xml
z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_content.html
z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_expected.html
z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_theme.html
Modified:
z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml
z3/deliverance/branches/packaged/deliverance/test_wsgi.py
Log:
more url tests
Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml (original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml Thu Nov 2 00:30:05 2006
@@ -1,6 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<deliverance-test-suite>
+<deliverance-test>
+<rules xmlns="http://www.plone.org/deliverance">
+</rules>
+
+<theme base="http://www.example.com/foo/bar/" >
+ <html>
+ <head>
+ <style type="text/css">
+ @import url(whatever.css)
+ </style>
+ </head>
+ <body>
+ <a href="quux/zoop">zoop</a>
+ </body>
+ </html>
+</theme>
+
+<content>
+</content>
+
+<output>
+ <html>
+ <head>
+ <style type="text/css">
+ @import url(http://www.example.com/foo/bar/whatever.css)
+ </style>
+ </head>
+ <body>
+ <a href="http://www.example.com/foo/bar/quux/zoop">zoop</a>
+ </body>
+ </html>
+</output>
+
+</deliverance-test>
+
<!-- tests url replacement successfully; replaces the relative urls with absolute urls based on <base> if present -->
<deliverance-test>
<rules xmlns="http://www.plone.org/deliverance">
Added: z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url.xml Thu Nov 2 00:30:05 2006
@@ -0,0 +1,2 @@
+<rules xmlns="http://www.plone.org/deliverance">
+</rules>
Added: z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_content.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_content.html Thu Nov 2 00:30:05 2006
@@ -0,0 +1,4 @@
+<html>
+<head></head>
+<body></body>
+</html>
Added: z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_expected.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_expected.html Thu Nov 2 00:30:05 2006
@@ -0,0 +1,11 @@
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <style type="text/css">
+ @import url(http://localhost/foo/bar/whatever.css)
+ </style>
+ </head>
+ <body>
+ <a href="http://localhost/foo/bar/quux/zoop">zoop</a>
+ </body>
+ </html>
Added: z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_theme.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_theme.html Thu Nov 2 00:30:05 2006
@@ -0,0 +1,10 @@
+ <html>
+ <head>
+ <style type="text/css">
+ @import url(whatever.css)
+ </style>
+ </head>
+ <body>
+ <a href="quux/zoop">zoop</a>
+ </body>
+ </html>
Modified: z3/deliverance/branches/packaged/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_wsgi.py (original)
+++ z3/deliverance/branches/packaged/deliverance/test_wsgi.py Thu Nov 2 00:30:05 2006
@@ -13,6 +13,7 @@
necoro_data = os.path.join(os.path.dirname(__file__), 'test-data', 'necoro')
guidesearch_data = os.path.join(os.path.dirname(__file__), 'test-data', 'guidesearch')
ajax_data = os.path.join(os.path.dirname(__file__), 'test-data', 'ajax')
+url_data = os.path.join(os.path.dirname(__file__), 'test-data', 'wsgiurl')
static_app = StaticURLParser(static_data)
tasktracker_app = StaticURLParser(tasktracker_data)
@@ -20,6 +21,7 @@
necoro_app = StaticURLParser(necoro_data)
guidesearch_app = StaticURLParser(guidesearch_data)
ajax_app = StaticURLParser(ajax_data)
+url_app = StaticURLParser(url_data)
def html_string_compare(astr, bstr):
@@ -112,9 +114,16 @@
res2 = app.get('/content.html?notheme')
html_string_compare(res.body, res2.body)
+def do_url(renderer_type, name):
+ wsgi_app = DeliveranceMiddleware(url_app, '/foo/bar/test_url_theme.html','/foo/bar/test_url.xml', renderer_type)
+ app = TestApp(wsgi_app)
+ res = app.get('/foo/bar/test_url_content.html')
+ res2 = app.get('/foo/bar/test_url_expected.html?notheme')
+ html_string_compare(res.body,res2.body)
+
RENDERER_TYPES = ['py', 'xslt']
-TEST_FUNCS = [ do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch, do_ajax ]
+TEST_FUNCS = [ do_url, do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch, do_ajax ]
def test_all():
for renderer_type in RENDERER_TYPES:
for test_func in TEST_FUNCS:
More information about the z3-checkins
mailing list