diff --git a/plone/portlet/static/tests/test_portlet_static.py b/plone/portlet/static/tests/test_portlet_static.py index 2c217ba..8a01011 100644 --- a/plone/portlet/static/tests/test_portlet_static.py +++ b/plone/portlet/static/tests/test_portlet_static.py @@ -26,12 +26,12 @@ def setUp(self): def testPortletTypeRegistered(self): portlet = getUtility(IPortletType, name='plone.portlet.static.Static') - self.assertEquals(portlet.addview, 'plone.portlet.static.Static') + self.assertEqual(portlet.addview, 'plone.portlet.static.Static') def testInterfaces(self): portlet = static.Assignment(header=u"title", text="text") - self.failUnless(IPortletAssignment.providedBy(portlet)) - self.failUnless(IPortletDataProvider.providedBy(portlet.data)) + self.assertTrue(IPortletAssignment.providedBy(portlet)) + self.assertTrue(IPortletDataProvider.providedBy(portlet.data)) def testInvokeAddview(self): portlet = getUtility(IPortletType, name='plone.portlet.static.Static') @@ -46,8 +46,8 @@ def testInvokeAddview(self): data={'header': u"test title", 'text': u"test text"} ) - self.assertEquals(len(mapping), 1) - self.failUnless(isinstance(list(mapping.values())[0], static.Assignment)) + self.assertEqual(len(mapping), 1) + self.assertTrue(isinstance(list(mapping.values())[0], static.Assignment)) def testInvokeEditView(self): mapping = PortletAssignmentMapping() @@ -55,7 +55,7 @@ def testInvokeEditView(self): mapping['foo'] = static.Assignment(header=u"title", text="text") editview = getMultiAdapter((mapping['foo'], request), name='edit') - self.failUnless(isinstance(editview, static.EditForm)) + self.assertTrue(isinstance(editview, static.EditForm)) def testRenderer(self): context = self.portal @@ -72,9 +72,9 @@ def testRenderer(self): (context, request, view, manager, assignment), IPortletRenderer ) - self.failUnless(isinstance(renderer, static.Renderer)) + self.assertTrue(isinstance(renderer, static.Renderer)) - self.failUnless(renderer.available, + self.assertTrue(renderer.available, "Renderer should be available by default.") @@ -120,8 +120,8 @@ def test_render(self): ) r.update() output = r.render() - self.failUnless('title' in output) - self.failUnless('text' in output) + self.assertTrue('title' in output) + self.assertTrue('text' in output) def test_no_header(self): r = self.renderer( @@ -144,7 +144,7 @@ def test_css_class(self): text="text" ) ) - self.assertEquals('portlet-static-welcome-text', r.css_class()) + self.assertEqual('portlet-static-welcome-text', r.css_class()) def test_relative_link(self): r = self.renderer(