[Zope3-checkins] CVS: Zope3/src/zope/app/content/tests - test_file.py:1.3 test_image.py:1.5 test_zptpage.py:1.7

Jim Fulton jim@zope.com
Mon, 3 Feb 2003 10:09:38 -0500


Update of /cvs-repository/Zope3/src/zope/app/content/tests
In directory cvs.zope.org:/tmp/cvs-serv15846/src/zope/app/content/tests

Modified Files:
	test_file.py test_image.py test_zptpage.py 
Log Message:
Refactored the ftp framework to make it much simpler, less general,
and easier to maintain.  This included ripping out the vfs framework.


=== Zope3/src/zope/app/content/tests/test_file.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/content/tests/test_file.py:1.2	Wed Dec 25 09:12:48 2002
+++ Zope3/src/zope/app/content/tests/test_file.py	Mon Feb  3 10:08:34 2003
@@ -19,10 +19,25 @@
 import unittest
 
 from zope.interface.verify import verifyClass
-from zope.app.content.file import FileChunk
+from zope.app.content.file import FileChunk, FileReadFile, FileWriteFile
 
+class TestFileAdapters:
+    
 
-class Test(unittest.TestCase):
+    def test_ReadFile(self):
+        file = self._makeFile()
+        content = "This is some file\ncontent."
+        file.edit(content, 'text/plain')
+        self.assertEqual(FileReadFile(file).read(), content)
+        self.assertEqual(FileReadFile(file).size(), len(content))
+
+    def test_WriteFile(self):
+        file = self._makeFile()
+        content = "This is some file\ncontent."
+        FileWriteFile(file).write(content)
+        self.assertEqual(file.getData(), content)
+
+class Test(unittest.TestCase, TestFileAdapters):
 
     def _makeFile(self, *args, **kw):
         """ """


=== Zope3/src/zope/app/content/tests/test_image.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/content/tests/test_image.py:1.4	Mon Dec 30 09:02:59 2002
+++ Zope3/src/zope/app/content/tests/test_image.py	Mon Feb  3 10:08:34 2003
@@ -18,11 +18,33 @@
 
 import unittest
 from zope.interface.verify import verifyClass
+import test_file
+from zope.app.content.image import Image, FileFactory
+from zope.app.content.file import File
+
+zptlogo = (
+    'GIF89a\x10\x00\x10\x00\xd5\x00\x00\xff\xff\xff\xff\xff\xfe\xfc\xfd\xfd'
+    '\xfa\xfb\xfc\xf7\xf9\xfa\xf5\xf8\xf9\xf3\xf6\xf8\xf2\xf5\xf7\xf0\xf4\xf6'
+    '\xeb\xf1\xf3\xe5\xed\xef\xde\xe8\xeb\xdc\xe6\xea\xd9\xe4\xe8\xd7\xe2\xe6'
+    '\xd2\xdf\xe3\xd0\xdd\xe3\xcd\xdc\xe1\xcb\xda\xdf\xc9\xd9\xdf\xc8\xd8\xdd'
+    '\xc6\xd7\xdc\xc4\xd6\xdc\xc3\xd4\xda\xc2\xd3\xd9\xc1\xd3\xd9\xc0\xd2\xd9'
+    '\xbd\xd1\xd8\xbd\xd0\xd7\xbc\xcf\xd7\xbb\xcf\xd6\xbb\xce\xd5\xb9\xcd\xd4'
+    '\xb6\xcc\xd4\xb6\xcb\xd3\xb5\xcb\xd2\xb4\xca\xd1\xb2\xc8\xd0\xb1\xc7\xd0'
+    '\xb0\xc7\xcf\xaf\xc6\xce\xae\xc4\xce\xad\xc4\xcd\xab\xc3\xcc\xa9\xc2\xcb'
+    '\xa8\xc1\xca\xa6\xc0\xc9\xa4\xbe\xc8\xa2\xbd\xc7\xa0\xbb\xc5\x9e\xba\xc4'
+    '\x9b\xbf\xcc\x98\xb6\xc1\x8d\xae\xbaFgs\x00\x00\x00\x00\x00\x00\x00\x00'
+    '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+    '\x00,\x00\x00\x00\x00\x10\x00\x10\x00\x00\x06z@\x80pH,\x12k\xc8$\xd2f\x04'
+    '\xd4\x84\x01\x01\xe1\xf0d\x16\x9f\x80A\x01\x91\xc0ZmL\xb0\xcd\x00V\xd4'
+    '\xc4a\x87z\xed\xb0-\x1a\xb3\xb8\x95\xbdf8\x1e\x11\xca,MoC$\x15\x18{'
+    '\x006}m\x13\x16\x1a\x1f\x83\x85}6\x17\x1b $\x83\x00\x86\x19\x1d!%)\x8c'
+    '\x866#\'+.\x8ca`\x1c`(,/1\x94B5\x19\x1e"&*-024\xacNq\xba\xbb\xb8h\xbeb'
+    '\x00A\x00;'
+    )
 
 class TestImage(unittest.TestCase):
 
     def _makeImage(self, *args, **kw):
-        from zope.app.content.image import Image
         return Image(*args, **kw)
 
 
@@ -59,6 +81,11 @@
         self.failUnless(IImage.isImplementedByInstancesOf(Image))
         self.failUnless(verifyClass(IImage, Image))
 
+class TestFileAdapters(test_file.TestFileAdapters, unittest.TestCase):
+
+    def _makeFile(self, *args, **kw):
+        return Image(*args, **kw)
+    
 
 class DummyImage:
 
@@ -74,6 +101,30 @@
         return self.width, self.height
 
 
+class TestFileFactory(unittest.TestCase):
+
+    def test_image(self):
+        factory = FileFactory(None)
+        f = factory("spam.txt", "image/foo", "hello world")
+        self.assert_(isinstance(f, Image), f)
+        f = factory("spam.txt", "", zptlogo)
+        self.assert_(isinstance(f, Image), f)
+
+    def test_text(self):
+        factory = FileFactory(None)
+        f = factory("spam.txt", "", "hello world")
+        self.assert_(isinstance(f, File), f)
+        self.assert_(not isinstance(f, Image), f)
+        f = factory("spam.txt", "", "\0\1\2\3\4")
+        self.assert_(isinstance(f, File), f)
+        self.assert_(not isinstance(f, Image), f)
+        f = factory("spam.txt", "text/splat", zptlogo)
+        self.assert_(isinstance(f, File), f)
+        self.assert_(not isinstance(f, Image), f)
+        f = factory("spam.txt", "application/splat", zptlogo)
+        self.assert_(isinstance(f, File), f)
+        self.assert_(not isinstance(f, Image), f)
+
 class TestSized(unittest.TestCase):
 
     def testInterface(self):
@@ -102,9 +153,12 @@
         self.assertEqual(s.sizeForDisplay(), u'1 KB ?x?')
 
 def test_suite():
-    return unittest.TestSuite((unittest.makeSuite(TestImage),
-                               unittest.makeSuite(TestSized)
-                             ))
+    return unittest.TestSuite((
+        unittest.makeSuite(TestImage),
+        unittest.makeSuite(TestFileAdapters),
+        unittest.makeSuite(TestFileFactory),
+        unittest.makeSuite(TestSized)
+        ))
 
 if __name__=='__main__':
     unittest.TextTestRunner().run(test_suite())


=== Zope3/src/zope/app/content/tests/test_zptpage.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/content/tests/test_zptpage.py:1.6	Sat Jan 25 09:48:52 2003
+++ Zope3/src/zope/app/content/tests/test_zptpage.py	Mon Feb  3 10:08:34 2003
@@ -22,6 +22,7 @@
 from zope.interface.verify import verifyClass
 from zope.exceptions import Forbidden
 
+import zope.app.content.zpt
 from zope.app.content.zpt import ZPTPage, SearchableText
 from zope.app.interfaces.content.zpt import IZPTPage
 from zope.app.interfaces.index.text import ISearchableText
@@ -137,11 +138,35 @@
         self.assertEqual(s.sizeForSorting(), ('line', 5))
         self.assertEqual(s.sizeForDisplay(), u'5 lines')
 
+class TestFileEmulation(unittest.TestCase):
+
+    def test_ReadFile(self):
+        page = zope.app.content.zpt.ZPTPage()
+        content = u"<p></p>"
+        page.setSource(content)        
+        f = zope.app.content.zpt.ZPTReadFile(page)
+        self.assertEqual(f.read(), content)
+        self.assertEqual(f.size(), len(content))
+
+    def test_WriteFile(self):
+        page = zope.app.content.zpt.ZPTPage()
+        f = zope.app.content.zpt.ZPTWriteFile(page)
+        content = "<p></p>"
+        f.write(content)
+        self.assertEqual(page.getSource(), content)
+
+    def test_factory(self):
+        content = "<p></p>"
+        page = zope.app.content.zpt.ZPTFactory(None)('foo', '', content)
+        self.assertEqual(page.getSource(), content)
+    
 
 def test_suite():
-    return unittest.TestSuite((unittest.makeSuite(ZPTPageTests),
-                               unittest.makeSuite(SizedTests)
-                             ))
+    return unittest.TestSuite((
+        unittest.makeSuite(ZPTPageTests),
+        unittest.makeSuite(SizedTests),
+        unittest.makeSuite(TestFileEmulation),
+        ))
 
 if __name__=='__main__':
     unittest.TextTestRunner().run(test_suite())