From: Thierry Parmentelat Date: Wed, 6 Oct 2010 08:00:22 +0000 (+0200) Subject: not sure if this is still current but the names have changed X-Git-Tag: sfa-1.0-2~8^2~2 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=68f94a7b84d60c1106a6283fb0ca37d88ee87029 not sure if this is still current but the names have changed --- diff --git a/tests/testRights.py b/tests/testRights.py index a67a25ff..a65c9ddb 100755 --- a/tests/testRights.py +++ b/tests/testRights.py @@ -30,56 +30,56 @@ class TestRight(unittest.TestCase): self.assert_(not pright.is_superset(cright)) self.assert_(not cright.is_superset(pright)) -class TestRightList(unittest.TestCase): +class TestRights(unittest.TestCase): def setUp(self): pass def testInit(self): # create a blank right list - rightList = RightList() + rightList = Rights() # create a right list with "embed" in it - rightList = RightList(string="embed") + rightList = Rights(string="embed") def testAsString(self): - rightList = RightList() + rightList = Rights() self.assertEqual(rightList.save_to_string(), "") - rightList = RightList(string="embed") + rightList = Rights(string="embed") self.assertEqual(rightList.save_to_string(), "embed") - rightList = RightList(string="embed,resolve") + rightList = Rights(string="embed,resolve") self.assertEqual(rightList.save_to_string(), "embed,resolve") def testCanPerform(self): - rightList = RightList(string="embed") + rightList = Rights(string="embed") self.assert_(rightList.can_perform("getticket")) self.assert_(not rightList.can_perform("resolve")) - rightList = RightList(string="embed,resolve") + rightList = Rights(string="embed,resolve") self.assert_(rightList.can_perform("getticket")) self.assert_(rightList.can_perform("resolve")) def testIsSuperset(self): - pRightList = RightList(string="sa") - cRightList = RightList(string="embed") - self.assert_(pRightList.is_superset(cRightList)) - self.assert_(not cRightList.is_superset(pRightList)) - - pRightList = RightList(string="embed") - cRightList = RightList(string="embed") - self.assert_(pRightList.is_superset(cRightList)) - self.assert_(cRightList.is_superset(pRightList)) - - pRightList = RightList(string="control") - cRightList = RightList(string="embed") - self.assert_(not pRightList.is_superset(cRightList)) - self.assert_(not cRightList.is_superset(pRightList)) - - pRightList = RightList(string="control,sa") - cRightList = RightList(string="embed") - self.assert_(pRightList.is_superset(cRightList)) - self.assert_(not cRightList.is_superset(pRightList)) + pRights = Rights(string="sa") + cRights = Rights(string="embed") + self.assert_(pRights.is_superset(cRights)) + self.assert_(not cRights.is_superset(pRights)) + + pRights = Rights(string="embed") + cRights = Rights(string="embed") + self.assert_(pRights.is_superset(cRights)) + self.assert_(cRights.is_superset(pRights)) + + pRights = Rights(string="control") + cRights = Rights(string="embed") + self.assert_(not pRights.is_superset(cRights)) + self.assert_(not cRights.is_superset(pRights)) + + pRights = Rights(string="control,sa") + cRights = Rights(string="embed") + self.assert_(pRights.is_superset(cRights)) + self.assert_(not cRights.is_superset(pRights)) if __name__ == "__main__":