uk_bin_collection 0.85.5__py3-none-any.whl → 0.85.7__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -245,7 +245,7 @@
         "url": "https://myaccount.chorley.gov.uk/wastecollections.aspx",
         "web_driver": "http://selenium:4444",
         "wiki_name": "Chorley Council",
-        "wiki_note": "Chorley needs to be passed both a Postcode & UPRN to work. Find this on [FindMyAddress](https://www.findmyaddress.co.uk/search)"
+        "wiki_note": "Chorley needs to be passed both a Postcode & UPRN in the format of UPRNXXXXXX to work. Find this on [FindMyAddress](https://www.findmyaddress.co.uk/search)"
     },
     "ConwyCountyBorough": {
         "postcode": "LL30 2DF",

uk_bin_collection/tests/test_collect_data.py

@@ -1,136 +1,73 @@
-import json
-from unittest import mock
-
+from unittest.mock import MagicMock, patch
+import argparse
 import pytest
-from requests import exceptions as req_exp
-from requests.models import Response
-from uk_bin_collection.get_bin_data import AbstractGetBinDataClass as agbdc
-from uk_bin_collection.get_bin_data import setup_logging
-import logging
-
-
-def mocked_requests_get(*args, **kwargs):
-    class MockResponse:
-        def __init__(self, json_data, status_code, raise_error_type):
-            self.text = json_data
-            self.status_code = status_code
-            if raise_error_type is not None:
-                self.raise_for_status = self.raise_error(raise_error_type)
-            else:
-                self.raise_for_status = lambda: None
-
-        def raise_error(self, errorType):
-            if errorType == "HTTPError":
-                raise req_exp.HTTPError()
-            elif errorType == "ConnectionError":
-                raise req_exp.ConnectionError()
-            elif errorType == "Timeout":
-                raise req_exp.Timeout()
-            elif errorType == "RequestException":
-                raise req_exp.RequestException()
-            return errorType
-
-    if args[0] == "aurl":
-        return MockResponse({"test_data": "test"}, 200, None)
-    elif args[0] == "HTTPError":
-        return MockResponse({}, 999, "HTTPError")
-    elif args[0] == "ConnectionError":
-        return MockResponse({}, 999, "ConnectionError")
-    elif args[0] == "Timeout":
-        return MockResponse({}, 999, "Timeout")
-    elif args[0] == "RequestException":
-        return MockResponse({}, 999, "RequestException")
-    elif args[0] == "notPage":
-        return MockResponse("not json", 200, None)
-    return MockResponse(None, 404, "HTTPError")
-
-
-# Unit tests
-
-
-def test_logging_exception():
-    logging_dict = "SW1A 1AA"
-    with pytest.raises(ValueError) as exc_info:
-        result = setup_logging(logging_dict, "ROOT")
-    assert exc_info.typename == "ValueError"
-
-
-def test_setup_logging_valid_config():
-    # Example of a minimal valid logging configuration dictionary
-    logging_config = {
-        "version": 1,
-        "handlers": {
-            "console": {
-                "class": "logging.StreamHandler",
-                "level": "DEBUG",
-            },
-        },
-        "loggers": {
-            "ROOT": {
-                "handlers": ["console"],
-                "level": "DEBUG",
-            },
-        },
-    }
-    logger_name = "ROOT"
-    # Run the function with valid logging configuration
-    logger = setup_logging(logging_config, logger_name)
-
-    # Assert that logger is correctly configured
-    assert logger.name == logger_name
-    assert logger.level == logging.DEBUG
-
-
-@mock.patch("requests.get", side_effect=mocked_requests_get)
-def test_get_data(mock_get):
-    page_data = agbdc.get_data("aurl")
-    assert page_data.text == {"test_data": "test"}
-
-
-@pytest.mark.parametrize(
-    "url", ["HTTPError", "ConnectionError", "Timeout", "RequestException"]
-)
-@mock.patch("requests.get", side_effect=mocked_requests_get)
-def test_get_data_error(mock_get, url):
-    with pytest.raises(Exception) as exc_info:
-        result = agbdc.get_data(url)
-    assert exc_info.typename == url
-
-
-def test_output_json():
-    bin_data = {"bin": ""}
-    output = agbdc.output_json(bin_data)
-    assert type(output) == str
-    assert output == '{\n    "bin": ""\n}'
-
-class ConcreteGetBinDataClass(agbdc):
-    """Concrete implementation of the abstract class to test abstract methods."""
-    def parse_data(self, page: str, **kwargs) -> dict:
-        return {"mock_key": "mock_value"}
-
-@pytest.fixture
-def concrete_class_instance():
-    return ConcreteGetBinDataClass()
-
-def test_get_and_parse_data_no_skip_get_url(concrete_class_instance):
-    mock_page = "mocked page content"
-    mock_parsed_data = {"mock_key": "mock_value"}
-
-    with mock.patch.object(concrete_class_instance, 'get_data', return_value=mock_page) as mock_get_data, \
-         mock.patch.object(concrete_class_instance, 'parse_data', return_value=mock_parsed_data) as mock_parse_data:
-        
-        result = concrete_class_instance.get_and_parse_data("http://example.com")
-
-        mock_get_data.assert_called_once_with("http://example.com")
-        mock_parse_data.assert_called_once_with(mock_page, url="http://example.com")
-        assert result == mock_parsed_data
-
-def test_get_and_parse_data_skip_get_url(concrete_class_instance):
-    mock_parsed_data = {"mock_key": "mock_value"}
-
-    with mock.patch.object(concrete_class_instance, 'parse_data', return_value=mock_parsed_data) as mock_parse_data:
-        
-        result = concrete_class_instance.get_and_parse_data("http://example.com", skip_get_url=True)
-
-        mock_parse_data.assert_called_once_with("", url="http://example.com", skip_get_url=True)
-        assert result == mock_parsed_data
+from uk_bin_collection.collect_data import UKBinCollectionApp, import_council_module
+
+
+
+# Test UKBinCollectionApp setup_arg_parser
+def test_setup_arg_parser():
+    app = UKBinCollectionApp()
+    app.setup_arg_parser()
+
+    # Assert that the argument parser has the correct arguments
+    assert isinstance(app.parser, argparse.ArgumentParser)
+    args = app.parser._actions
+    arg_names = [action.dest for action in args]
+
+    expected_args = [
+        "module",
+        "URL",
+        "postcode",
+        "number",
+        "skip_get_url",
+        "uprn",
+        "web_driver",
+        "headless",
+        "local_browser",
+        "dev_mode",
+    ]
+    assert all(arg in arg_names for arg in expected_args)
+
+
+# Test UKBinCollectionApp set_args
+def test_set_args():
+    app = UKBinCollectionApp()
+    app.setup_arg_parser()
+
+    # Test valid args
+    args = ["council_module", "http://example.com", "--postcode", "AB1 2CD"]
+    app.set_args(args)
+
+    assert app.parsed_args.module == "council_module"
+    assert app.parsed_args.URL == "http://example.com"
+    assert app.parsed_args.postcode == "AB1 2CD"
+
+
+# Test UKBinCollectionApp client_code method
+def test_client_code():
+    app = UKBinCollectionApp()
+    mock_get_bin_data_class = MagicMock()
+
+    # Run the client_code and ensure that template_method is called
+    app.client_code(mock_get_bin_data_class, "http://example.com", postcode="AB1 2CD")
+    mock_get_bin_data_class.template_method.assert_called_once_with(
+        "http://example.com", postcode="AB1 2CD"
+    )
+
+
+# Test the run() function with logging setup
+@patch("uk_bin_collection.collect_data.setup_logging")  # Correct patch path
+@patch("uk_bin_collection.collect_data.UKBinCollectionApp.run")  # Correct patch path
+@patch("sys.argv", ["uk_bin_collection.py", "council_module", "http://example.com"])
+def test_run_function(mock_app_run, mock_setup_logging):
+    from uk_bin_collection.collect_data import run
+
+    mock_setup_logging.return_value = MagicMock()
+    mock_app_run.return_value = None
+
+    run()
+
+    # Ensure logging was set up and the app run method was called
+    mock_setup_logging.assert_called_once()
+    mock_app_run.assert_called_once()

uk_bin_collection/tests/test_get_data.py

@@ -0,0 +1,197 @@
+import os
+from unittest import mock
+import tempfile
+
+import pytest
+from requests import exceptions as req_exp
+from requests.models import Response
+from unittest.mock import patch
+from uk_bin_collection.get_bin_data import AbstractGetBinDataClass as agbdc
+from uk_bin_collection.get_bin_data import setup_logging
+import logging
+
+
+def mocked_requests_get(*args, **kwargs):
+    class MockResponse:
+        def __init__(self, json_data, status_code, raise_error_type):
+            self.text = json_data
+            self.status_code = status_code
+            if raise_error_type is not None:
+                self.raise_for_status = self.raise_error(raise_error_type)
+            else:
+                self.raise_for_status = lambda: None
+
+        def raise_error(self, errorType):
+            if errorType == "HTTPError":
+                raise req_exp.HTTPError()
+            elif errorType == "ConnectionError":
+                raise req_exp.ConnectionError()
+            elif errorType == "Timeout":
+                raise req_exp.Timeout()
+            elif errorType == "RequestException":
+                raise req_exp.RequestException()
+            return errorType
+
+    if args[0] == "aurl":
+        return MockResponse({"test_data": "test"}, 200, None)
+    elif args[0] == "HTTPError":
+        return MockResponse({}, 999, "HTTPError")
+    elif args[0] == "ConnectionError":
+        return MockResponse({}, 999, "ConnectionError")
+    elif args[0] == "Timeout":
+        return MockResponse({}, 999, "Timeout")
+    elif args[0] == "RequestException":
+        return MockResponse({}, 999, "RequestException")
+    elif args[0] == "notPage":
+        return MockResponse("not json", 200, None)
+    return MockResponse(None, 404, "HTTPError")
+
+
+# Unit tests
+
+
+def test_logging_exception():
+    logging_dict = "SW1A 1AA"
+    with pytest.raises(ValueError) as exc_info:
+        result = setup_logging(logging_dict, "ROOT")
+    assert exc_info.typename == "ValueError"
+
+
+def test_setup_logging_valid_config():
+    # Example of a minimal valid logging configuration dictionary
+    logging_config = {
+        "version": 1,
+        "handlers": {
+            "console": {
+                "class": "logging.StreamHandler",
+                "level": "DEBUG",
+            },
+        },
+        "loggers": {
+            "ROOT": {
+                "handlers": ["console"],
+                "level": "DEBUG",
+            },
+        },
+    }
+    logger_name = "ROOT"
+    # Run the function with valid logging configuration
+    logger = setup_logging(logging_config, logger_name)
+
+    # Assert that logger is correctly configured
+    assert logger.name == logger_name
+    assert logger.level == logging.DEBUG
+
+
+@mock.patch("requests.get", side_effect=mocked_requests_get)
+def test_get_data(mock_get):
+    page_data = agbdc.get_data("aurl")
+    assert page_data.text == {"test_data": "test"}
+
+
+@pytest.mark.parametrize(
+    "url", ["HTTPError", "ConnectionError", "Timeout", "RequestException"]
+)
+@mock.patch("requests.get", side_effect=mocked_requests_get)
+def test_get_data_error(mock_get, url):
+    with pytest.raises(Exception) as exc_info:
+        result = agbdc.get_data(url)
+    assert exc_info.typename == url
+
+
+def test_output_json():
+    bin_data = {"bin": ""}
+    output = agbdc.output_json(bin_data)
+    assert type(output) == str
+    assert output == '{\n    "bin": ""\n}'
+
+class ConcreteGetBinDataClass(agbdc):
+    """Concrete implementation of the abstract class to test abstract methods."""
+    def parse_data(self, page: str, **kwargs) -> dict:
+        return {"mock_key": "mock_value"}
+
+    def update_dev_mode_data(self, council_module_str, this_url, **kwargs):
+        # You can implement the method or delegate it to the abstract class's method
+        super().update_dev_mode_data(council_module_str, this_url, **kwargs)
+
+@pytest.fixture
+def concrete_class_instance():
+    return ConcreteGetBinDataClass()
+
+def test_get_and_parse_data_no_skip_get_url(concrete_class_instance):
+    mock_page = "mocked page content"
+    mock_parsed_data = {"mock_key": "mock_value"}
+
+    with mock.patch.object(concrete_class_instance, 'get_data', return_value=mock_page) as mock_get_data, \
+         mock.patch.object(concrete_class_instance, 'parse_data', return_value=mock_parsed_data) as mock_parse_data:
+        
+        result = concrete_class_instance.get_and_parse_data("http://example.com")
+
+        mock_get_data.assert_called_once_with("http://example.com")
+        mock_parse_data.assert_called_once_with(mock_page, url="http://example.com")
+        assert result == mock_parsed_data
+
+def test_get_and_parse_data_skip_get_url(concrete_class_instance):
+    mock_parsed_data = {"mock_key": "mock_value"}
+
+    with mock.patch.object(concrete_class_instance, 'parse_data', return_value=mock_parsed_data) as mock_parse_data:
+        
+        result = concrete_class_instance.get_and_parse_data("http://example.com", skip_get_url=True)
+
+        mock_parse_data.assert_called_once_with("", url="http://example.com", skip_get_url=True)
+        assert result == mock_parsed_data
+        
+@pytest.fixture
+def setup_test_update_dev_mode_data():
+    """Fixture to set up and tear down the environment for test_update_dev_mode_data"""
+    # Create a temporary directory to simulate the working directory
+    test_dir = tempfile.TemporaryDirectory()
+
+    # Patch os.getcwd() to return the temporary directory
+    cwd_patch = patch('os.getcwd', return_value=test_dir.name)
+    mock_getcwd = cwd_patch.start()
+
+    # Ensure the nested directory structure exists
+    os.makedirs(os.path.join(test_dir.name, "uk_bin_collection", "tests"))
+
+    # Yield control back to the test, then clean up after the test
+    yield test_dir.name  # Provide the test with the temporary directory
+
+    # Teardown
+    test_dir.cleanup()
+    cwd_patch.stop()
+
+
+def test_update_dev_mode_data(setup_test_update_dev_mode_data):
+    """Test update_dev_mode_data method to ensure input.json is updated correctly"""
+    # The setup fixture returns the mocked current working directory
+    mock_cwd = setup_test_update_dev_mode_data
+
+    # Create an instance of the concrete class that inherits from AbstractGetBinDataClass
+    obj = ConcreteGetBinDataClass()
+
+    # Define input arguments for the method
+    council_module_str = 'test_council_module'
+    this_url = 'https://example.com'
+    kwargs = {
+        'postcode': '12345',
+        'paon': '1A',
+        'uprn': '100012345',
+        'usrn': '200012345',
+        'web_driver': 'mocked_web_driver',
+        'skip_get_url': True,
+    }
+
+    # Call the method being tested on the instance
+    obj.update_dev_mode_data(council_module_str, this_url, **kwargs)
+
+    # Verify that input.json was created in the correct location
+    input_file_path = os.path.join(mock_cwd, "uk_bin_collection", "tests", "input.json")
+    assert os.path.exists(input_file_path)
+
+    # Read the contents of the file and make necessary assertions
+    with open(input_file_path, 'r') as f:
+        file_content = f.read()
+
+    # Example assertion - check if certain values exist in the file content (based on your actual file format)
+    assert '100012345' in file_content  # Checking UPRN as an example

{uk_bin_collection-0.85.5.dist-info → uk_bin_collection-0.85.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.85.5
+Version: 0.85.7
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com

{uk_bin_collection-0.85.5.dist-info → uk_bin_collection-0.85.7.dist-info}/RECORD

@@ -2,13 +2,14 @@ uk_bin_collection/README.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-cutwz5RoYYWZRLYx2tr6zIs_9Rc,3843
 uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
 uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
-uk_bin_collection/tests/input.json,sha256=VahhxxLYSXAux-pD0P_orlSLSEPyQ-kpcenaeXls0Js,59700
+uk_bin_collection/tests/input.json,sha256=mhfscmGyBmckPef5PwBNFLus437GxD8E6WBlKxhzY5I,59728
 uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
 uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
 uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=LrOSt_loA1Mw3vTqaO2LpaDMu7rYJy6k5Kr-EOBln7s,3424
-uk_bin_collection/tests/test_collect_data.py,sha256=cZjz4XUe5zaWCDJK96p2p7EC9GWrmT15ooFFx6mlP1Q,4776
+uk_bin_collection/tests/test_collect_data.py,sha256=xit4lopMGXb5g2faCK9VrOjHl81QDV9sZAu7vBdr2Uw,2253
 uk_bin_collection/tests/test_common_functions.py,sha256=WRm7AYI9qaDqW0dNROTFh-KZRdNFhhYHvjrFZUN4IPs,14084
 uk_bin_collection/tests/test_conftest.py,sha256=GWqP6-fCv5A2VUYiyXqUO-Dm0hlUOwbFgfi6CkdGqvQ,1061
+uk_bin_collection/tests/test_get_data.py,sha256=tQGyuTR8pZvnwzVsDqFhUrFtBeMP11eRnWD4Xq-mF-U,7181
 uk_bin_collection/uk_bin_collection/collect_data.py,sha256=dB7wWXsJX4fm5bIf84lexkvHIcO54CZ3JPxqmS-60YY,4654
 uk_bin_collection/uk_bin_collection/common.py,sha256=oZQW8CYRGfbhNSyq7t7jEhrFl1tjb4H157xSx8QHWSY,10106
 uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py,sha256=ppbrmm-MzB1wOulK--CU_0j4P-djNf3ozMhHnmQFqLo,1511
@@ -185,8 +186,8 @@ uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bId
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=4s9ODGPAwPqwXc8SrTX5Wlfmizs3_58iXUtHc4Ir86o,1162
 uk_bin_collection/uk_bin_collection/create_new_council.py,sha256=m-IhmWmeWQlFsTZC4OxuFvtw5ZtB8EAJHxJTH4O59lQ,1536
 uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=YvmHfZqanwrJ8ToGch34x-L-7yPe31nB_x77_Mgl_vo,4545
-uk_bin_collection-0.85.5.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.85.5.dist-info/METADATA,sha256=G7stCdHgn58f50RCOAtx0YIs9vFto9YHNZR1nLQXUQY,16231
-uk_bin_collection-0.85.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uk_bin_collection-0.85.5.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.85.5.dist-info/RECORD,,
+uk_bin_collection-0.85.7.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.85.7.dist-info/METADATA,sha256=QaL1Kok_IeZ67sAPpPQQBarqR_SHff1CY-3HPMTuoIM,16231
+uk_bin_collection-0.85.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uk_bin_collection-0.85.7.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.85.7.dist-info/RECORD,,