Fix argument order for assertEqual to (exp, obs)

assertEqual expects that the arguments provided to it
should be (expected, observed). If a particluar order
is kept as a convention, then it helps to provide a cleaner
message to the developer if Unit Tests fail.
The following patch fixes this issue.

TrivialFix

Change-Id: I6a8e11df30516f6be9a745b1f0f68ef3f2825fcf
Closes-Bug: #1259292

12 files changed, 108 insertions, 106 deletions

diff --git a/barbicanclient/tests/test_client.py b/barbicanclient/tests/test_client.py
index e862c5a..bb3b44c 100644
--- a/barbicanclient/tests/test_client.py
+++ b/barbicanclient/tests/test_client.py
@@ -41,7 +41,7 @@ class WhenTestingClientInit(TestClient):
         c = client._HTTPClient(session=self.session,
                                endpoint=self.endpoint,
                                project_id=self.project_id)
-        self.assertEqual(c.endpoint_override, 'http://localhost:9311/v1')
+        self.assertEqual('http://localhost:9311/v1', c.endpoint_override)
 
     def test_default_headers_are_empty(self):
         c = client._HTTPClient(session=self.session, endpoint=self.endpoint)
@@ -53,7 +53,7 @@ class WhenTestingClientInit(TestClient):
                                endpoint=self.endpoint,
                                project_id=self.project_id)
         self.assertIn('X-Project-Id', c._default_headers.keys())
-        self.assertEqual(c._default_headers['X-Project-Id'], self.project_id)
+        self.assertEqual(self.project_id, c._default_headers['X-Project-Id'])
 
     def test_error_thrown_when_no_session_and_no_endpoint(self):
         self.assertRaises(ValueError, client.Client,
@@ -124,7 +124,7 @@ class WhenTestingClientPut(TestClient):
     def test_put_passes_data(self):
         data = "test"
         self.httpclient.put(self.href, data=data)
-        self.assertEqual(self.put_mock.last_request.text, "test")
+        self.assertEqual("test", self.put_mock.last_request.text)
 
     def test_put_includes_default_headers(self):
         self.httpclient._default_headers = {'Test-Default-Header': 'test'}
@@ -213,7 +213,7 @@ class WhenTestingClientDelete(TestClient):
     def test_delete_passes_json(self):
         json = {"test": "test"}
         self.httpclient.delete(self.href, json=json)
-        self.assertEqual(self.del_mock.last_request.text, '{"test": "test"}')
+        self.assertEqual('{"test": "test"}', self.del_mock.last_request.text)
 
     def test_delete_includes_default_headers(self):
         self.httpclient._default_headers = {'Test-Default-Header': 'test'}
@@ -256,7 +256,7 @@ class WhenTestingGetErrorMessage(TestClient):
         resp = mock.MagicMock()
         resp.json.return_value = {'title': 'test_text'}
         msg = self.httpclient._get_error_message(resp)
-        self.assertEqual(msg, 'test_text')
+        self.assertEqual('test_text', msg)
 
     def test_gets_error_message_from_content_when_no_json(self):
         resp = mock.MagicMock()
diff --git a/barbicanclient/tests/test_containers.py b/barbicanclient/tests/test_containers.py
index 1327216..51f92b7 100644
--- a/barbicanclient/tests/test_containers.py
+++ b/barbicanclient/tests/test_containers.py
@@ -520,7 +520,7 @@ class WhenTestingContainers(test_client.BaseEntityResource):
     def test_should_get_total(self):
         self.responses.get(self.entity_base, json={'total': 1})
         total = self.manager.total()
-        self.assertEqual(total, 1)
+        self.assertEqual(1, total)
 
     def test_should_get_acls_lazy(self):
         data = self.container.get_dict(self.entity_href,
diff --git a/barbicanclient/tests/test_formatter.py b/barbicanclient/tests/test_formatter.py
index 7f29367..94f3752 100644
--- a/barbicanclient/tests/test_formatter.py
+++ b/barbicanclient/tests/test_formatter.py
@@ -30,30 +30,30 @@ class TestFormatter(testtools.TestCase):
         entity_1 = Entity('test_attr_a_1', 'test_attr_b_1', 'test_attr_c_1')
         entity_2 = Entity('test_attr_a_2', 'test_attr_b_2', 'test_attr_c_2')
         columns, data = EntityFormatter._list_objects([entity_1, entity_2])
-        self.assertEqual(columns, ('Column A', 'Column B', 'Column C'))
-        self.assertEqual([e for e in data],
-                         [('test_attr_a_1', 'test_attr_b_1', 'test_attr_c_1'),
-                          ('test_attr_a_2', 'test_attr_b_2', 'test_attr_c_2')])
+        self.assertEqual(('Column A', 'Column B', 'Column C'), columns)
+        self.assertEqual([('test_attr_a_1', 'test_attr_b_1', 'test_attr_c_1'),
+                          ('test_attr_a_2', 'test_attr_b_2', 'test_attr_c_2')],
+                         [e for e in data])
 
     def test_should_get_list_objects_empty(self):
         columns, data = EntityFormatter._list_objects([])
-        self.assertEqual(columns, [])
-        self.assertEqual([e for e in data], [])
+        self.assertEqual([], columns)
+        self.assertEqual([], [e for e in data])
 
     def test_should_get_str(self):
         entity = Entity('test_attr_a_1', 'test_attr_b_1', 'test_attr_c_1')
-        self.assertEqual(str(entity),
-                         '+----------+---------------+\n'
+        self.assertEqual('+----------+---------------+\n'
                          '| Field    | Value         |\n'
                          '+----------+---------------+\n'
                          '| Column A | test_attr_a_1 |\n'
                          '| Column B | test_attr_b_1 |\n'
                          '| Column C | test_attr_c_1 |\n'
-                         '+----------+---------------+')
+                         '+----------+---------------+',
+                         str(entity))
 
     def test_should_to_dict(self):
         entity = Entity('test_attr_a_1', 'test_attr_b_1', 'test_attr_c_1')
-        self.assertEqual(entity.to_dict(),
-                         {'Column A': 'test_attr_a_1',
+        self.assertEqual({'Column A': 'test_attr_a_1',
                           'Column B': 'test_attr_b_1',
-                          'Column C': 'test_attr_c_1'})
+                          'Column C': 'test_attr_c_1'},
+                         entity.to_dict())
diff --git a/barbicanclient/tests/test_orders.py b/barbicanclient/tests/test_orders.py
index 6cabea0..02fcafc 100644
--- a/barbicanclient/tests/test_orders.py
+++ b/barbicanclient/tests/test_orders.py
@@ -320,6 +320,6 @@ class WhenTestingCertificateOrders(test_client.BaseEntityResource):
         self.responses.get(self.entity_base, json=data)
 
         orders_list = self.manager.list(limit=10, offset=5)
-        self.assertEqual(len(orders_list), 3)
+        self.assertEqual(3, len(orders_list))
         self.assertIsInstance(orders_list[0], orders.CertificateOrder)
         self.assertEqual(self.entity_href, orders_list[0].order_ref)
diff --git a/barbicanclient/tests/test_secrets.py b/barbicanclient/tests/test_secrets.py
index 98f3975..9be1be7 100644
--- a/barbicanclient/tests/test_secrets.py
+++ b/barbicanclient/tests/test_secrets.py
@@ -487,4 +487,4 @@ class WhenTestingSecrets(test_client.BaseEntityResource):
     def test_should_get_total(self):
         self.responses.get(self.entity_base, json={'total': 1})
         total = self.manager.total()
-        self.assertEqual(total, 1)
+        self.assertEqual(1, total)
diff --git a/functionaltests/client/v1/functional/test_acl.py b/functionaltests/client/v1/functional/test_acl.py
index 220d78c..cdfcd0e 100644
--- a/functionaltests/client/v1/functional/test_acl.py
+++ b/functionaltests/client/v1/functional/test_acl.py
@@ -271,7 +271,7 @@ class ACLsTestCase(BaseACLsTestCase):
             url
         )
 
-        self.assertEqual(e.status_code, 404)
+        self.assertEqual(404, e.status_code)
 
     @testcase.attr('negative')
     def test_delete_non_existent_secret_valid_uuid(self):
diff --git a/functionaltests/client/v1/functional/test_containers.py b/functionaltests/client/v1/functional/test_containers.py
index 50cd6a9..294e99a 100644
--- a/functionaltests/client/v1/functional/test_containers.py
+++ b/functionaltests/client/v1/functional/test_containers.py
@@ -125,7 +125,7 @@ class GenericContainersTestCase(BaseContainersTestCase):
             container.store
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @testcase.attr('negative')
     def test_get_non_existent_container(self):
@@ -139,7 +139,7 @@ class GenericContainersTestCase(BaseContainersTestCase):
         e = self.assertRaises(ValueError, self.barbicanclient.containers.get,
                               url)
 
-        self.assertEqual(e.message, 'Container incorrectly specified.')
+        self.assertEqual('Container incorrectly specified.', e.message)
 
     @testcase.attr('negative')
     def test_get_non_existent_container_valid_uuid(self):
@@ -157,7 +157,7 @@ class GenericContainersTestCase(BaseContainersTestCase):
             url
         )
 
-        self.assertEqual(e.status_code, 404)
+        self.assertEqual(404, e.status_code)
 
     @testcase.attr('negative')
     def test_delete_non_existent_container(self):
@@ -171,7 +171,7 @@ class GenericContainersTestCase(BaseContainersTestCase):
         e = self.assertRaises(ValueError, self.barbicanclient.containers.get,
                               url)
 
-        self.assertEqual(e.message, 'Container incorrectly specified.')
+        self.assertEqual('Container incorrectly specified.', e.message)
 
     @testcase.attr('negative')
     def test_delete_non_existent_container_valid_uuid(self):
@@ -189,7 +189,7 @@ class GenericContainersTestCase(BaseContainersTestCase):
             url
         )
 
-        self.assertEqual(e.status_code, 404)
+        self.assertEqual(404, e.status_code)
 
     @utils.parameterized_dataset({'0': [0], '1': [1], '50': [50]})
     @testcase.attr('positive')
@@ -266,7 +266,7 @@ class RSAContainersTestCase(BaseContainersTestCase):
 
         container_resp = self.barbicanclient.containers.get(container_ref)
         self.assertIsNone(container_resp.private_key_passphrase)
-        self.assertEqual(len(container_resp.secrets), 2)
+        self.assertEqual(2, len(container_resp.secrets))
 
     @utils.parameterized_dataset(accepted_str_values)
     @testcase.attr('positive')
@@ -280,7 +280,7 @@ class RSAContainersTestCase(BaseContainersTestCase):
         self.assertIsNotNone(container_ref)
 
         container_resp = self.barbicanclient.containers.get(container_ref)
-        self.assertEqual(container_resp.name, name)
+        self.assertEqual(name, container_resp.name)
 
     @testcase.attr('negative')
     def test_create_rsa_invalid_key_names(self):
@@ -317,7 +317,7 @@ class RSAContainersTestCase(BaseContainersTestCase):
             container.store
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @testcase.attr('negative')
     def test_create_rsa_no_private_key(self):
@@ -338,4 +338,4 @@ class RSAContainersTestCase(BaseContainersTestCase):
             container.store
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
diff --git a/functionaltests/client/v1/functional/test_orders.py b/functionaltests/client/v1/functional/test_orders.py
index 53fa625..3c1243e 100644
--- a/functionaltests/client/v1/functional/test_orders.py
+++ b/functionaltests/client/v1/functional/test_orders.py
@@ -66,7 +66,7 @@ class OrdersTestCase(base.TestCase):
         self.assertIsNotNone(order_ref)
 
         order_resp = self.barbicanclient.orders.get(order_ref)
-        self.assertEqual(order.name, order.name)
+        self.assertEqual(order.name, order_resp.name)
 
     @testcase.attr('positive')
     def test_create_order_defaults_w_empty_name(self):
@@ -77,7 +77,7 @@ class OrdersTestCase(base.TestCase):
         self.assertIsNotNone(order_ref)
 
         order_resp = self.barbicanclient.orders.get(order_ref)
-        self.assertEqual(order_resp.name, order.name)
+        self.assertEqual(order.name, order_resp.name)
 
     @testcase.attr('positive')
     def test_create_order_defaults_payload_content_type_none(self):
@@ -114,7 +114,7 @@ class OrdersTestCase(base.TestCase):
         # verify the new secret's name matches the name in the secret ref
         # in the newly created order.
         secret_resp = self.barbicanclient.secrets.get(order_resp.secret_ref)
-        self.assertEqual(secret_resp.name, order.name)
+        self.assertEqual(order.name, secret_resp.name)
 
     @testcase.attr('positive')
     def test_order_and_secret_metadata_same(self):
@@ -134,20 +134,20 @@ class OrdersTestCase(base.TestCase):
 
         secret_resp = self.barbicanclient.secrets.get(order_resp.secret_ref)
 
-        self.assertEqual(order_resp.name,
-                         secret_resp.name,
+        self.assertEqual(secret_resp.name,
+                         order_resp.name,
                          'Names were not the same')
-        self.assertEqual(order_resp.algorithm,
-                         secret_resp.algorithm,
+        self.assertEqual(secret_resp.algorithm,
+                         order_resp.algorithm,
                          'Algorithms were not the same')
-        self.assertEqual(order_resp.bit_length,
-                         secret_resp.bit_length,
+        self.assertEqual(secret_resp.bit_length,
+                         order_resp.bit_length,
                          'Bit lengths were not the same')
-        self.assertEqual(order_resp.expiration,
-                         secret_resp.expiration,
+        self.assertEqual(secret_resp.expiration,
+                         order_resp.expiration,
                          'Expirations were not the same')
-        self.assertEqual(order_resp.mode,
-                         secret_resp.mode,
+        self.assertEqual(secret_resp.mode,
+                         order_resp.mode,
                          'Modes were not the same')
 
     @testcase.attr('negative')
@@ -159,7 +159,7 @@ class OrdersTestCase(base.TestCase):
         e = self.assertRaises(ValueError, self.barbicanclient.orders.get, ref)
 
         # verify that the order get failed
-        self.assertEqual(e.message, 'Order incorrectly specified.')
+        self.assertEqual('Order incorrectly specified.', e.message)
 
     @testcase.attr('negative')
     def test_get_order_defaults_that_doesnt_exist_valid_uuid(self):
@@ -176,7 +176,7 @@ class OrdersTestCase(base.TestCase):
         )
 
         # verify that the order get failed
-        self.assertEqual(e.status_code, 404)
+        self.assertEqual(404, e.status_code)
 
     @testcase.attr('negative')
     def test_create_order_nones(self):
@@ -189,7 +189,7 @@ class OrdersTestCase(base.TestCase):
             order.submit
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @testcase.attr('negative')
     def test_create_order_empty_entries(self):
@@ -207,7 +207,7 @@ class OrdersTestCase(base.TestCase):
             order.submit
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @testcase.attr('negative')
     def test_create_order_defaults_oversized_strings(self):
@@ -222,7 +222,7 @@ class OrdersTestCase(base.TestCase):
             order.submit
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @utils.parameterized_dataset({
         '8': [8],
@@ -244,7 +244,7 @@ class OrdersTestCase(base.TestCase):
         self.assertIsNotNone(order_ref)
 
         order_resp = self.barbicanclient.orders.get(order_ref)
-        self.assertEqual(order_resp.bit_length, order.bit_length)
+        self.assertEqual(order.bit_length, order_resp.bit_length)
 
     @utils.parameterized_dataset({
         'negative_maxint': [-sys.maxint],
@@ -269,7 +269,7 @@ class OrdersTestCase(base.TestCase):
             exceptions.HTTPClientError,
             order.submit
         )
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @utils.parameterized_dataset({
         'alphanumeric': ['1f34ds'],
@@ -287,7 +287,7 @@ class OrdersTestCase(base.TestCase):
         self.assertIsNotNone(order_ref)
 
         order_resp = self.barbicanclient.orders.get(order_ref)
-        self.assertEqual(order_resp.name, order.name)
+        self.assertEqual(order.name, order_resp.name)
 
     @utils.parameterized_dataset({
         'int': [123]
@@ -303,7 +303,7 @@ class OrdersTestCase(base.TestCase):
             order.submit
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @utils.parameterized_dataset({
         'cbc': ['cbc']
@@ -318,7 +318,7 @@ class OrdersTestCase(base.TestCase):
         self.assertIsNotNone(order_ref)
 
         order_resp = self.barbicanclient.orders.get(order_ref)
-        self.assertEqual(order_resp.mode, order.mode)
+        self.assertEqual(order.mode, order_resp.mode)
 
     @utils.parameterized_dataset({
         'int': [123]
@@ -333,7 +333,7 @@ class OrdersTestCase(base.TestCase):
             exceptions.HTTPClientError,
             order.submit
         )
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @utils.parameterized_dataset({
         'aes': ['aes']
@@ -348,7 +348,7 @@ class OrdersTestCase(base.TestCase):
         self.assertIsNotNone(order_ref)
 
         order_resp = self.barbicanclient.orders.get(order_ref)
-        self.assertEqual(order_resp.algorithm, order.algorithm)
+        self.assertEqual(order.algorithm, order_resp.algorithm)
 
     @utils.parameterized_dataset({
         'int': [123]
@@ -364,7 +364,7 @@ class OrdersTestCase(base.TestCase):
             order.submit
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     # TODO(tdink) Add empty after Launchpad 1420444 is resolved
     @utils.parameterized_dataset({
@@ -381,8 +381,8 @@ class OrdersTestCase(base.TestCase):
         self.assertIsNotNone(order_ref)
 
         order_resp = self.barbicanclient.orders.get(order_ref)
-        self.assertEqual(order_resp.payload_content_type,
-                         order.payload_content_type)
+        self.assertEqual(order.payload_content_type,
+                         order_resp.payload_content_type)
 
     @utils.parameterized_dataset({
         'int': [123],
@@ -402,7 +402,7 @@ class OrdersTestCase(base.TestCase):
             order.submit
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @utils.parameterized_dataset({
         'negative_five_long_expire': {
@@ -456,4 +456,4 @@ class OrdersTestCase(base.TestCase):
             order.submit
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
diff --git a/functionaltests/client/v1/functional/test_secrets.py b/functionaltests/client/v1/functional/test_secrets.py
index 1f47a9e..650b61c 100644
--- a/functionaltests/client/v1/functional/test_secrets.py
+++ b/functionaltests/client/v1/functional/test_secrets.py
@@ -96,7 +96,7 @@ class SecretsTestCase(base.TestCase):
         self.assertIsNotNone(secret_ref)
 
         resp = self.barbicanclient.secrets.get(secret_ref)
-        self.assertEqual(resp.algorithm, secret.algorithm)
+        self.assertEqual(secret.algorithm, resp.algorithm)
 
     @testcase.attr('positive')
     def test_secret_read_with_acls(self):
@@ -129,7 +129,7 @@ class SecretsTestCase(base.TestCase):
         self.assertIsNotNone(secret_ref)
 
         resp = self.barbicanclient.secrets.get(secret_ref)
-        self.assertEqual(resp.mode, secret.mode)
+        self.assertEqual(secret.mode, resp.mode)
 
     @testcase.attr('negative')
     def test_secret_delete_doesnt_exist(self):
@@ -143,7 +143,7 @@ class SecretsTestCase(base.TestCase):
         e = self.assertRaises(ValueError, self.barbicanclient.secrets.delete,
                               url)
 
-        self.assertEqual(e.message, 'Secret incorrectly specified.')
+        self.assertEqual('Secret incorrectly specified.', e.message)
 
     @testcase.attr('negative')
     def test_secret_delete_doesnt_exist_valid_uuid_format(self):
@@ -162,7 +162,7 @@ class SecretsTestCase(base.TestCase):
             url
         )
 
-        self.assertEqual(e.status_code, 404)
+        self.assertEqual(404, e.status_code)
 
     @testcase.attr('negative')
     def test_secret_get_secret_doesnt_exist(self):
@@ -193,7 +193,7 @@ class SecretsTestCase(base.TestCase):
             exceptions.HTTPClientError,
             secret.store
         )
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @testcase.attr('negative')
     def test_secret_create_emptystrings(self):
@@ -224,7 +224,7 @@ class SecretsTestCase(base.TestCase):
             exceptions.HTTPClientError,
             secret.store
         )
-        self.assertEqual(e.status_code, 413)
+        self.assertEqual(413, e.status_code)
 
     @utils.parameterized_dataset({
         'alphanumeric': ['1f34ds'],
@@ -245,7 +245,7 @@ class SecretsTestCase(base.TestCase):
         self.assertIsNotNone(secret_ref)
 
         resp = self.barbicanclient.secrets.get(secret_ref)
-        self.assertEqual(resp.name, secret.name)
+        self.assertEqual(secret.name, resp.name)
 
     @utils.parameterized_dataset({
         'int': [400]
@@ -265,7 +265,7 @@ class SecretsTestCase(base.TestCase):
             secret.store
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @utils.parameterized_dataset({
         'aes': ['aes']
@@ -281,7 +281,7 @@ class SecretsTestCase(base.TestCase):
         self.assertIsNotNone(secret_ref)
 
         resp = self.barbicanclient.secrets.get(secret_ref)
-        self.assertEqual(resp.algorithm, secret.algorithm)
+        self.assertEqual(secret.algorithm, resp.algorithm)
 
     @utils.parameterized_dataset({
         'int': [400]
@@ -301,7 +301,7 @@ class SecretsTestCase(base.TestCase):
             secret.store
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @utils.parameterized_dataset({
         'symmetric': ['symmetric',
@@ -345,7 +345,7 @@ class SecretsTestCase(base.TestCase):
         self.assertIsNotNone(secret_ref)
 
         resp = self.barbicanclient.secrets.get(secret_ref)
-        self.assertEqual(resp.secret_type, secret_type)
+        self.assertEqual(secret_type, resp.secret_type)
 
     @testcase.attr('negative')
     def test_secret_create_defaults_invalid_secret_type(self):
@@ -359,7 +359,7 @@ class SecretsTestCase(base.TestCase):
             secret.store
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @utils.parameterized_dataset({
         '512': [512],
@@ -381,7 +381,7 @@ class SecretsTestCase(base.TestCase):
         self.assertIsNotNone(secret_ref)
 
         resp = self.barbicanclient.secrets.get(secret_ref)
-        self.assertEqual(resp.bit_length, secret.bit_length)
+        self.assertEqual(secret.bit_length, resp.bit_length)
 
     @utils.parameterized_dataset({
         'str_type': ['not-an-int'],
@@ -403,7 +403,7 @@ class SecretsTestCase(base.TestCase):
             secret.store
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @utils.parameterized_dataset({
         'cbc': ['cbc']
@@ -419,7 +419,7 @@ class SecretsTestCase(base.TestCase):
         self.assertIsNotNone(secret_ref)
 
         resp = self.barbicanclient.secrets.get(secret_ref)
-        self.assertEqual(resp.mode, secret.mode)
+        self.assertEqual(secret.mode, resp.mode)
 
     @utils.parameterized_dataset({
         'zero': [0],
@@ -438,7 +438,7 @@ class SecretsTestCase(base.TestCase):
             secret.store
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @utils.parameterized_dataset({
         'text_content_type_none_encoding': {
@@ -556,7 +556,7 @@ class SecretsTestCase(base.TestCase):
             secret.store
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @utils.parameterized_dataset({
         'max_payload_string': [base.TestCase.max_sized_payload]
@@ -644,7 +644,7 @@ class SecretsTestCase(base.TestCase):
 
         resp = self.barbicanclient.secrets.get(secret_ref)
         self.assertIsNotNone(resp)
-        self.assertEqual(resp.name, secret.name)
+        self.assertEqual(secret.name, resp.name)
 
     @utils.parameterized_dataset({
         'malformed_timezone': {
@@ -664,7 +664,7 @@ class SecretsTestCase(base.TestCase):
             secret.store
         )
 
-        self.assertEqual(e.status_code, 400)
+        self.assertEqual(400, e.status_code)
 
     @utils.parameterized_dataset({
         'text/plain':
@@ -692,8 +692,8 @@ class SecretsTestCase(base.TestCase):
         secret.update()
 
         resp = self.barbicanclient.secrets.get(secret_ref)
-        self.assertEqual(resp.payload, payload)
-        self.assertEqual(resp.payload_content_type, payload_content_type)
+        self.assertEqual(payload, resp.payload)
+        self.assertEqual(payload_content_type, resp.payload_content_type)
 
     @utils.parameterized_dataset({
         'alphanumeric': ['1f34ds'],
@@ -714,11 +714,11 @@ class SecretsTestCase(base.TestCase):
         self.assertIsNotNone(secret_ref)
 
         resp = self.barbicanclient.secrets.get(secret_ref)
-        self.assertEqual(resp.status, "ACTIVE")
-        self.assertEqual(resp.name, name)
-        self.assertEqual(resp.mode, secret.mode)
-        self.assertEqual(resp.algorithm, secret.algorithm)
-        self.assertEqual(resp.bit_length, secret.bit_length)
+        self.assertEqual("ACTIVE", resp.status)
+        self.assertEqual(name, resp.name)
+        self.assertEqual(secret.mode, resp.mode)
+        self.assertEqual(secret.algorithm, resp.algorithm)
+        self.assertEqual(secret.bit_length, resp.bit_length)
 
     @utils.parameterized_dataset({
         'symmetric': ['symmetric',
@@ -762,5 +762,5 @@ class SecretsTestCase(base.TestCase):
         self.assertIsNotNone(secret_ref)
 
         resp = self.barbicanclient.secrets.get(secret_ref)
-        self.assertEqual(resp.status, "ACTIVE")
-        self.assertEqual(resp.secret_type, secret_type)
+        self.assertEqual("ACTIVE", resp.status)
+        self.assertEqual(secret_type, resp.secret_type)
diff --git a/functionaltests/client/v1/smoke/test_containers.py b/functionaltests/client/v1/smoke/test_containers.py
index 82dd864..b25d700 100644
--- a/functionaltests/client/v1/smoke/test_containers.py
+++ b/functionaltests/client/v1/smoke/test_containers.py
@@ -133,15 +133,15 @@ class ContainersTestCase(base.TestCase):
         container_resp = self.barbicanclient.containers.get(container_ref)
 
         # Verify the response data
-        self.assertEqual(container_resp.name, container.name)
-        self.assertEqual(container_resp.container_ref, container_ref)
+        self.assertEqual(container.name, container_resp.name)
+        self.assertEqual(container_ref, container_resp.container_ref)
 
         get_resp_secret_refs = []
         for name, ref in container_resp.secret_refs.iteritems():
             get_resp_secret_refs.append(str(ref))
 
         # Verify the secret refs in the response
-        self.assertEqual(len(container_resp.secret_refs), 3)
+        self.assertEqual(3, len(container_resp.secret_refs))
         self.assertIn(secret_refs[0], get_resp_secret_refs)
         self.assertIn(secret_refs[1], get_resp_secret_refs)
         self.assertIn(secret_refs[2], get_resp_secret_refs)
@@ -160,14 +160,14 @@ class ContainersTestCase(base.TestCase):
         container_resp = self.barbicanclient.containers.get(container_ref)
 
         # Verify the response data
-        self.assertEqual(container_resp.name, "rsacontainer")
-        self.assertEqual(container_resp.container_ref, container_ref)
+        self.assertEqual("rsacontainer", container_resp.name)
+        self.assertEqual(container_ref, container_resp.container_ref)
 
         get_resp_secret_refs = []
         for name, ref in container_resp.secret_refs.iteritems():
             get_resp_secret_refs.append(str(ref))
         # Verify the secret refs in the response
-        self.assertEqual(len(container_resp.secret_refs), 3)
+        self.assertEqual(3, len(container_resp.secret_refs))
         self.assertIn(secret_refs[0], get_resp_secret_refs)
         self.assertIn(secret_refs[1], get_resp_secret_refs)
         self.assertIn(secret_refs[2], get_resp_secret_refs)
@@ -188,7 +188,7 @@ class ContainersTestCase(base.TestCase):
         containers = self.barbicanclient.containers.list(limit=limit,
                                                          offset=offset)
 
-        self.assertEqual(len(containers), limit)
+        self.assertEqual(limit, len(containers))
 
     def test_container_delete_defaults(self):
         """Covers deleting a container."""
diff --git a/functionaltests/client/v1/smoke/test_orders.py b/functionaltests/client/v1/smoke/test_orders.py
index ceaefb8..e99c777 100644
--- a/functionaltests/client/v1/smoke/test_orders.py
+++ b/functionaltests/client/v1/smoke/test_orders.py
@@ -88,14 +88,16 @@ class OrdersTestCase(base.TestCase):
                         order_resp.status == "PENDING")
 
         # verify the metadata
-        self.assertEqual(order_resp.name,
-                         order.name)
-        self.assertEqual(order_resp.mode,
-                         order.mode)
-        self.assertEqual(order_resp.algorithm,
-                         order.algorithm)
-        self.assertEqual(order_resp.bit_length,
-                         order.bit_length)
+        self.assertEqual(order.name,
+                         order_resp.name)
+        self.assertEqual(order.mode,
+                         order_resp.mode)
+        self.assertEqual(order.algorithm,
+                         order_resp.algorithm)
+        self.assertEqual(order.bit_length,
+                         order_resp.bit_length)
+        self.assertEqual(order.payload_content_type,
+                         order_resp.payload_content_type)
 
     @testcase.attr('positive')
     def test_get_order_defaults(self):
@@ -115,7 +117,7 @@ class OrdersTestCase(base.TestCase):
 
         # verify the order
         self.assertIsNotNone(order_resp.order_ref)
-        self.assertEqual(order_resp._type, 'key')
+        self.assertEqual('key', order_resp._type)
         self.assertTrue(order_resp.status == "ACTIVE" or
                         order_resp.status == "PENDING")
 
@@ -158,4 +160,4 @@ class OrdersTestCase(base.TestCase):
                                                       offset=offset)
 
         # verify that the get for the list was successful
-        self.assertEqual(len(orders_list), limit)
+        self.assertEqual(limit, len(orders_list))
diff --git a/functionaltests/client/v1/smoke/test_secrets.py b/functionaltests/client/v1/smoke/test_secrets.py
index 39725d4..70cdf68 100644
--- a/functionaltests/client/v1/smoke/test_secrets.py
+++ b/functionaltests/client/v1/smoke/test_secrets.py
@@ -164,4 +164,4 @@ class SecretsTestCase(base.TestCase):
         secret_list = self.barbicanclient.secrets.list(limit=limit,
                                                        offset=offset)
 
-        self.assertEqual(len(secret_list), limit)
+        self.assertEqual(limit, len(secret_list))