[CMF-checkins] CVS: CMF/CMFDefault/tests - test_Favorite.py:1.2.8.2 test_Image.py:1.3.8.1

[Chris Withers]

Update of /cvs-repository/CMF/CMFDefault/tests
In directory cvs.zope.org:/tmp/cvs-serv30431/CMFDefault/tests

Modified Files:
      Tag: ChrisW-refactor_tests-branch
	test_Favorite.py test_Image.py 
Log Message:
Done Image

=== CMF/CMFDefault/tests/test_Favorite.py 1.2.8.1 => 1.2.8.2 ===
 """
 __version__ = "$Revision$"[11:-2]
-
+import Zope
 from unittest import TestCase, TestSuite, makeSuite, main
 
 from Products.CMFCore.tests.base.dummy import \


=== CMF/CMFDefault/tests/test_Image.py 1.3 => 1.3.8.1 ===
+import Zope
+from unittest import TestCase, TestSuite, makeSuite, main
+
+import os, cStringIO
 
 from Products.CMFDefault.Image import Image
 from Products.CMFDefault import tests
@@ -6,14 +9,7 @@
 TESTS_HOME = tests.__path__[0]
 TEST_JPG = os.path.join(TESTS_HOME, 'TestImage.jpg')
 
-
-class TestImageElement(unittest.TestCase):
-
-    def setUp( self ):
-        get_transaction().begin()
-
-    def tearDown( self ):
-        get_transaction().abort()
+class TestImageElement(TestCase):
 
     def test_EditWithEmptyFile(self):
         """ Test handling of empty file uploads """
@@ -34,19 +30,10 @@
         assert image.get_size() == testfilesize
         
 def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestImageElement))
+    return TestSuite((
+        makeSuite(TestImageElement),
+        ))
     return suite
 
-def run():
-    suite = test_suite()
-    return unittest.TextTestRunner().run(suite)
-
 if __name__ == '__main__':
-    import sys
-    result = run()
-    if result.wasSuccessful():
-        sys.exit(0)
-    else:
-        sys.exit(1)
-        
+    main(defaultTest='test_suite')