[CMF-checkins] CVS: CMF/CMFDefault/tests - test_Link.py:1.4.8.1 test_MetadataTool.py:1.2.38.1 test_join.py:1.3.34.1
Chris Withers
chrisw@nipltd.com
Fri, 15 Feb 2002 14:03:06 -0500
Update of /cvs-repository/CMF/CMFDefault/tests
In directory cvs.zope.org:/tmp/cvs-serv533/CMFDefault/tests
Modified Files:
Tag: ChrisW-refactor_tests-branch
test_Link.py test_MetadataTool.py test_join.py
Log Message:
Done Join, Link, MetadataTool
=== CMF/CMFDefault/tests/test_Link.py 1.4 => 1.4.8.1 ===
+import Zope
+from unittest import TestCase, TestSuite, makeSuite, main
+
+from re import compile
+
from Products.CMFDefault.Link import Link
BASIC_STRUCTUREDTEXT = '''\
@@ -18,7 +22,7 @@
http://www.zope.org
'''
-class LinkTests(unittest.TestCase):
+class LinkTests(TestCase):
def test_Empty( self ):
d = Link( 'foo' )
@@ -42,7 +46,7 @@
d = Link('foo')
d._writeFromPUT( body=STX_W_CONTINUATION )
- rnlinesplit = re.compile( r'\r?\n?' )
+ rnlinesplit = compile( r'\r?\n?' )
desc_lines = rnlinesplit.split( d.Description() )
self.assertEqual( d.Title(), 'Zope Community' )
@@ -67,11 +71,10 @@
self.assertEqual( d.getRemoteUrl(), 'http://baz.com' )
-
def test_suite():
- return unittest.makeSuite(LinkTests)
-
-def main():
- unittest.TextTestRunner().run(test_suite())
+ return TestSuite((
+ makeSuite(LinkTests),
+ ))
-if __name__=='__main__': main()
+if __name__ == '__main__':
+ main(defaultTest='test_suite')
=== CMF/CMFDefault/tests/test_MetadataTool.py 1.2 => 1.2.38.1 ===
import Zope
-import unittest, string
-from Products.CMFDefault.MetadataTool import *
+from unittest import TestCase, TestSuite, makeSuite, main
+
+from Products.CMFDefault.MetadataTool import \
+ MetadataElementPolicy, MetadataTool, ElementSpec, \
+ DEFAULT_ELEMENT_SPECS, MetadataError
+
from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
-class TestMetadataElementPolicy( unittest.TestCase ):
+class TestMetadataElementPolicy( TestCase ):
def setUp( self ):
- get_transaction().begin()
self.sv_policy = MetadataElementPolicy( 0 )
self.mv_policy = MetadataElementPolicy( 1 )
def tearDown( self ):
del self.sv_policy
del self.mv_policy
- get_transaction().abort()
def test_emptySV( self ):
assert not self.sv_policy.isMultiValued()
@@ -52,7 +53,7 @@
assert 'xxx' in self.mv_policy.allowedVocabulary()
assert 'yyy' in self.mv_policy.allowedVocabulary()
-class TestElementSpec( unittest.TestCase ):
+class TestElementSpec( TestCase ):
def setUp( self ):
self.sv_spec = ElementSpec( 0 )
@@ -91,7 +92,7 @@
def Type( self ):
return 'Bar'
-class TestMetadataTool( unittest.TestCase ):
+class TestMetadataTool( TestCase ):
def setUp( self ):
self.tool = MetadataTool()
@@ -358,13 +359,11 @@
def test_suite():
- suite = unittest.TestSuite()
- suite.addTest( unittest.makeSuite( TestMetadataElementPolicy ) )
- suite.addTest( unittest.makeSuite( TestElementSpec ) )
- suite.addTest( unittest.makeSuite( TestMetadataTool ) )
- return suite
-
-def main():
- unittest.TextTestRunner().run(test_suite())
+ return TestSuite((
+ makeSuite(TestMetadataElementPolicy),
+ makeSuite(TestElementSpec),
+ makeSuite(TestMetadataTool),
+ ))
-if __name__=='__main__': main()
+if __name__ == '__main__':
+ main(defaultTest='test_suite')
=== CMF/CMFDefault/tests/test_join.py 1.3 => 1.3.34.1 ===
-import unittest
-import Products.CMFCore
-import Products.CMFDefault
-
-class MembershipTests( unittest.TestCase ):
-
- def setUp( self ):
- get_transaction().begin()
- self.connection = Zope.DB.open()
- self.root = self.connection.root()[ 'Application' ]
-
- def tearDown( self ):
- get_transaction().abort()
- self.connection.close()
+from unittest import TestSuite, makeSuite, main
+
+from Products.CMFCore.tests.base.testcase import \
+ TransactionalTest
+
+class MembershipTests( TransactionalTest ):
def test_join( self ):
self.root.manage_addProduct[ 'CMFDefault' ].manage_addCMFSite( 'site' )
@@ -27,12 +19,9 @@
def test_suite():
- suite = unittest.TestSuite()
- suite.addTest( unittest.makeSuite( MembershipTests ) )
- return suite
-
-def run():
- unittest.TextTestRunner().run(test_suite())
+ return TestSuite((
+ makeSuite(MembershipTests),
+ ))
if __name__ == '__main__':
- run()
+ main(defaultTest='test_suite')