revert r37751.

svn path=/plone.app.discussion/trunk/; revision=37752

plone/app/discussion/tests/test_comments_viewlet.py

@@ -3,7 +3,7 @@ from datetime import datetime, timedelta
 
 from plone.registry import Registry
 
-from zope.component import createObject, getUtility
+from zope.component import createObject, queryUtility
 
 from Acquisition import aq_base, aq_parent, aq_inner
 
@@ -248,7 +248,7 @@ class TestCommentsViewlet(PloneTestCase):
         # Anonymous discussion is not allowed by default
         self.failIf(self.viewlet.anonymous_discussion_allowed())
         # Allow anonymous discussion
-        registry = getUtility(IRegistry)
+        registry = queryUtility(IRegistry)
         settings = registry.forInterface(IDiscussionSettings)
         registry['plone.app.discussion.interfaces.IDiscussionSettings.anonymous_comments'] = True
         # Test if anonymous discussion is allowed for the viewlet
@@ -256,7 +256,7 @@ class TestCommentsViewlet(PloneTestCase):
     
     def test_show_commenter_image(self):
         self.failUnless(self.viewlet.show_commenter_image())
-        registry = getUtility(IRegistry)
+        registry = queryUtility(IRegistry)
         settings = registry.forInterface(IDiscussionSettings)
         registry['plone.app.discussion.interfaces.IDiscussionSettings.show_commenter_image'] = False        
         self.failIf(self.viewlet.show_commenter_image())

plone/app/discussion/tests/test_conversation.py

@@ -1,7 +1,7 @@
 import unittest
 from datetime import datetime, timedelta
 
-from zope.component import createObject, getUtility
+from zope.component import createObject, queryUtility
 
 from Acquisition import aq_base, aq_parent, aq_inner
 
@@ -231,7 +231,7 @@ class ConversationTest(PloneTestCase):
         self.assertEquals(conversation.enabled(), True)
 
         # Disable commenting in the registry
-        registry = getUtility(IRegistry)
+        registry = queryUtility(IRegistry)
         settings = registry.forInterface(IDiscussionSettings)
         settings.globally_enabled = False
 
@@ -259,7 +259,7 @@ class ConversationTest(PloneTestCase):
         self.assertEquals(conversation.enabled(), True)
 
         # Disable commenting in the registry
-        registry = getUtility(IRegistry)
+        registry = queryUtility(IRegistry)
         settings = registry.forInterface(IDiscussionSettings)
         settings.globally_enabled = False
 
@@ -349,7 +349,7 @@ class ConversationTest(PloneTestCase):
     def test_is_discussion_allowed_on_content_object(self):
         # Allow discussion on a single content object
 
-        registry = getUtility(IRegistry)
+        registry = queryUtility(IRegistry)
         settings = registry.forInterface(IDiscussionSettings)
 
         # Create a conversation.

plone/app/discussion/tests/test_notifications.py

@@ -9,7 +9,7 @@ from zope.app.container.interfaces import IObjectAddedEvent
 
 from zope.component import createObject
 from zope.component import getSiteManager
-from zope.component import getUtility
+from zope.component import queryUtility
 
 from Products.PloneTestCase.ptc import PloneTestCase
 
@@ -41,7 +41,7 @@ from plone.app.discussion.tests.layer import DiscussionLayer
 #        self.mailhost = self.portal.MailHost
 #
 #        # Enable user notification setting
-#        registry = getUtility(IRegistry)
+#        registry = queryUtility(IRegistry)
 #        settings = registry.forInterface(IDiscussionSettings)
 #        registry['plone.app.discussion.interfaces.IDiscussionSettings.user_notification_enabled'] = True
 #
@@ -88,7 +88,7 @@ from plone.app.discussion.tests.layer import DiscussionLayer
 #
 #    def test_do_not_notify_user_when_notification_is_disabled(self):
 #        # Disable user notification and make sure no email is send to the user.
-#        registry = getUtility(IRegistry)
+#        registry = queryUtility(IRegistry)
 #        settings = registry.forInterface(IDiscussionSettings)
 #        registry['plone.app.discussion.interfaces.IDiscussionSettings.user_notification_enabled'] = False
 #
@@ -162,7 +162,7 @@ class TestModeratorNotificationUnit(PloneTestCase):
             ('comment_review_workflow',))
         
         # Enable moderator notification setting
-        registry = getUtility(IRegistry)
+        registry = queryUtility(IRegistry)
         settings = registry.forInterface(IDiscussionSettings)
         registry['plone.app.discussion.interfaces.IDiscussionSettings.moderator_notification_enabled'] = True        
 
@@ -220,7 +220,7 @@ class TestModeratorNotificationUnit(PloneTestCase):
     def test_do_not_notify_moderator_when_notification_is_disabled(self):
         # Disable moderator notification setting and make sure no email is send 
         # to the moderator.
-        registry = getUtility(IRegistry)
+        registry = queryUtility(IRegistry)
         settings = registry.forInterface(IDiscussionSettings)
         registry['plone.app.discussion.interfaces.IDiscussionSettings.moderator_notification_enabled'] = False