Sync bbb PloneTestCase class with original one

Conflicts:
	CHANGES.rst

CHANGES.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+4.2.3 (unreleased)
+------------------
+
+- Sync bbb PloneTestCase class with original one.
+  [tomgross]
+
 4.2.2 (2013-02-09)
 ------------------
 

plone/app/testing/bbb.py

@@ -3,6 +3,7 @@
 from plone.testing import z2
 from plone.app import testing
 from Testing.ZopeTestCase.functional import Functional
+from AccessControl import getSecurityManager
 import transaction
 import unittest
 
@@ -83,9 +84,17 @@ def beforeTearDown(self):
     def afterTearDown(self):
         """Hook to do teardown after the portal is removed."""
 
-    def setRoles(self, roles):
-        """Set the effective roles of the test user."""
-        testing.setRoles(self.portal, testing.TEST_USER_ID, roles)
+    def setRoles(self, roles, name=testing.TEST_USER_ID):
+        """Set the effective roles of a user."""
+        testing.setRoles(self.portal, name, roles)
+
+    def setGroups(self, groups, name=testing.TEST_USER_ID):
+        '''Changes the user's groups.'''
+        uf = self.portal['acl_users']
+        uf.userSetGroups(name, list(groups))
+        user = getSecurityManager().getUser()
+        if name == user.getId():
+            self.login(user.getUserName())
 
     def setPermissions(self, permissions, role='Member'):
         """Changes the permissions assigned to role."""