From c19fa87ff763172ade3e94c91114831fe81eddd4 Mon Sep 17 00:00:00 2001 From: jiansong Date: Thu, 8 Sep 2016 05:27:53 -0700 Subject: [PATCH] To simplify the setUp At the time of test setup, repeat the definition of the several variables, and does not change the contents of the variable in a method, they can be declared as global variables to the to simplify the setup Close-Bug: #1621464 Change-Id: I9c00c17e85c591671e0a104c004d6465b7bbb72a --- trove/tests/unittests/api/test_versions.py | 27 ++++------------------ 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/trove/tests/unittests/api/test_versions.py b/trove/tests/unittests/api/test_versions.py index 1df5023479..b4b1860251 100644 --- a/trove/tests/unittests/api/test_versions.py +++ b/trove/tests/unittests/api/test_versions.py @@ -27,6 +27,11 @@ from trove.versions import VersionsDataView BASE_URL = 'http://localhost' +id = VERSIONS['1.0']['id'] +status = VERSIONS['1.0']['status'] +base_url = BASE_URL +updated = VERSIONS['1.0']['updated'] + class VersionsControllerTest(trove_testtools.TestCase): @@ -84,12 +89,6 @@ class BaseVersionTestCase(trove_testtools.TestCase): def setUp(self): super(BaseVersionTestCase, self).setUp() - - id = VERSIONS['1.0']['id'] - status = VERSIONS['1.0']['status'] - base_url = BASE_URL - updated = VERSIONS['1.0']['updated'] - self.base_version = BaseVersion(id, status, base_url, updated) self.assertIsNotNone(self.base_version, 'BaseVersion instance was None') @@ -118,12 +117,6 @@ class VersionTestCase(trove_testtools.TestCase): def setUp(self): super(VersionTestCase, self).setUp() - - id = VERSIONS['1.0']['id'] - status = VERSIONS['1.0']['status'] - base_url = BASE_URL - updated = VERSIONS['1.0']['updated'] - self.version = Version(id, status, base_url, updated) self.assertIsNotNone(self.version, 'Version instance was None') @@ -147,10 +140,6 @@ class VersionDataViewTestCase(trove_testtools.TestCase): super(VersionDataViewTestCase, self).setUp() # get a version object first - id = VERSIONS['1.0']['id'] - status = VERSIONS['1.0']['status'] - base_url = BASE_URL - updated = VERSIONS['1.0']['updated'] self.version = Version(id, status, base_url, updated) self.assertIsNotNone(self.version, @@ -185,12 +174,6 @@ class VersionsDataViewTestCase(trove_testtools.TestCase): # get a version object, put it in a list self.versions = [] - - id = VERSIONS['1.0']['id'] - status = VERSIONS['1.0']['status'] - base_url = BASE_URL - updated = VERSIONS['1.0']['updated'] - self.version = Version(id, status, base_url, updated) self.assertIsNotNone(self.version, 'Version instance was None')