openstack
/
barbican
Code Issues Proposed changes

Fix order of arguments in assertEqual 

Some tests used incorrect order assertEqual(observed, expected).
The correct order expected by testtools is assertEqual(expected, observed).

Change-Id: I7e311d3d3e440478fd242aa74370d09f71ceb7c4
Partial-Bug: #1259292
This commit is contained in:
Pradeep Kumar Singh 2015-09-29 15:48:44 +05:30
parent 4fd6f9c6c3
commit b6e00bb7b4
6 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
barbican/tests/model/repositories/test_repositories.py
View File

@ -37,7 +37,7 @@ class WhenCleaningRepositoryPagingParameters(utils.BaseTestCase):
"""The cleaner should use defaults when params are not specified."""
clean_offset, clean_limit = repositories.clean_paging_values()
self.assertEqual(clean_offset, 0)
self.assertEqual(0, clean_offset)
self.assertEqual(self.default_limit, clean_limit)
def test_limit_as_none(self):
@ -47,7 +47,7 @@ class WhenCleaningRepositoryPagingParameters(utils.BaseTestCase):
offset_arg=offset,
limit_arg=None)
self.assertEqual(clean_offset, offset)
self.assertEqual(offset, clean_offset)
self.assertEqual(self.default_limit, clean_limit)
def test_offset_as_none(self):
@ -64,7 +64,7 @@ class WhenCleaningRepositoryPagingParameters(utils.BaseTestCase):
clean_offset, clean_limit = repositories.clean_paging_values(
offset_arg=0,
limit_arg='boom')
self.assertEqual(clean_offset, 0)
self.assertEqual(0, clean_offset)
self.assertEqual(self.default_limit, clean_limit)
def test_offset_as_uncastable_str(self):
@ -72,7 +72,7 @@ class WhenCleaningRepositoryPagingParameters(utils.BaseTestCase):
clean_offset, clean_limit = repositories.clean_paging_values(
offset_arg='boom',
limit_arg=self.default_limit)
self.assertEqual(clean_offset, 0)
self.assertEqual(0, clean_offset)
self.assertEqual(self.default_limit, clean_limit)
def test_limit_is_less_than_one(self):
@ -81,8 +81,8 @@ class WhenCleaningRepositoryPagingParameters(utils.BaseTestCase):
clean_offset, clean_limit = repositories.clean_paging_values(
offset_arg=1,
limit_arg=limit)
self.assertEqual(clean_offset, 1)
self.assertEqual(clean_limit, 1)
self.assertEqual(1, clean_offset)
self.assertEqual(1, clean_limit)
def test_limit_ist_too_big(self):
"""Limit should max out at configured value."""

12
barbican/tests/model/repositories/test_repositories_certificate_authorities.py
View File

@ -131,7 +131,7 @@ class WhenTestingCertificateAuthorityRepo(database_utils.RepositoryTestCase):
session.commit()
count = self.ca_repo.get_count(project.id, session=session)
self.assertEqual(count, 0)
self.assertEqual(0, count)
def test_get_count_should_return_one(self):
session = self.ca_repo.get_session()
@ -147,7 +147,7 @@ class WhenTestingCertificateAuthorityRepo(database_utils.RepositoryTestCase):
session.commit()
count = self.ca_repo.get_count(project.id, session=session)
self.assertEqual(count, 1)
self.assertEqual(1, count)
def test_get_count_should_return_one_after_delete(self):
session = self.ca_repo.get_session()
@ -166,14 +166,14 @@ class WhenTestingCertificateAuthorityRepo(database_utils.RepositoryTestCase):
session.commit()
count = self.ca_repo.get_count(project.id, session=session)
self.assertEqual(count, 2)
self.assertEqual(2, count)
self.ca_repo.delete_entity_by_id(ca_model.id, "my keystone id",
session=session)
session.commit()
count = self.ca_repo.get_count(project.id, session=session)
self.assertEqual(count, 1)
self.assertEqual(1, count)
class WhenTestingProjectCARepo(database_utils.RepositoryTestCase):
@ -429,8 +429,8 @@ class WhenTestingPreferredCARepo(database_utils.RepositoryTestCase):
self.assertEqual(0, total)
def test_do_entity_name(self):
self.assertEqual(self.preferred_ca_repo._do_entity_name(),
"PreferredCertificateAuthority")
self.assertEqual("PreferredCertificateAuthority",
self.preferred_ca_repo._do_entity_name())
def test_should_raise_no_result_found(self):
session = self.preferred_ca_repo.get_session()

8
barbican/tests/model/repositories/test_repositories_consumers.py
View File

@ -136,7 +136,7 @@ class WhenTestingContainerConsumerRepository(utils.RepositoryTestCase):
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 0)
self.assertEqual(0, count)
def test_should_get_count_one(self):
session = self.repo.get_session()
@ -155,7 +155,7 @@ class WhenTestingContainerConsumerRepository(utils.RepositoryTestCase):
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 1)
self.assertEqual(1, count)
def test_should_get_count_one_after_delete(self):
session = self.repo.get_session()
@ -178,11 +178,11 @@ class WhenTestingContainerConsumerRepository(utils.RepositoryTestCase):
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 2)
self.assertEqual(2, count)
self.repo.delete_entity_by_id(consumer.id, "my keystone id",
session=session)
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 1)
self.assertEqual(1, count)

8
barbican/tests/model/repositories/test_repositories_containers.py
View File

@ -66,7 +66,7 @@ class WhenTestingContainerRepository(database_utils.RepositoryTestCase):
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 0)
self.assertEqual(0, count)
def test_should_get_count_one(self):
session = self.repo.get_session()
@ -82,7 +82,7 @@ class WhenTestingContainerRepository(database_utils.RepositoryTestCase):
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 1)
self.assertEqual(1, count)
def test_should_get_count_one_after_delete(self):
session = self.repo.get_session()
@ -101,11 +101,11 @@ class WhenTestingContainerRepository(database_utils.RepositoryTestCase):
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 2)
self.assertEqual(2, count)
self.repo.delete_entity_by_id(container_model.id, "my keystone id",
session=session)
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 1)
self.assertEqual(1, count)

8
barbican/tests/model/repositories/test_repositories_orders.py
View File

@ -77,7 +77,7 @@ class WhenTestingOrderRepository(database_utils.RepositoryTestCase):
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 0)
self.assertEqual(0, count)
def test_should_get_count_one(self):
session = self.repo.get_session()
@ -93,7 +93,7 @@ class WhenTestingOrderRepository(database_utils.RepositoryTestCase):
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 1)
self.assertEqual(1, count)
def test_should_get_count_one_after_delete(self):
session = self.repo.get_session()
@ -112,11 +112,11 @@ class WhenTestingOrderRepository(database_utils.RepositoryTestCase):
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 2)
self.assertEqual(2, count)
self.repo.delete_entity_by_id(order_model.id, "my keystone id",
session=session)
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 1)
self.assertEqual(1, count)

32
barbican/tests/model/repositories/test_repositories_secrets.py
View File

@ -71,10 +71,10 @@ class WhenTestingSecretRepository(database_utils.RepositoryTestCase):
session=session,
)
self.assertEqual([s.id for s in secrets], [secret.id])
self.assertEqual(offset, 0)
self.assertEqual(limit, 10)
self.assertEqual(total, 1)
self.assertEqual([secret.id], [s.id for s in secrets])
self.assertEqual(0, offset)
self.assertEqual(10, limit)
self.assertEqual(1, total)
def test_get_secret_by_id(self):
session = self.repo.get_session()
@ -130,9 +130,9 @@ class WhenTestingSecretRepository(database_utils.RepositoryTestCase):
resulting_secret_ids = [s.id for s in secrets]
self.assertIn(secret1.id, resulting_secret_ids)
self.assertNotIn(secret2.id, resulting_secret_ids)
self.assertEqual(offset, 0)
self.assertEqual(limit, 10)
self.assertEqual(total, 1)
self.assertEqual(0, offset)
self.assertEqual(10, limit)
self.assertEqual(1, total)
def test_get_by_create_date_nothing(self):
session = self.repo.get_session()
@ -143,13 +143,13 @@ class WhenTestingSecretRepository(database_utils.RepositoryTestCase):
suppress_exception=True
)
self.assertEqual(secrets, [])
self.assertEqual(offset, 0)
self.assertEqual(limit, 10)
self.assertEqual(total, 0)
self.assertEqual([], secrets)
self.assertEqual(0, offset)
self.assertEqual(10, limit)
self.assertEqual(0, total)
def test_do_entity_name(self):
self.assertEqual(self.repo._do_entity_name(), "Secret")
self.assertEqual("Secret", self.repo._do_entity_name())
def test_should_raise_no_result_found(self):
session = self.repo.get_session()
@ -171,7 +171,7 @@ class WhenTestingSecretRepository(database_utils.RepositoryTestCase):
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 0)
self.assertEqual(0, count)
def test_should_get_count_one(self):
session = self.repo.get_session()
@ -187,7 +187,7 @@ class WhenTestingSecretRepository(database_utils.RepositoryTestCase):
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 1)
self.assertEqual(1, count)
def test_should_get_count_one_after_delete(self):
session = self.repo.get_session()
@ -206,11 +206,11 @@ class WhenTestingSecretRepository(database_utils.RepositoryTestCase):
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 2)
self.assertEqual(2, count)
self.repo.delete_entity_by_id(secret_model.id, "my keystone id",
session=session)
session.commit()
count = self.repo.get_count(project.id, session=session)
self.assertEqual(count, 1)
self.assertEqual(1, count)