Merge "Trivial: Reorder unit tests in test_type.py"

Author: Jenkins

openstackclient/tests/volume/v2/test_type.py

@@ -61,7 +61,7 @@ def setUp(self):
         self.types_mock.create.return_value = fakes.FakeResource(
             None,
             copy.deepcopy(volume_fakes.TYPE),
-            loaded=True,
+            loaded=True
         )
         # Get the command object to test
         self.cmd = volume_type.CreateVolumeType(self.app, None)
@@ -115,6 +115,35 @@ def test_type_create_private(self):
         self.assertEqual(self.datalist, data)
 
 
+class TestTypeDelete(TestType):
+
+    def setUp(self):
+        super(TestTypeDelete, self).setUp()
+
+        self.types_mock.get.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(volume_fakes.TYPE),
+            loaded=True
+        )
+        self.types_mock.delete.return_value = None
+
+        # Get the command object to mock
+        self.cmd = volume_type.DeleteVolumeType(self.app, None)
+
+    def test_type_delete(self):
+        arglist = [
+            volume_fakes.type_id
+        ]
+        verifylist = [
+            ("volume_type", volume_fakes.type_id)
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+        self.types_mock.delete.assert_called_with(volume_fakes.type_id)
+
+
 class TestTypeList(TestType):
 
     columns = [
@@ -170,34 +199,6 @@ def test_type_list_with_options(self):
         self.assertEqual(datalist, tuple(data))
 
 
-class TestTypeShow(TestType):
-
-    def setUp(self):
-        super(TestTypeShow, self).setUp()
-
-        self.types_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(volume_fakes.TYPE),
-            loaded=True)
-        # Get the command object to test
-        self.cmd = volume_type.ShowVolumeType(self.app, None)
-
-    def test_type_show(self):
-        arglist = [
-            volume_fakes.type_id
-        ]
-        verifylist = [
-            ("volume_type", volume_fakes.type_id)
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-        self.types_mock.get.assert_called_with(volume_fakes.type_id)
-
-        self.assertEqual(volume_fakes.TYPE_FORMATTED_columns, columns)
-        self.assertEqual(volume_fakes.TYPE_FORMATTED_data, data)
-
-
 class TestTypeSet(TestType):
 
     def setUp(self):
@@ -282,61 +283,63 @@ def test_type_set_property(self):
         self.assertEqual('myvalue', result['myprop'])
 
 
-class TestTypeUnset(TestType):
+class TestTypeShow(TestType):
 
     def setUp(self):
-        super(TestTypeUnset, self).setUp()
+        super(TestTypeShow, self).setUp()
 
-        self.types_mock.get.return_value = FakeTypeResource(
+        self.types_mock.get.return_value = fakes.FakeResource(
             None,
             copy.deepcopy(volume_fakes.TYPE),
-            loaded=True,
+            loaded=True
         )
 
-        self.cmd = volume_type.UnsetVolumeType(self.app, None)
+        # Get the command object to test
+        self.cmd = volume_type.ShowVolumeType(self.app, None)
 
-    def test_type_unset(self):
+    def test_type_show(self):
         arglist = [
-            '--property', 'property',
-            volume_fakes.type_id,
+            volume_fakes.type_id
         ]
         verifylist = [
-            ('property', 'property'),
-            ('volume_type', volume_fakes.type_id),
+            ("volume_type", volume_fakes.type_id)
         ]
-
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.cmd.take_action(parsed_args)
-
-        result = self.types_mock.get.return_value._keys
+        columns, data = self.cmd.take_action(parsed_args)
+        self.types_mock.get.assert_called_with(volume_fakes.type_id)
 
-        self.assertNotIn('property', result)
+        self.assertEqual(volume_fakes.TYPE_FORMATTED_columns, columns)
+        self.assertEqual(volume_fakes.TYPE_FORMATTED_data, data)
 
 
-class TestTypeDelete(TestType):
+class TestTypeUnset(TestType):
 
     def setUp(self):
-        super(TestTypeDelete, self).setUp()
+        super(TestTypeUnset, self).setUp()
 
-        self.types_mock.get.return_value = fakes.FakeResource(
+        self.types_mock.get.return_value = FakeTypeResource(
             None,
             copy.deepcopy(volume_fakes.TYPE),
-            loaded=True)
-        self.types_mock.delete.return_value = None
+            loaded=True
+        )
 
-        # Get the command object to mock
-        self.cmd = volume_type.DeleteVolumeType(self.app, None)
+        self.cmd = volume_type.UnsetVolumeType(self.app, None)
 
-    def test_type_delete(self):
+    def test_type_unset(self):
         arglist = [
-            volume_fakes.type_id
+            '--property', 'property',
+            volume_fakes.type_id,
         ]
         verifylist = [
-            ("volume_type", volume_fakes.type_id)
+            ('property', 'property'),
+            ('volume_type', volume_fakes.type_id),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.cmd.take_action(parsed_args)
-        self.types_mock.delete.assert_called_with(volume_fakes.type_id)
+
+        result = self.types_mock.get.return_value._keys
+
+        self.assertNotIn('property', result)