Made test case naming more consistent

cloudbridge/cloud/base.py

@@ -77,10 +77,6 @@ class BaseCloudProvider(CloudProvider):
     def config(self):
         return self._config
 
-    @config.setter
-    def config(self, config):
-        self._config = config
-
     @property
     def name(self):
         return str(self.__class__.__name__)

test/__init__.py

@@ -27,29 +27,27 @@ as a base class to each combination).
 """
 import cloudbridge
 from test.helpers import ProviderTestCaseGenerator
+from test.test_block_store_service import CloudBlockStoreServiceTestCase
 from test.test_cloud_helpers import CloudHelpersTestCase
-from test.test_instance_types_service import \
-    ProviderInstanceTypesServiceTestCase
-from test.test_provider_block_store_service import \
-    ProviderBlockStoreServiceTestCase
-from test.test_provider_compute_service import ProviderComputeServiceTestCase
-from test.test_provider_image_service import ProviderImageServiceTestCase
-from test.test_provider_interface import ProviderInterfaceTestCase
-from test.test_provider_object_store_service import \
-    ProviderObjectStoreServiceTestCase
-from test.test_provider_region_service import ProviderRegionServiceTestCase
-from test.test_provider_security_service import ProviderSecurityServiceTestCase
+from test.test_compute_service import CloudComputeServiceTestCase
+from test.test_image_service import CloudImageServiceTestCase
+from test.test_instance_types_service import CloudInstanceTypesServiceTestCase
+from test.test_interface import CloudInterfaceTestCase
+from test.test_object_store_service import CloudObjectStoreServiceTestCase
+from test.test_region_service import CloudRegionServiceTestCase
+from test.test_security_service import CloudSecurityServiceTestCase
+
 
 PROVIDER_TESTS = [
     CloudHelpersTestCase,
-    ProviderInterfaceTestCase,
-    ProviderSecurityServiceTestCase,
-    ProviderInstanceTypesServiceTestCase,
-    ProviderComputeServiceTestCase,
-    ProviderRegionServiceTestCase,
-    ProviderImageServiceTestCase,
-    ProviderBlockStoreServiceTestCase,
-    ProviderObjectStoreServiceTestCase
+    CloudInterfaceTestCase,
+    CloudSecurityServiceTestCase,
+    CloudInstanceTypesServiceTestCase,
+    CloudComputeServiceTestCase,
+    CloudRegionServiceTestCase,
+    CloudImageServiceTestCase,
+    CloudBlockStoreServiceTestCase,
+    CloudObjectStoreServiceTestCase
 ]
 
 

test/test_provider_block_store_service.py → test/test_block_store_service.py

@@ -7,10 +7,10 @@ from test.helpers import ProviderTestBase
 import test.helpers as helpers
 
 
-class ProviderBlockStoreServiceTestCase(ProviderTestBase):
+class CloudBlockStoreServiceTestCase(ProviderTestBase):
 
     def __init__(self, methodName, provider):
-        super(ProviderBlockStoreServiceTestCase, self).__init__(
+        super(CloudBlockStoreServiceTestCase, self).__init__(
             methodName=methodName, provider=provider)
 
     def test_crud_volume(self):

test/test_provider_factory.py → test/test_cloud_factory.py

@@ -7,7 +7,7 @@ from cloudbridge.cloud.providers.aws import AWSCloudProvider
 import test.helpers as helpers
 
 
-class ProviderFactoryTestCase(unittest.TestCase):
+class CloudFactoryTestCase(unittest.TestCase):
 
     def test_create_provider_valid(self):
         """

test/test_provider_compute_service.py → test/test_compute_service.py

@@ -11,10 +11,10 @@ from test.helpers import ProviderTestBase
 import test.helpers as helpers
 
 
-class ProviderComputeServiceTestCase(ProviderTestBase):
+class CloudComputeServiceTestCase(ProviderTestBase):
 
     def __init__(self, methodName, provider):
-        super(ProviderComputeServiceTestCase, self).__init__(
+        super(CloudComputeServiceTestCase, self).__init__(
             methodName=methodName, provider=provider)
 
     def test_crud_instance(self):

test/test_provider_image_service.py → test/test_image_service.py

@@ -8,10 +8,10 @@ from test.helpers import ProviderTestBase
 import test.helpers as helpers
 
 
-class ProviderImageServiceTestCase(ProviderTestBase):
+class CloudImageServiceTestCase(ProviderTestBase):
 
     def __init__(self, methodName, provider):
-        super(ProviderImageServiceTestCase, self).__init__(
+        super(CloudImageServiceTestCase, self).__init__(
             methodName=methodName, provider=provider)
 
     def test_create_and_list_image(self):

test/test_instance_types_service.py

@@ -3,10 +3,10 @@ import six
 from test.helpers import ProviderTestBase
 
 
-class ProviderInstanceTypesServiceTestCase(ProviderTestBase):
+class CloudInstanceTypesServiceTestCase(ProviderTestBase):
 
     def __init__(self, methodName, provider):
-        super(ProviderInstanceTypesServiceTestCase, self).__init__(
+        super(CloudInstanceTypesServiceTestCase, self).__init__(
             methodName=methodName, provider=provider)
 
     def test_instance_types(self):

test/test_provider_interface.py → test/test_interface.py

@@ -2,10 +2,10 @@ from cloudbridge.cloud import interfaces
 from test.helpers import ProviderTestBase
 
 
-class ProviderInterfaceTestCase(ProviderTestBase):
+class CloudInterfaceTestCase(ProviderTestBase):
 
     def __init__(self, methodName, provider):
-        super(ProviderInterfaceTestCase, self).__init__(
+        super(CloudInterfaceTestCase, self).__init__(
             methodName=methodName, provider=provider)
 
     def test_name_property(self):

test/test_provider_object_store_service.py → test/test_object_store_service.py

@@ -6,10 +6,10 @@ from test.helpers import ProviderTestBase
 import test.helpers as helpers
 
 
-class ProviderObjectStoreServiceTestCase(ProviderTestBase):
+class CloudObjectStoreServiceTestCase(ProviderTestBase):
 
     def __init__(self, methodName, provider):
-        super(ProviderObjectStoreServiceTestCase, self).__init__(
+        super(CloudObjectStoreServiceTestCase, self).__init__(
             methodName=methodName, provider=provider)
 
     def test_crud_container(self):

test/test_provider_region_service.py → test/test_region_service.py

@@ -4,10 +4,10 @@ from cloudbridge.cloud.interfaces import Region
 from test.helpers import ProviderTestBase
 
 
-class ProviderRegionServiceTestCase(ProviderTestBase):
+class CloudRegionServiceTestCase(ProviderTestBase):
 
     def __init__(self, methodName, provider):
-        super(ProviderRegionServiceTestCase, self).__init__(
+        super(CloudRegionServiceTestCase, self).__init__(
             methodName=methodName, provider=provider)
 
     def test_get_and_list_regions(self):

test/test_provider_security_service.py → test/test_security_service.py

@@ -5,10 +5,10 @@ from test.helpers import ProviderTestBase
 import test.helpers as helpers
 
 
-class ProviderSecurityServiceTestCase(ProviderTestBase):
+class CloudSecurityServiceTestCase(ProviderTestBase):
 
     def __init__(self, methodName, provider):
-        super(ProviderSecurityServiceTestCase, self).__init__(
+        super(CloudSecurityServiceTestCase, self).__init__(
             methodName=methodName, provider=provider)
 
     def test_crud_key_pair_service(self):