From 6559731fb33bddccb364ab8430f6b41b1447f76f Mon Sep 17 00:00:00 2001 From: reedip Date: Wed, 6 Jan 2016 14:38:55 +0900 Subject: [PATCH] Fix argument order for assertEqual to (expected, observed) 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: I164dd6b2b820e4ca26bf3406f591ca786893f279 Closes-Bug: #1259292 Closes-Bug: #1277104 --- solumclient/tests/common/test_yamlutils.py | 4 +- solumclient/tests/v1/test_assembly.py | 4 +- solumclient/tests/v1/test_component.py | 60 +++++++++++----------- solumclient/tests/v1/test_languagepack.py | 2 +- solumclient/tests/v1/test_pipeline.py | 4 +- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/solumclient/tests/common/test_yamlutils.py b/solumclient/tests/common/test_yamlutils.py index 412e3f2..fa7fa6b 100644 --- a/solumclient/tests/common/test_yamlutils.py +++ b/solumclient/tests/common/test_yamlutils.py @@ -23,14 +23,14 @@ class TestYamlUtils(base.TestCase): def test_load_yaml(self): yml_dict = yamlutils.load('a: x\nb: y\n') - self.assertEqual(yml_dict, {'a': 'x', 'b': 'y'}) + self.assertEqual({'a': 'x', 'b': 'y'}, yml_dict) def test_load_empty_yaml(self): self.assertRaises(ValueError, yamlutils.load, '{}') def test_load_empty_list(self): yml_dict = yamlutils.load('[]') - self.assertEqual(yml_dict, []) + self.assertEqual([], yml_dict) def test_load_invalid_yaml_syntax(self): self.assertRaises(ValueError, yamlutils.load, "}invalid: y'm'l3!") diff --git a/solumclient/tests/v1/test_assembly.py b/solumclient/tests/v1/test_assembly.py index fcd322b..a9b9c1c 100644 --- a/solumclient/tests/v1/test_assembly.py +++ b/solumclient/tests/v1/test_assembly.py @@ -144,7 +144,7 @@ class AssemblyManagerTest(base.TestCase): api_client = sclient.Client(fake_http_client) mgr = assembly.AssemblyManager(api_client) assemblies = mgr.list() - self.assertEqual(len(assemblies), 2) + self.assertEqual(2, len(assemblies)) self.assertIn('Assembly', repr(assemblies[0])) self.assertEqual(assembly_list[0]['uri'], assemblies[0].uri) self.assertEqual(assembly_list[1]['uri'], assemblies[1].uri) @@ -154,7 +154,7 @@ class AssemblyManagerTest(base.TestCase): api_client = sclient.Client(fake_http_client) mgr = assembly.AssemblyManager(api_client) assemblies = mgr.findall(name='database') - self.assertEqual(len(assemblies), 1) + self.assertEqual(1, len(assemblies)) self.assertIn('Assembly', repr(assemblies[0])) self.assertEqual(assembly_list[0]['uri'], assemblies[0].uri) diff --git a/solumclient/tests/v1/test_component.py b/solumclient/tests/v1/test_component.py index c96dc73..c176416 100644 --- a/solumclient/tests/v1/test_component.py +++ b/solumclient/tests/v1/test_component.py @@ -119,12 +119,12 @@ class ComponentManagerTest(base.TestCase): api_client = sclient.Client(fake_http_client) self.mgr = component.ComponentManager(api_client) components = self.mgr.list() - self.assertEqual(len(components), 2) + self.assertEqual(2, len(components)) self.assertIn('Component', repr(components[0])) - self.assertEqual(components[0].uri, - 'http://example.com/v1/components/c1') - self.assertEqual(components[1].uri, - 'http://example.com/v1/components/c2') + self.assertEqual('http://example.com/v1/components/c1', + components[0].uri) + self.assertEqual('http://example.com/v1/components/c2', + components[1].uri) def test_create(self): fake_http_client = fake_client.FakeHTTPClient(fixtures=fixtures_create) @@ -132,14 +132,14 @@ class ComponentManagerTest(base.TestCase): mgr = component.ComponentManager(api_client) component_obj = mgr.create() self.assertIn('Component', repr(component_obj)) - self.assertEqual(component_obj.uri, - 'http://example.com/v1/components/c1') - self.assertEqual(component_obj.type, - 'component') - self.assertEqual(component_obj.project_id, - '1dae5a09ef2b4d8cbf3594b0eb4f6b94') - self.assertEqual(component_obj.user_id, - '55f41cf46df74320b9486a35f5d28a11') + self.assertEqual('http://example.com/v1/components/c1', + component_obj.uri) + self.assertEqual('component', + component_obj.type) + self.assertEqual('1dae5a09ef2b4d8cbf3594b0eb4f6b94', + component_obj.project_id) + self.assertEqual('55f41cf46df74320b9486a35f5d28a11', + component_obj.user_id) def test_get(self): fake_http_client = fake_client.FakeHTTPClient(fixtures=fixtures_get) @@ -147,14 +147,14 @@ class ComponentManagerTest(base.TestCase): mgr = component.ComponentManager(api_client) component_obj = mgr.get(component_id='c1') self.assertIn('Component', repr(component_obj)) - self.assertEqual(component_obj.uri, - 'http://example.com/v1/components/c1') - self.assertEqual(component_obj.type, - 'component') - self.assertEqual(component_obj.project_id, - '1dae5a09ef2b4d8cbf3594b0eb4f6b94') - self.assertEqual(component_obj.user_id, - '55f41cf46df74320b9486a35f5d28a11') + self.assertEqual('http://example.com/v1/components/c1', + component_obj.uri) + self.assertEqual('component', + component_obj.type) + self.assertEqual('1dae5a09ef2b4d8cbf3594b0eb4f6b94', + component_obj.project_id) + self.assertEqual('55f41cf46df74320b9486a35f5d28a11', + component_obj.user_id) def test_put(self): fake_http_client = fake_client.FakeHTTPClient(fixtures=fixtures_put) @@ -162,21 +162,21 @@ class ComponentManagerTest(base.TestCase): mgr = component.ComponentManager(api_client) component_obj = mgr.put(component_id='c1') self.assertIn('Component', repr(component_obj)) - self.assertEqual(component_obj.uri, - 'http://example.com/v1/components/c1') - self.assertEqual(component_obj.type, - 'component') - self.assertEqual(component_obj.project_id, - '1dae5a09ef2b4d8cbf3594b0eb4f6b94') - self.assertEqual(component_obj.user_id, - '55f41cf46df74320b9486a35f5d28a11') + self.assertEqual('http://example.com/v1/components/c1', + component_obj.uri) + self.assertEqual('component', + component_obj.type) + self.assertEqual('1dae5a09ef2b4d8cbf3594b0eb4f6b94', + component_obj.project_id) + self.assertEqual('55f41cf46df74320b9486a35f5d28a11', + component_obj.user_id) def test_find_one(self): fake_http_client = fake_client.FakeHTTPClient(fixtures=fixtures_list) api_client = sclient.Client(fake_http_client) mgr = component.ComponentManager(api_client) components = mgr.findall(name='php-web-app') - self.assertEqual(len(components), 1) + self.assertEqual(1, len(components)) self.assertIn('Component', repr(components[0])) self.assertEqual(component_list[0]['uri'], components[0].uri) diff --git a/solumclient/tests/v1/test_languagepack.py b/solumclient/tests/v1/test_languagepack.py index ad9f11b..3615f38 100644 --- a/solumclient/tests/v1/test_languagepack.py +++ b/solumclient/tests/v1/test_languagepack.py @@ -124,7 +124,7 @@ class LanguagePackManagerTest(base.TestCase): api_client = sclient.Client(fake_http_client) mgr = languagepack.LanguagePackManager(api_client) languagepacks = mgr.list() - self.assertEqual(len(languagepacks), 2) + self.assertEqual(2, len(languagepacks)) self.assertIn('LanguagePack', repr(languagepacks[0])) self.assertEqual(languagepack_list[0]['uri'], languagepacks[0].uri) diff --git a/solumclient/tests/v1/test_pipeline.py b/solumclient/tests/v1/test_pipeline.py index 43d6901..df556e5 100644 --- a/solumclient/tests/v1/test_pipeline.py +++ b/solumclient/tests/v1/test_pipeline.py @@ -127,7 +127,7 @@ class PipelineManagerTest(base.TestCase): api_client = sclient.Client(fake_http_client) mgr = pipeline.PipelineManager(api_client) pipelines = mgr.list() - self.assertEqual(len(pipelines), 2) + self.assertEqual(2, len(pipelines)) self.assertIn('Pipeline', repr(pipelines[0])) self.assertEqual(pipeline_list[0]['uri'], pipelines[0].uri) self.assertEqual(pipeline_list[1]['uri'], pipelines[1].uri) @@ -137,7 +137,7 @@ class PipelineManagerTest(base.TestCase): api_client = sclient.Client(fake_http_client) mgr = pipeline.PipelineManager(api_client) pipelines = mgr.findall(name='database') - self.assertEqual(len(pipelines), 1) + self.assertEqual(1, len(pipelines)) self.assertIn('Pipeline', repr(pipelines[0])) self.assertEqual(pipeline_list[0]['uri'], pipelines[0].uri)