diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2020-02-09 20:47:13 -0600 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2020-02-09 20:47:13 -0600 |
| commit | 74048486b37cda4dc9a252ed1415b6e136f65186 (patch) | |
| tree | 705815f5dbb7f89cb1435e748b6407beac299dcc /tests | |
| parent | Merge branch 'master' of github.com:eugenetriguba/config_file (diff) | |
| download | config-file-74048486b37cda4dc9a252ed1415b6e136f65186.zip | |
Add default + return_type param to get(), turn off automatic parsing
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_base_parser.py | 4 | ||||
| -rw-r--r-- | tests/test_config_file.py | 33 | ||||
| -rw-r--r-- | tests/test_ini_parser.py | 2 | ||||
| -rw-r--r-- | tests/test_json_parser.py | 2 |
4 files changed, 33 insertions, 8 deletions
diff --git a/tests/test_base_parser.py b/tests/test_base_parser.py index 64be16e..1127a61 100644 --- a/tests/test_base_parser.py +++ b/tests/test_base_parser.py @@ -7,8 +7,8 @@ class ConcreteParser(BaseParser): def __init__(self, file_contents): super().__init__(file_contents) - def get(self, key, parse_type=True): - super().get(key, parse_type=parse_type) + def get(self, key, parse_types=True): + super().get(key, parse_types=parse_types) def set(self, key, value): super().set(key, value) diff --git a/tests/test_config_file.py b/tests/test_config_file.py index 24b948b..f083538 100644 --- a/tests/test_config_file.py +++ b/tests/test_config_file.py @@ -76,12 +76,13 @@ def test_that_config_file_can_save(tmpdir, file_contents, file_name): @pytest.mark.parametrize( - "section_key, value, parse_type, default, file_name, file_contents", + "section_key, value, parse_type, return_type, default, file_name, file_contents", [ ( "calendar.sunday_index", 0, True, + None, False, "config.ini", "[calendar]\nsunday_index = 0\n\n", @@ -90,6 +91,7 @@ def test_that_config_file_can_save(tmpdir, file_contents, file_name): "calendar.sunday_index", "0", False, + None, False, "config.ini", "[calendar]\nsunday_index = 0\n\n", @@ -98,6 +100,7 @@ def test_that_config_file_can_save(tmpdir, file_contents, file_name): "calendar.sunday_index", 0, False, + None, False, "config.json", json.dumps({"calendar": {"sunday_index": 0}}), @@ -106,19 +109,41 @@ def test_that_config_file_can_save(tmpdir, file_contents, file_name): "calendar.missing", "my default value", False, + None, "my default value", "config.json", json.dumps({"calendar": 5}), ), + ( + "calendar.sunday_index", + 0, + False, + int, + False, + "config.ini", + "[calendar]\nsunday_index = 0\n\n", + ), ], ) def test_that_config_file_can_get( - tmpdir, section_key, value, parse_type, file_name, file_contents, default + tmpdir, + section_key, + value, + return_type, + parse_type, + file_name, + file_contents, + default, ): config_path = tmpdir / file_name config_path.write_text(file_contents, encoding="utf-8") config = ConfigFile(str(config_path)) - assert config.get(section_key, parse_type=parse_type, default=default) == value + + ret_val = config.get(section_key, parse_types=parse_type, default=default) + if return_type is not None: + assert return_type(ret_val) == value + else: + assert ret_val == value @pytest.mark.parametrize( @@ -183,7 +208,7 @@ def test_that_custom_parser_can_be_used(tmpdir): def __init__(self, file_contents): super().__init__(file_contents) - def get(self, key, parse_type=True): + def get(self, key, parse_types=True): return key def set(self, key, value): diff --git a/tests/test_ini_parser.py b/tests/test_ini_parser.py index 7af3ea4..7cdeea8 100644 --- a/tests/test_ini_parser.py +++ b/tests/test_ini_parser.py @@ -41,7 +41,7 @@ floatkey = 5.3 """ parser = IniParser(ini_file) - assert parser.get(section_key, parse_type=parse_type) == expected_value + assert parser.get(section_key, parse_types=parse_type) == expected_value @pytest.mark.parametrize( diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py index fd715a8..0e91395 100644 --- a/tests/test_json_parser.py +++ b/tests/test_json_parser.py @@ -121,7 +121,7 @@ def test_that_json_parser_can_get_keys( test_json, section_key, parse_type, expected_result ): parser = JsonParser(json.dumps(test_json)) - assert parser.get(section_key, parse_type=parse_type) == expected_result + assert parser.get(section_key, parse_types=parse_type) == expected_result @pytest.mark.parametrize( |