[z3-checkins] r43393 - in z3/deliverance/trunk/deliverance: . test-data/aggregate2

Tue May 15 00:35:12 CEST 2007

Author: ltucker
Date: Tue May 15 00:35:11 2007
New Revision: 43393

Added:
   z3/deliverance/trunk/deliverance/test-data/aggregate2/
   z3/deliverance/trunk/deliverance/test-data/aggregate2/expected.html
   z3/deliverance/trunk/deliverance/test-data/aggregate2/index.html
   z3/deliverance/trunk/deliverance/test-data/aggregate2/irrelevant.html
   z3/deliverance/trunk/deliverance/test-data/aggregate2/rules.xml
   z3/deliverance/trunk/deliverance/test-data/aggregate2/theme.html
Modified:
   z3/deliverance/trunk/deliverance/test_wsgi.py
Log:
checking in failing test for xpath union and aggregation error

Added: z3/deliverance/trunk/deliverance/test-data/aggregate2/expected.html
==============================================================================

--- (empty file)
+++ z3/deliverance/trunk/deliverance/test-data/aggregate2/expected.html	Tue May 15 00:35:11 2007
@@ -0,0 +1,6 @@
+<html>
+<body>
+    <div class="foo" >
+    </div>
+</body>
+</html>
\ No newline at end of file

Added: z3/deliverance/trunk/deliverance/test-data/aggregate2/index.html
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/test-data/aggregate2/index.html	Tue May 15 00:35:11 2007
@@ -0,0 +1,8 @@
+<html>	
+  <head>
+  </head>
+  <body>
+    <div class="foo" >
+    </div>
+  </body>
+</html>
\ No newline at end of file

Added: z3/deliverance/trunk/deliverance/test-data/aggregate2/irrelevant.html
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/test-data/aggregate2/irrelevant.html	Tue May 15 00:35:11 2007
@@ -0,0 +1,12 @@
+<html>	
+  <head>
+  </head>
+  <body>
+    <div class="foo" >
+      I'm irrelevant
+    </div>
+
+    <div id="irrelevant">
+    </div>
+  </body>
+</html>
\ No newline at end of file

Added: z3/deliverance/trunk/deliverance/test-data/aggregate2/rules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/test-data/aggregate2/rules.xml	Tue May 15 00:35:11 2007
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+  <rules xmlns="http://www.plone.org/deliverance">
+       <append content="//div[@id='nomatch']|//div[@class='foo']" theme="//body"/>
+       <drop content="//div[@id='irrelevant']" href="/irrelevant.html" />
+  </rules>

Added: z3/deliverance/trunk/deliverance/test-data/aggregate2/theme.html
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/test-data/aggregate2/theme.html	Tue May 15 00:35:11 2007
@@ -0,0 +1,4 @@
+<html>
+<body>
+</body>
+</html>
\ No newline at end of file

Modified: z3/deliverance/trunk/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/trunk/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/trunk/deliverance/test_wsgi.py	Tue May 15 00:35:11 2007
@@ -20,6 +20,7 @@
 ajax_data = os.path.join(os.path.dirname(__file__), 'test-data', 'ajax')
 url_data = os.path.join(os.path.dirname(__file__), 'test-data', 'wsgiurl')
 aggregate_data = os.path.join(os.path.dirname(__file__), 'test-data', 'aggregate')
+aggregate2_data = os.path.join(os.path.dirname(__file__), 'test-data', 'aggregate2')
 
 static_app = StaticURLParser(static_data)
 tasktracker_app = StaticURLParser(tasktracker_data)
@@ -29,6 +30,7 @@
 ajax_app = StaticURLParser(ajax_data)
 url_app = StaticURLParser(url_data)
 aggregate_app = StaticURLParser(aggregate_data)
+aggregate2_app = StaticURLParser(aggregate2_data)
 
 
 
@@ -155,6 +157,14 @@
     res2 = app.get('/expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
+def do_aggregate2(renderer_type, name):
+    wsgi_app = DeliveranceMiddleware(aggregate2_app, 'theme.html', 'rules.xml',
+                                     renderer_type)
+    app = TestApp(wsgi_app)
+    res = app.get('/index.html')
+    res2 = app.get('/expected.html?notheme')
+    html_string_compare(res.body, res2.body)
+
 def do_cache(renderer_type, name): 
     # XXX this should be busted up into multiple tests I spose 
 
@@ -272,7 +282,7 @@
                                           
 
 RENDERER_TYPES = ['py', 'xslt']
-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, do_cache ] 
+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, do_aggregate2, do_cache ] 
 def test_all():
     for renderer_type in RENDERER_TYPES:
         for test_func in TEST_FUNCS: 
