Change in vdsm[master]: tests: Clean up test classes names

nsoffer at redhat.com nsoffer at redhat.com
Fri Feb 14 16:23:17 UTC 2014


Nir Soffer has uploaded a new change for review.

Change subject: tests: Clean up test classes names
......................................................................

tests: Clean up test classes names

Now when the securable tests have their own module, we don't need to use
inner classes. Using top level classes makes the code shorter and easier
to read.

While modifying the names, the "My" prefix was removed, as it adds no
value and annoy the author of this patch.

Change-Id: Ia2156071c5d2842e45e027933e2d51ba98bab1de
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
---
M tests/securableTests.py
1 file changed, 51 insertions(+), 48 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/24488/1

diff --git a/tests/securableTests.py b/tests/securableTests.py
index 037ae49..8662580 100644
--- a/tests/securableTests.py
+++ b/tests/securableTests.py
@@ -22,47 +22,50 @@
 from testrunner import VdsmTestCase as TestCaseBase
 
 
-class TestSecurable(TestCaseBase):
+ at secured
+class SecureClass(object):
 
-    @secured
-    class MySecureClass(object):
-
-        class InnerClass(object):
-            pass
-
-        classVariable = 42
-
-        def __init__(self):
-            self.secured = False
-
-        def __is_secure__(self):
-            return self.secured
-
-        @staticmethod
-        def staticMethod():
-            pass
-
-        @classmethod
-        def classMethod(cls):
-            pass
-
-        def securedMethod(self):
-            "securedMethod docstring"
-            pass
-
-        @unsecured
-        def unsecuredMethod(self):
-            "unsecuredMethod docstring"
-            pass
-
-    class MyClassWithoutIsSecureMethod(object):
+    class InnerClass(object):
         pass
 
-    class MyClassIsSecureClassMethod(object):
+    classVariable = 42
 
-        @classmethod
-        def __is_secure__(self):
-            pass
+    def __init__(self):
+        self.secured = False
+
+    def __is_secure__(self):
+        return self.secured
+
+    @staticmethod
+    def staticMethod():
+        pass
+
+    @classmethod
+    def classMethod(cls):
+        pass
+
+    def securedMethod(self):
+        "securedMethod docstring"
+        pass
+
+    @unsecured
+    def unsecuredMethod(self):
+        "unsecuredMethod docstring"
+        pass
+
+
+class ClassWithoutIsSecureMethod(object):
+    pass
+
+
+class ClassIsSecureClassMethod(object):
+
+    @classmethod
+    def __is_secure__(self):
+        pass
+
+
+class TestSecurable(TestCaseBase):
 
     def assertUnsecured(self, secureObject):
         self.assertRaises(SecureError, secureObject.securedMethod)
@@ -74,12 +77,12 @@
 
     def testIsSecureMethodCheck(self):
         self.assertRaises(NotImplementedError, secured,
-                          TestSecurable.MyClassWithoutIsSecureMethod)
+                          ClassWithoutIsSecureMethod)
         self.assertRaises(NotImplementedError, secured,
-                          TestSecurable.MyClassIsSecureClassMethod)
+                          ClassIsSecureClassMethod)
 
     def testSecurable(self):
-        secureObject = TestSecurable.MySecureClass()
+        secureObject = SecureClass()
         self.assertUnsecured(secureObject)
 
         secureObject.secured = True
@@ -89,11 +92,11 @@
         self.assertUnsecured(secureObject)
 
     def testSecurityOverride(self):
-        secureObject = TestSecurable.MySecureClass()
+        secureObject = SecureClass()
         secureObject.securedMethod(__securityOverride=True)
 
     def testDocstringWrapping(self):
-        secureObject = TestSecurable.MySecureClass()
+        secureObject = SecureClass()
 
         self.assertEqual(secureObject.securedMethod.__doc__,
                          "securedMethod docstring")
@@ -101,16 +104,16 @@
                          "unsecuredMethod docstring")
 
     def testInnerClass(self):
-        obj = TestSecurable.MySecureClass.InnerClass()
-        self.assertEqual(type(obj), TestSecurable.MySecureClass.InnerClass)
+        obj = SecureClass.InnerClass()
+        self.assertEqual(type(obj), SecureClass.InnerClass)
 
     def testClassVariable(self):
-        self.assertEqual(TestSecurable.MySecureClass.classVariable, 42)
+        self.assertEqual(SecureClass.classVariable, 42)
 
     def testStaticMethod(self):
-        TestSecurable.MySecureClass.staticMethod()
+        SecureClass.staticMethod()
 
     def testClassMethod(self):
-        TestSecurable.MySecureClass.classMethod()
-        secureObject = TestSecurable.MySecureClass()
+        SecureClass.classMethod()
+        secureObject = SecureClass()
         secureObject.classMethod()


-- 
To view, visit http://gerrit.ovirt.org/24488
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2156071c5d2842e45e027933e2d51ba98bab1de
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer at redhat.com>


More information about the vdsm-patches mailing list