[Checkins] SVN: Products.CMFCore/branches/2.2/Products/CMFCore/ deprecated aliases were replaced on tests
Hector Edwardo Velade Diaz
cvs-admin at zope.org
Tue May 22 14:18:19 UTC 2012
Log message for revision 126436:
deprecated aliases were replaced on tests
Changed:
U Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_ActionInformation.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_ActionProviderBase.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_ActionsTool.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CMFBTreeFolder.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CMFCatalogAware.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CachingPolicyManager.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CatalogTool.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CookieCrumbler.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_DirectoryView.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_DynamicType.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_Expression.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSDTMLMethod.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSFile.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSImage.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSPageTemplate.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSPropertiesObject.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSPythonScript.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSReSTMethod.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSSTXMethod.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSZSQLMethod.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_MemberDataTool.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_MembershipTool.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_OpaqueItems.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_PortalFolder.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_RegistrationTool.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_SkinsTool.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_TypesTool.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_WorkflowTool.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_utils.py
-=-
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt 2012-05-22 14:18:14 UTC (rev 126436)
@@ -4,6 +4,8 @@
2.2.7 (unreleased)
------------------
+- Deprecated aliases were replaced on tests.
+
- Add GenericSetup export/import support for type information action
descriptions.
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_ActionInformation.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_ActionInformation.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_ActionInformation.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -113,7 +113,7 @@
a = self._makeOne('extensible').__of__(container)
form_html = a.manage_propertiesForm(request)
- self.failUnless('value=" Add "' in form_html)
+ self.assertTrue('value=" Add "' in form_html)
def test_clearExprObjects(self):
"""When a *_expr property is set, a *_expr_object attribute is
@@ -128,14 +128,14 @@
permissions=('View',),
visible=False,
link_target='_top')
- self.failUnless(hasattr(a, 'icon_expr_object'))
- self.failUnless(hasattr(a, 'url_expr_object'))
- self.failIf(hasattr(a, 'available_expr_object'))
+ self.assertTrue(hasattr(a, 'icon_expr_object'))
+ self.assertTrue(hasattr(a, 'url_expr_object'))
+ self.assertFalse(hasattr(a, 'available_expr_object'))
a.manage_changeProperties(
icon_expr='', url_expr='', available_expr='')
- self.failIf(hasattr(a, 'icon_expr_object'))
- self.failIf(hasattr(a, 'url_expr_object'))
- self.failIf(hasattr(a, 'available_expr_object'))
+ self.assertFalse(hasattr(a, 'icon_expr_object'))
+ self.assertFalse(hasattr(a, 'url_expr_object'))
+ self.assertFalse(hasattr(a, 'available_expr_object'))
class DummyRequest:
@@ -332,7 +332,7 @@
self.assertEqual( ai._lazy_keys, ['allowed'] )
self.assertEqual( ai2._lazy_keys, ['allowed'] )
- self.failIf( ai2._lazy_keys is ai._lazy_keys )
+ self.assertFalse( ai2._lazy_keys is ai._lazy_keys )
self.assertEqual( ai['allowed'], True )
self.assertEqual( ai2['allowed'], True )
@@ -391,7 +391,7 @@
from Products.CMFCore.Expression import Expression
ai = self._makeOne(id='view', category='folder')
ai.setActionExpression('string:blah')
- self.failUnless(isinstance(ai.action,Expression))
+ self.assertTrue(isinstance(ai.action,Expression))
self.assertEqual(ai.getActionExpression(), 'string:blah')
def test_construction_with_Expressions(self):
@@ -423,7 +423,7 @@
visible=True )
ec = createExprContext(folder, portal, object)
- self.failIf(ai.testCondition(ec))
+ self.assertFalse(ai.testCondition(ec))
def test_Condition_PathExpression(self):
portal = self.portal
@@ -440,7 +440,7 @@
visible=True )
ec = createExprContext(folder, portal, object)
- self.failUnless(ai.testCondition(ec))
+ self.assertTrue(ai.testCondition(ec))
def test_getInfoData_empty(self):
WANTED = ( {'available': True, 'category': 'object',
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_ActionProviderBase.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_ActionProviderBase.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_ActionProviderBase.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -85,7 +85,7 @@
def test_addAction( self ):
apb = self._makeProvider()
- self.failIf( apb._actions )
+ self.assertFalse( apb._actions )
old_actions = apb._actions
apb.addAction( id='foo'
, name='foo_action'
@@ -94,8 +94,8 @@
, permission=''
, category=''
)
- self.failUnless( apb._actions )
- self.failIf( apb._actions is old_actions )
+ self.assertTrue( apb._actions )
+ self.assertFalse( apb._actions is old_actions )
def test_addActionBlankPermission(self):
# make sure a blank permission gets stored as an empty tuple
@@ -199,7 +199,7 @@
, value
, '%s, %s != %s, %s'
% ( attr, attr_value, key, value ) )
- self.failIf( apb._actions is old_actions )
+ self.assertFalse( apb._actions is old_actions )
def test_deleteActions( self ):
@@ -207,7 +207,7 @@
apb._actions = tuple( map( DummyAction, [ '0', '1', '2' ] ) )
apb.deleteActions( selections=(0,2) )
self.assertEqual( len( apb._actions ), 1 )
- self.failUnless( DummyAction('1') in apb._actions )
+ self.assertTrue( DummyAction('1') in apb._actions )
def test_DietersNastySharingBug( self ):
@@ -233,7 +233,7 @@
one_ids = map( idify, one.listActions() )
another_ids = map( idify, another.listActions() )
- self.failIf( one_ids == another_ids )
+ self.assertFalse( one_ids == another_ids )
self.assertEqual( old_ids, another_ids )
def test_listActionInfos(self):
@@ -281,7 +281,7 @@
except ValueError, e:
message = e.args[0]
detail = '"%s" does not offer action "%s"' % (message, INVALID_ID)
- self.failUnless(message.find(INVALID_ID) != -1, detail)
+ self.assertTrue(message.find(INVALID_ID) != -1, detail)
def test_suite():
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_ActionsTool.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_ActionsTool.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_ActionsTool.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -88,7 +88,7 @@
rval = tool.getActionObject('object/an_id')
self.assertEqual(rval, tool._actions[0])
warning = self._our_stderr_stream.getvalue()
- self.failUnless(
+ self.assertTrue(
'DeprecationWarning: '
'Old-style actions are deprecated and will be removed in CMF '
'2.4. Use Action and Action Category objects instead.' in warning)
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CMFBTreeFolder.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CMFBTreeFolder.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CMFBTreeFolder.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -37,7 +37,7 @@
## from Products.BTreeFolder2.CMFBTreeFolder \
## import CMFBTreeFolder as BBB
##
-## self.failUnless( BBB is self._getTargetClass() )
+## self.assertTrue( BBB is self._getTargetClass() )
def test_suite():
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CMFCatalogAware.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CMFCatalogAware.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CMFCatalogAware.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -145,14 +145,14 @@
cat = self.site.portal_catalog
foo.reindexObject()
self.assertEquals(cat.log, ["reindex /site/foo []"])
- self.assert_(foo.notified)
+ self.assertTrue(foo.notified)
def test_reindexObject_idxs(self):
foo = self.site.foo
cat = self.site.portal_catalog
foo.reindexObject(idxs=['bar'])
self.assertEquals(cat.log, ["reindex /site/foo ['bar']"])
- self.failIf(foo.notified)
+ self.assertFalse(foo.notified)
def test_reindexObjectSecurity(self):
foo = self.site.foo
@@ -170,9 +170,9 @@
"reindex /site/foo/bar %s"%str(CMF_SECURITY_INDEXES),
"reindex /site/foo/hop %s"%str(CMF_SECURITY_INDEXES),
])
- self.failIf(foo.notified)
- self.failIf(bar.notified)
- self.failIf(hop.notified)
+ self.assertFalse(foo.notified)
+ self.assertFalse(bar.notified)
+ self.assertFalse(hop.notified)
def test_reindexObjectSecurity_missing_raise(self):
# Exception raised for missing object (Zope 2.8 brains)
@@ -186,7 +186,7 @@
finally:
self._ignore_log_errors()
self.assertRaises(NotFound, foo.reindexObjectSecurity)
- self.failIf( self.logged ) # no logging due to raise
+ self.assertFalse( self.logged ) # no logging due to raise
def test_reindexObjectSecurity_missing_noraise(self):
# Raising disabled
@@ -199,8 +199,8 @@
foo.reindexObjectSecurity()
self.assertEquals(cat.log,
["reindex /site/foo %s"%str(CMF_SECURITY_INDEXES)])
- self.failIf(foo.notified)
- self.failIf(missing.notified)
+ self.assertFalse(foo.notified)
+ self.assertFalse(missing.notified)
self.assertEqual( len(self.logged), 1 ) # logging because no raise
def test_catalog_tool(self):
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CachingPolicyManager.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CachingPolicyManager.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CachingPolicyManager.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -433,7 +433,7 @@
self._epoch = DateTime()
def assertEqualDelta( self, lhs, rhs, delta ):
- self.failUnless( abs( lhs - rhs ) <= delta )
+ self.assertTrue( abs( lhs - rhs ) <= delta )
def test_interfaces(self):
from Products.CMFCore.CachingPolicyManager import CachingPolicyManager
@@ -925,8 +925,8 @@
# no headers should be added by the CPM if all is well
headers = [x.lower() for x in self.RESPONSE.headers.keys()]
- self.failIf('x-cache-headers-set-by' in headers)
- self.failIf('vary' in headers)
+ self.assertFalse('x-cache-headers-set-by' in headers)
+ self.assertFalse('vary' in headers)
def test_subtemplate_cpm_2( self ):
# test that calling content from a template doesnt call the cpm
@@ -964,8 +964,8 @@
# no headers should be added by the CPM if all is well
headers = [x.lower() for x in self.RESPONSE.headers.keys()]
- self.failIf('x-cache-headers-set-by' in headers)
- self.failIf('vary' in headers)
+ self.assertFalse('x-cache-headers-set-by' in headers)
+ self.assertFalse('vary' in headers)
def test_subtemplate_cpm_3( self ):
# test a bigger mix of zpt templates
@@ -1006,8 +1006,8 @@
# no headers should be added by the CPM if all is well
headers = [x.lower() for x in self.RESPONSE.headers.keys()]
- self.failIf('x-cache-headers-set-by' in headers)
- self.failIf('vary' in headers)
+ self.assertFalse('x-cache-headers-set-by' in headers)
+ self.assertFalse('vary' in headers)
def test_mixed_subtemplate_cpm( self ):
# test a mix of zpt and dtml templates
@@ -1045,8 +1045,8 @@
# no headers should be added by the CPM if all is well
headers = [x.lower() for x in self.RESPONSE.headers.keys()]
- self.failIf('x-cache-headers-set-by' in headers)
- self.failIf('vary' in headers)
+ self.assertFalse('x-cache-headers-set-by' in headers)
+ self.assertFalse('vary' in headers)
def test_fireForSubtemplates(self):
# This is a FSPageTemplate that will be used as the View for
@@ -1107,8 +1107,8 @@
# no headers should be added by the CPM if all is well
headers = [x.lower() for x in self.RESPONSE.headers.keys()]
- self.failIf('x-cache-headers-set-by' in headers)
- self.failIf('vary' in headers)
+ self.assertFalse('x-cache-headers-set-by' in headers)
+ self.assertFalse('vary' in headers)
def test_fireForSubtemplates2(self):
# This is a FSPageTemplate that will be used as the View for
@@ -1187,7 +1187,7 @@
header_info = self.RESPONSE.headers.items()
[headers.__setitem__(x[0].lower(), x[1]) for x in header_info]
- self.failUnless(headers.get('x-cache-headers-set-by'))
+ self.assertTrue(headers.get('x-cache-headers-set-by'))
self.assertEquals(headers.get('vary'), 'doc1')
self.assertEquals( headers.get('cache-control')
, 'max-age=100, s-maxage=100'
@@ -1229,8 +1229,8 @@
cpm = self.portal.caching_policy_manager
doc1 = self.portal.doc1
- self.failUnless(cpm._isCacheManager)
- self.failUnless(isinstance(cpm.ZCacheManager_getCache(), CPMCache))
+ self.assertTrue(cpm._isCacheManager)
+ self.assertTrue(isinstance(cpm.ZCacheManager_getCache(), CPMCache))
self.assertEquals( doc1.ZCacheable_getManagerIds()
, ({'id':cpm.getId(), 'title':''},)
)
@@ -1242,8 +1242,8 @@
# no headers should be added by the CPM if all is well
headers = [x.lower() for x in self.RESPONSE.headers.keys()]
- self.failIf('x-cache-headers-set-by' in headers)
- self.failIf('vary' in headers)
+ self.assertFalse('x-cache-headers-set-by' in headers)
+ self.assertFalse('vary' in headers)
def test_unsuitable_association(self):
# Render an item that is associated with the CPM, but that does not
@@ -1256,8 +1256,8 @@
# no headers should be added by the CPM if all is well
headers = [x.lower() for x in self.RESPONSE.headers.keys()]
- self.failIf('x-cache-headers-set-by' in headers)
- self.failIf('vary' in headers)
+ self.assertFalse('x-cache-headers-set-by' in headers)
+ self.assertFalse('vary' in headers)
def test_suitable_association(self):
# Render a content item that will trigger the CPM
@@ -1274,7 +1274,7 @@
header_info = self.RESPONSE.headers.items()
[headers.__setitem__(x[0].lower(), x[1]) for x in header_info]
- self.failUnless(headers.get('x-cache-headers-set-by'))
+ self.assertTrue(headers.get('x-cache-headers-set-by'))
self.assertEquals(headers.get('vary'), 'doc1')
self.assertEquals( headers.get('cache-control')
, 'max-age=100'
@@ -1296,7 +1296,7 @@
header_info = self.RESPONSE.headers.items()
[headers.__setitem__(x[0].lower(), x[1]) for x in header_info]
- self.failUnless(headers.get('x-cache-headers-set-by'))
+ self.assertTrue(headers.get('x-cache-headers-set-by'))
self.assertEquals(headers.get('vary'), 'doc1')
self.assertEquals( headers.get('cache-control')
, 'max-age=100'
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CatalogTool.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CatalogTool.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CatalogTool.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -110,9 +110,9 @@
obj = self._makeContent()
w = self._makeOne({}, obj)
- self.failUnless(IContentish.providedBy(w))
- self.failUnless(IIndexableObjectWrapper.providedBy(w))
- self.failUnless(IIndexableObject.providedBy(w))
+ self.assertTrue(IContentish.providedBy(w))
+ self.assertTrue(IIndexableObjectWrapper.providedBy(w))
+ self.assertTrue(IIndexableObject.providedBy(w))
def test_adapts(self):
from zope.component import adaptedBy
@@ -485,17 +485,17 @@
# First case, no proxy roles set at all
arus = catalog._listAllowedRolesAndUsers(user)
self.assertEquals(len(arus), 3)
- self.failUnless('Anonymous' in arus)
- self.failUnless('Blob' in arus)
- self.failUnless('user:%s' % user.getId() in arus)
+ self.assertTrue('Anonymous' in arus)
+ self.assertTrue('Blob' in arus)
+ self.assertTrue('user:%s' % user.getId() in arus)
# Second case, a proxy role is set
self.setupProxyRoles('Waggle')
arus = catalog._listAllowedRolesAndUsers(user)
self.assertEquals(len(arus), 3)
- self.failUnless('Anonymous' in arus)
- self.failUnless('Waggle' in arus)
- self.failUnless('user:%s' % user.getId() in arus)
+ self.assertTrue('Anonymous' in arus)
+ self.assertTrue('Waggle' in arus)
+ self.assertTrue('user:%s' % user.getId() in arus)
# Third case, proxy roles are an empty tuple. This happens if
# proxy roles are unset using the ZMI. The behavior should
@@ -503,9 +503,9 @@
self.setupProxyRoles()
arus = catalog._listAllowedRolesAndUsers(user)
self.assertEquals(len(arus), 3)
- self.failUnless('Anonymous' in arus)
- self.failUnless('Blob' in arus)
- self.failUnless('user:%s' % user.getId() in arus)
+ self.assertTrue('Anonymous' in arus)
+ self.assertTrue('Blob' in arus)
+ self.assertTrue('user:%s' % user.getId() in arus)
def test_wrapping1(self):
# DummyContent implements IIndexableObject
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CookieCrumbler.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CookieCrumbler.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CookieCrumbler.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -141,11 +141,11 @@
req.cookies['__ac_password'] = 'pass-w'
req.traverse('/')
- self.failUnless(req.has_key('AUTHENTICATED_USER'))
+ self.assertTrue(req.has_key('AUTHENTICATED_USER'))
self.assertEqual(req['AUTHENTICATED_USER'].getUserName(),
'abraham')
resp = req.response
- self.failUnless(resp.cookies.has_key('__ac'))
+ self.assertTrue(resp.cookies.has_key('__ac'))
self.assertEqual(resp.cookies['__ac']['value'],
credentials)
self.assertEqual(resp.cookies['__ac']['path'], '/')
@@ -155,7 +155,7 @@
root, cc, req, credentials = self._makeSite()
req.cookies['__ac'] = credentials
req.traverse('/')
- self.failUnless(req.has_key('AUTHENTICATED_USER'))
+ self.assertTrue(req.has_key('AUTHENTICATED_USER'))
self.assertEqual(req['AUTHENTICATED_USER'].getUserName(),
'abraham')
@@ -164,18 +164,18 @@
root, cc, req, credentials = self._makeSite()
req.cookies['__ac_name'] = 'abraham'
req.cookies['__ac_password'] = 'pass-w'
- self.failUnless(req.has_key('__ac_password'))
+ self.assertTrue(req.has_key('__ac_password'))
req.traverse('/')
- self.failIf( req.has_key('__ac_password'))
- self.failIf( req.has_key('__ac'))
+ self.assertFalse( req.has_key('__ac_password'))
+ self.assertFalse( req.has_key('__ac'))
def testCredentialsNotRevealed(self):
# verify the credentials are shredded before the app gets the request
root, cc, req, credentials = self._makeSite()
req.cookies['__ac'] = credentials
- self.failUnless(req.has_key('__ac'))
+ self.assertTrue(req.has_key('__ac'))
req.traverse('/')
- self.failIf( req.has_key('__ac'))
+ self.assertFalse( req.has_key('__ac'))
def testAutoLoginRedirection(self):
# Redirect unauthorized anonymous users to the login page
@@ -216,9 +216,9 @@
# Test passed
if hasattr(s, 'args'):
s = s.args[0]
- self.failUnless(s.find('came_from=') >= 0)
- self.failUnless(s.find('retry=1') >= 0)
- self.failUnless(s.find('disable_cookie_login__=1') >= 0)
+ self.assertTrue(s.find('came_from=') >= 0)
+ self.assertTrue(s.find('retry=1') >= 0)
+ self.assertTrue(s.find('disable_cookie_login__=1') >= 0)
else:
self.fail('Did not redirect')
@@ -238,7 +238,7 @@
if hasattr(s, 'args'):
s = s.args[0]
to_find = urllib.quote('/protected?' + req['QUERY_STRING'])
- self.failUnless(s.find(to_find) >= 0, s)
+ self.assertTrue(s.find(to_find) >= 0, s)
else:
self.fail('Did not redirect')
@@ -289,7 +289,7 @@
self.assertEqual(req['AUTHENTICATED_USER'].getUserName(),
'abraham')
# Here is the real test: the password should have been shredded.
- self.failIf( req.has_key('__ac_password'))
+ self.assertFalse( req.has_key('__ac_password'))
def testDisableLoginDoesNotPreventPasswordShredding2(self):
root, cc, req, credentials = self._makeSite()
@@ -298,7 +298,7 @@
req.traverse('/')
self.assertEqual(req['AUTHENTICATED_USER'].getUserName(),
'abraham')
- self.failIf( req.has_key('__ac'))
+ self.assertFalse( req.has_key('__ac'))
def testMidApplicationAutoLoginRedirection(self):
# Redirect anonymous users to login page if Unauthorized
@@ -347,7 +347,7 @@
req.cookies['__ac'] = credentials
req.traverse('/')
- self.failUnless(req.has_key('AUTHENTICATED_USER'))
+ self.assertTrue(req.has_key('AUTHENTICATED_USER'))
self.assertEqual(req['AUTHENTICATED_USER'].getUserName(),
'isaac')
@@ -376,14 +376,14 @@
marker = []
bt_before = getattr(container, '__before_traverse__', marker)
- self.failUnless(bt_before is marker)
+ self.assertTrue(bt_before is marker)
container._setObject(self._CC_ID, cc)
bt_added = getattr(container, '__before_traverse__')
self.assertEqual(len(bt_added.items()), 1)
k, v = bt_added.items()[0]
- self.failUnless(k[1].startswith(self._getTargetClass().meta_type))
+ self.assertTrue(k[1].startswith(self._getTargetClass().meta_type))
self.assertEqual(v.name, self._CC_ID)
container._delObject(self._CC_ID)
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_DirectoryView.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_DirectoryView.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_DirectoryView.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -49,7 +49,7 @@
self.assertEqual(key.split(':')[0], 'Products.CMFCore')
subkey = _generateKey('Products.CMFCore', 'tests\foo')
- self.failUnless(subkey.startswith(key))
+ self.assertTrue(subkey.startswith(key))
def test__findProductForPath(self):
from Products.CMFCore.DirectoryView import _findProductForPath
@@ -65,7 +65,7 @@
def test_getDirectoryInfo(self):
skin = self.ob.fake_skin
skin.manage_properties('Products.CMFCore.tests:fake_skins/fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
+ self.assertTrue( hasattr(self.ob.fake_skin, 'test1'),
self.ob.fake_skin.getDirPath() )
# 1 - 7, in effect, test the pre CMF 1.5 backwards compatibility code in
@@ -75,7 +75,7 @@
def test_getDirectoryInfo1(self):
skin = self.ob.fake_skin
skin.manage_properties(r'Products\CMFCore\tests\fake_skins\fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
+ self.assertTrue( hasattr(self.ob.fake_skin, 'test1'),
self.ob.fake_skin.getDirPath() )
# windows SOFTWARE_HOME
@@ -83,14 +83,14 @@
skin = self.ob.fake_skin
skin.manage_properties(
r'C:\Zope\2.5.1\Products\CMFCore\tests\fake_skins\fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
+ self.assertTrue( hasattr(self.ob.fake_skin, 'test1'),
self.ob.fake_skin.getDirPath() )
# *nix INSTANCE_HOME
def test_getDirectoryInfo3(self):
skin = self.ob.fake_skin
skin.manage_properties('Products/CMFCore/tests/fake_skins/fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
+ self.assertTrue( hasattr(self.ob.fake_skin, 'test1'),
self.ob.fake_skin.getDirPath() )
# *nix SOFTWARE_HOME
@@ -98,7 +98,7 @@
skin = self.ob.fake_skin
skin.manage_properties(
'/usr/local/zope/2.5.1/Products/CMFCore/tests/fake_skins/fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
+ self.assertTrue( hasattr(self.ob.fake_skin, 'test1'),
self.ob.fake_skin.getDirPath() )
# windows PRODUCTS_PATH
@@ -106,7 +106,7 @@
skin = self.ob.fake_skin
skin.manage_properties( mktemp() +
r'\Products\CMFCore\tests\fake_skins\fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
+ self.assertTrue( hasattr(self.ob.fake_skin, 'test1'),
self.ob.fake_skin.getDirPath() )
# linux PRODUCTS_PATH
@@ -114,7 +114,7 @@
skin = self.ob.fake_skin
skin.manage_properties( mktemp() +
'/Products/CMFCore/tests/fake_skins/fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
+ self.assertTrue( hasattr(self.ob.fake_skin, 'test1'),
self.ob.fake_skin.getDirPath() )
# second 'Products' in path
@@ -122,7 +122,7 @@
skin = self.ob.fake_skin
skin.manage_properties(
r'C:\CoolProducts\Zope\Products\CMFCore\tests\fake_skins\fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
+ self.assertTrue( hasattr(self.ob.fake_skin, 'test1'),
self.ob.fake_skin.getDirPath() )
# Test pre CMF 2.1 backwards compatibility code in DirectoryView's __of__
@@ -130,7 +130,7 @@
def test_getDirectoryInfo8(self):
skin = self.ob.fake_skin
skin.manage_properties('CMFCore/tests/fake_skins/fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
+ self.assertTrue( hasattr(self.ob.fake_skin, 'test1'),
self.ob.fake_skin.getDirPath() )
# Test we do nothing if given a really wacky path
@@ -144,8 +144,8 @@
from Products.CMFCore import DirectoryView
warnings = [t[0] for t in DirectoryView.__warningregistry__]
text = 'DirectoryView fake_skin refers to a non-existing path %r' % file
- self.assert_(text in warnings)
- self.failUnless(text in self._our_stderr_stream.getvalue())
+ self.assertTrue(text in warnings)
+ self.assertTrue(text in self._our_stderr_stream.getvalue())
def test_UnhandleableMinimalPath( self ):
from Products.CMFCore.utils import minimalpath, normalize
@@ -159,7 +159,7 @@
def test_registerDirectoryKeys(self):
from Products.CMFCore.DirectoryView import _dirreg
dirs = _dirreg._directories
- self.failUnless( dirs.has_key('Products.CMFCore.tests:fake_skins/fake_skin'),
+ self.assertTrue( dirs.has_key('Products.CMFCore.tests:fake_skins/fake_skin'),
dirs.keys() )
self.assertEqual( self.ob.fake_skin.getDirPath(),
'Products.CMFCore.tests:fake_skins/fake_skin' )
@@ -181,7 +181,7 @@
# appears as a DirectoryViewSurrogate due
# to Acquisition hackery.
from Products.CMFCore.DirectoryView import DirectoryViewSurrogate
- self.failUnless(isinstance(self.ob.fake_skin,DirectoryViewSurrogate))
+ self.assertTrue(isinstance(self.ob.fake_skin,DirectoryViewSurrogate))
def test_DirectoryViewMethod( self ):
# Check if DirectoryView method works
@@ -238,7 +238,7 @@
visible = self.ob.fake_skin.objectIds()
for name in must_ignore:
- self.failIf(name in visible)
+ self.assertFalse(name in visible)
class DirectoryViewFolderTests(FSDVTest):
@@ -273,7 +273,7 @@
# DirectoryViewSurrogate
from Products.CMFCore.DirectoryView import DirectoryViewSurrogate
testfolder = self.ob.fake_skin.test_directory
- self.failUnless(isinstance(testfolder, DirectoryViewSurrogate))
+ self.assertTrue(isinstance(testfolder, DirectoryViewSurrogate))
def test_DirectoryViewFolderCustom(self):
# Now we register a different class under the fake meta_type
@@ -286,7 +286,7 @@
self.ob._delObject('fake_skin')
self._registerDirectory(self)
testfolder = self.ob.fake_skin.test_directory
- self.failUnless(isinstance(testfolder, DummyDirectoryViewSurrogate))
+ self.assertTrue(isinstance(testfolder, DummyDirectoryViewSurrogate))
class DebugModeTests(WritableFSDVTest):
@@ -330,21 +330,21 @@
def test_NewFolder( self ):
# See if a new folder shows up
from Products.CMFCore.DirectoryView import DirectoryViewSurrogate
- self.failUnless(isinstance(self.ob.fake_skin.test3,
+ self.assertTrue(isinstance(self.ob.fake_skin.test3,
DirectoryViewSurrogate))
self.ob.fake_skin.test3.objectIds()
def test_DeleteMethod( self ):
# Make sure a deleted method goes away
remove(self.test2path)
- self.failIf(hasattr(self.ob.fake_skin,'test2'))
+ self.assertFalse(hasattr(self.ob.fake_skin,'test2'))
def test_DeleteAddEditMethod( self ):
# Check that if we delete a method, then add it back,
# then edit it, the DirectoryView notices.
# This exercises yet another Win32 mtime weirdity.
remove(self.test2path)
- self.failIf(hasattr(self.ob.fake_skin,'test2'))
+ self.assertFalse(hasattr(self.ob.fake_skin,'test2'))
# add method back to the fake skin folder
self._writeFile(self.test2path, "return 'test2.2'",
@@ -363,7 +363,7 @@
def test_DeleteFolder( self ):
# Make sure a deleted folder goes away
rmdir(self.test3path)
- self.failIf(hasattr(self.ob.fake_skin,'test3'))
+ self.assertFalse(hasattr(self.ob.fake_skin,'test3'))
def test_suite():
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_DynamicType.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_DynamicType.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_DynamicType.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -177,7 +177,7 @@
except ValueError, e:
message = e.args[0]
detail = '"%s" does not offer action "%s"' % (message, INVALID_ID)
- self.failUnless(message.find(INVALID_ID) != -1, detail)
+ self.assertTrue(message.find(INVALID_ID) != -1, detail)
def test_suite():
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_Expression.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_Expression.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_Expression.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -46,7 +46,7 @@
self.portal.portal_membership = DummyMembershipTool()
ec = createExprContext(self.folder, self.portal, self.object)
member = ec.contexts['member']
- self.failIf(member)
+ self.assertFalse(member)
def test_authenticatedUser_ec(self):
self.portal.portal_membership = DummyMembershipTool(anon=0)
@@ -60,13 +60,13 @@
object = ec.contexts['object']
portal = ec.contexts['portal']
folder = ec.contexts['folder']
- self.failUnless(object)
+ self.assertTrue(object)
self.assertEqual(object.id, 'bar')
self.assertEqual(object.absolute_url(), 'url_bar')
- self.failUnless(portal)
+ self.assertTrue(portal)
self.assertEqual(portal.id, 'portal')
self.assertEqual(portal.absolute_url(), 'url_portal')
- self.failUnless(folder)
+ self.assertTrue(folder)
self.assertEqual(folder.id, 'foo')
self.assertEqual(folder.absolute_url(), 'url_foo')
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSDTMLMethod.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSDTMLMethod.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSDTMLMethod.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -68,9 +68,9 @@
script = self._makeOne('testDTML', 'testDTML.dtml')
script = script.__of__(self.root)
script(self.root, self.REQUEST, self.RESPONSE)
- self.failUnless( len( self.RESPONSE.headers ) >= original_len + 2 )
- self.failUnless( 'foo' in self.RESPONSE.headers.keys() )
- self.failUnless( 'bar' in self.RESPONSE.headers.keys() )
+ self.assertTrue( len( self.RESPONSE.headers ) >= original_len + 2 )
+ self.assertTrue( 'foo' in self.RESPONSE.headers.keys() )
+ self.assertTrue( 'bar' in self.RESPONSE.headers.keys() )
def test_ownership( self ):
script = self._makeOne( 'testDTML', 'testDTML.dtml' )
@@ -128,7 +128,7 @@
self.fsDTML.manage_doCustomize( folder_path='custom' )
self.assertEqual( len( self.custom.objectIds() ), 1 )
- self.failUnless( 'testDTML' in self.custom.objectIds() )
+ self.assertTrue( 'testDTML' in self.custom.objectIds() )
def test_customize_alternate_root( self ):
@@ -138,15 +138,15 @@
self.fsDTML.manage_doCustomize( folder_path='other', root=self.root )
- self.failIf( 'testDTML' in self.custom.objectIds() )
- self.failUnless( 'testDTML' in self.root.other.objectIds() )
+ self.assertFalse( 'testDTML' in self.custom.objectIds() )
+ self.assertTrue( 'testDTML' in self.root.other.objectIds() )
def test_customize_fspath_as_dot( self ):
self.fsDTML.manage_doCustomize( folder_path='.' )
- self.failIf( 'testDTML' in self.custom.objectIds() )
- self.failUnless( 'testDTML' in self.skins.objectIds() )
+ self.assertFalse( 'testDTML' in self.custom.objectIds() )
+ self.assertTrue( 'testDTML' in self.skins.objectIds() )
def test_customize_manual_clone( self ):
@@ -156,8 +156,8 @@
self.fsDTML.manage_doCustomize( folder_path='custom', obj=clone )
- self.failUnless( 'testDTML' in self.custom.objectIds() )
- self.failUnless( aq_base(self.custom._getOb('testDTML')) is clone)
+ self.assertTrue( 'testDTML' in self.custom.objectIds() )
+ self.assertTrue( aq_base(self.custom._getOb('testDTML')) is clone)
def test_customize_caching(self):
# Test to ensure that cache manager associations survive customizing
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSFile.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSFile.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSFile.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -136,7 +136,7 @@
data = file.index_html( self.REQUEST, self.RESPONSE )
- self.failUnless( data, '' )
+ self.assertTrue( data, '' )
self.assertEqual( self.RESPONSE.getStatus(), 200 )
def test_index_html_with_304_from_cpm( self ):
@@ -193,9 +193,9 @@
file = file.__of__(self.root)
file.index_html(self.REQUEST, self.RESPONSE)
headers = self.RESPONSE.headers
- self.failUnless(len(headers) >= original_len + 3)
- self.failUnless('foo' in headers.keys())
- self.failUnless('bar' in headers.keys())
+ self.assertTrue(len(headers) >= original_len + 3)
+ self.assertTrue('foo' in headers.keys())
+ self.assertTrue('bar' in headers.keys())
self.assertEqual(headers['test_path'], '/test_file')
def test_forced_content_type( self ):
@@ -228,7 +228,7 @@
file = file.__of__(self.root)
file.index_html(self.REQUEST, self.RESPONSE)
mime = self.RESPONSE.getHeader('content-type')
- self.failUnless(mime.endswith('; charset=utf-8'))
+ self.assertTrue(mime.endswith('; charset=utf-8'))
def test_unnecessary_invalidation_avoidance(self):
# See https://bugs.launchpad.net/zope-cmf/+bug/325246
@@ -242,25 +242,25 @@
# equals the filesystem modification time.
del invalidated[:]
file._readFile(True)
- self.failIf(invalidated)
+ self.assertFalse(invalidated)
del invalidated[:]
file._parsed = False
file._updateFromFS()
- self.failIf(invalidated)
+ self.assertFalse(invalidated)
# Second pass: Forcing a different internal file modification
# time onto the instance. Now the file will be invalidated.
del invalidated[:]
file._file_mod_time = 0
file._readFile(True)
- self.failUnless(invalidated)
+ self.assertTrue(invalidated)
del invalidated[:]
file._file_mod_time = 0
file._parsed = False
file._updateFromFS()
- self.failUnless(invalidated)
+ self.assertTrue(invalidated)
def test_suite():
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSImage.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSImage.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSImage.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -124,7 +124,7 @@
data = image.index_html( self.REQUEST, self.RESPONSE )
- self.failUnless( data, '' )
+ self.assertTrue( data, '' )
self.assertEqual( self.RESPONSE.getStatus(), 200 )
def test_index_html_with_304_from_cpm( self ):
@@ -156,9 +156,9 @@
image = image.__of__(self.root)
image.index_html(self.REQUEST, self.RESPONSE)
headers = self.RESPONSE.headers
- self.failUnless(len(headers) >= original_len + 3)
- self.failUnless('foo' in headers.keys())
- self.failUnless('bar' in headers.keys())
+ self.assertTrue(len(headers) >= original_len + 3)
+ self.assertTrue('foo' in headers.keys())
+ self.assertTrue('bar' in headers.keys())
self.assertEqual(headers['test_path'], '/test_image')
def test_index_html_200_with_cpm( self ):
@@ -210,9 +210,9 @@
self.assertEqual( self.RESPONSE.getStatus(), 304 )
headers = self.RESPONSE.headers
- self.failUnless(len(headers) >= original_len + 3)
- self.failUnless('foo' in headers.keys())
- self.failUnless('bar' in headers.keys())
+ self.assertTrue(len(headers) >= original_len + 3)
+ self.assertTrue('foo' in headers.keys())
+ self.assertTrue('bar' in headers.keys())
self.assertEqual(headers['test_path'], '/test_image')
def test_tag_with_acquired_clashing_attrs(self):
@@ -229,7 +229,7 @@
image = image.__of__( self.root )
tag = image.tag()
- self.failUnless('alt=""' in tag)
+ self.assertTrue('alt=""' in tag)
def test_unnecessary_invalidation_avoidance(self):
# See https://bugs.launchpad.net/zope-cmf/+bug/325246
@@ -243,25 +243,25 @@
# equals the filesystem modification time.
del invalidated[:]
image._readFile(True)
- self.failIf(invalidated)
+ self.assertFalse(invalidated)
del invalidated[:]
image._parsed = False
image._updateFromFS()
- self.failIf(invalidated)
+ self.assertFalse(invalidated)
# Second pass: Forcing a different internal file modification
# time onto the image instance. Now the image will be invalidated.
del invalidated[:]
image._file_mod_time = 0
image._readFile(True)
- self.failUnless(invalidated)
+ self.assertTrue(invalidated)
del invalidated[:]
image._file_mod_time = 0
image._parsed = False
image._updateFromFS()
- self.failUnless(invalidated)
+ self.assertTrue(invalidated)
def test_suite():
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSPageTemplate.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSPageTemplate.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSPageTemplate.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -100,7 +100,7 @@
script = self._makeOne('testPT3', 'testPT3.pt')
script = script.__of__(self.root)
data = script.read()
- self.failUnless(u'123üöäß' in data)
+ self.assertTrue(u'123üöäß' in data)
self.assertEqual(script.content_type, 'text/html')
def test_CharsetFrom2FSMetadata(self):
@@ -109,14 +109,14 @@
script = self._makeOne('testPT4', 'testPT4.pt')
script = script.__of__(self.root)
data = script.read()
- self.failUnless(u'123üöäß' in data)
+ self.assertTrue(u'123üöäß' in data)
self.assertEqual(script.content_type, 'text/html')
def test_CharsetFromContentTypeMetadata(self):
script = self._makeOne('testPT5', 'testPT5.pt')
script = script.__of__(self.root)
data = script.read()
- self.failUnless(u'123üöäß' in data)
+ self.assertTrue(u'123üöäß' in data)
self.assertEqual(script.content_type, 'text/html; charset=utf-16')
def test_BadCall( self ):
@@ -138,9 +138,9 @@
script = self._makeOne('testPT', 'testPT.pt')
script = script.__of__(self.root)
script()
- self.failUnless( len( self.RESPONSE.headers ) >= original_len + 2 )
- self.failUnless( 'foo' in self.RESPONSE.headers.keys() )
- self.failUnless( 'bar' in self.RESPONSE.headers.keys() )
+ self.assertTrue( len( self.RESPONSE.headers ) >= original_len + 2 )
+ self.assertTrue( 'foo' in self.RESPONSE.headers.keys() )
+ self.assertTrue( 'bar' in self.RESPONSE.headers.keys() )
def test_pt_properties( self ):
@@ -187,7 +187,7 @@
self.fsPT.manage_doCustomize( folder_path='custom' )
self.assertEqual( len( self.custom.objectIds() ), 1 )
- self.failUnless( 'testPT' in self.custom.objectIds() )
+ self.assertTrue( 'testPT' in self.custom.objectIds() )
def test_customize_alternate_root( self ):
@@ -196,15 +196,15 @@
self.fsPT.manage_doCustomize( folder_path='other', root=self.root )
- self.failIf( 'testPT' in self.custom.objectIds() )
- self.failUnless( 'testPT' in self.root.other.objectIds() )
+ self.assertFalse( 'testPT' in self.custom.objectIds() )
+ self.assertTrue( 'testPT' in self.root.other.objectIds() )
def test_customize_fspath_as_dot( self ):
self.fsPT.manage_doCustomize( folder_path='.' )
- self.failIf( 'testPT' in self.custom.objectIds() )
- self.failUnless( 'testPT' in self.skins.objectIds() )
+ self.assertFalse( 'testPT' in self.custom.objectIds() )
+ self.assertTrue( 'testPT' in self.skins.objectIds() )
def test_customize_manual_clone( self ):
@@ -212,8 +212,8 @@
self.fsPT.manage_doCustomize( folder_path='custom', obj=clone )
- self.failUnless( 'testPT' in self.custom.objectIds() )
- self.failUnless( aq_base(self.custom._getOb('testPT')) is clone )
+ self.assertTrue( 'testPT' in self.custom.objectIds() )
+ self.assertTrue( aq_base(self.custom._getOb('testPT')) is clone )
def test_customize_caching(self):
# Test to ensure that cache manager associations survive customizing
@@ -237,7 +237,7 @@
self.fsPT.manage_doCustomize( folder_path='custom' )
customized = self.custom.testPT
- self.failIf( customized.expand )
+ self.assertFalse( customized.expand )
def test_suite():
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSPropertiesObject.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSPropertiesObject.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSPropertiesObject.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -68,7 +68,7 @@
, 'test_props.props')
target = fspo._createZODBClone()
- self.failUnless( isinstance( target, Folder ) )
+ self.assertTrue( isinstance( target, Folder ) )
for prop_id in fspo.propertyIds():
self.assertEqual( target.getProperty( prop_id )
, fspo.getProperty( prop_id ) )
@@ -80,7 +80,7 @@
fspo.manage_doCustomize( folder_path='custom' )
self.assertEqual( len( custom.objectIds() ), 1 )
- self.failUnless( 'test_props' in custom.objectIds() )
+ self.assertTrue( 'test_props' in custom.objectIds() )
def test_manage_doCustomize_alternate_root( self ):
from OFS.Folder import Folder
@@ -91,16 +91,16 @@
fspo.manage_doCustomize( folder_path='other', root=self.root )
- self.failIf( 'test_props' in custom.objectIds() )
- self.failUnless( 'test_props' in self.root.other.objectIds() )
+ self.assertFalse( 'test_props' in custom.objectIds() )
+ self.assertTrue( 'test_props' in self.root.other.objectIds() )
def test_manage_doCustomize_fspath_as_dot( self ):
custom, fsdir, fspo = self._makeContext( 'test_props'
, 'test_props.props')
fspo.manage_doCustomize( folder_path='.' )
- self.failIf( 'test_props' in custom.objectIds() )
- self.failUnless( 'test_props' in self.root.portal_skins.objectIds() )
+ self.assertFalse( 'test_props' in custom.objectIds() )
+ self.assertTrue( 'test_props' in self.root.portal_skins.objectIds() )
def test_manage_doCustomize_manual_clone( self ):
from OFS.Folder import Folder
@@ -110,8 +110,8 @@
clone = Folder('test_props')
fspo.manage_doCustomize( folder_path='custom', obj=clone )
- self.failUnless( 'test_props' in custom.objectIds() )
- self.failUnless( aq_base(custom._getOb('test_props')) is clone )
+ self.assertTrue( 'test_props' in custom.objectIds() )
+ self.assertTrue( aq_base(custom._getOb('test_props')) is clone )
def test_suite():
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSPythonScript.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSPythonScript.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSPythonScript.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -118,11 +118,11 @@
fsPS.manage_doCustomize( folder_path='custom' )
self.assertEqual( len( custom.objectIds() ), 1 )
- self.failUnless( 'test6' in custom.objectIds() )
+ self.assertTrue( 'test6' in custom.objectIds() )
test6 = custom._getOb('test6')
- self.failUnless(isinstance(test6, CustomizedPythonScript))
+ self.assertTrue(isinstance(test6, CustomizedPythonScript))
self.assertEqual(test6.original_source, fsPS.read())
def test_customize_alternate_root( self ):
@@ -132,8 +132,8 @@
fsPS.manage_doCustomize( folder_path='other', root=root )
- self.failIf( 'test6' in custom.objectIds() )
- self.failUnless( 'test6' in root.other.objectIds() )
+ self.assertFalse( 'test6' in custom.objectIds() )
+ self.assertTrue( 'test6' in root.other.objectIds() )
def test_customize_fspath_as_dot( self ):
@@ -141,8 +141,8 @@
fsPS.manage_doCustomize( folder_path='.' )
- self.failIf( 'test6' in custom.objectIds() )
- self.failUnless( 'test6' in root.portal_skins.objectIds() )
+ self.assertFalse( 'test6' in custom.objectIds() )
+ self.assertTrue( 'test6' in root.portal_skins.objectIds() )
def test_customize_manual_clone( self ):
@@ -151,8 +151,8 @@
fsPS.manage_doCustomize( folder_path='custom', obj=clone )
- self.failUnless( 'test6' in custom.objectIds() )
- self.failUnless( aq_base(custom._getOb('test6')) is clone )
+ self.assertTrue( 'test6' in custom.objectIds() )
+ self.assertTrue( aq_base(custom._getOb('test6')) is clone )
def test_customize_caching(self):
# Test to ensure that cache manager associations survive customizing
@@ -177,13 +177,13 @@
root, tool, custom, fsdir, fsPS = self._makeSkins()
fsPS._proxy_roles = ('Manager', 'Anonymous')
- self.failUnless(fsPS.manage_haveProxy('Anonymous'))
- self.failUnless(fsPS.manage_haveProxy('Manager'))
+ self.assertTrue(fsPS.manage_haveProxy('Anonymous'))
+ self.assertTrue(fsPS.manage_haveProxy('Manager'))
fsPS.manage_doCustomize(folder_path='custom')
custom_ps = custom.test6
- self.failUnless(custom_ps.manage_haveProxy('Anonymous'))
- self.failUnless(custom_ps.manage_haveProxy('Manager'))
+ self.assertTrue(custom_ps.manage_haveProxy('Anonymous'))
+ self.assertTrue(custom_ps.manage_haveProxy('Manager'))
def test_customization_permissions(self):
# Test to ensure that permission settings survive customizing
@@ -198,9 +198,9 @@
rop = fsPS.rolesOfPermission(perm)
for rop_info in rop:
if rop_info['name'] == 'Anonymous':
- self.failIf(rop_info['selected'] == '')
+ self.assertFalse(rop_info['selected'] == '')
else:
- self.failUnless(rop_info['selected'] == '')
+ self.assertTrue(rop_info['selected'] == '')
# Now customize and verify again
fsPS.manage_doCustomize(folder_path='custom')
@@ -208,9 +208,9 @@
rop = custom_ps.rolesOfPermission(perm)
for rop_info in rop:
if rop_info['name'] == 'Anonymous':
- self.failIf(rop_info['selected'] == '')
+ self.assertFalse(rop_info['selected'] == '')
else:
- self.failUnless(rop_info['selected'] == '')
+ self.assertTrue(rop_info['selected'] == '')
_ORIGINAL_TEXT = """\
## Script (Python) "cps"
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSReSTMethod.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSReSTMethod.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSReSTMethod.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -101,9 +101,9 @@
script = self._makeOne('testReST', 'testReST.rst')
script = script.__of__(self.root)
script(self.REQUEST, self.RESPONSE)
- self.failUnless( len( self.RESPONSE.headers ) >= original_len + 2 )
- self.failUnless( 'foo' in self.RESPONSE.headers.keys() )
- self.failUnless( 'bar' in self.RESPONSE.headers.keys() )
+ self.assertTrue( len( self.RESPONSE.headers ) >= original_len + 2 )
+ self.assertTrue( 'foo' in self.RESPONSE.headers.keys() )
+ self.assertTrue( 'bar' in self.RESPONSE.headers.keys() )
def test_ownership( self ):
script = self._makeOne( 'testReST', 'testReST.rst' )
@@ -181,10 +181,10 @@
self.fsReST.manage_doCustomize(folder_path='custom')
self.assertEqual(len(self.custom.objectIds()), 1)
- self.failUnless('testReST' in self.custom.objectIds())
+ self.assertTrue('testReST' in self.custom.objectIds())
target = self.custom._getOb('testReST')
- self.failUnless(isinstance(target, ZopePageTemplate))
+ self.assertTrue(isinstance(target, ZopePageTemplate))
propinfo = target.propdict()['rest']
self.assertEqual(propinfo['type'], 'text')
@@ -200,15 +200,15 @@
self.fsReST.manage_doCustomize(folder_path='other', root=self.root)
- self.failIf('testReST' in self.custom.objectIds())
- self.failUnless('testReST' in self.root.other.objectIds())
+ self.assertFalse('testReST' in self.custom.objectIds())
+ self.assertTrue('testReST' in self.root.other.objectIds())
def test_customize_fpath_as_dot( self ):
self.fsReST.manage_doCustomize(folder_path='.')
- self.failIf('testReST' in self.custom.objectIds())
- self.failUnless('testReST' in self.skins.objectIds())
+ self.assertFalse('testReST' in self.custom.objectIds())
+ self.assertTrue('testReST' in self.skins.objectIds())
def test_customize_manual_clone( self ):
from OFS.Folder import Folder
@@ -217,8 +217,8 @@
self.fsReST.manage_doCustomize(folder_path='custom', obj=clone)
- self.failUnless('testReST' in self.custom.objectIds())
- self.failUnless(aq_base(self.custom._getOb('testReST')) is clone)
+ self.assertTrue('testReST' in self.custom.objectIds())
+ self.assertTrue(aq_base(self.custom._getOb('testReST')) is clone)
def test_customize_caching(self):
# Test to ensure that cache manager associations survive customizing
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSSTXMethod.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSSTXMethod.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSSTXMethod.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -131,9 +131,9 @@
script = self._makeOne('testSTX', 'testSTX.stx')
script = script.__of__(self.root)
script(self.REQUEST, self.RESPONSE)
- self.failUnless( len( self.RESPONSE.headers ) >= original_len + 2 )
- self.failUnless( 'foo' in self.RESPONSE.headers.keys() )
- self.failUnless( 'bar' in self.RESPONSE.headers.keys() )
+ self.assertTrue( len( self.RESPONSE.headers ) >= original_len + 2 )
+ self.assertTrue( 'foo' in self.RESPONSE.headers.keys() )
+ self.assertTrue( 'bar' in self.RESPONSE.headers.keys() )
def test_ownership( self ):
script = self._makeOne( 'testSTX', 'testSTX.stx' )
@@ -215,16 +215,16 @@
self.fsSTX.manage_doCustomize(folder_path='other', root=self.root)
- self.failIf('testSTX' in self.custom.objectIds())
- self.failUnless('testSTX' in self.root.other.objectIds())
+ self.assertFalse('testSTX' in self.custom.objectIds())
+ self.assertTrue('testSTX' in self.root.other.objectIds())
def test_customize_fspath_as_dot( self ):
self._setWhichTemplate('DTML')
self.fsSTX.manage_doCustomize(folder_path='.')
- self.failIf('testSTX' in self.custom.objectIds())
- self.failUnless('testSTX' in self.skins.objectIds())
+ self.assertFalse('testSTX' in self.custom.objectIds())
+ self.assertTrue('testSTX' in self.skins.objectIds())
def test_customize_manual_clone( self ):
from OFS.Folder import Folder
@@ -235,8 +235,8 @@
self.fsSTX.manage_doCustomize(folder_path='custom', obj=clone)
- self.failUnless('testSTX' in self.custom.objectIds())
- self.failUnless(aq_base(self.custom._getOb('testSTX')) is clone)
+ self.assertTrue('testSTX' in self.custom.objectIds())
+ self.assertTrue(aq_base(self.custom._getOb('testSTX')) is clone)
def test_customize_with_DTML( self ):
from OFS.DTMLDocument import DTMLDocument
@@ -247,10 +247,10 @@
self.fsSTX.manage_doCustomize(folder_path='custom')
self.assertEqual(len(self.custom.objectIds()), 1)
- self.failUnless('testSTX' in self.custom.objectIds())
+ self.assertTrue('testSTX' in self.custom.objectIds())
target = self.custom._getOb('testSTX')
- self.failUnless(isinstance(target, DTMLDocument))
+ self.assertTrue(isinstance(target, DTMLDocument))
propinfo = target.propdict()['stx']
self.assertEqual(propinfo['type'], 'text')
@@ -268,10 +268,10 @@
self.fsSTX.manage_doCustomize(folder_path='custom')
self.assertEqual(len(self.custom.objectIds()), 1)
- self.failUnless('testSTX' in self.custom.objectIds())
+ self.assertTrue('testSTX' in self.custom.objectIds())
target = self.custom._getOb('testSTX')
- self.failUnless(isinstance(target, ZopePageTemplate))
+ self.assertTrue(isinstance(target, ZopePageTemplate))
propinfo = target.propdict()['stx']
self.assertEqual(propinfo['type'], 'text')
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSZSQLMethod.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSZSQLMethod.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSZSQLMethod.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -39,7 +39,7 @@
self.assertEqual(zsql.class_name_, 'MyRecord')
self.assertEqual(zsql.class_file_, 'CMFCore.TestRecord')
self.assertEqual(zsql.connection_hook, 'MyHook')
- self.failIf(zsql.allow_simple_one_argument_traversal is None)
+ self.assertFalse(zsql.allow_simple_one_argument_traversal is None)
class FSZSQLMethodCustomizationTests(SecurityTest, FSZSQLMaker):
@@ -71,7 +71,7 @@
self.fsZSQL.manage_doCustomize( folder_path='custom' )
self.assertEqual( len( self.custom.objectIds() ), 1 )
- self.failUnless( 'testsql' in self.custom.objectIds() )
+ self.assertTrue( 'testsql' in self.custom.objectIds() )
def test_customize_alternate_root( self ):
@@ -81,15 +81,15 @@
self.fsZSQL.manage_doCustomize( folder_path='other', root=self.root )
- self.failIf( 'testsql' in self.custom.objectIds() )
- self.failUnless( 'testsql' in self.root.other.objectIds() )
+ self.assertFalse( 'testsql' in self.custom.objectIds() )
+ self.assertTrue( 'testsql' in self.root.other.objectIds() )
def test_customize_fspath_as_dot( self ):
self.fsZSQL.manage_doCustomize( folder_path='.' )
- self.failIf( 'testsql' in self.custom.objectIds() )
- self.failUnless( 'testsql' in self.skins.objectIds() )
+ self.assertFalse( 'testsql' in self.custom.objectIds() )
+ self.assertTrue( 'testsql' in self.skins.objectIds() )
def test_customize_manual_clone( self ):
@@ -99,8 +99,8 @@
self.fsZSQL.manage_doCustomize( folder_path='custom', obj=clone )
- self.failUnless( 'testsql' in self.custom.objectIds() )
- self.failUnless( aq_base(self.custom._getOb('testsql')) is clone )
+ self.assertTrue( 'testsql' in self.custom.objectIds() )
+ self.assertTrue( aq_base(self.custom._getOb('testsql')) is clone )
def test_customize_properties(self):
# Make sure all properties are coming across
@@ -116,7 +116,7 @@
self.assertEqual(zsql.class_name_, 'MyRecord')
self.assertEqual(zsql.class_file_, 'CMFCore.TestRecord')
self.assertEqual(zsql.connection_hook, 'MyHook')
- self.failIf(zsql.allow_simple_one_argument_traversal is None)
+ self.assertFalse(zsql.allow_simple_one_argument_traversal is None)
def test_suite():
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_MemberDataTool.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_MemberDataTool.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_MemberDataTool.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -86,10 +86,10 @@
def test_deleteMemberData(self):
tool = self._makeOne()
tool.registerMemberData('Dummy', 'user_foo')
- self.failUnless( tool._members.has_key('user_foo') )
- self.failUnless( tool.deleteMemberData('user_foo') )
- self.failIf( tool._members.has_key('user_foo') )
- self.failIf( tool.deleteMemberData('user_foo') )
+ self.assertTrue( tool._members.has_key('user_foo') )
+ self.assertTrue( tool.deleteMemberData('user_foo') )
+ self.assertFalse( tool._members.has_key('user_foo') )
+ self.assertFalse( tool.deleteMemberData('user_foo') )
def test_pruneMemberData(self):
# This needs a tad more setup
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_MembershipTool.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_MembershipTool.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_MembershipTool.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -75,18 +75,18 @@
# permission
mtool.createMemberArea('user_foo')
- self.failIf( hasattr(members.aq_self, 'user_foo') )
+ self.assertFalse( hasattr(members.aq_self, 'user_foo') )
newSecurityManager(None, acl_users.user_bar)
mtool.createMemberArea('user_foo')
- self.failIf( hasattr(members.aq_self, 'user_foo') )
+ self.assertFalse( hasattr(members.aq_self, 'user_foo') )
newSecurityManager(None, acl_users.user_foo)
mtool.setMemberareaCreationFlag()
mtool.createMemberArea('user_foo')
- self.failIf( hasattr(members.aq_self, 'user_foo') )
+ self.assertFalse( hasattr(members.aq_self, 'user_foo') )
newSecurityManager(None, acl_users.all_powerful_Oz)
mtool.setMemberareaCreationFlag()
mtool.createMemberArea('user_foo')
- self.failUnless( hasattr(members.aq_self, 'user_foo') )
+ self.assertTrue( hasattr(members.aq_self, 'user_foo') )
# default content
f = members.user_foo
@@ -108,18 +108,18 @@
# permission
mtool.createMemberArea('user_foo')
- self.failIf( hasattr(members.aq_self, 'user_foo') )
+ self.assertFalse( hasattr(members.aq_self, 'user_foo') )
newSecurityManager(None, acl_users.user_bar)
mtool.createMemberArea('user_foo')
- self.failIf( hasattr(members.aq_self, 'user_foo') )
+ self.assertFalse( hasattr(members.aq_self, 'user_foo') )
newSecurityManager(None, acl_users.user_foo)
mtool.setMemberareaCreationFlag()
mtool.createMemberArea('user_foo')
- self.failIf( hasattr(members.aq_self, 'user_foo') )
+ self.assertFalse( hasattr(members.aq_self, 'user_foo') )
newSecurityManager(None, acl_users.all_powerful_Oz)
mtool.setMemberareaCreationFlag()
mtool.createMemberArea('user_foo')
- self.failUnless( hasattr(members.aq_self, 'user_foo') )
+ self.assertTrue( hasattr(members.aq_self, 'user_foo') )
# default content
f = members.user_foo
@@ -150,9 +150,9 @@
newSecurityManager(None, acl_users.all_powerful_Oz)
mtool.createMemberArea( NONLOCAL_USER_ID )
- self.failUnless( hasattr(members.aq_self, NONLOCAL_USER_ID ) )
+ self.assertTrue( hasattr(members.aq_self, NONLOCAL_USER_ID ) )
mtool.createMemberArea( LOCAL_USER_ID )
- self.failUnless( hasattr(members.aq_self, LOCAL_USER_ID ) )
+ self.assertTrue( hasattr(members.aq_self, LOCAL_USER_ID ) )
def test_deleteMembers(self):
site = self._makeSite()
@@ -167,15 +167,15 @@
self.assertEqual( acl_users.getUserById('user_foo'),
acl_users.user_foo )
mtool.createMemberArea('user_foo')
- self.failUnless( hasattr(members.aq_self, 'user_foo') )
+ self.assertTrue( hasattr(members.aq_self, 'user_foo') )
mdtool.registerMemberData('Dummy', 'user_foo')
- self.failUnless( mdtool._members.has_key('user_foo') )
+ self.assertTrue( mdtool._members.has_key('user_foo') )
rval = mtool.deleteMembers( ('user_foo', 'user_baz') )
self.assertEqual( rval, ('user_foo',) )
- self.failIf( acl_users.getUserById('user_foo', None) )
- self.failIf( mdtool._members.has_key('user_foo') )
- self.failIf( hasattr(members.aq_self, 'user_foo') )
+ self.assertFalse( acl_users.getUserById('user_foo', None) )
+ self.assertFalse( mdtool._members.has_key('user_foo') )
+ self.assertFalse( hasattr(members.aq_self, 'user_foo') )
cleanUp()
@@ -195,9 +195,9 @@
self.assertEqual( acl_users.getUserById('user_foo'),
acl_users.user_foo )
mtool.createMemberArea('user_foo')
- self.failUnless( hasattr(members.aq_self, 'user_foo') )
+ self.assertTrue( hasattr(members.aq_self, 'user_foo') )
mdtool.registerMemberData('Dummy', 'user_foo')
- self.failUnless( mdtool._members.has_key('user_foo') )
+ self.assertTrue( mdtool._members.has_key('user_foo') )
# Fake an incompatible user folder by deleting the class method
deletion_method = DummyUserFolder.userFolderDelUsers
@@ -206,9 +206,9 @@
, mtool.deleteMembers
, ('user_foo',)
)
- self.failUnless( acl_users.getUserById('user_foo', None) )
- self.failUnless( mdtool._members.has_key('user_foo') )
- self.failUnless( hasattr(members.aq_self, 'user_foo') )
+ self.assertTrue( acl_users.getUserById('user_foo', None) )
+ self.assertTrue( mdtool._members.has_key('user_foo') )
+ self.assertTrue( hasattr(members.aq_self, 'user_foo') )
# Cleanup
DummyUserFolder.userFolderDelUsers = deletion_method
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_OpaqueItems.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_OpaqueItems.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_OpaqueItems.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -188,9 +188,9 @@
sub = self.sub
dummy = addDummyContent(folder, 'dummy', Marker)
- self.failIf(dummy.isNotifiedByAfterAdd())
- self.failIf(dummy.isNotifiedByAfterClone())
- self.failIf(dummy.isNotifiedByBeforeDelete())
+ self.assertFalse(dummy.isNotifiedByAfterAdd())
+ self.assertFalse(dummy.isNotifiedByAfterClone())
+ self.assertFalse(dummy.isNotifiedByBeforeDelete())
# WAAAA! must get _p_jar set
old, dummy._p_jar = sub._p_jar, self.root._p_jar
@@ -200,18 +200,18 @@
finally:
dummy._p_jar = old
- self.failIf(dummy.isNotifiedByAfterAdd())
- self.failIf(dummy.isNotifiedByAfterClone())
- self.failIf(dummy.isNotifiedByBeforeDelete())
+ self.assertFalse(dummy.isNotifiedByAfterAdd())
+ self.assertFalse(dummy.isNotifiedByAfterClone())
+ self.assertFalse(dummy.isNotifiedByBeforeDelete())
def test_callableItemWithHooksOnly(self):
folder = self.folder
sub = self.sub
dummy = addDummyContent(folder, 'dummy', Hooks)
- self.failIf(dummy.isNotifiedByAfterAdd())
- self.failIf(dummy.isNotifiedByAfterClone())
- self.failIf(dummy.isNotifiedByBeforeDelete())
+ self.assertFalse(dummy.isNotifiedByAfterAdd())
+ self.assertFalse(dummy.isNotifiedByAfterClone())
+ self.assertFalse(dummy.isNotifiedByBeforeDelete())
# WAAAA! must get _p_jar set
old, dummy._p_jar = sub._p_jar, self.root._p_jar
@@ -221,9 +221,9 @@
finally:
dummy._p_jar = old
- self.failIf(dummy.isNotifiedByAfterAdd())
- self.failIf(dummy.isNotifiedByAfterClone())
- self.failIf(dummy.isNotifiedByBeforeDelete())
+ self.assertFalse(dummy.isNotifiedByAfterAdd())
+ self.assertFalse(dummy.isNotifiedByAfterClone())
+ self.assertFalse(dummy.isNotifiedByBeforeDelete())
def test_callableItemWithMarkerAndHooks(self):
folder = self.folder
@@ -231,8 +231,8 @@
dummy = addDummyContent(folder, 'dummy', MarkerAndHooks)
self.assertEqual(dummy.isNotifiedByAfterAdd(), 1)
- self.failIf(dummy.isNotifiedByAfterClone())
- self.failIf(dummy.isNotifiedByBeforeDelete())
+ self.assertFalse(dummy.isNotifiedByAfterClone())
+ self.assertFalse(dummy.isNotifiedByBeforeDelete())
# WAAAA! must get _p_jar set
old, dummy._p_jar = sub._p_jar, self.root._p_jar
@@ -244,7 +244,7 @@
self.assertEqual(dummy.isNotifiedByAfterAdd(), 2)
self.assertEqual(dummy.isNotifiedByAfterClone(), 1)
- self.failIf(dummy.isNotifiedByBeforeDelete())
+ self.assertFalse(dummy.isNotifiedByBeforeDelete())
def test_talkbackItem(self):
folder = self.folder
@@ -253,8 +253,8 @@
dummy = addDummyContent(folder, 'dummy', 'talkback')
self.assertEqual(dummy.isNotifiedByAfterAdd(), 1)
- self.failIf(dummy.isNotifiedByAfterClone())
- self.failIf(dummy.isNotifiedByBeforeDelete())
+ self.assertFalse(dummy.isNotifiedByAfterClone())
+ self.assertFalse(dummy.isNotifiedByBeforeDelete())
# WAAAA! must get _p_jar set
old, dummy._p_jar = sub._p_jar, self.root._p_jar
@@ -266,7 +266,7 @@
self.assertEqual(dummy.isNotifiedByAfterAdd(), 2)
self.assertEqual(dummy.isNotifiedByAfterClone(), 1)
- self.failIf(dummy.isNotifiedByBeforeDelete())
+ self.assertFalse(dummy.isNotifiedByBeforeDelete())
def test_suite():
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_PortalFolder.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_PortalFolder.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_PortalFolder.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -114,12 +114,12 @@
def test_invokeFactory(self):
f = self.f
- self.failIf( 'foo' in f.objectIds() )
+ self.assertFalse( 'foo' in f.objectIds() )
f.manage_addProduct = {'FooProduct': DummyFactoryDispatcher(f)}
f.invokeFactory( type_name='Dummy Content', id='foo' )
- self.failUnless( 'foo' in f.objectIds() )
+ self.assertTrue( 'foo' in f.objectIds() )
foo = f.foo
self.assertEqual( foo.getId(), 'foo' )
self.assertEqual( foo.getPortalTypeName(), 'Dummy Content' )
@@ -134,7 +134,7 @@
ftype.allowed_content_types = (self._PORTAL_TYPE,)
f.invokeFactory(self._PORTAL_TYPE, id='sub')
- self.failUnless('sub' in f.objectIds())
+ self.assertTrue('sub' in f.objectIds())
self.assertRaises(ValueError, f.invokeFactory, 'Dummy Content', 'foo')
@@ -200,23 +200,23 @@
test = self._makeOne('test')
foo = DummyContent('foo')
foo.reset()
- self.failIf( foo.after_add_called )
- self.failIf( foo.before_delete_called )
+ self.assertFalse( foo.after_add_called )
+ self.assertFalse( foo.before_delete_called )
test._setObject('foo', foo)
- self.failUnless( foo.after_add_called )
- self.failIf( foo.before_delete_called )
+ self.assertTrue( foo.after_add_called )
+ self.assertFalse( foo.before_delete_called )
foo.reset()
test._delObject('foo')
- self.failIf( foo.after_add_called )
- self.failUnless( foo.before_delete_called )
+ self.assertFalse( foo.after_add_called )
+ self.assertTrue( foo.before_delete_called )
foo.reset()
test._setObject('foo', foo)
test._delOb('foo') # doesn't propagate
- self.failUnless( foo.after_add_called )
- self.failIf( foo.before_delete_called )
+ self.assertTrue( foo.after_add_called )
+ self.assertFalse( foo.before_delete_called )
def test_manageDelObjects(self):
test = self._makeOne('test')
@@ -225,8 +225,8 @@
test._setObject('foo', foo)
foo.reset()
test.manage_delObjects( ids=['foo'] )
- self.failIf( foo.after_add_called )
- self.failUnless( foo.before_delete_called )
+ self.assertFalse( foo.after_add_called )
+ self.assertTrue( foo.before_delete_called )
def test_catalogUnindexAndIndex(self):
#
@@ -240,14 +240,14 @@
test._setObject( 'foo', DummyContent( 'foo' , catalog=1 ) )
foo = test.foo
- self.failUnless( foo.after_add_called )
- self.failIf( foo.before_delete_called )
+ self.assertTrue( foo.after_add_called )
+ self.assertFalse( foo.before_delete_called )
self.assertEqual( len(ctool), 1 )
foo.reset()
test._delObject('foo')
- self.failIf( foo.after_add_called )
- self.failUnless( foo.before_delete_called )
+ self.assertFalse( foo.after_add_called )
+ self.assertTrue( foo.before_delete_called )
self.assertEqual( len(ctool), 0 )
def test_portalfolder_cataloging(self):
@@ -281,14 +281,14 @@
sub._setObject( 'foo', DummyContent( 'foo', catalog=1 ) )
foo = sub.foo
- self.failUnless( foo.after_add_called )
- self.failIf( foo.before_delete_called )
+ self.assertTrue( foo.after_add_called )
+ self.assertFalse( foo.before_delete_called )
self.assertEqual( len(ctool), 1 )
foo.reset()
test._delObject('sub')
- self.failIf( foo.after_add_called )
- self.failUnless( foo.before_delete_called )
+ self.assertFalse( foo.after_add_called )
+ self.assertTrue( foo.before_delete_called )
self.assertEqual( len(ctool), 0 )
def test_manageAddFolder(self):
@@ -462,7 +462,7 @@
acl_users = self.site._setObject('acl_users', DummyUserFolder())
newSecurityManager(None, acl_users.user_foo)
- self.assert_(sub.checkIdAvailable('.foo'))
+ self.assertTrue(sub.checkIdAvailable('.foo'))
def test__checkId_Five(self):
test = self._makeOne('test')
@@ -475,7 +475,7 @@
#
test = self._makeOne('test')
test._setObject('foo', DummyContent('foo'))
- self.failIf(test.checkIdAvailable('foo'))
+ self.assertFalse(test.checkIdAvailable('foo'))
class PortalFolderMoveTests(SecurityTest):
@@ -506,21 +506,21 @@
folder._setObject( 'sub', PortalFolder( 'sub', '' ) )
folder.sub._setObject( 'foo', DummyContent( 'foo', catalog=1 ) )
self.assertEqual( len(ctool), 1 )
- self.failUnless( has_id(ctool, 'foo') )
- self.failUnless( has_path(ctool,
+ self.assertTrue( has_id(ctool, 'foo') )
+ self.assertTrue( has_path(ctool,
'/bar/site/folder/sub/foo') )
transaction.savepoint(optimistic=True)
folder.manage_renameObject(id='sub', new_id='new_sub')
self.assertEqual( len(ctool), 1 )
- self.failUnless( has_id(ctool, 'foo') )
- self.failUnless( has_path(ctool,
+ self.assertTrue( has_id(ctool, 'foo') )
+ self.assertTrue( has_path(ctool,
'/bar/site/folder/new_sub/foo') )
folder._setObject( 'bar', DummyContent( 'bar', catalog=1 ) )
self.assertEqual( len(ctool), 2 )
- self.failUnless( has_id(ctool, 'bar') )
- self.failUnless( has_path(ctool, '/bar/site/folder/bar') )
+ self.assertTrue( has_id(ctool, 'bar') )
+ self.assertTrue( has_path(ctool, '/bar/site/folder/bar') )
folder._setObject( 'sub2', PortalFolder( 'sub2', '' ) )
sub2 = folder.sub2
@@ -533,10 +533,10 @@
cookie = folder.manage_cutObjects(ids=['bar'])
sub2.manage_pasteObjects(cookie)
- self.failUnless( has_id( ctool, 'foo' ) )
- self.failUnless( has_id( ctool, 'bar' ) )
+ self.assertTrue( has_id( ctool, 'foo' ) )
+ self.assertTrue( has_id( ctool, 'bar' ) )
self.assertEqual( len(ctool), 2 )
- self.failUnless( has_path(ctool,
+ self.assertTrue( has_path(ctool,
'/bar/site/folder/sub2/bar') )
def test_contentPaste(self):
@@ -553,15 +553,15 @@
self.assertEqual( len(ctool), 0 )
sub1._setObject( 'dummy', DummyContent( 'dummy', catalog=1 ) )
- self.failUnless( 'dummy' in sub1.objectIds() )
- self.failUnless( 'dummy' in sub1.contentIds() )
- self.failIf( 'dummy' in sub2.objectIds() )
- self.failIf( 'dummy' in sub2.contentIds() )
- self.failIf( 'dummy' in sub3.objectIds() )
- self.failIf( 'dummy' in sub3.contentIds() )
- self.failUnless( has_path(ctool, '/bar/site/sub1/dummy') )
- self.failIf( has_path(ctool, '/bar/site/sub2/dummy') )
- self.failIf( has_path(ctool, '/bar/site/sub3/dummy') )
+ self.assertTrue( 'dummy' in sub1.objectIds() )
+ self.assertTrue( 'dummy' in sub1.contentIds() )
+ self.assertFalse( 'dummy' in sub2.objectIds() )
+ self.assertFalse( 'dummy' in sub2.contentIds() )
+ self.assertFalse( 'dummy' in sub3.objectIds() )
+ self.assertFalse( 'dummy' in sub3.contentIds() )
+ self.assertTrue( has_path(ctool, '/bar/site/sub1/dummy') )
+ self.assertFalse( has_path(ctool, '/bar/site/sub2/dummy') )
+ self.assertFalse( has_path(ctool, '/bar/site/sub3/dummy') )
cookie = sub1.manage_copyObjects( ids = ( 'dummy', ) )
# Waaa! force sub2 to allow paste of Dummy object.
@@ -569,15 +569,15 @@
sub2.all_meta_types.extend( sub2.all_meta_types )
sub2.all_meta_types.extend( extra_meta_types() )
sub2.manage_pasteObjects( cookie )
- self.failUnless( 'dummy' in sub1.objectIds() )
- self.failUnless( 'dummy' in sub1.contentIds() )
- self.failUnless( 'dummy' in sub2.objectIds() )
- self.failUnless( 'dummy' in sub2.contentIds() )
- self.failIf( 'dummy' in sub3.objectIds() )
- self.failIf( 'dummy' in sub3.contentIds() )
- self.failUnless( has_path(ctool, '/bar/site/sub1/dummy') )
- self.failUnless( has_path(ctool, '/bar/site/sub2/dummy') )
- self.failIf( has_path(ctool, '/bar/site/sub3/dummy') )
+ self.assertTrue( 'dummy' in sub1.objectIds() )
+ self.assertTrue( 'dummy' in sub1.contentIds() )
+ self.assertTrue( 'dummy' in sub2.objectIds() )
+ self.assertTrue( 'dummy' in sub2.contentIds() )
+ self.assertFalse( 'dummy' in sub3.objectIds() )
+ self.assertFalse( 'dummy' in sub3.contentIds() )
+ self.assertTrue( has_path(ctool, '/bar/site/sub1/dummy') )
+ self.assertTrue( has_path(ctool, '/bar/site/sub2/dummy') )
+ self.assertFalse( has_path(ctool, '/bar/site/sub3/dummy') )
transaction.savepoint(optimistic=True)
cookie = sub1.manage_cutObjects( ids = ('dummy',) )
@@ -586,15 +586,15 @@
sub3.all_meta_types.extend(sub3.all_meta_types)
sub3.all_meta_types.extend( extra_meta_types() )
sub3.manage_pasteObjects(cookie)
- self.failIf( 'dummy' in sub1.objectIds() )
- self.failIf( 'dummy' in sub1.contentIds() )
- self.failUnless( 'dummy' in sub2.objectIds() )
- self.failUnless( 'dummy' in sub2.contentIds() )
- self.failUnless( 'dummy' in sub3.objectIds() )
- self.failUnless( 'dummy' in sub3.contentIds() )
- self.failIf( has_path(ctool, '/bar/site/sub1/dummy') )
- self.failUnless( has_path(ctool, '/bar/site/sub2/dummy') )
- self.failUnless( has_path(ctool, '/bar/site/sub3/dummy') )
+ self.assertFalse( 'dummy' in sub1.objectIds() )
+ self.assertFalse( 'dummy' in sub1.contentIds() )
+ self.assertTrue( 'dummy' in sub2.objectIds() )
+ self.assertTrue( 'dummy' in sub2.contentIds() )
+ self.assertTrue( 'dummy' in sub3.objectIds() )
+ self.assertTrue( 'dummy' in sub3.contentIds() )
+ self.assertFalse( has_path(ctool, '/bar/site/sub1/dummy') )
+ self.assertTrue( has_path(ctool, '/bar/site/sub2/dummy') )
+ self.assertTrue( has_path(ctool, '/bar/site/sub3/dummy') )
class ContentFilterTests(unittest.TestCase):
@@ -682,13 +682,13 @@
cfilter = ContentFilter( Creator='moe' )
dummy = self.dummy
- self.failIf( cfilter(dummy) )
+ self.assertFalse( cfilter(dummy) )
dummy.creators = ('curly',)
- self.failIf( cfilter(dummy) )
+ self.assertFalse( cfilter(dummy) )
dummy.creators = ('moe',)
- self.failUnless( cfilter(dummy) )
+ self.assertTrue( cfilter(dummy) )
dummy.creators = ('moe', 'curly')
- self.failUnless( cfilter(dummy) )
+ self.assertTrue( cfilter(dummy) )
desc = str( cfilter )
lines = desc.split('; ')
self.assertEqual(len( lines ),1)
@@ -760,13 +760,13 @@
cfilter = ContentFilter( created=creation_date
, created_usage='range:min' )
dummy = self.dummy
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.created_date = DateTime( '2000/12/31' )
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.created_date = DateTime( '2001/12/31' )
- self.failUnless(cfilter(dummy))
+ self.assertTrue(cfilter(dummy))
dummy.created_date = DateTime( '2001/01/01' )
- self.failUnless(cfilter(dummy))
+ self.assertTrue(cfilter(dummy))
desc = str( cfilter )
lines = desc.split('; ')
self.assertEquals(len(lines), 1)
@@ -784,13 +784,13 @@
, created_usage='range:max' )
dummy = self.dummy
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.created_date = DateTime( '2000/12/31' )
- self.failUnless(cfilter(dummy))
+ self.assertTrue(cfilter(dummy))
dummy.created_date = DateTime( '2001/12/31' )
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.created_date = DateTime( '2001/01/01' )
- self.failUnless(cfilter(dummy))
+ self.assertTrue(cfilter(dummy))
desc = str( cfilter )
lines = desc.split('; ')
self.assertEquals(len(lines), 1)
@@ -807,13 +807,13 @@
cfilter = ContentFilter( modified=DateTime( '2001/01/01' )
, modified_usage='range:min' )
dummy = self.dummy
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.modified_date = DateTime( '2000/12/31' )
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.modified_date = DateTime( '2001/12/31' )
- self.failUnless(cfilter(dummy))
+ self.assertTrue(cfilter(dummy))
dummy.modified_date = DateTime( '2001/01/01' )
- self.failUnless(cfilter(dummy))
+ self.assertTrue(cfilter(dummy))
desc = str( cfilter )
lines = desc.split('; ')
self.assertEquals(len(lines), 1)
@@ -830,13 +830,13 @@
cfilter = ContentFilter( modified=DateTime( '2001/01/01' )
, modified_usage='range:max' )
dummy = self.dummy
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.modified_date = DateTime( '2000/12/31' )
- self.failUnless(cfilter(dummy))
+ self.assertTrue(cfilter(dummy))
dummy.modified_date = DateTime( '2001/12/31' )
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.modified_date = DateTime( '2001/01/01' )
- self.failUnless(cfilter(dummy))
+ self.assertTrue(cfilter(dummy))
desc = str( cfilter )
lines = desc.split('; ')
self.assertEquals(len(lines), 1)
@@ -856,29 +856,29 @@
)
dummy = self.dummy
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.created_date = DateTime( '2000/12/31' )
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.created_date = DateTime( '2001/12/31' )
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.created_date = DateTime( '2001/01/01' )
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.title = 'ohsofoolish'
del dummy.created_date
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.created_date = DateTime( '2000/12/31' )
- self.failUnless(cfilter(dummy))
+ self.assertTrue(cfilter(dummy))
dummy.created_date = DateTime( '2001/12/31' )
- self.failIf(cfilter(dummy))
+ self.assertFalse(cfilter(dummy))
dummy.created_date = DateTime( '2001/01/01' )
- self.failUnless(cfilter(dummy))
+ self.assertTrue(cfilter(dummy))
desc = str( cfilter )
lines = desc.split('; ')
self.assertEquals(len(lines), 2)
- self.failUnless('Created before: 2001/01/01 00:00:00 %s' % tz in lines)
- self.failUnless('Title: foo' in lines)
+ self.assertTrue('Created before: 2001/01/01 00:00:00 %s' % tz in lines)
+ self.assertTrue('Title: foo' in lines)
#------------------------------------------------------------------------------
@@ -998,14 +998,14 @@
self._initPolicyAndUser()
- self.failUnless( 'file' in folder1.objectIds() )
- self.failIf( 'file' in folder2.objectIds() )
+ self.assertTrue( 'file' in folder1.objectIds() )
+ self.assertFalse( 'file' in folder2.objectIds() )
cookie = folder1.manage_copyObjects( ids=( 'file', ) )
folder2.manage_pasteObjects( cookie )
- self.failUnless( 'file' in folder1.objectIds() )
- self.failUnless( 'file' in folder2.objectIds() )
+ self.assertTrue( 'file' in folder1.objectIds() )
+ self.assertTrue( 'file' in folder2.objectIds() )
def test_copy_cant_read_source( self ):
@@ -1042,16 +1042,16 @@
folder1, folder2 = self._initFolders()
folder2.all_meta_types = FILE_META_TYPES
- self.failUnless( 'file' in folder1.objectIds() )
- self.failIf( 'file' in folder2.objectIds() )
+ self.assertTrue( 'file' in folder1.objectIds() )
+ self.assertFalse( 'file' in folder2.objectIds() )
self._initPolicyAndUser()
cookie = folder1.manage_cutObjects( ids=( 'file', ) )
folder2.manage_pasteObjects( cookie )
- self.failIf( 'file' in folder1.objectIds() )
- self.failUnless( 'file' in folder2.objectIds() )
+ self.assertFalse( 'file' in folder1.objectIds() )
+ self.assertTrue( 'file' in folder2.objectIds() )
def test_move_cant_read_source( self ):
folder1, folder2 = self._initFolders()
@@ -1235,7 +1235,7 @@
# an exception, because the folder's type allows it.
copy_cookie = self.app.manage_copyObjects( ids=[ 'folder2' ] )
folder1.manage_pasteObjects( copy_cookie )
- self.failUnless( 'folder2' in folder1.objectIds() )
+ self.assertTrue( 'folder2' in folder1.objectIds() )
def test_paste_with_restricted_container_content_type(self):
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_RegistrationTool.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_RegistrationTool.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_RegistrationTool.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -33,7 +33,7 @@
def test_generatePassword(self):
rtool = self._makeOne()
- self.failUnless( len( rtool.generatePassword() ) >= 5 )
+ self.assertTrue( len( rtool.generatePassword() ) >= 5 )
def test_suite():
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_SkinsTool.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_SkinsTool.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_SkinsTool.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -57,12 +57,12 @@
# Make sure the skin selection exists
paths = tool.getSkinPath('fooskin')
- self.failIf(paths is None)
+ self.assertFalse(paths is None)
# Test for the contents
- self.failIf(paths.find('foo') == -1)
- self.failIf(paths.find('bar') == -1)
- self.failUnless(paths.find('.svn') == -1)
+ self.assertFalse(paths.find('foo') == -1)
+ self.assertFalse(paths.find('bar') == -1)
+ self.assertTrue(paths.find('.svn') == -1)
class SkinnableTests(unittest.TestCase):
@@ -99,11 +99,11 @@
som.tool.manage_properties(default_skin='skinA')
# Expect the default skin name to be returned
- self.failUnless(som.getCurrentSkinName() == 'skinA')
+ self.assertTrue(som.getCurrentSkinName() == 'skinA')
# after a changeSkin the new skin name should be returned
som.changeSkin('skinB', som.REQUEST)
- self.failUnless(som.getCurrentSkinName() == 'skinB')
+ self.assertTrue(som.getCurrentSkinName() == 'skinB')
def test_suite():
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_TypesTool.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_TypesTool.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_TypesTool.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -104,11 +104,11 @@
# The html_quote below is necessary 'cos of the one in
# main.dtml. Could be removed once that is gone.
act = tool.unrestrictedTraverse(html_quote(factype['action']))
- self.failIf(type(aq_base(act)) is NullResource)
+ self.assertFalse(type(aq_base(act)) is NullResource)
# Check the ones we're expecting are there
- self.failUnless(meta_types.has_key('Scriptable Type Information'))
- self.failUnless(meta_types.has_key('Factory-based Type Information'))
+ self.assertTrue(meta_types.has_key('Scriptable Type Information'))
+ self.assertTrue(meta_types.has_key('Factory-based Type Information'))
def test_constructContent_simple_FTI(self):
from AccessControl.SecurityManagement import newSecurityManager
@@ -298,14 +298,14 @@
def test_allowType( self ):
self.tool = self._makeTypesTool()
ti = self._makeAndSetInstance( 'Foo' )
- self.failIf( ti.allowType( 'Foo' ) )
- self.failIf( ti.allowType( 'Bar' ) )
+ self.assertFalse( ti.allowType( 'Foo' ) )
+ self.assertFalse( ti.allowType( 'Bar' ) )
ti = self._makeAndSetInstance( 'Foo2', allowed_content_types=( 'Bar', ) )
- self.failUnless( ti.allowType( 'Bar' ) )
+ self.assertTrue( ti.allowType( 'Bar' ) )
ti = self._makeAndSetInstance( 'Foo3', filter_content_types=0 )
- self.failUnless( ti.allowType( 'Foo3' ) )
+ self.assertTrue( ti.allowType( 'Foo3' ) )
def test_GlobalHide( self ):
self.tool = self._makeTypesTool()
@@ -316,11 +316,11 @@
tih = self._makeAndSetInstance( 'Hidden', global_allow=0)
tnh = self._makeAndSetInstance( 'Not Hidden')
# make sure we're normally hidden but everything else is visible
- self.failIf ( tnf.allowType( 'Hidden' ) )
- self.failUnless ( tnf.allowType( 'Not Hidden') )
+ self.assertFalse ( tnf.allowType( 'Hidden' ) )
+ self.assertTrue ( tnf.allowType( 'Not Hidden') )
# make sure we're available where we should be
- self.failUnless ( taf.allowType( 'Hidden' ) )
- self.failUnless ( taf.allowType( 'Not Hidden') )
+ self.assertTrue ( taf.allowType( 'Hidden' ) )
+ self.assertTrue ( taf.allowType( 'Not Hidden') )
# make sure we're available in a non-content-type-filtered type
# where we have been explicitly allowed
taf2 = self._makeAndSetInstance( 'Allowing Folder2'
@@ -329,43 +329,43 @@
)
, filter_content_types=0
)
- self.failUnless ( taf2.allowType( 'Hidden' ) )
- self.failUnless ( taf2.allowType( 'Not Hidden') )
+ self.assertTrue ( taf2.allowType( 'Hidden' ) )
+ self.assertTrue ( taf2.allowType( 'Not Hidden') )
def test_allowDiscussion( self ):
ti = self._makeOne( 'Foo' )
- self.failIf( ti.allowDiscussion() )
+ self.assertFalse( ti.allowDiscussion() )
ti = self._makeOne( 'Foo', allow_discussion=1 )
- self.failUnless( ti.allowDiscussion() )
+ self.assertTrue( ti.allowDiscussion() )
def test_listActions( self ):
from Products.CMFCore.tests.base.tidata import FTIDATA_ACTIONS
ti = self._makeOne( 'Foo' )
- self.failIf( ti.listActions() )
+ self.assertFalse( ti.listActions() )
ti = self._makeOne( **FTIDATA_ACTIONS[0] )
actions = ti.listActions()
- self.failUnless( actions )
+ self.assertTrue( actions )
ids = [ x.getId() for x in actions ]
- self.failUnless( 'view' in ids )
- self.failUnless( 'edit' in ids )
- self.failUnless( 'objectproperties' in ids )
- self.failUnless( 'slot' in ids )
+ self.assertTrue( 'view' in ids )
+ self.assertTrue( 'edit' in ids )
+ self.assertTrue( 'objectproperties' in ids )
+ self.assertTrue( 'slot' in ids )
names = [ x.Title() for x in actions ]
- self.failUnless( 'View' in names )
- self.failUnless( 'Edit' in names )
- self.failUnless( 'Object Properties' in names )
- self.failIf( 'slot' in names )
- self.failUnless( 'Slot' in names )
+ self.assertTrue( 'View' in names )
+ self.assertTrue( 'Edit' in names )
+ self.assertTrue( 'Object Properties' in names )
+ self.assertFalse( 'slot' in names )
+ self.assertTrue( 'Slot' in names )
visible = [ x.getId() for x in actions if x.getVisibility() ]
- self.failUnless( 'view' in visible )
- self.failUnless( 'edit' in visible )
- self.failUnless( 'objectproperties' in visible )
- self.failIf( 'slot' in visible )
+ self.assertTrue( 'view' in visible )
+ self.assertTrue( 'edit' in visible )
+ self.assertTrue( 'objectproperties' in visible )
+ self.assertFalse( 'slot' in visible )
def test_MethodAliases_methods(self):
from Products.CMFCore.tests.base.tidata import FTIDATA_CMF
@@ -438,7 +438,7 @@
wanted_actions_text1 = 'string:${object_url}/dummy_edit_form'
wanted_actions_text2 = 'string:${object_url}/metadata_edit_form'
- self.failUnless( isinstance( ti._actions[0], ActionInformation ) )
+ self.assertTrue( isinstance( ti._actions[0], ActionInformation ) )
self.assertEqual( len( ti._actions ), 3 )
self.assertEqual(ti._aliases, wanted_aliases)
self.assertEqual(ti._actions[0].action.text, wanted_actions_text0)
@@ -461,7 +461,7 @@
wanted_actions_text1 = 'string:${object_url}/dummy_edit_form'
wanted_actions_text2 = 'string:${object_url}/folder_localrole_form'
- self.failUnless( isinstance( ti._actions[0], ActionInformation ) )
+ self.assertTrue( isinstance( ti._actions[0], ActionInformation ) )
self.assertEqual( len( ti._actions ), 3 )
self.assertEqual(ti._aliases, wanted_aliases)
self.assertEqual(ti._actions[0].action.text, wanted_actions_text0)
@@ -482,20 +482,20 @@
'link_target': '_new'}
ti = self._makeOne(**ti_data)
info_data = ti.getInfoData()
- self.failUnless(hasattr(ti, 'icon_expr_object'))
- self.failUnless(info_data[0].get('icon'))
- self.failUnless('icon' in info_data[1])
- self.failUnless(hasattr(ti, 'add_view_expr_object'))
- self.failUnless(info_data[0].get('url'))
- self.failUnless('url' in info_data[1])
+ self.assertTrue(hasattr(ti, 'icon_expr_object'))
+ self.assertTrue(info_data[0].get('icon'))
+ self.assertTrue('icon' in info_data[1])
+ self.assertTrue(hasattr(ti, 'add_view_expr_object'))
+ self.assertTrue(info_data[0].get('url'))
+ self.assertTrue('url' in info_data[1])
ti.manage_changeProperties(icon_expr='', add_view_expr='')
info_data = ti.getInfoData()
- self.failIf(hasattr(ti, 'icon_expr_object'))
- self.failIf(info_data[0].get('icon'))
- self.failIf('icon' in info_data[1])
- self.failIf(hasattr(ti, 'add_view_expr_object'))
- self.failIf(info_data[0].get('url'))
- self.failIf('url' in info_data[1])
+ self.assertFalse(hasattr(ti, 'icon_expr_object'))
+ self.assertFalse(info_data[0].get('icon'))
+ self.assertFalse('icon' in info_data[1])
+ self.assertFalse(hasattr(ti, 'add_view_expr_object'))
+ self.assertFalse(info_data[0].get('url'))
+ self.assertFalse('url' in info_data[1])
class FTIDataTests( TypeInfoTests, unittest.TestCase ):
@@ -546,31 +546,31 @@
return self._getTargetClass()(*args, **kw)
def test_isConstructionAllowed_wo_Container(self):
- self.failIf(self.ti.isConstructionAllowed(None))
+ self.assertFalse(self.ti.isConstructionAllowed(None))
def test_isConstructionAllowed_wo_ProductFactory(self):
ti = self._makeOne('foo')
- self.failIf(ti.isConstructionAllowed(self.f))
+ self.assertFalse(ti.isConstructionAllowed(self.f))
def test_isConstructionAllowed_wo_Security(self):
from AccessControl.SecurityManagement import noSecurityManager
noSecurityManager()
- self.failIf(self.ti.isConstructionAllowed(self.f))
+ self.assertFalse(self.ti.isConstructionAllowed(self.f))
def test_isConstructionAllowed_for_Omnipotent(self):
from AccessControl.SecurityManagement import newSecurityManager
from Products.CMFCore.tests.base.security import OmnipotentUser
newSecurityManager(None, OmnipotentUser().__of__(self.f))
- self.failUnless(self.ti.isConstructionAllowed(self.f))
+ self.assertTrue(self.ti.isConstructionAllowed(self.f))
def test_isConstructionAllowed_w_Role(self):
- self.failUnless(self.ti.isConstructionAllowed(self.f))
+ self.assertTrue(self.ti.isConstructionAllowed(self.f))
def test_isConstructionAllowed_wo_Role(self):
from AccessControl.SecurityManagement import newSecurityManager
from Products.CMFCore.tests.base.security import UserWithRoles
newSecurityManager(None, UserWithRoles('FooViewer').__of__(self.f))
- self.failIf(self.ti.isConstructionAllowed(self.f))
+ self.assertFalse(self.ti.isConstructionAllowed(self.f))
def test_constructInstance_wo_Roles(self):
from AccessControl.SecurityManagement import newSecurityManager
@@ -666,11 +666,11 @@
self.assertEquals(len(events), 3)
evt = events[0]
- self.failUnless(IObjectCreatedEvent.providedBy(evt))
+ self.assertTrue(IObjectCreatedEvent.providedBy(evt))
self.assertEquals(evt.object, self.f.foo)
evt = events[1]
- self.failUnless(IObjectAddedEvent.providedBy(evt))
+ self.assertTrue(IObjectAddedEvent.providedBy(evt))
self.assertEquals(evt.object, self.f.foo)
self.assertEquals(evt.oldParent, None)
self.assertEquals(evt.oldName, None)
@@ -678,7 +678,7 @@
self.assertEquals(evt.newName, 'foo')
evt = events[2]
- self.failUnless(IContainerModifiedEvent.providedBy(evt))
+ self.assertTrue(IContainerModifiedEvent.providedBy(evt))
self.assertEquals(evt.object, self.f)
@@ -738,11 +738,11 @@
self.assertEquals(len(events), 4)
evt = events[0]
- self.failUnless(IObjectCreatedEvent.providedBy(evt))
+ self.assertTrue(IObjectCreatedEvent.providedBy(evt))
self.assertEquals(evt.object, self.f.foo)
evt = events[1]
- self.failUnless(IObjectWillBeAddedEvent.providedBy(evt))
+ self.assertTrue(IObjectWillBeAddedEvent.providedBy(evt))
self.assertEquals(evt.object, self.f.foo)
self.assertEquals(evt.oldParent, None)
self.assertEquals(evt.oldName, None)
@@ -750,7 +750,7 @@
self.assertEquals(evt.newName, 'foo')
evt = events[2]
- self.failUnless(IObjectAddedEvent.providedBy(evt))
+ self.assertTrue(IObjectAddedEvent.providedBy(evt))
self.assertEquals(evt.object, self.f.foo)
self.assertEquals(evt.oldParent, None)
self.assertEquals(evt.oldName, None)
@@ -758,7 +758,7 @@
self.assertEquals(evt.newName, 'foo')
evt = events[3]
- self.failUnless(IContainerModifiedEvent.providedBy(evt))
+ self.assertTrue(IContainerModifiedEvent.providedBy(evt))
self.assertEquals(evt.object, self.f)
class DummyWorkflowTool:
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_WorkflowTool.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_WorkflowTool.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_WorkflowTool.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -200,7 +200,7 @@
tool = self._makeOne()
- self.failIf( tool.getWorkflowIds() )
+ self.assertFalse( tool.getWorkflowIds() )
self.assertEqual( tool.getWorkflowById( 'default_workflow' ), None )
self.assertEqual( tool.getWorkflowById( 'a' ), None )
@@ -215,8 +215,8 @@
wfids = tool.getWorkflowIds()
self.assertEqual( len( wfids ), 2 )
- self.failUnless( 'a' in wfids )
- self.failUnless( 'b' in wfids )
+ self.assertTrue( 'a' in wfids )
+ self.assertTrue( 'b' in wfids )
self.assertEqual( tool.getWorkflowById( 'default' ), None )
wf = tool.getWorkflowById( 'a' )
self.assertEqual( wf.getId(), 'a' )
@@ -267,13 +267,13 @@
self.assertEquals( len( tool.listChainOverrides() ), 1 )
chain = tool.getChainFor( dummy )
self.assertEquals( len( chain ), 2 )
- self.failUnless( 'a' in chain )
- self.failUnless( 'b' in chain )
+ self.assertTrue( 'a' in chain )
+ self.assertTrue( 'b' in chain )
vars = tool.getCatalogVariablesFor( dummy )
self.assertEquals( len( vars ), 1 )
- self.failUnless( 'dummy' in vars.keys() )
- self.failUnless( 'a: dummy' in vars.values() )
+ self.assertTrue( 'dummy' in vars.keys() )
+ self.assertTrue( 'a: dummy' in vars.values() )
def test_setChainForPortalTypes(self):
@@ -308,8 +308,8 @@
vars = tool.getCatalogVariablesFor( dummy )
self.assertEquals( len( vars ), 1 )
- self.failUnless( 'dummy' in vars.keys() )
- self.failUnless( 'a: dummy' in vars.values() )
+ self.assertTrue( 'dummy' in vars.keys() )
+ self.assertTrue( 'a: dummy' in vars.values() )
def test_getInfoFor( self ):
@@ -320,8 +320,8 @@
info = tool.getInfoFor( dummy, 'info' )
self.assertEqual( info, 1 )
- self.failIf( tool.a.gaveInfo( 'info' ) )
- self.failUnless( tool.b.gaveInfo( 'info' ) )
+ self.assertFalse( tool.a.gaveInfo( 'info' ) )
+ self.assertTrue( tool.b.gaveInfo( 'info' ) )
def test_doActionFor( self ):
@@ -331,8 +331,8 @@
tool.doActionFor( dummy, 'action' )
- self.failUnless( tool.a.didAction( 'action' ) )
- self.failIf( tool.b.didAction( 'action' ) )
+ self.assertTrue( tool.a.didAction( 'action' ) )
+ self.assertFalse( tool.b.didAction( 'action' ) )
def test_notifyCreated( self ):
@@ -432,14 +432,14 @@
dummy_status0 = object()
tool.setStatusOf('a', ob, dummy_status0)
- self.failUnless( 'a' in ob.workflow_history )
+ self.assertTrue( 'a' in ob.workflow_history )
self.assertEqual( len(ob.workflow_history['a']), 1 )
self.assertEqual( ob.workflow_history['a'][0], dummy_status0 )
dummy_status1 = object()
tool.setStatusOf('a', ob, dummy_status1)
- self.failUnless( 'a' in ob.workflow_history )
+ self.assertTrue( 'a' in ob.workflow_history )
self.assertEqual( len(ob.workflow_history['a']), 2 )
self.assertEqual( ob.workflow_history['a'][0], dummy_status0 )
self.assertEqual( ob.workflow_history['a'][1], dummy_status1 )
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_utils.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_utils.py 2012-05-22 13:34:24 UTC (rev 126435)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_utils.py 2012-05-22 14:18:14 UTC (rev 126436)
@@ -129,19 +129,19 @@
eo = site.foo_dummy
eo._owner = (['acl_users'], 'all_powerful_Oz')
getSecurityManager().addContext(eo)
- self.failUnless( _checkPermission('View', o) )
- self.failUnless( _checkPermission('WebDAV access', o) )
- self.failIf( _checkPermission('Manage users', o) )
+ self.assertTrue( _checkPermission('View', o) )
+ self.assertTrue( _checkPermission('WebDAV access', o) )
+ self.assertFalse( _checkPermission('Manage users', o) )
eo._proxy_roles = ('Authenticated',)
- self.failIf( _checkPermission('View', o) )
- self.failUnless( _checkPermission('WebDAV access', o) )
- self.failIf( _checkPermission('Manage users', o) )
+ self.assertFalse( _checkPermission('View', o) )
+ self.assertTrue( _checkPermission('WebDAV access', o) )
+ self.assertFalse( _checkPermission('Manage users', o) )
eo._proxy_roles = ('Manager',)
- self.failIf( _checkPermission('View', o) )
- self.failIf( _checkPermission('WebDAV access', o) )
- self.failUnless( _checkPermission('Manage users', o) )
+ self.assertFalse( _checkPermission('View', o) )
+ self.assertFalse( _checkPermission('WebDAV access', o) )
+ self.assertTrue( _checkPermission('Manage users', o) )
def test_mergedLocalRolesManipulation(self):
# The _mergedLocalRoles function used to return references to
More information about the checkins
mailing list