From aa44fe7a60a4f3326cc47877b3e246b56d46d6ac Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 20 Jun 2020 13:41:35 -0500 Subject: Add python 3.5 support, ConfigFileError, and more type hints Also, get_all, set_all, and delete_all in JsonParser have been renamed to just all. --- tests/test_json_parser.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'tests/test_json_parser.py') diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py index a5e38a1..9a8ac09 100644 --- a/tests/test_json_parser.py +++ b/tests/test_json_parser.py @@ -2,7 +2,8 @@ import json import pytest -from config_file.parsers.json_parser import JsonParser, ParsingError +from config_file.parsers.json_parser import JsonParser +from config_file.exceptions import ParsingError @pytest.mark.parametrize("test_json", ["{'test': }", "[section]\nblah = value\n\n"]) @@ -162,7 +163,7 @@ def test_that_json_parser_can_delete_keys(key, test_json, expected_json): ) def test_that_json_parser_can_retrieve_all_keys(test_json, key, expected_output): parser = JsonParser(json.dumps(test_json)) - assert parser.get(key, get_all=True) == expected_output + assert parser.get(key, all=True) == expected_output @pytest.mark.parametrize( @@ -178,8 +179,8 @@ def test_that_json_parser_can_retrieve_all_keys(test_json, key, expected_output) ) def test_that_json_parser_can_set_all_keys(test_json, key, value, expected_output): parser = JsonParser(json.dumps(test_json)) - parser.set(key, value, set_all=True) - assert parser.get(key, get_all=True) == expected_output + parser.set(key, value, all=True) + assert parser.get(key, all=True) == expected_output @pytest.mark.parametrize( @@ -194,5 +195,5 @@ def test_that_json_parser_can_set_all_keys(test_json, key, value, expected_outpu ) def test_that_json_parser_can_delete_all_keys(test_json, key, expected_output): parser = JsonParser(json.dumps(test_json)) - parser.delete(key, delete_all=True) + parser.delete(key, all=True) assert parser.stringify() == json.dumps(expected_output) -- cgit v1.2.3 From b3fb6aae1201faca1238b3c79e5e95ba57282bf1 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 20 Jun 2020 15:35:05 -0500 Subject: Add more type hints to ConfigFile and lint all files --- tests/test_json_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/test_json_parser.py') diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py index 9a8ac09..42a0ba9 100644 --- a/tests/test_json_parser.py +++ b/tests/test_json_parser.py @@ -2,8 +2,8 @@ import json import pytest -from config_file.parsers.json_parser import JsonParser from config_file.exceptions import ParsingError +from config_file.parsers.json_parser import JsonParser @pytest.mark.parametrize("test_json", ["{'test': }", "[section]\nblah = value\n\n"]) -- cgit v1.2.3 From 2c293cc0ac6678253c6af8101ba93866785f64c0 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 21 Jun 2020 11:12:26 -0500 Subject: WIP for refactoring tests --- tests/test_json_parser.py | 201 ++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 116 deletions(-) (limited to 'tests/test_json_parser.py') diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py index 42a0ba9..18a2b6f 100644 --- a/tests/test_json_parser.py +++ b/tests/test_json_parser.py @@ -6,155 +6,124 @@ from config_file.exceptions import ParsingError from config_file.parsers.json_parser import JsonParser -@pytest.mark.parametrize("test_json", ["{'test': }", "[section]\nblah = value\n\n"]) -def test_invalid_json(test_json): +def test_invalid_json(templated_parser): with pytest.raises(ParsingError): - JsonParser(test_json) + templated_parser("json", "invalid") -def test_that_json_parser_can_stringify(): - json_str = '{"test": 5, "blah": true}' - parser = JsonParser(json_str) - assert parser.stringify() == json_str +def test_that_json_parser_can_stringify(template_and_parser): + template, parser = template_and_parser("json") + assert parser.stringify() == template.read_text() @pytest.mark.parametrize( - "test_input,expected_result", + "key", [ - ("glossary", True), - ("title", True), - ("example glossary", False), - ("GlossDiv", True), - ("title", True), - ("5", False), - ("GlossList", True), - ("GlossEntry", True), - ("ID", True), - ("false", False), - ("GlossTerm", True), - ("Standard Generalized Markup Language", False), - ("Acronym", True), - ("ISO 8879:1986", False), - ("GlossDef", True), - ("para", True), - ( - "A meta-markup language, used to create markup languages " - "such as DocBook.", - False, - ), - ("GlossSeeAlso", True), - ("GML", False), - ("XML", False), - ("GlossSee", True), - ("5.5", False), + "glossary", + "title", + "GlossDiv", + "title", + "GlossList", + "GlossEntry", + "ID", + "GlossTerm", + "Acronym", + "GlossDef", + "para", + "GlossSeeAlso", + "GlossSee", ], ) -def test_that_json_parser_can_find_keys(test_input, expected_result): - test_json = { - "glossary": { - "title": "example glossary", - "GlossDiv": { - "title": "5", - "GlossList": { - "GlossEntry": { - "ID": "false", - "SortAs": "SGML", - "GlossTerm": "Standard Generalized Markup Language", - "Acronym": "SGML", - "Abbrev": "ISO 8879:1986", - "GlossDef": { - "para": "A meta-markup language, used to create markup " - + "languages such as DocBook.", - "GlossSeeAlso": ["GML", "XML"], - }, - "GlossSee": "5.5", - } - }, - }, - } - } +def test_that_json_parser_can_find_keys(key, templated_parser): + parser = templated_parser("json", "glossary") + assert parser.has(key) - parser = JsonParser(json.dumps(test_json)) - assert parser.has(test_input) == expected_result + +@pytest.mark.parametrize( + "value", + [ + "str_value", + "5", + "false", + "Standard Generalized Markup Language", + "ISO 8879:1986", + "A meta-markup language, used to create markup languages such as DocBook.", + "GML", + "XML", + "5.5", + ], +) +def test_that_json_parser_does_not_find_value_with_has(value, templated_parser): + parser = templated_parser("json", "glossary") + assert not parser.has(value) @pytest.mark.parametrize( - "test_json, section_key, parse_type, expected_result", + "key, value", [ + ("glossary.title", "str_value"), + ("glossary.dict", {"key": "str_value", "str_number": "5"}), + ], +) +def test_that_json_parser_can_get_keys_without_parsing_types( + templated_parser, key, value +): + parser = templated_parser("json", "glossary") + assert parser.get(key) == value + + +@pytest.mark.parametrize( + "key, value", + [ + ("glossary.title", "str_value"), + ("glossary.dict.str_number", 5), ( - {"glossary": {"title": "example glossary"}}, - "glossary.title", - False, - "example glossary", - ), - ( - {"glossary": {"title": "example glossary"}}, - "glossary.title", - True, - "example glossary", - ), - ( - {"glossary": {"title": "example glossary", "dict": {"blah": "5"}}}, - "glossary.dict", - False, - {"blah": "5"}, - ), - ( - {"glossary": {"title": "example glossary", "dict": {"blah": "5"}}}, - "glossary.dict", - True, - {"blah": 5}, - ), - ( + "glossary.dict_within_dict", { - "glossary": { - "title": "example glossary", - "dict": {"blah": "5", "second": {"third": "5"}}, - } + "str_number": 16, + "another_dict": {"str_bool": False, "list_of_values": [5, False, True]}, }, - "glossary.dict", - True, - {"blah": 5, "second": {"third": 5}}, ), ], ) -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_types=parse_type) == expected_result +def test_that_json_parser_can_get_keys_with_parsing_types(templated_parser, key, value): + parser = templated_parser("json", "glossary") + assert parser.get(key, parse_types=True) == value @pytest.mark.parametrize( "key, value", [("zip", "zipzip"), ("foo.bar.foobar", 5), ("foo.baz", "bar")] ) -def test_that_json_parser_can_set_keys(key, value): - test_json = { - "foo": { - "baz": 5, - "boo": "4.4", - "bar": {"test_key": "foobar", "foobar": {"test": True}}, - }, - "bar": {"baz": 10}, - "zip": "piz", - } +def test_that_json_parser_can_set_keys(templated_parser, key, value): + parser = templated_parser("json") + + # test_json = { + # "foo": { + # "baz": 5, + # "boo": "4.4", + # "bar": {"test_key": "foobar", "foobar": {"test": True}}, + # }, + # "bar": {"baz": 10}, + # "zip": "piz", + # } + # parser = JsonParser(json.dumps(test_json)) - parser = JsonParser(json.dumps(test_json)) parser.set(key, value) assert parser.get(key) == value @pytest.mark.parametrize( - "key, test_json, expected_json", - [ - ("foo", {"foo": "bar", "baz": 5}, {"baz": 5}), - ("foo.bar", {"foo": {"bar": 5}}, {"foo": {}}), - ], + "key", + ["glossary", "dict_within_dict", "glossary.GlossDiv.GlossList.GlossEntry.Abbrev"], ) -def test_that_json_parser_can_delete_keys(key, test_json, expected_json): - parser = JsonParser(json.dumps(test_json)) +def test_that_json_parser_can_delete_keys( + template_and_parser, key, test_json, expected_json +): + template, parser = template_and_parser("json", "glossary") + parser.delete(key) - assert parser.stringify() == json.dumps(expected_json) + + assert parser.stringify() == template.read_text(encoding="utf-8") @pytest.mark.parametrize( -- cgit v1.2.3 From 2d6b50509cc29516f9ef379619d9a3ac15c5c629 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 11 Jul 2020 14:56:53 -0500 Subject: Fix imports in tests/ --- tests/test_json_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/test_json_parser.py') diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py index 18a2b6f..b622f01 100644 --- a/tests/test_json_parser.py +++ b/tests/test_json_parser.py @@ -3,7 +3,7 @@ import json import pytest from config_file.exceptions import ParsingError -from config_file.parsers.json_parser import JsonParser +from config_file.parsers import JsonParser def test_invalid_json(templated_parser): -- cgit v1.2.3 From 3fa782f5b5e3bd4445a5db63c0fce5aaac2d4ac3 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Mon, 20 Jul 2020 22:55:40 -0500 Subject: Add work in progress tests --- tests/test_json_parser.py | 68 +---------------------------------------------- 1 file changed, 1 insertion(+), 67 deletions(-) (limited to 'tests/test_json_parser.py') diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py index b622f01..aa29ec6 100644 --- a/tests/test_json_parser.py +++ b/tests/test_json_parser.py @@ -1,9 +1,6 @@ -import json - import pytest from config_file.exceptions import ParsingError -from config_file.parsers import JsonParser def test_invalid_json(templated_parser): @@ -72,25 +69,6 @@ def test_that_json_parser_can_get_keys_without_parsing_types( assert parser.get(key) == value -@pytest.mark.parametrize( - "key, value", - [ - ("glossary.title", "str_value"), - ("glossary.dict.str_number", 5), - ( - "glossary.dict_within_dict", - { - "str_number": 16, - "another_dict": {"str_bool": False, "list_of_values": [5, False, True]}, - }, - ), - ], -) -def test_that_json_parser_can_get_keys_with_parsing_types(templated_parser, key, value): - parser = templated_parser("json", "glossary") - assert parser.get(key, parse_types=True) == value - - @pytest.mark.parametrize( "key, value", [("zip", "zipzip"), ("foo.bar.foobar", 5), ("foo.baz", "bar")] ) @@ -116,53 +94,9 @@ def test_that_json_parser_can_set_keys(templated_parser, key, value): "key", ["glossary", "dict_within_dict", "glossary.GlossDiv.GlossList.GlossEntry.Abbrev"], ) -def test_that_json_parser_can_delete_keys( - template_and_parser, key, test_json, expected_json -): +def test_that_json_parser_can_delete_keys(template_and_parser, key): template, parser = template_and_parser("json", "glossary") parser.delete(key) assert parser.stringify() == template.read_text(encoding="utf-8") - - -@pytest.mark.parametrize( - "test_json, key, expected_output", - [({"foo": {"bar": 5, "baz": {"bar": 10, "bam": {"bar": 15}}}}, "bar", [5, 10, 15])], -) -def test_that_json_parser_can_retrieve_all_keys(test_json, key, expected_output): - parser = JsonParser(json.dumps(test_json)) - assert parser.get(key, all=True) == expected_output - - -@pytest.mark.parametrize( - "test_json, key, value, expected_output", - [ - ( - {"foo": {"bar": 5, "baz": {"bar": 10, "bam": {"bar": 15}}}}, - "bar", - "new_value", - ["new_value", "new_value", "new_value"], - ) - ], -) -def test_that_json_parser_can_set_all_keys(test_json, key, value, expected_output): - parser = JsonParser(json.dumps(test_json)) - parser.set(key, value, all=True) - assert parser.get(key, all=True) == expected_output - - -@pytest.mark.parametrize( - "test_json, key, expected_output", - [ - ( - {"foo": {"bar": 5, "baz": {"bar": 10, "bam": {"bar": 15}}}}, - "bar", - {"foo": {"baz": {"bam": {}}}}, - ) - ], -) -def test_that_json_parser_can_delete_all_keys(test_json, key, expected_output): - parser = JsonParser(json.dumps(test_json)) - parser.delete(key, all=True) - assert parser.stringify() == json.dumps(expected_output) -- cgit v1.2.3 From df90fd036d004c79f340e4c1d01b2171add80047 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Wed, 29 Jul 2020 21:27:18 -0500 Subject: Fix tests for recent changes --- tests/test_json_parser.py | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'tests/test_json_parser.py') diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py index aa29ec6..514a640 100644 --- a/tests/test_json_parser.py +++ b/tests/test_json_parser.py @@ -1,6 +1,9 @@ +import json + import pytest from config_file.exceptions import ParsingError +from config_file.parsers.json_parser import JsonParser def test_invalid_json(templated_parser): @@ -10,6 +13,7 @@ def test_invalid_json(templated_parser): def test_that_json_parser_can_stringify(template_and_parser): template, parser = template_and_parser("json") + assert parser.stringify() == template.read_text() @@ -31,7 +35,20 @@ def test_that_json_parser_can_stringify(template_and_parser): "GlossSee", ], ) -def test_that_json_parser_can_find_keys(key, templated_parser): +def test_that_json_parser_can_find_wild_keys(key, templated_parser): + parser = templated_parser("json", "glossary") + assert parser.has(key, wild=True) + + +@pytest.mark.parametrize( + "key", + [ + "glossary", + "glossary.title", + "glossary.GlossDiv.GlossList.GlossEntry.GlossDef.para" + ] +) +def test_that_json_parser_can_find_dot_keys(key, templated_parser): parser = templated_parser("json", "glossary") assert parser.has(key) @@ -50,7 +67,7 @@ def test_that_json_parser_can_find_keys(key, templated_parser): "5.5", ], ) -def test_that_json_parser_does_not_find_value_with_has(value, templated_parser): +def test_that_json_parser_does_not_find_values(value, templated_parser): parser = templated_parser("json", "glossary") assert not parser.has(value) @@ -75,28 +92,17 @@ def test_that_json_parser_can_get_keys_without_parsing_types( def test_that_json_parser_can_set_keys(templated_parser, key, value): parser = templated_parser("json") - # test_json = { - # "foo": { - # "baz": 5, - # "boo": "4.4", - # "bar": {"test_key": "foobar", "foobar": {"test": True}}, - # }, - # "bar": {"baz": 10}, - # "zip": "piz", - # } - # parser = JsonParser(json.dumps(test_json)) - parser.set(key, value) assert parser.get(key) == value @pytest.mark.parametrize( "key", - ["glossary", "dict_within_dict", "glossary.GlossDiv.GlossList.GlossEntry.Abbrev"], + ["glossary", "glossary.dict_within_dict", "glossary.GlossDiv.GlossList.GlossEntry.Abbrev"], ) def test_that_json_parser_can_delete_keys(template_and_parser, key): template, parser = template_and_parser("json", "glossary") parser.delete(key) - assert parser.stringify() == template.read_text(encoding="utf-8") + assert parser.has(key) is False -- cgit v1.2.3 From b1c23487c33fc2ad5503b6340b17980a326918c8 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 1 Aug 2020 11:53:56 -0500 Subject: Lint files --- tests/test_json_parser.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'tests/test_json_parser.py') diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py index 514a640..f8200b0 100644 --- a/tests/test_json_parser.py +++ b/tests/test_json_parser.py @@ -1,9 +1,6 @@ -import json - import pytest from config_file.exceptions import ParsingError -from config_file.parsers.json_parser import JsonParser def test_invalid_json(templated_parser): @@ -45,8 +42,8 @@ def test_that_json_parser_can_find_wild_keys(key, templated_parser): [ "glossary", "glossary.title", - "glossary.GlossDiv.GlossList.GlossEntry.GlossDef.para" - ] + "glossary.GlossDiv.GlossList.GlossEntry.GlossDef.para", + ], ) def test_that_json_parser_can_find_dot_keys(key, templated_parser): parser = templated_parser("json", "glossary") @@ -98,7 +95,11 @@ def test_that_json_parser_can_set_keys(templated_parser, key, value): @pytest.mark.parametrize( "key", - ["glossary", "glossary.dict_within_dict", "glossary.GlossDiv.GlossList.GlossEntry.Abbrev"], + [ + "glossary", + "glossary.dict_within_dict", + "glossary.GlossDiv.GlossList.GlossEntry.Abbrev", + ], ) def test_that_json_parser_can_delete_keys(template_and_parser, key): template, parser = template_and_parser("json", "glossary") -- cgit v1.2.3 From 59eeb1321fbad41dce7c971778e37ac1943fda3b Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Wed, 5 Aug 2020 20:39:28 -0500 Subject: Redo package to have a flat package structure By having a flat package structure like this, it'll avoid exposing packages and things we don't want to be exposed. --- tests/test_json_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/test_json_parser.py') diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py index f8200b0..54ea646 100644 --- a/tests/test_json_parser.py +++ b/tests/test_json_parser.py @@ -84,7 +84,7 @@ def test_that_json_parser_can_get_keys_without_parsing_types( @pytest.mark.parametrize( - "key, value", [("zip", "zipzip"), ("foo.bar.foobar", 5), ("foo.baz", "bar")] + "key, value", [("zip", "zipzip"), ("foo.bar.foobar", "5"), ("foo.baz", "bar")] ) def test_that_json_parser_can_set_keys(templated_parser, key, value): parser = templated_parser("json") -- cgit v1.2.3 From 286cec0d1c05b6b85f49714ec4635d2e8dcacfc7 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Thu, 6 Aug 2020 19:03:53 -0500 Subject: Remove ini and json parser tests They heavily overlap with the config_file test case now and are unnecessary. --- tests/test_json_parser.py | 109 ---------------------------------------------- 1 file changed, 109 deletions(-) delete mode 100644 tests/test_json_parser.py (limited to 'tests/test_json_parser.py') diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py deleted file mode 100644 index 54ea646..0000000 --- a/tests/test_json_parser.py +++ /dev/null @@ -1,109 +0,0 @@ -import pytest - -from config_file.exceptions import ParsingError - - -def test_invalid_json(templated_parser): - with pytest.raises(ParsingError): - templated_parser("json", "invalid") - - -def test_that_json_parser_can_stringify(template_and_parser): - template, parser = template_and_parser("json") - - assert parser.stringify() == template.read_text() - - -@pytest.mark.parametrize( - "key", - [ - "glossary", - "title", - "GlossDiv", - "title", - "GlossList", - "GlossEntry", - "ID", - "GlossTerm", - "Acronym", - "GlossDef", - "para", - "GlossSeeAlso", - "GlossSee", - ], -) -def test_that_json_parser_can_find_wild_keys(key, templated_parser): - parser = templated_parser("json", "glossary") - assert parser.has(key, wild=True) - - -@pytest.mark.parametrize( - "key", - [ - "glossary", - "glossary.title", - "glossary.GlossDiv.GlossList.GlossEntry.GlossDef.para", - ], -) -def test_that_json_parser_can_find_dot_keys(key, templated_parser): - parser = templated_parser("json", "glossary") - assert parser.has(key) - - -@pytest.mark.parametrize( - "value", - [ - "str_value", - "5", - "false", - "Standard Generalized Markup Language", - "ISO 8879:1986", - "A meta-markup language, used to create markup languages such as DocBook.", - "GML", - "XML", - "5.5", - ], -) -def test_that_json_parser_does_not_find_values(value, templated_parser): - parser = templated_parser("json", "glossary") - assert not parser.has(value) - - -@pytest.mark.parametrize( - "key, value", - [ - ("glossary.title", "str_value"), - ("glossary.dict", {"key": "str_value", "str_number": "5"}), - ], -) -def test_that_json_parser_can_get_keys_without_parsing_types( - templated_parser, key, value -): - parser = templated_parser("json", "glossary") - assert parser.get(key) == value - - -@pytest.mark.parametrize( - "key, value", [("zip", "zipzip"), ("foo.bar.foobar", "5"), ("foo.baz", "bar")] -) -def test_that_json_parser_can_set_keys(templated_parser, key, value): - parser = templated_parser("json") - - parser.set(key, value) - assert parser.get(key) == value - - -@pytest.mark.parametrize( - "key", - [ - "glossary", - "glossary.dict_within_dict", - "glossary.GlossDiv.GlossList.GlossEntry.Abbrev", - ], -) -def test_that_json_parser_can_delete_keys(template_and_parser, key): - template, parser = template_and_parser("json", "glossary") - - parser.delete(key) - - assert parser.has(key) is False -- cgit v1.2.3