squash! package.UserDefinedMapping: Include source of mapping in Package objects

Expand the UserDefinedMapping unit tests in test_packages to also test
the keys/descriptions in Package.mappings, not only the .import_names
member.

Author: jherland

tests/test_packages.py

@@ -161,7 +161,21 @@ def test_package__both_mappings():
             """
             ],
             None,
-            {"apache_airflow": ["airflow"], "attrs": ["attr", "attrs"]},
+            {
+                "apache_airflow": Package(
+                    "apache_airflow",
+                    {"User-defined mapping from {tmp_path}/mapping0.toml": {"airflow"}},
+                ),
+                "attrs": Package(
+                    "attrs",
+                    {
+                        "User-defined mapping from {tmp_path}/mapping0.toml": {
+                            "attr",
+                            "attrs",
+                        }
+                    },
+                ),
+            },
             id="well_formated_input_file__parses_correctly",
         ),
         pytest.param(
@@ -177,9 +191,28 @@ def test_package__both_mappings():
             ],
             None,
             {
-                "apache_airflow": ["airflow", "baz"],
-                "attrs": ["attr", "attrs"],
-                "foo": ["bar"],
+                "apache_airflow": Package(
+                    "apache_airflow",
+                    {
+                        "User-defined mapping from {tmp_path}/mapping0.toml": {
+                            "airflow"
+                        },
+                        "User-defined mapping from {tmp_path}/mapping1.toml": {"baz"},
+                    },
+                ),
+                "attrs": Package(
+                    "attrs",
+                    {
+                        "User-defined mapping from {tmp_path}/mapping0.toml": {
+                            "attr",
+                            "attrs",
+                        }
+                    },
+                ),
+                "foo": Package(
+                    "foo",
+                    {"User-defined mapping from {tmp_path}/mapping1.toml": {"bar"}},
+                ),
             },
             id="well_formated_input_2files__parses_correctly",
         ),
@@ -196,9 +229,29 @@ def test_package__both_mappings():
             ],
             {"apache-airflow": ["unicorn"]},
             {
-                "apache_airflow": ["airflow", "baz", "unicorn"],
-                "attrs": ["attr", "attrs"],
-                "foo": ["bar"],
+                "apache_airflow": Package(
+                    "apache_airflow",
+                    {
+                        "User-defined mapping from {tmp_path}/mapping0.toml": {
+                            "airflow"
+                        },
+                        "User-defined mapping from {tmp_path}/mapping1.toml": {"baz"},
+                        "User-defined mapping from settings": {"unicorn"},
+                    },
+                ),
+                "attrs": Package(
+                    "attrs",
+                    {
+                        "User-defined mapping from {tmp_path}/mapping0.toml": {
+                            "attr",
+                            "attrs",
+                        }
+                    },
+                ),
+                "foo": Package(
+                    "foo",
+                    {"User-defined mapping from {tmp_path}/mapping1.toml": {"bar"}},
+                ),
             },
             id="well_formated_input_2files_and_config__parses_correctly",
         ),
@@ -219,8 +272,8 @@ def test_user_defined_mapping__well_formated_input_file__parses_correctly(
     udm = UserDefinedMapping(
         mapping_paths=custom_mapping_files, custom_mapping=custom_mapping
     )
-    mapped_packages = {k: sorted(list(v.import_names)) for k, v in udm.packages.items()}
-    assert mapped_packages == expect
+    expect = expand_package_mappings_placeholders(expect, tmp_path=tmp_path)
+    assert udm.packages == expect
 
 
 def test_user_defined_mapping__input_is_no_file__raises_unparsable_path_exeption():