From 36f51183ff000cd29d09e923c4d61dc4f71468e3 Mon Sep 17 00:00:00 2001 From: Gauthier Bastien Date: Mon, 18 Jan 2016 11:57:10 +0100 Subject: [PATCH] Increased coverage by using vocabulary methods instead of redefining it in tests. --- CHANGES.rst | 3 ++- src/collective/messagesviewlet/tests/test_message.py | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 6deb6a1..40202db 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,8 @@ Changelog 0.9 (unreleased) ---------------- -- Nothing changed yet. +- Increased coverage by using vocabulary methods instead of redefining it in tests. + [gbastien] 0.8 (2016-01-18) diff --git a/src/collective/messagesviewlet/tests/test_message.py b/src/collective/messagesviewlet/tests/test_message.py index 7b32a8d..9138c6b 100644 --- a/src/collective/messagesviewlet/tests/test_message.py +++ b/src/collective/messagesviewlet/tests/test_message.py @@ -3,8 +3,6 @@ from DateTime import DateTime -from Products.CMFCore.utils import getToolByName - from zope.component import queryUtility from zope.component import createObject @@ -17,6 +15,8 @@ from collective.messagesviewlet.browser.messagesviewlet import MessagesViewlet from collective.messagesviewlet.message import IMessage +from collective.messagesviewlet.message import location +from collective.messagesviewlet.message import msg_types from collective.messagesviewlet.testing import COLLECTIVE_MESSAGESVIEWLET_INTEGRATION_TESTING # noqa from collective.messagesviewlet.utils import add_message @@ -28,8 +28,7 @@ class MessageIntegrationTest(unittest.TestCase): def _changeUser(self, loginName): logout() login(self.portal, loginName) - membershipTool = getToolByName(self.portal, 'portal_membership') - self.member = membershipTool.getAuthenticatedMember() + self.member = api.user.get_current() self.portal.REQUEST['AUTHENTICATED_USER'] = self.member def _set_viewlet(self): @@ -44,9 +43,9 @@ def _set_viewlet(self): def setUp(self): """Custom shared utility setup for tests.""" - self.message_types = ["info", "significant", "warning"] self.isHidden = [True, True, False] self.portal = self.layer['portal'] + self.message_types = [term.token for term in msg_types(self.portal)._terms] # The products build the "special" folder "messages-config" to store messages. self.message_config_folder = self.portal["messages-config"] setRoles(self.portal, TEST_USER_ID, ['Manager']) @@ -140,6 +139,8 @@ def test_getAllMessages_tal_condition(self): def test_getAllMessages_location(self): viewlet = self._set_viewlet() self.assertEqual(len(viewlet.getAllMessages()), len(self.message_types)) + locations = [term.token for term in location(self.portal)._terms] + self.assertEquals(locations, ['fullsite', 'homepage']) message = self.messages[2] message.location = "homepage" message.reindexObject()