[Checkins] SVN: zope.app.file/trunk/src/zope/app/file/browser/ftests.py Decouple tests from zope.publisher implementation

[Dmitry Vasiliev]

Log message for revision 75787:
  Decouple tests from zope.publisher implementation

Changed:
  U   zope.app.file/trunk/src/zope/app/file/browser/ftests.py

-=-
Modified: zope.app.file/trunk/src/zope/app/file/browser/ftests.py
===================================================================
--- zope.app.file/trunk/src/zope/app/file/browser/ftests.py	2007-05-15 22:43:52 UTC (rev 75786)
+++ zope.app.file/trunk/src/zope/app/file/browser/ftests.py	2007-05-16 04:11:44 UTC (rev 75787)
@@ -15,16 +15,21 @@
 
 $Id$
 """
+
+import re
 import unittest
 from xml.sax.saxutils import escape
 from StringIO import StringIO
+from zope.testing import renormalizing
 
+from zope.app.testing import functional
 from zope.app.testing.functional import BrowserTestCase
 from zope.app.file.file import File
 from zope.app.file.image import Image
 from zope.app.file.tests.test_image import zptlogo
 from zope.app.file.testing import AppFileLayer
 
+
 class FileTest(BrowserTestCase):
 
     content = u'File <Data>'
@@ -230,8 +235,6 @@
         image = root['test.gif']
         self.assertEqual(image.data, self.content)
 
-
-
     def testUploadForm(self):
         self.addImage()
         response = self.publish(
@@ -302,13 +305,19 @@
         self.assert_('<iframe src="."' in body)
         self.checkForBrokenLinks(body, '/image/@@preview.html', 'mgr:mgrpw')
 
+
+checker = renormalizing.RENormalizing([
+    (re.compile(r"HTTP/1\.1 200 .*"), "HTTP/1.1 200 OK"),
+    (re.compile(r"HTTP/1\.1 303 .*"), "HTTP/1.1 303 See Other"),
+    ])
+
+
 def test_suite():
-    from zope.app.testing import functional
     FileTest.layer = AppFileLayer
     ImageTest.layer = AppFileLayer
-    url = functional.FunctionalDocFileSuite('url.txt')
+    url = functional.FunctionalDocFileSuite('url.txt', checker=checker)
     url.layer = AppFileLayer
-    file = functional.FunctionalDocFileSuite('file.txt')
+    file = functional.FunctionalDocFileSuite('file.txt', checker=checker)
     file.layer = AppFileLayer
     return unittest.TestSuite((
         unittest.makeSuite(FileTest),
@@ -317,5 +326,6 @@
         file,
         ))
 
+
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')