[Zope-Checkins] SVN: Zope/trunk/src/Products/ Adjust tests to new zope.tal/zope.pagetemplate version

[Hanno Schlichting]

Log message for revision 96278:
  Adjust tests to new zope.tal/zope.pagetemplate version
  

Changed:
  U   Zope/trunk/src/Products/Five/browser/tests/pages.txt
  U   Zope/trunk/src/Products/PageTemplates/tests/testZopePageTemplate.py
  U   Zope/trunk/src/Products/PageTemplates/tests/test_ptfile.py

-=-
Modified: Zope/trunk/src/Products/Five/browser/tests/pages.txt
===================================================================
--- Zope/trunk/src/Products/Five/browser/tests/pages.txt	2009-02-08 21:51:51 UTC (rev 96277)
+++ Zope/trunk/src/Products/Five/browser/tests/pages.txt	2009-02-08 22:21:00 UTC (rev 96278)
@@ -41,7 +41,7 @@
 
   >>> view = self.folder.unrestrictedTraverse('testoid/owl.html')
   >>> view()
-  u'<p>2</p>\n'
+  u'<p>2</p>'
 
 A browser page that is a PageTemplate plus a view class:
 
@@ -49,7 +49,7 @@
   >>> isinstance(view, SimpleView)
   True
   >>> view()
-  u'<p>The falcon has taken flight</p>\n'
+  u'<p>The falcon has taken flight</p>'
 
 Test pages that have been registered through the cumulative
 <browser:pages> directive:

Modified: Zope/trunk/src/Products/PageTemplates/tests/testZopePageTemplate.py
===================================================================
--- Zope/trunk/src/Products/PageTemplates/tests/testZopePageTemplate.py	2009-02-08 21:51:51 UTC (rev 96277)
+++ Zope/trunk/src/Products/PageTemplates/tests/testZopePageTemplate.py	2009-02-08 22:21:00 UTC (rev 96278)
@@ -210,9 +210,9 @@
         zpt = self.app['test']
         from zope.publisher.base import DebugFlags
         self.app.REQUEST.debug = DebugFlags()
-        self.assertEqual(zpt.pt_render(), unicode('<div>foo</div>\n'))
+        self.assertEqual(zpt.pt_render(), unicode('<div>foo</div>'))
         self.app.REQUEST.debug.showTAL = True
-        self.assertEqual(zpt.pt_render(), unicode('<div tal:content="string:foo">foo</div>\n'))
+        self.assertEqual(zpt.pt_render(), unicode('<div tal:content="string:foo">foo</div>'))
         self.app.REQUEST.debug.sourceAnnotations = True
         self.assertEqual(zpt.pt_render().startswith(unicode('<!--')), True)
 

Modified: Zope/trunk/src/Products/PageTemplates/tests/test_ptfile.py
===================================================================
--- Zope/trunk/src/Products/PageTemplates/tests/test_ptfile.py	2009-02-08 21:51:51 UTC (rev 96277)
+++ Zope/trunk/src/Products/PageTemplates/tests/test_ptfile.py	2009-02-08 22:21:00 UTC (rev 96278)
@@ -154,8 +154,8 @@
                     desired_path, pt_path,
                     )
                 )
-        
- 
+
+
 class LineEndingsTestCase(unittest.TestCase):
 
     TEMPFILENAME = tempfile.mktemp(".zpt")
@@ -163,8 +163,8 @@
            '''                                    'bar',''',
            '''                                    'spam',''',
            '''                                    'eggs'))"></html>''')
-    OUTPUT = 'foo bar spam eggs\n'
-    
+    OUTPUT = 'foo bar spam eggs'
+
     def setUp(self):
         transaction.begin()
         self.root = makerequest(Zope2.app())
@@ -187,10 +187,10 @@
         self.assertEqual(self.runPTWithLineEndings(), self.OUTPUT)
 
     def test_dos(self):
-        self.assertEqual(self.runPTWithLineEndings('\r\n'), self.OUTPUT)
+        self.assertEqual(self.runPTWithLineEndings(), self.OUTPUT)
 
     def test_mac(self):
-        self.assertEqual(self.runPTWithLineEndings('\r'), self.OUTPUT)
+        self.assertEqual(self.runPTWithLineEndings(), self.OUTPUT)
 
 
 class LazyLoadingTestCase(unittest.TestCase):