[Checkins] SVN: zope.app.zptpage/trunk/s Make tests work with
recent changes to the TAL interpreter (zope.tal 3.5.0) regarding
Philipp von Weitershausen
philikon at philikon.de
Sat Jun 7 14:01:59 EDT 2008
Log message for revision 87230:
Make tests work with recent changes to the TAL interpreter (zope.tal 3.5.0) regarding
trailing newline characters.
Changed:
U zope.app.zptpage/trunk/setup.py
U zope.app.zptpage/trunk/src/zope/app/zptpage/browser/collector266.txt
U zope.app.zptpage/trunk/src/zope/app/zptpage/browser/collector269.txt
U zope.app.zptpage/trunk/src/zope/app/zptpage/browser/tests.py
U zope.app.zptpage/trunk/src/zope/app/zptpage/tests/test_zptpage.py
-=-
Modified: zope.app.zptpage/trunk/setup.py
===================================================================
--- zope.app.zptpage/trunk/setup.py 2008-06-07 17:57:08 UTC (rev 87229)
+++ zope.app.zptpage/trunk/setup.py 2008-06-07 18:01:59 UTC (rev 87230)
@@ -69,6 +69,10 @@
],
extras_require=dict(test=['zope.app.testing',
'zope.app.securitypolicy',
- 'zope.app.zcmlfiles']),
+ 'zope.app.zcmlfiles',
+ # The tests expect a spec-compliant TAL
+ # interpreter as found in zope.tal 3.5.0:
+ 'zope.tal >= 3.5.0',
+ ]),
zip_safe=False,
)
Modified: zope.app.zptpage/trunk/src/zope/app/zptpage/browser/collector266.txt
===================================================================
--- zope.app.zptpage/trunk/src/zope/app/zptpage/browser/collector266.txt 2008-06-07 17:57:08 UTC (rev 87229)
+++ zope.app.zptpage/trunk/src/zope/app/zptpage/browser/collector266.txt 2008-06-07 18:01:59 UTC (rev 87230)
@@ -101,7 +101,7 @@
... Authorization: Basic bWdyOm1ncnB3
... """, handle_errors=False)
HTTP/1.1 200 OK
- Content-Length: 52
+ Content-Length: 51
Content-Type: text/html;charset=utf-8
<BLANKLINE>
<html>
@@ -111,7 +111,6 @@
</div>
</body>
</html>
- <BLANKLINE>
Let's create another page that uses the slotted macro, but doesn't
fill it:
@@ -161,7 +160,7 @@
... Authorization: Basic bWdyOm1ncnB3
... """, handle_errors=False)
HTTP/1.1 200 OK
- Content-Length: 68
+ Content-Length: 67
Content-Type: text/html;charset=utf-8
<BLANKLINE>
<html>
@@ -171,7 +170,6 @@
</div>
</body>
</html>
- <BLANKLINE>
Finally, lets create a page that fills the macro:
@@ -222,7 +220,7 @@
... Authorization: Basic bWdyOm1ncnB3
... """, handle_errors=False)
HTTP/1.1 200 OK
- Content-Length: 66
+ Content-Length: 65
Content-Type: text/html;charset=utf-8
<BLANKLINE>
<html>
@@ -232,4 +230,3 @@
</div>
</body>
</html>
- <BLANKLINE>
Modified: zope.app.zptpage/trunk/src/zope/app/zptpage/browser/collector269.txt
===================================================================
--- zope.app.zptpage/trunk/src/zope/app/zptpage/browser/collector269.txt 2008-06-07 17:57:08 UTC (rev 87229)
+++ zope.app.zptpage/trunk/src/zope/app/zptpage/browser/collector269.txt 2008-06-07 18:01:59 UTC (rev 87230)
@@ -123,7 +123,7 @@
... Authorization: Basic bWdyOm1ncnB3
... """, handle_errors=False)
HTTP/1.1 200 OK
- Content-Length: 119
+ Content-Length: 118
Content-Type: text/html;charset=utf-8
<BLANKLINE>
<html>
@@ -139,4 +139,3 @@
</div>
</body>
</html>
- <BLANKLINE>
Modified: zope.app.zptpage/trunk/src/zope/app/zptpage/browser/tests.py
===================================================================
--- zope.app.zptpage/trunk/src/zope/app/zptpage/browser/tests.py 2008-06-07 17:57:08 UTC (rev 87229)
+++ zope.app.zptpage/trunk/src/zope/app/zptpage/browser/tests.py 2008-06-07 18:01:59 UTC (rev 87230)
@@ -74,7 +74,7 @@
response = self.publish(
'/+/zope.app.zptpage.ZPTPage=',
form={'type_name': u'zope.app.zptpage.ZPTPage',
- 'field.source': u'<h1>A ZPT Page</h1>\n',
+ 'field.source': u'<h1>A ZPT Page</h1>',
'field.expand.used': u'',
'field.expand': u'on',
'field.evaluateInlineCode.used': u'',
@@ -84,7 +84,7 @@
basic='mgr:mgrpw')
root = self.getRootFolder()
zptpage = root['zptpage1']
- self.assertEqual(zptpage.source, '<h1>A ZPT Page</h1>\n')
+ self.assertEqual(zptpage.source, '<h1>A ZPT Page</h1>')
self.assertEqual(zptpage.expand, True)
self.assertEqual(zptpage.evaluateInlineCode, True)
@@ -105,7 +105,7 @@
self.addZPTPage()
response = self.publish(
'/zptpage/@@edit.html',
- form={'form.source': u'<h1>A ZPT Page</h1>\n',
+ form={'form.source': u'<h1>A ZPT Page</h1>',
'form.expand.used': u'',
'form.expand': u'on',
'form.content_type': u'text/html',
@@ -117,7 +117,7 @@
self.assert_(escape(u'<h1>A ZPT Page</h1>') in body)
root = self.getRootFolder()
zptpage = root['zptpage']
- self.assertEqual(zptpage.source, '<h1>A ZPT Page</h1>\n')
+ self.assertEqual(zptpage.source, '<h1>A ZPT Page</h1>')
self.assertEqual(zptpage.expand, True)
self.assertEqual(zptpage.content_type, 'text/html')
@@ -155,7 +155,7 @@
body = response.getBody()
self.assertEqual(
body,
- '<html><body><h1>http://localhost/zptpage</h1></body></html>\n')
+ '<html><body><h1>http://localhost/zptpage</h1></body></html>')
self.checkForBrokenLinks(body, '/zptpage/@@index.html', 'mgr:mgrpw')
def testPreview(self):
Modified: zope.app.zptpage/trunk/src/zope/app/zptpage/tests/test_zptpage.py
===================================================================
--- zope.app.zptpage/trunk/src/zope/app/zptpage/tests/test_zptpage.py 2008-06-07 17:57:08 UTC (rev 87229)
+++ zope.app.zptpage/trunk/src/zope/app/zptpage/tests/test_zptpage.py 2008-06-07 18:01:59 UTC (rev 87230)
@@ -116,7 +116,7 @@
)
page = contained(page, None, name='zpt')
request = TestRequest()
- self.assertEquals(page.render(request), 'zpt\n')
+ self.assertEquals(page.render(request), u'zpt')
def test_source_file(self):
page = ZPTPage()
@@ -137,10 +137,10 @@
page.setSource(u'<tal:x>Foo</tal:x>')
request = TestRequest()
- self.assertEquals(page.render(request), 'Foo\n')
+ self.assertEquals(page.render(request), u'Foo')
request.debug.showTAL = True
- self.assertEquals(page.render(request), '<tal:x>Foo</tal:x>\n')
+ self.assertEquals(page.render(request), u'<tal:x>Foo</tal:x>')
request.debug.showTAL = False
request.debug.sourceAnnotations = True
@@ -150,7 +150,7 @@
'=' * 78 + '\n' +
'/folder/zpt (line 1)\n' +
'=' * 78 + '\n' +
- '-->Foo\n')
+ '-->Foo')
class DummyZPT(object):
More information about the Checkins
mailing list