a little nicer wrt pep8

[sfa.git] / tests / testRights.py

diff --git a/tests/testRights.py b/tests/testRights.py
index 2479d4a..f5cb9ad 100755 (executable)
--- a/tests/testRights.py
+++ b/tests/testRights.py
@@ -1,5 +1,5 @@
 import unittest
-from geni.trust.rights import *
+from sfa.trust.rights import *
 
 class TestRight(unittest.TestCase):
    def setUp(self):
@@ -11,75 +11,75 @@ class TestRight(unittest.TestCase):
 
    def testRightCanPerform(self):
       right = Right("embed")
-      self.assert_(right.can_perform("getticket"))
-      self.assert_(not right.can_perform("resolve"))
+      self.assertTrue(right.can_perform("getticket"))
+      self.assertTrue(not right.can_perform("resolve"))
 
    def testIsSuperset(self):
       pright = Right("sa")
       cright = Right("embed")
-      self.assert_(pright.is_superset(cright))
-      self.assert_(not cright.is_superset(pright))
+      self.assertTrue(pright.is_superset(cright))
+      self.assertTrue(not cright.is_superset(pright))
 
       pright = Right("embed")
       cright = Right("embed")
-      self.assert_(pright.is_superset(cright))
-      self.assert_(cright.is_superset(pright))
+      self.assertTrue(pright.is_superset(cright))
+      self.assertTrue(cright.is_superset(pright))
 
       pright = Right("control")
       cright = Right("embed")
-      self.assert_(not pright.is_superset(cright))
-      self.assert_(not cright.is_superset(pright))
+      self.assertTrue(not pright.is_superset(cright))
+      self.assertTrue(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")
-        self.assert_(rightList.can_perform("getticket"))
-        self.assert_(not rightList.can_perform("resolve"))
+        rightList = Rights(string="embed")
+        self.assertTrue(rightList.can_perform("getticket"))
+        self.assertTrue(not rightList.can_perform("resolve"))
 
-        rightList = RightList(string="embed,resolve")
-        self.assert_(rightList.can_perform("getticket"))
-        self.assert_(rightList.can_perform("resolve"))
+        rightList = Rights(string="embed,resolve")
+        self.assertTrue(rightList.can_perform("getticket"))
+        self.assertTrue(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.assertTrue(pRights.is_superset(cRights))
+        self.assertTrue(not cRights.is_superset(pRights))
+
+        pRights = Rights(string="embed")
+        cRights = Rights(string="embed")
+        self.assertTrue(pRights.is_superset(cRights))
+        self.assertTrue(cRights.is_superset(pRights))
+
+        pRights = Rights(string="control")
+        cRights = Rights(string="embed")
+        self.assertTrue(not pRights.is_superset(cRights))
+        self.assertTrue(not cRights.is_superset(pRights))
+
+        pRights = Rights(string="control,sa")
+        cRights = Rights(string="embed")
+        self.assertTrue(pRights.is_superset(cRights))
+        self.assertTrue(not cRights.is_superset(pRights))
 
 
 if __name__ == "__main__":