add setup function and move resource and app into it

c-3lab · Mar 28, 2023 · c533eb4 · c533eb4
1 parent 13edb4a
commit c533eb4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/ckanext/feedback/tests/controllers/test_download.py b/ckanext/feedback/tests/controllers/test_download.py
@@ -35,27 +35,27 @@ def setup_class(cls):
         create_resource_tables(engine)
         create_download_tables(engine)
 
+    def setup(self):
+        self.resource = factories.Resource()
+        self.app = Flask(__name__)
+
     @patch('ckanext.feedback.controllers.download.download')
     def test_extended_download(self, mocker):
-        resource = factories.Resource()
-        self.app = Flask(__name__)
         download = mocker.patch('ckanext.feedback.controllers.download.download')
         with self.app.test_request_context(headers={'Sec-Fetch-Dest': 'document'}):
             DownloadController.extended_download(
-                'package_type', resource['package_id'], resource['id'], None
+                'package_type', self.resource['package_id'], self.resource['id'], None
             )
-            assert get_downloads(resource['id']) == 1
+            assert get_downloads(self.resource['id']) == 1
             assert download
 
     @patch('ckanext.feedback.controllers.download.download')
     def test_extended_download_with_preview(self, mocker):
-        resource = factories.Resource()
-        self.app = Flask(__name__)
         download = mocker.patch('ckanext.feedback.controllers.download.download')
 
         with self.app.test_request_context(headers={'Sec-Fetch-Dest': 'image'}):
             DownloadController.extended_download(
-                'package_type', resource['package_id'], resource['id'], None
+                'package_type', self.resource['package_id'], self.resource['id'], None
             )
-            assert get_downloads(resource['id']) is None
+            assert get_downloads(self.resource['id']) is None
             assert download
diff --git a/ckanext/feedback/tests/services/download/test_summary.py b/ckanext/feedback/tests/services/download/test_summary.py
@@ -36,35 +36,35 @@ def setup_class(cls):
         create_resource_tables(engine)
         create_download_tables(engine)
 
+    def setup(self):
+        self.resource = factories.Resource()
+
     def test_increment_resource_downloads(self):
-        resource = factories.Resource()
-        increment_resource_downloads(resource['id'])
-        assert get_downloads(resource['id']) == 1
-        increment_resource_downloads(resource['id'])
-        assert get_downloads(resource['id']) == 2
+        increment_resource_downloads(self.resource['id'])
+        assert get_downloads(self.resource['id']) == 1
+        increment_resource_downloads(self.resource['id'])
+        assert get_downloads(self.resource['id']) == 2
 
     def test_get_package_download(self):
-        resource = factories.Resource()
-        assert get_package_downloads(resource['package_id']) == 0
+        assert get_package_downloads(self.resource['package_id']) == 0
         download_summary = DownloadSummary(
             id=str('test_id'),
-            resource_id=resource['id'],
+            resource_id=self.resource['id'],
             download=1,
             created='2023-03-31 01:23:45.123456',
             updated='2023-03-31 01:23:45.123456',
         )
         session.add(download_summary)
-        assert get_package_downloads(resource['package_id']) == 1
+        assert get_package_downloads(self.resource['package_id']) == 1
 
     def test_get_resource_download(self):
-        resource = factories.Resource()
-        assert get_resource_downloads(resource['id']) == 0
+        assert get_resource_downloads(self.resource['id']) == 0
         download_summary = DownloadSummary(
             id=str('test_id'),
-            resource_id=resource['id'],
+            resource_id=self.resource['id'],
             download=1,
             created='2023-03-31 01:23:45.123456',
             updated='2023-03-31 01:23:45.123456',
         )
         session.add(download_summary)
-        assert get_resource_downloads(resource['id']) == 1
+        assert get_resource_downloads(self.resource['id']) == 1