simplify tests

Author: yucongalicechen

src/diffpy/labpdfproc/tests/conftest.py

@@ -11,8 +11,6 @@ def user_filesystem(tmp_path):
     input_dir.mkdir(parents=True, exist_ok=True)
     home_dir = base_dir / "home_dir"
     home_dir.mkdir(parents=True, exist_ok=True)
-    cwd_dir = base_dir / "cwd_dir"
-    cwd_dir.mkdir(parents=True, exist_ok=True)
 
     chi_data = "dataformat = twotheta\n mode = xray\n # chi_Q chi_I\n 1 2\n 3 4\n 5 6\n 7 8\n"
     xy_data = "1 2\n 3 4\n 5 6\n 7 8"

src/diffpy/labpdfproc/tests/test_tools.py

@@ -1,4 +1,3 @@
-import json
 import os
 import re
 from pathlib import Path
@@ -245,117 +244,24 @@ def test_load_user_metadata_bad(inputs, msg):
         actual_args = load_user_metadata(actual_args)
 
 
-def _setup_dirs(monkeypatch, user_filesystem):
+params_user_info = [
+    ([None, None], ["home_username", "[email protected]"]),
+    (["cli_username", None], ["cli_username", "[email protected]"]),
+    ([None, "[email protected]"], ["home_username", "[email protected]"]),
+    (["cli_username", "[email protected]"], ["cli_username", "[email protected]"]),
+]
+
+
+@pytest.mark.parametrize("inputs, expected", params_user_info)
+def test_load_user_info(monkeypatch, inputs, expected, user_filesystem):
     cwd = Path(user_filesystem)
     home_dir = cwd / "home_dir"
     monkeypatch.setattr("pathlib.Path.home", lambda _: home_dir)
     os.chdir(cwd)
-    return home_dir
 
-
-def _run_tests(inputs, expected):
     expected_username, expected_email = expected
     cli_inputs = ["2.5", "data.xy", "--username", inputs[0], "--email", inputs[1]]
     actual_args = get_args(cli_inputs)
     actual_args = load_user_info(actual_args)
     assert actual_args.username == expected_username
     assert actual_args.email == expected_email
-
-
-params_user_info_with_home_conf_file = [
-    (["", ""], ["home_username", "[email protected]"]),
-    (["cli_username", ""], ["cli_username", "[email protected]"]),
-    (["", "[email protected]"], ["home_username", "[email protected]"]),
-    ([None, None], ["home_username", "[email protected]"]),
-    (["cli_username", None], ["cli_username", "[email protected]"]),
-    ([None, "[email protected]"], ["home_username", "[email protected]"]),
-    (["cli_username", "[email protected]"], ["cli_username", "[email protected]"]),
-]
-params_user_info_with_local_conf_file = [
-    (["", ""], ["cwd_username", "[email protected]"]),
-    (["cli_username", ""], ["cli_username", "[email protected]"]),
-    (["", "[email protected]"], ["cwd_username", "[email protected]"]),
-    ([None, None], ["cwd_username", "[email protected]"]),
-    (["cli_username", None], ["cli_username", "[email protected]"]),
-    ([None, "[email protected]"], ["cwd_username", "[email protected]"]),
-    (["cli_username", "[email protected]"], ["cli_username", "[email protected]"]),
-]
-params_user_info_with_no_home_conf_file = [
-    (
-        [None, None],
-        ["input_username", "[email protected]"],
-        ["input_username", "[email protected]"],
-    ),
-    (
-        ["cli_username", None],
-        ["", "[email protected]"],
-        ["cli_username", "[email protected]"],
-    ),
-    (
-        [None, "[email protected]"],
-        ["input_username", ""],
-        ["input_username", "[email protected]"],
-    ),
-    (
-        ["", ""],
-        ["input_username", "[email protected]"],
-        ["input_username", "[email protected]"],
-    ),
-    (
-        ["cli_username", ""],
-        ["", "[email protected]"],
-        ["cli_username", "[email protected]"],
-    ),
-    (
-        ["", "[email protected]"],
-        ["input_username", ""],
-        ["input_username", "[email protected]"],
-    ),
-    (
-        ["cli_username", "[email protected]"],
-        ["input_username", "[email protected]"],
-        ["cli_username", "[email protected]"],
-    ),
-]
-params_user_info_no_conf_file_no_inputs = [
-    ([None, None], ["", ""], ["", ""]),
-]
-
-
-@pytest.mark.parametrize("inputs, expected", params_user_info_with_home_conf_file)
-def test_load_user_info_with_home_conf_file(monkeypatch, inputs, expected, user_filesystem):
-    _setup_dirs(monkeypatch, user_filesystem)
-    _run_tests(inputs, expected)
-
-
-@pytest.mark.parametrize("inputs, expected", params_user_info_with_local_conf_file)
-def test_load_user_info_with_local_conf_file(monkeypatch, inputs, expected, user_filesystem):
-    _setup_dirs(monkeypatch, user_filesystem)
-    local_config_data = {"username": "cwd_username", "email": "[email protected]"}
-    with open(Path(user_filesystem) / "diffpyconfig.json", "w") as f:
-        json.dump(local_config_data, f)
-    _run_tests(inputs, expected)
-    os.remove(Path().home() / "diffpyconfig.json")
-    _run_tests(inputs, expected)
-
-
-@pytest.mark.parametrize("inputsa, inputsb, expected", params_user_info_with_no_home_conf_file)
-def test_load_user_info_with_no_home_conf_file(monkeypatch, inputsa, inputsb, expected, user_filesystem):
-    _setup_dirs(monkeypatch, user_filesystem)
-    os.remove(Path().home() / "diffpyconfig.json")
-    inp_iter = iter(inputsb)
-    monkeypatch.setattr("builtins.input", lambda _: next(inp_iter))
-    _run_tests(inputsa, expected)
-    confile = Path().home() / "diffpyconfig.json"
-    assert confile.is_file()
-
-
-@pytest.mark.parametrize("inputsa, inputsb, expected", params_user_info_no_conf_file_no_inputs)
-def test_load_user_info_no_conf_file_no_inputs(monkeypatch, inputsa, inputsb, expected, user_filesystem):
-    _setup_dirs(monkeypatch, user_filesystem)
-    os.remove(Path().home() / "diffpyconfig.json")
-    inp_iter = iter(inputsb)
-    monkeypatch.setattr("builtins.input", lambda _: next(inp_iter))
-    _run_tests(inputsa, expected)
-    confile = Path().home() / "diffpyconfig.json"
-    assert confile.exists() is False