Fix mocking to match the new package structure.

Author: Michael Smit

tests/country/test_uk.py

@@ -9,7 +9,7 @@ def test_uk_macro_single():
         country="uk",
     )
 
-    #sim.calculate_single_economy()
+    # sim.calculate_single_economy()
 
 
 def test_uk_macro_comparison():
@@ -23,7 +23,7 @@ def test_uk_macro_comparison():
         },
     )
 
-    #sim.calculate_economy_comparison()
+    # sim.calculate_economy_comparison()
 
 
 def test_uk_macro_bad_package_versions_fail():

tests/fixtures/simulation.py

@@ -45,7 +45,7 @@
 @pytest.fixture
 def mock_get_default_dataset():
     with patch(
-        "policyengine.simulation.get_default_dataset",
+        "policyengine.simulation.simulation.get_default_dataset",
         return_value=SAMPLE_DATASET_FILE_ADDRESS,
     ) as mock_get_default_dataset:
         yield mock_get_default_dataset
@@ -54,7 +54,7 @@ def mock_get_default_dataset():
 @pytest.fixture
 def mock_dataset():
     """Simple Dataset mock fixture"""
-    with patch("policyengine.simulation.Dataset") as mock_dataset_class:
+    with patch("policyengine.simulation.simulation.Dataset") as mock_dataset_class:
         mock_instance = Mock()
         # Set file_path to mimic Dataset's behavior of clipping URI and bucket name from GCS paths
         mock_instance.from_file = Mock()