fix(tests): finalized test method;

- Finalized parameters and fixtures for new test method.

Author: JVickery-TBS

ckanext/xloader/tests/test_plugin.py

@@ -9,20 +9,25 @@
 from six import text_type as str
 from ckan.tests import helpers, factories
 from ckan.logic import _actions
+from ckan.plugins import toolkit
 from ckanext.xloader.plugin import _should_remove_unsupported_resource_from_datastore
 
 
 @pytest.fixture
-def mock_toolkit_config(request):
-    with mock.patch('ckan.plugins.toolkit.config.get') as mock_get:
-        mock_get.return_value = request.params
-        yield mock_get
+def toolkit_config_value(request):
+    _original_config = toolkit.config.copy()
+    toolkit.config['ckanext.xloader.clean_datastore_tables'] = request.param
+    try:
+        yield
+    finally:
+        toolkit.config.clear()
+        toolkit.config.update(_original_config)
 
 
 @pytest.fixture
 def mock_xloader_formats(request):
     with mock.patch('ckanext.xloader.plugin.XLoaderFormats.is_it_an_xloader_format') as mock_is_xloader_format:
-        mock_is_xloader_format.return_value = request.params
+        mock_is_xloader_format.return_value = request.param
         yield mock_is_xloader_format
 
 
@@ -73,50 +78,44 @@ def test_submit_when_url_changes(self, monkeypatch):
 
         assert func.called
 
-    @pytest.mark.parametrize("toolkit_config_value, xloader_formats_value, url_type, datastore_active, expected_result",
-                             [(True, True, 'upload', True, True),  # Test1
-                              (True, False, 'upload', True, False),  # Test2
-                              (False, True, 'upload', True, False),  # Test3
-                              (False, False, 'upload', True, False),  # Test4
-                              (True, True, 'custom_type', True, False),  # Test5
-                              (True, True, 'upload', False, False),  # Test6
-                              (True, True, '', True, True),  # Test7
-                              (True, True, None, True, True),  # Test8
-                             ])
+    @pytest.mark.usefixtures("toolkit_config_value", "mock_xloader_formats")
+    @pytest.mark.parametrize("toolkit_config_value, mock_xloader_formats, url_type, datastore_active, expected_result",
+                             [(True, False, 'upload', True, True),  # Test1
+                              (True, True, 'upload', True, False),  # Test2
+                              (False, False, 'upload', True, False),  # Test3
+                              (True, False, 'custom_type', True, False),  # Test4
+                              (True, False, 'upload', False, False),  # Test5
+                              (True, False, '', True, True),  # Test6
+                              (True, False, None, True, True),  # Test7
+                             ], indirect=["toolkit_config_value", "mock_xloader_formats"])
     def test_should_remove_unsupported_resource_from_datastore(
-        mock_toolkit_config, mock_xloader_formats, toolkit_config_value,
-        xloader_formats_value, url_type, datastore_active, expected_result):
+        toolkit_config_value, mock_xloader_formats, url_type, datastore_active, expected_result):
 
         # Test1: clean_datastore_tables=True, is_it_an_xloader_format=True, url_type='upload', datastore_active=True, expected_result=True
-        #   Should pass as it is an Xloader format and supported url type and datastore active.
+        #   Should pass as it is not an XLoader format and supported url type and datastore active.
         # Test2: clean_datastore_tables=True, is_it_an_xloader_format=False, url_type='upload', datastore_active=True, expected_result=False
-        #   Should fail as it is not a supported Xloader format.
+        #   Should fail as it is a supported XLoader format.
         # Test3: clean_datastore_tables=False, is_it_an_xloader_format=True, url_type='upload', datastore_active=True, expected_result=False
         #   Should fail as the config option is turned off.
-        # Test4: clean_datastore_tables=False, is_it_an_xloader_format=False, url_type='upload', datastore_active=True, expected_result=False
-        #   Should fail as the config option is turned off and the Xloader format is not supported.
-        # Test5: clean_datastore_tables=True, is_it_an_xloader_format=True, url_type='custom_type', datastore_active=True, expected_result=False
+        # Test4: clean_datastore_tables=True, is_it_an_xloader_format=True, url_type='custom_type', datastore_active=True, expected_result=False
         #   Should fail as the url_type is not supported.
-        # Test6: clean_datastore_tables=True, is_it_an_xloader_format=True, url_type='upload', datastore_active=False, expected_result=False
+        # Test5: clean_datastore_tables=True, is_it_an_xloader_format=True, url_type='upload', datastore_active=False, expected_result=False
         #   Should fail as datastore is inactive.
-        # Test7: clean_datastore_tables=True, is_it_an_xloader_format=True, url_type='', datastore_active=True, expected_result=True
-        #   Should pass as it is an Xloader format and supported url type and datastore active.
-        # Test8: clean_datastore_tables=True, is_it_an_xloader_format=True, url_type=None, datastore_active=True, expected_result=True
-        #   Should pass as it is an Xloader format and supported url type as falsy and datastore active.
+        # Test6: clean_datastore_tables=True, is_it_an_xloader_format=True, url_type='', datastore_active=True, expected_result=True
+        #   Should pass as it is not an XLoader format and supported url type and datastore active.
+        # Test7: clean_datastore_tables=True, is_it_an_xloader_format=True, url_type=None, datastore_active=True, expected_result=True
+        #   Should pass as it is not an XLoader format and supported url type as falsy and datastore active.
 
         # Setup mock data
         res_dict = {
             'format': 'some_format',
             'url_type': url_type,
-            'datastore_active': True,
-            'extras': {'datastore_active': True}
+            'datastore_active': datastore_active,
+            'extras': {'datastore_active': datastore_active}
         }
 
-        # Call the function
-        result = _should_remove_unsupported_resource_from_datastore(res_dict)
-
         # Assert the result based on the logic paths covered
-        assert result == expected_result
+        assert _should_remove_unsupported_resource_from_datastore(res_dict) == expected_result
 
     def _pending_task(self, resource_id):
         return {