plone.api/fix_tests: fix some tests

Alexander Loechel <jenkins-z4DKO/[email protected]> Wed, 26 Jul 2017 16:52:13 -0700 (PDT)
Newsgroups gmane.comp.web.zope.plone.cvs
Message-ID <[email protected]>
Repository: plone.api
Branch: refs/heads/fix_tests
Date: 2017-07-27T01:51:33+02:00
Author: Alexander Loechel (loechel) <[email protected]>
Commit: https://github.com/plone/plone.api/commit/1f0d3c676ac77de89b10e7f5cd7af43524858ab6

fix some tests

Files changed:
M src/plone/api/tests/test_user.py

diff --git a/src/plone/api/tests/test_user.py b/src/plone/api/tests/test_user.py
index ad31500..09e44ac 100644
--- a/src/plone/api/tests/test_user.py
+++ b/src/plone/api/tests/test_user.py
@@ -137,8 +137,8 @@ def test_create_default_roles(self):
             password='secret',
         )
         self.assertEqual(
-            api.user.get_roles(user=user),
-            ['Member', 'Authenticated', ],
+            sorted(api.user.get_roles(user=user)),
+            sorted(['Member', 'Authenticated', ]),
         )
 
     def test_create_specified_roles(self):
@@ -426,13 +426,13 @@ def test_get_roles_local_includes_group_roles(self):
             title='Document One',
         )
         self.assertEqual(
-            api.user.get_roles(username='chuck', obj=document),
-            ['Member', 'Reviewer', 'Authenticated'],
+            sorted(api.user.get_roles(username='chuck', obj=document)),
+            sorted(['Member', 'Reviewer', 'Authenticated']),
         )
         api.user.grant_roles(username='chuck', roles=['Editor'], obj=folder)
         self.assertEqual(
-            api.user.get_roles(username='chuck', obj=document),
-            ['Member', 'Reviewer', 'Authenticated', 'Editor'],
+            sorted(api.user.get_roles(username='chuck', obj=document)),
+            sorted(['Member', 'Reviewer', 'Authenticated', 'Editor']),
         )
         self.assertEqual(
             api.user.get_roles(username='chuck', obj=document, inherit=False),
@@ -767,7 +767,7 @@ def test_grant_roles_in_context(self):
             'Editor',
             api.user.get_roles(username='chuck', obj=folder),
         )
-        self.assertEqual(
+        self.assertItemsEqual(
             ['Editor'],
             api.user.get_roles(username='chuck', obj=folder, inherit=False),
         )
@@ -804,12 +804,15 @@ def test_grant_roles_in_context(self):
         )
 
         ROLES = set(('Editor', 'Contributor', 'Authenticated', 'Member'))
-        self.assertEqual(
+        self.assertItemsEqual(
             ROLES,
             set(api.user.get_roles(username='chuck', obj=folder)),
         )
-        self.assertEqual(ROLES, set(api.user.get_roles(user=user, obj=folder)))
-        self.assertEqual(
+        self.assertItemsEqual(
+            ROLES,
+            set(api.user.get_roles(user=user, obj=folder)),
+        )
+        self.assertItemsEqual(
             ROLES,
             set(api.user.get_roles(username='chuck', obj=document)),
         )
@@ -841,7 +844,7 @@ def test_grant_roles_disregards_adapter(self):
             password='secret',
         )
 
-        self.assertEqual(
+        self.assertItemsEqual(
             api.user.get_roles(username='chuck', obj=folder),
             ['Member', 'Authenticated'],
         )
@@ -883,7 +886,7 @@ def getRoles(self, principal_id):
         )
 
         # The adapter role is in in the local roles but not persistent
-        self.assertEqual(
+        self.assertItemsEqual(
             api.user.get_roles(username='chuck', obj=folder, inherit=False),
             ['Contributor', 'Reviewer'],
         )
@@ -893,7 +896,7 @@ def getRoles(self, principal_id):
             ['Contributor'],
         )
 
-        self.assertEqual(
+        self.assertItemsEqual(
             api.user.get_roles(username='chuck', obj=document, inherit=False),
             ['Reviewer'],
         )
@@ -907,24 +910,24 @@ def getRoles(self, principal_id):
         api.group.grant_roles(groupname='foo', roles=['Contributor'], obj=document)  # noqa
         api.group.add_user(groupname='foo', username='chuck')
 
-        self.assertEqual(
+        self.assertItemsEqual(
             api.user.get_roles(username='chuck', obj=document, inherit=False),
             ['Contributor', 'Reviewer'],
         )
         api.group.grant_roles(groupname='foo', roles=['Manager'], obj=folder)
-        self.assertEqual(
+        self.assertItemsEqual(
             api.user.get_roles(username='chuck', obj=document, inherit=False),
             ['Contributor', 'Reviewer'],
         )
-        self.assertEqual(
+        self.assertItemsEqual(
             api.user.get_roles(username='chuck', obj=document),
             ['Contributor', 'Reviewer', 'Manager', 'Authenticated', 'Member'],
         )
-        self.assertEqual(
+        self.assertItemsEqual(
             api.user.get_roles(username='chuck', obj=folder),
             ['Contributor', 'Reviewer', 'Manager', 'Authenticated', 'Member'],
         )
-        self.assertEqual(
+        self.assertItemsEqual(
             api.user.get_roles(username='chuck', obj=folder, inherit=False),
             ['Contributor', 'Reviewer', 'Manager'],
         )



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot