From c1f907e24d2884cd94368f002e7e4854e7f715ad Mon Sep 17 00:00:00 2001 From: Satoru SATOH Date: Sat, 27 Apr 2024 11:25:19 +0900 Subject: [PATCH] fix/change: migrate test cases for dicts from unittest to pytest --- tests/dicts/test_get.py | 31 ++++++----- tests/dicts/test_merge.py | 63 ++++++++++++++-------- tests/dicts/test_mk_nested_dic.py | 26 +++++---- tests/res/dicts/get/10/10.json | 1 - tests/res/dicts/get/10/20.json | 1 - tests/res/dicts/get/10/e/10.json | 1 - tests/res/dicts/get/10/e/20.json | 1 - tests/res/dicts/get/10/q/10.py | 1 - tests/res/dicts/get/10/q/20.py | 1 - tests/res/dicts/get/10/s/10.py | 1 - tests/res/dicts/get/10/s/20.py | 1 - tests/res/dicts/get/20/00.json | 13 ----- tests/res/dicts/get/20/10.json | 1 - tests/res/dicts/get/20/100.json | 1 - tests/res/dicts/get/20/110.json | 1 - tests/res/dicts/get/20/20.json | 1 - tests/res/dicts/get/20/30.json | 1 - tests/res/dicts/get/20/40.json | 1 - tests/res/dicts/get/20/50.json | 1 - tests/res/dicts/get/20/60.json | 1 - tests/res/dicts/get/20/70.json | 1 - tests/res/dicts/get/20/80.json | 1 - tests/res/dicts/get/20/90.json | 1 - tests/res/dicts/get/20/e/00.json | 1 - tests/res/dicts/get/20/e/10.json | 1 - tests/res/dicts/get/20/e/100.py | 1 - tests/res/dicts/get/20/e/110.py | 1 - tests/res/dicts/get/20/e/20.py | 1 - tests/res/dicts/get/20/e/30.py | 1 - tests/res/dicts/get/20/e/40.py | 1 - tests/res/dicts/get/20/e/50.py | 1 - tests/res/dicts/get/20/e/60.py | 1 - tests/res/dicts/get/20/e/70.py | 1 - tests/res/dicts/get/20/e/80.py | 1 - tests/res/dicts/get/20/e/90.py | 1 - tests/res/dicts/get/20/q/00.py | 1 - tests/res/dicts/get/20/q/10.py | 1 - tests/res/dicts/get/20/q/100.py | 1 - tests/res/dicts/get/20/q/110.py | 1 - tests/res/dicts/get/20/q/20.py | 1 - tests/res/dicts/get/20/q/30.py | 1 - tests/res/dicts/get/20/q/40.py | 1 - tests/res/dicts/get/20/q/50.py | 1 - tests/res/dicts/get/20/q/60.py | 1 - tests/res/dicts/get/20/q/70.py | 1 - tests/res/dicts/get/20/q/80.py | 1 - tests/res/dicts/get/20/q/90.py | 1 - tests/res/dicts/get/20/s/00.py | 1 - tests/res/dicts/get/20/s/10.py | 1 - tests/res/dicts/get/20/s/100.py | 1 - tests/res/dicts/get/20/s/110.py | 1 - tests/res/dicts/get/20/s/20.py | 1 - tests/res/dicts/get/20/s/30.py | 1 - tests/res/dicts/get/20/s/40.py | 1 - tests/res/dicts/get/20/s/50.py | 1 - tests/res/dicts/get/20/s/60.py | 1 - tests/res/dicts/get/20/s/70.py | 1 - tests/res/dicts/get/20/s/80.py | 1 - tests/res/dicts/get/20/s/90.py | 1 - tests/res/dicts/get/30/10.json | 1 - tests/res/dicts/get/30/20.json | 1 - tests/res/dicts/get/30/30.json | 1 - tests/res/dicts/get/30/e/10.py | 1 - tests/res/dicts/get/30/e/20.json | 1 - tests/res/dicts/get/30/e/30.json | 1 - tests/res/dicts/get/30/q/10.txt | 1 - tests/res/dicts/get/30/q/20.txt | 1 - tests/res/dicts/get/30/q/30.txt | 1 - tests/res/dicts/get/30/s/10.txt | 0 tests/res/dicts/get/30/s/20.txt | 2 - tests/res/dicts/get/30/s/30.txt | 2 - tests/res/dicts/merge/10/10.json | 1 - tests/res/dicts/merge/10/e/10.json | 1 - tests/res/dicts/merge/10/o/10.json | 1 - tests/res/dicts/merge/10/s/10.json | 1 - tests/res/dicts/merge/20/10.json | 1 - tests/res/dicts/merge/20/e/10.json | 1 - tests/res/dicts/merge/20/o/10.json | 1 - tests/res/dicts/merge/20/s/10.json | 1 - tests/res/dicts/merge/30/10.json | 1 - tests/res/dicts/merge/30/e/10.json | 1 - tests/res/dicts/merge/30/o/10.json | 1 - tests/res/dicts/merge/30/s/10.json | 1 - tests/res/dicts/merge/40/10.json | 1 - tests/res/dicts/merge/40/e/10.json | 1 - tests/res/dicts/merge/40/o/10.json | 1 - tests/res/dicts/merge/40/s/10.json | 1 - tests/res/dicts/mk_nested_dic/10/10.py | 1 - tests/res/dicts/mk_nested_dic/10/20.py | 1 - tests/res/dicts/mk_nested_dic/10/e/10.json | 1 - tests/res/dicts/mk_nested_dic/10/e/20.json | 1 - tests/res/dicts/mk_nested_dic/10/o/10.json | 1 - tests/res/dicts/mk_nested_dic/10/o/20.json | 1 - tests/res/dicts/mk_nested_dic/10/q/10.py | 1 - tests/res/dicts/mk_nested_dic/10/q/20.py | 1 - 95 files changed, 76 insertions(+), 149 deletions(-) delete mode 100644 tests/res/dicts/get/10/10.json delete mode 120000 tests/res/dicts/get/10/20.json delete mode 120000 tests/res/dicts/get/10/e/10.json delete mode 100644 tests/res/dicts/get/10/e/20.json delete mode 100644 tests/res/dicts/get/10/q/10.py delete mode 100644 tests/res/dicts/get/10/q/20.py delete mode 100644 tests/res/dicts/get/10/s/10.py delete mode 100644 tests/res/dicts/get/10/s/20.py delete mode 100644 tests/res/dicts/get/20/00.json delete mode 120000 tests/res/dicts/get/20/10.json delete mode 120000 tests/res/dicts/get/20/100.json delete mode 120000 tests/res/dicts/get/20/110.json delete mode 120000 tests/res/dicts/get/20/20.json delete mode 120000 tests/res/dicts/get/20/30.json delete mode 120000 tests/res/dicts/get/20/40.json delete mode 120000 tests/res/dicts/get/20/50.json delete mode 120000 tests/res/dicts/get/20/60.json delete mode 120000 tests/res/dicts/get/20/70.json delete mode 120000 tests/res/dicts/get/20/80.json delete mode 120000 tests/res/dicts/get/20/90.json delete mode 120000 tests/res/dicts/get/20/e/00.json delete mode 100644 tests/res/dicts/get/20/e/10.json delete mode 100644 tests/res/dicts/get/20/e/100.py delete mode 100644 tests/res/dicts/get/20/e/110.py delete mode 100644 tests/res/dicts/get/20/e/20.py delete mode 100644 tests/res/dicts/get/20/e/30.py delete mode 100644 tests/res/dicts/get/20/e/40.py delete mode 100644 tests/res/dicts/get/20/e/50.py delete mode 100644 tests/res/dicts/get/20/e/60.py delete mode 100644 tests/res/dicts/get/20/e/70.py delete mode 100644 tests/res/dicts/get/20/e/80.py delete mode 100644 tests/res/dicts/get/20/e/90.py delete mode 100644 tests/res/dicts/get/20/q/00.py delete mode 100644 tests/res/dicts/get/20/q/10.py delete mode 100644 tests/res/dicts/get/20/q/100.py delete mode 100644 tests/res/dicts/get/20/q/110.py delete mode 100644 tests/res/dicts/get/20/q/20.py delete mode 100644 tests/res/dicts/get/20/q/30.py delete mode 100644 tests/res/dicts/get/20/q/40.py delete mode 100644 tests/res/dicts/get/20/q/50.py delete mode 100644 tests/res/dicts/get/20/q/60.py delete mode 100644 tests/res/dicts/get/20/q/70.py delete mode 100644 tests/res/dicts/get/20/q/80.py delete mode 100644 tests/res/dicts/get/20/q/90.py delete mode 100644 tests/res/dicts/get/20/s/00.py delete mode 120000 tests/res/dicts/get/20/s/10.py delete mode 120000 tests/res/dicts/get/20/s/100.py delete mode 120000 tests/res/dicts/get/20/s/110.py delete mode 120000 tests/res/dicts/get/20/s/20.py delete mode 120000 tests/res/dicts/get/20/s/30.py delete mode 120000 tests/res/dicts/get/20/s/40.py delete mode 120000 tests/res/dicts/get/20/s/50.py delete mode 120000 tests/res/dicts/get/20/s/60.py delete mode 120000 tests/res/dicts/get/20/s/70.py delete mode 120000 tests/res/dicts/get/20/s/80.py delete mode 120000 tests/res/dicts/get/20/s/90.py delete mode 100644 tests/res/dicts/get/30/10.json delete mode 120000 tests/res/dicts/get/30/20.json delete mode 120000 tests/res/dicts/get/30/30.json delete mode 100644 tests/res/dicts/get/30/e/10.py delete mode 100644 tests/res/dicts/get/30/e/20.json delete mode 100644 tests/res/dicts/get/30/e/30.json delete mode 100644 tests/res/dicts/get/30/q/10.txt delete mode 100644 tests/res/dicts/get/30/q/20.txt delete mode 100644 tests/res/dicts/get/30/q/30.txt delete mode 100644 tests/res/dicts/get/30/s/10.txt delete mode 100644 tests/res/dicts/get/30/s/20.txt delete mode 100644 tests/res/dicts/get/30/s/30.txt delete mode 100644 tests/res/dicts/merge/10/10.json delete mode 100644 tests/res/dicts/merge/10/e/10.json delete mode 100644 tests/res/dicts/merge/10/o/10.json delete mode 100644 tests/res/dicts/merge/10/s/10.json delete mode 120000 tests/res/dicts/merge/20/10.json delete mode 100644 tests/res/dicts/merge/20/e/10.json delete mode 100644 tests/res/dicts/merge/20/o/10.json delete mode 120000 tests/res/dicts/merge/20/s/10.json delete mode 120000 tests/res/dicts/merge/30/10.json delete mode 100644 tests/res/dicts/merge/30/e/10.json delete mode 100644 tests/res/dicts/merge/30/o/10.json delete mode 120000 tests/res/dicts/merge/30/s/10.json delete mode 120000 tests/res/dicts/merge/40/10.json delete mode 100644 tests/res/dicts/merge/40/e/10.json delete mode 100644 tests/res/dicts/merge/40/o/10.json delete mode 120000 tests/res/dicts/merge/40/s/10.json delete mode 100644 tests/res/dicts/mk_nested_dic/10/10.py delete mode 100644 tests/res/dicts/mk_nested_dic/10/20.py delete mode 100644 tests/res/dicts/mk_nested_dic/10/e/10.json delete mode 120000 tests/res/dicts/mk_nested_dic/10/e/20.json delete mode 100644 tests/res/dicts/mk_nested_dic/10/o/10.json delete mode 120000 tests/res/dicts/mk_nested_dic/10/o/20.json delete mode 100644 tests/res/dicts/mk_nested_dic/10/q/10.py delete mode 120000 tests/res/dicts/mk_nested_dic/10/q/20.py diff --git a/tests/dicts/test_get.py b/tests/dicts/test_get.py index 8f36f679..54029dcf 100644 --- a/tests/dicts/test_get.py +++ b/tests/dicts/test_get.py @@ -6,23 +6,30 @@ # pylint: disable=missing-docstring,invalid-name from __future__ import annotations +import typing + +import pytest + import anyconfig.dicts as TT -from .. import base from . import common +if typing.TYPE_CHECKING: + import pathlib + + +DATASETS: list[tuple[typing.Any, dict[str, typing.Any]]] = [ + (obj, data) for _, obj, data in common.collect_data("get") +] -class TestCase(common.TestCase): - kind = 'get' - def test_get(self): - for data in self.each_data(): - emsg = base.load_data(data.scm) # diversion. - (res, err) = TT.get(data.inp, data.query) +@pytest.mark.parametrize(("obj", "data"), DATASETS) +def test_get(obj, data): + query = data.get("q") + exp = data.get("e") + emsg = data.get("s") - if emsg: - self.assertTrue(bool(err), data) - else: # emsg = '' - self.assertEqual(err, '', data) + (res, err) = TT.get(obj, query) - self.assertEqual(res, data.exp, data) + assert bool(err) if emsg else err == "" + assert res == exp diff --git a/tests/dicts/test_merge.py b/tests/dicts/test_merge.py index 814acdea..cb0d0151 100644 --- a/tests/dicts/test_merge.py +++ b/tests/dicts/test_merge.py @@ -6,33 +6,54 @@ # pylint: disable=missing-docstring from __future__ import annotations +import typing + +import pytest + import anyconfig.dicts as TT -from .. import base from . import common -class TestCase(common.TestCase): - kind = 'merge' +if typing.TYPE_CHECKING: + import pathlib + + +DATASETS: list[tuple[typing.Any, dict[str, typing.Any]]] = [ + (obj, data) for _, obj, data in common.collect_data("merge") +] + + +@pytest.mark.parametrize(("obj", "data"), DATASETS) +def test_merge(obj, data): + exp = data.get("e") + upd = data.get("s") + opts = data.get("o") + + TT.merge(obj, upd, **opts) + assert obj == exp + + +@pytest.mark.parametrize(("obj", "data"), DATASETS) +def test_merge_with_a_dict(obj, data): + exp = data.get("e") + upd = data.get("s") + opts = data.get("o") + + TT.merge(obj, upd, **opts) + assert obj == exp + - def test_merge(self): - for data in self.each_data(): - upd = base.load_data(data.scm, ordered=True) # diversion. - TT.merge(data.inp, upd, **data.opts) - self.assertEqual(data.inp, data.exp, data) +@pytest.mark.parametrize(("obj", "data"), DATASETS) +def test_merge_with_an_iterable(obj, data): + exp = data.get("e") + upd = data.get("s").items() + opts = data.get("o") - def test_merge_with_a_dict(self): - for data in self.each_data(): - upd = base.load_data(data.scm) - TT.merge(data.inp, upd, **data.opts) - self.assertEqual(data.inp, data.exp, data) + TT.merge(obj, upd, **opts) + assert obj == exp - def test_merge_with_an_iterable(self): - for data in self.each_data(): - upd = base.load_data(data.scm).items() - TT.merge(data.inp, upd, **data.opts) - self.assertEqual(data.inp, data.exp, data) - def test_merge_with_invalid_data(self): - with self.assertRaises((ValueError, TypeError)): - TT.merge(dict(a=1), 1) +def test_merge_with_invalid_data(): + with pytest.raises((ValueError, TypeError)): + TT.merge({"a": 1}, 1) diff --git a/tests/dicts/test_mk_nested_dic.py b/tests/dicts/test_mk_nested_dic.py index 318de53d..5b1eb4fc 100644 --- a/tests/dicts/test_mk_nested_dic.py +++ b/tests/dicts/test_mk_nested_dic.py @@ -6,20 +6,24 @@ # pylint: disable=missing-docstring from __future__ import annotations +import typing + +import pytest + import anyconfig.dicts as TT from . import common -class TestCase(common.TestCase): - kind = 'mk_nested_dic' - pattern = '*.*' - ordered = False +DATASETS: list[tuple[typing.Any, dict[str, typing.Any]]] = [ + (obj, data) for _, obj, data in common.collect_data("mk_nested_dic") +] + + +@pytest.mark.parametrize(("obj", "data"), DATASETS) +def test_mk_nested_dic(obj, data): + val = data.get("q") + exp = data.get("e") + opts = data.get("o") - def test_mk_nested_dic(self): - for data in self.each_data(): - val = data.query # diversion. - self.assertEqual( - TT.mk_nested_dic(data.inp, val, **data.opts), - data.exp - ) + assert TT.mk_nested_dic(obj, val, **opts) == exp diff --git a/tests/res/dicts/get/10/10.json b/tests/res/dicts/get/10/10.json deleted file mode 100644 index 86a4a4d5..00000000 --- a/tests/res/dicts/get/10/10.json +++ /dev/null @@ -1 +0,0 @@ -{"a": 1, "b": [1, 2]} diff --git a/tests/res/dicts/get/10/20.json b/tests/res/dicts/get/10/20.json deleted file mode 120000 index 0159d68f..00000000 --- a/tests/res/dicts/get/10/20.json +++ /dev/null @@ -1 +0,0 @@ -10.json \ No newline at end of file diff --git a/tests/res/dicts/get/10/e/10.json b/tests/res/dicts/get/10/e/10.json deleted file mode 120000 index 0cdec646..00000000 --- a/tests/res/dicts/get/10/e/10.json +++ /dev/null @@ -1 +0,0 @@ -../10.json \ No newline at end of file diff --git a/tests/res/dicts/get/10/e/20.json b/tests/res/dicts/get/10/e/20.json deleted file mode 100644 index 19765bd5..00000000 --- a/tests/res/dicts/get/10/e/20.json +++ /dev/null @@ -1 +0,0 @@ -null diff --git a/tests/res/dicts/get/10/q/10.py b/tests/res/dicts/get/10/q/10.py deleted file mode 100644 index a614936f..00000000 --- a/tests/res/dicts/get/10/q/10.py +++ /dev/null @@ -1 +0,0 @@ -'' diff --git a/tests/res/dicts/get/10/q/20.py b/tests/res/dicts/get/10/q/20.py deleted file mode 100644 index 40765836..00000000 --- a/tests/res/dicts/get/10/q/20.py +++ /dev/null @@ -1 +0,0 @@ -'c' diff --git a/tests/res/dicts/get/10/s/10.py b/tests/res/dicts/get/10/s/10.py deleted file mode 100644 index a614936f..00000000 --- a/tests/res/dicts/get/10/s/10.py +++ /dev/null @@ -1 +0,0 @@ -'' diff --git a/tests/res/dicts/get/10/s/20.py b/tests/res/dicts/get/10/s/20.py deleted file mode 100644 index 40765836..00000000 --- a/tests/res/dicts/get/10/s/20.py +++ /dev/null @@ -1 +0,0 @@ -'c' diff --git a/tests/res/dicts/get/20/00.json b/tests/res/dicts/get/20/00.json deleted file mode 100644 index a0071da6..00000000 --- a/tests/res/dicts/get/20/00.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "seealso": "http://tools.ietf.org/html/rfc6901", - "foo": ["bar", "baz"], - "": 0, - "a/b": 1, - "c%d": 2, - "e^f": 3, - "g|h": 4, - "i\\j": 5, - "k\"l": 6, - " ": 7, - "m~n": 8 -} diff --git a/tests/res/dicts/get/20/10.json b/tests/res/dicts/get/20/10.json deleted file mode 120000 index a9005a1b..00000000 --- a/tests/res/dicts/get/20/10.json +++ /dev/null @@ -1 +0,0 @@ -00.json \ No newline at end of file diff --git a/tests/res/dicts/get/20/100.json b/tests/res/dicts/get/20/100.json deleted file mode 120000 index a9005a1b..00000000 --- a/tests/res/dicts/get/20/100.json +++ /dev/null @@ -1 +0,0 @@ -00.json \ No newline at end of file diff --git a/tests/res/dicts/get/20/110.json b/tests/res/dicts/get/20/110.json deleted file mode 120000 index a9005a1b..00000000 --- a/tests/res/dicts/get/20/110.json +++ /dev/null @@ -1 +0,0 @@ -00.json \ No newline at end of file diff --git a/tests/res/dicts/get/20/20.json b/tests/res/dicts/get/20/20.json deleted file mode 120000 index a9005a1b..00000000 --- a/tests/res/dicts/get/20/20.json +++ /dev/null @@ -1 +0,0 @@ -00.json \ No newline at end of file diff --git a/tests/res/dicts/get/20/30.json b/tests/res/dicts/get/20/30.json deleted file mode 120000 index a9005a1b..00000000 --- a/tests/res/dicts/get/20/30.json +++ /dev/null @@ -1 +0,0 @@ -00.json \ No newline at end of file diff --git a/tests/res/dicts/get/20/40.json b/tests/res/dicts/get/20/40.json deleted file mode 120000 index a9005a1b..00000000 --- a/tests/res/dicts/get/20/40.json +++ /dev/null @@ -1 +0,0 @@ -00.json \ No newline at end of file diff --git a/tests/res/dicts/get/20/50.json b/tests/res/dicts/get/20/50.json deleted file mode 120000 index a9005a1b..00000000 --- a/tests/res/dicts/get/20/50.json +++ /dev/null @@ -1 +0,0 @@ -00.json \ No newline at end of file diff --git a/tests/res/dicts/get/20/60.json b/tests/res/dicts/get/20/60.json deleted file mode 120000 index a9005a1b..00000000 --- a/tests/res/dicts/get/20/60.json +++ /dev/null @@ -1 +0,0 @@ -00.json \ No newline at end of file diff --git a/tests/res/dicts/get/20/70.json b/tests/res/dicts/get/20/70.json deleted file mode 120000 index a9005a1b..00000000 --- a/tests/res/dicts/get/20/70.json +++ /dev/null @@ -1 +0,0 @@ -00.json \ No newline at end of file diff --git a/tests/res/dicts/get/20/80.json b/tests/res/dicts/get/20/80.json deleted file mode 120000 index a9005a1b..00000000 --- a/tests/res/dicts/get/20/80.json +++ /dev/null @@ -1 +0,0 @@ -00.json \ No newline at end of file diff --git a/tests/res/dicts/get/20/90.json b/tests/res/dicts/get/20/90.json deleted file mode 120000 index a9005a1b..00000000 --- a/tests/res/dicts/get/20/90.json +++ /dev/null @@ -1 +0,0 @@ -00.json \ No newline at end of file diff --git a/tests/res/dicts/get/20/e/00.json b/tests/res/dicts/get/20/e/00.json deleted file mode 120000 index a5f954a8..00000000 --- a/tests/res/dicts/get/20/e/00.json +++ /dev/null @@ -1 +0,0 @@ -../00.json \ No newline at end of file diff --git a/tests/res/dicts/get/20/e/10.json b/tests/res/dicts/get/20/e/10.json deleted file mode 100644 index db125f2c..00000000 --- a/tests/res/dicts/get/20/e/10.json +++ /dev/null @@ -1 +0,0 @@ -["bar", "baz"] diff --git a/tests/res/dicts/get/20/e/100.py b/tests/res/dicts/get/20/e/100.py deleted file mode 100644 index 7f8f011e..00000000 --- a/tests/res/dicts/get/20/e/100.py +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/tests/res/dicts/get/20/e/110.py b/tests/res/dicts/get/20/e/110.py deleted file mode 100644 index 45a4fb75..00000000 --- a/tests/res/dicts/get/20/e/110.py +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/tests/res/dicts/get/20/e/20.py b/tests/res/dicts/get/20/e/20.py deleted file mode 100644 index 196e5879..00000000 --- a/tests/res/dicts/get/20/e/20.py +++ /dev/null @@ -1 +0,0 @@ -"bar" diff --git a/tests/res/dicts/get/20/e/30.py b/tests/res/dicts/get/20/e/30.py deleted file mode 100644 index 573541ac..00000000 --- a/tests/res/dicts/get/20/e/30.py +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tests/res/dicts/get/20/e/40.py b/tests/res/dicts/get/20/e/40.py deleted file mode 100644 index d00491fd..00000000 --- a/tests/res/dicts/get/20/e/40.py +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/res/dicts/get/20/e/50.py b/tests/res/dicts/get/20/e/50.py deleted file mode 100644 index 0cfbf088..00000000 --- a/tests/res/dicts/get/20/e/50.py +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tests/res/dicts/get/20/e/60.py b/tests/res/dicts/get/20/e/60.py deleted file mode 100644 index 00750edc..00000000 --- a/tests/res/dicts/get/20/e/60.py +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/tests/res/dicts/get/20/e/70.py b/tests/res/dicts/get/20/e/70.py deleted file mode 100644 index b8626c4c..00000000 --- a/tests/res/dicts/get/20/e/70.py +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/tests/res/dicts/get/20/e/80.py b/tests/res/dicts/get/20/e/80.py deleted file mode 100644 index 7ed6ff82..00000000 --- a/tests/res/dicts/get/20/e/80.py +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/tests/res/dicts/get/20/e/90.py b/tests/res/dicts/get/20/e/90.py deleted file mode 100644 index 1e8b3149..00000000 --- a/tests/res/dicts/get/20/e/90.py +++ /dev/null @@ -1 +0,0 @@ -6 diff --git a/tests/res/dicts/get/20/q/00.py b/tests/res/dicts/get/20/q/00.py deleted file mode 100644 index e16c76df..00000000 --- a/tests/res/dicts/get/20/q/00.py +++ /dev/null @@ -1 +0,0 @@ -"" diff --git a/tests/res/dicts/get/20/q/10.py b/tests/res/dicts/get/20/q/10.py deleted file mode 100644 index a7f5d924..00000000 --- a/tests/res/dicts/get/20/q/10.py +++ /dev/null @@ -1 +0,0 @@ -"/foo" diff --git a/tests/res/dicts/get/20/q/100.py b/tests/res/dicts/get/20/q/100.py deleted file mode 100644 index 44d02fed..00000000 --- a/tests/res/dicts/get/20/q/100.py +++ /dev/null @@ -1 +0,0 @@ -"/ " diff --git a/tests/res/dicts/get/20/q/110.py b/tests/res/dicts/get/20/q/110.py deleted file mode 100644 index ec60fd7a..00000000 --- a/tests/res/dicts/get/20/q/110.py +++ /dev/null @@ -1 +0,0 @@ -"/m~0n" diff --git a/tests/res/dicts/get/20/q/20.py b/tests/res/dicts/get/20/q/20.py deleted file mode 100644 index 239ee851..00000000 --- a/tests/res/dicts/get/20/q/20.py +++ /dev/null @@ -1 +0,0 @@ -"/foo/0" diff --git a/tests/res/dicts/get/20/q/30.py b/tests/res/dicts/get/20/q/30.py deleted file mode 100644 index 91427272..00000000 --- a/tests/res/dicts/get/20/q/30.py +++ /dev/null @@ -1 +0,0 @@ -"/" diff --git a/tests/res/dicts/get/20/q/40.py b/tests/res/dicts/get/20/q/40.py deleted file mode 100644 index 02e9ff77..00000000 --- a/tests/res/dicts/get/20/q/40.py +++ /dev/null @@ -1 +0,0 @@ -"/a~1b" diff --git a/tests/res/dicts/get/20/q/50.py b/tests/res/dicts/get/20/q/50.py deleted file mode 100644 index 3859e672..00000000 --- a/tests/res/dicts/get/20/q/50.py +++ /dev/null @@ -1 +0,0 @@ -"/c%d" diff --git a/tests/res/dicts/get/20/q/60.py b/tests/res/dicts/get/20/q/60.py deleted file mode 100644 index b45f0a29..00000000 --- a/tests/res/dicts/get/20/q/60.py +++ /dev/null @@ -1 +0,0 @@ -"/e^f" diff --git a/tests/res/dicts/get/20/q/70.py b/tests/res/dicts/get/20/q/70.py deleted file mode 100644 index 0443898a..00000000 --- a/tests/res/dicts/get/20/q/70.py +++ /dev/null @@ -1 +0,0 @@ -"/g|h" diff --git a/tests/res/dicts/get/20/q/80.py b/tests/res/dicts/get/20/q/80.py deleted file mode 100644 index aee900e9..00000000 --- a/tests/res/dicts/get/20/q/80.py +++ /dev/null @@ -1 +0,0 @@ -'/i\j' diff --git a/tests/res/dicts/get/20/q/90.py b/tests/res/dicts/get/20/q/90.py deleted file mode 100644 index 65745906..00000000 --- a/tests/res/dicts/get/20/q/90.py +++ /dev/null @@ -1 +0,0 @@ -'/k\"l' diff --git a/tests/res/dicts/get/20/s/00.py b/tests/res/dicts/get/20/s/00.py deleted file mode 100644 index e16c76df..00000000 --- a/tests/res/dicts/get/20/s/00.py +++ /dev/null @@ -1 +0,0 @@ -"" diff --git a/tests/res/dicts/get/20/s/10.py b/tests/res/dicts/get/20/s/10.py deleted file mode 120000 index ab4fa9c5..00000000 --- a/tests/res/dicts/get/20/s/10.py +++ /dev/null @@ -1 +0,0 @@ -00.py \ No newline at end of file diff --git a/tests/res/dicts/get/20/s/100.py b/tests/res/dicts/get/20/s/100.py deleted file mode 120000 index ab4fa9c5..00000000 --- a/tests/res/dicts/get/20/s/100.py +++ /dev/null @@ -1 +0,0 @@ -00.py \ No newline at end of file diff --git a/tests/res/dicts/get/20/s/110.py b/tests/res/dicts/get/20/s/110.py deleted file mode 120000 index ab4fa9c5..00000000 --- a/tests/res/dicts/get/20/s/110.py +++ /dev/null @@ -1 +0,0 @@ -00.py \ No newline at end of file diff --git a/tests/res/dicts/get/20/s/20.py b/tests/res/dicts/get/20/s/20.py deleted file mode 120000 index ab4fa9c5..00000000 --- a/tests/res/dicts/get/20/s/20.py +++ /dev/null @@ -1 +0,0 @@ -00.py \ No newline at end of file diff --git a/tests/res/dicts/get/20/s/30.py b/tests/res/dicts/get/20/s/30.py deleted file mode 120000 index ab4fa9c5..00000000 --- a/tests/res/dicts/get/20/s/30.py +++ /dev/null @@ -1 +0,0 @@ -00.py \ No newline at end of file diff --git a/tests/res/dicts/get/20/s/40.py b/tests/res/dicts/get/20/s/40.py deleted file mode 120000 index ab4fa9c5..00000000 --- a/tests/res/dicts/get/20/s/40.py +++ /dev/null @@ -1 +0,0 @@ -00.py \ No newline at end of file diff --git a/tests/res/dicts/get/20/s/50.py b/tests/res/dicts/get/20/s/50.py deleted file mode 120000 index ab4fa9c5..00000000 --- a/tests/res/dicts/get/20/s/50.py +++ /dev/null @@ -1 +0,0 @@ -00.py \ No newline at end of file diff --git a/tests/res/dicts/get/20/s/60.py b/tests/res/dicts/get/20/s/60.py deleted file mode 120000 index ab4fa9c5..00000000 --- a/tests/res/dicts/get/20/s/60.py +++ /dev/null @@ -1 +0,0 @@ -00.py \ No newline at end of file diff --git a/tests/res/dicts/get/20/s/70.py b/tests/res/dicts/get/20/s/70.py deleted file mode 120000 index ab4fa9c5..00000000 --- a/tests/res/dicts/get/20/s/70.py +++ /dev/null @@ -1 +0,0 @@ -00.py \ No newline at end of file diff --git a/tests/res/dicts/get/20/s/80.py b/tests/res/dicts/get/20/s/80.py deleted file mode 120000 index ab4fa9c5..00000000 --- a/tests/res/dicts/get/20/s/80.py +++ /dev/null @@ -1 +0,0 @@ -00.py \ No newline at end of file diff --git a/tests/res/dicts/get/20/s/90.py b/tests/res/dicts/get/20/s/90.py deleted file mode 120000 index ab4fa9c5..00000000 --- a/tests/res/dicts/get/20/s/90.py +++ /dev/null @@ -1 +0,0 @@ -00.py \ No newline at end of file diff --git a/tests/res/dicts/get/30/10.json b/tests/res/dicts/get/30/10.json deleted file mode 100644 index 532bbf67..00000000 --- a/tests/res/dicts/get/30/10.json +++ /dev/null @@ -1 +0,0 @@ -{"a": [1, 2]} diff --git a/tests/res/dicts/get/30/20.json b/tests/res/dicts/get/30/20.json deleted file mode 120000 index 0159d68f..00000000 --- a/tests/res/dicts/get/30/20.json +++ /dev/null @@ -1 +0,0 @@ -10.json \ No newline at end of file diff --git a/tests/res/dicts/get/30/30.json b/tests/res/dicts/get/30/30.json deleted file mode 120000 index 0159d68f..00000000 --- a/tests/res/dicts/get/30/30.json +++ /dev/null @@ -1 +0,0 @@ -10.json \ No newline at end of file diff --git a/tests/res/dicts/get/30/e/10.py b/tests/res/dicts/get/30/e/10.py deleted file mode 100644 index 0cfbf088..00000000 --- a/tests/res/dicts/get/30/e/10.py +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tests/res/dicts/get/30/e/20.json b/tests/res/dicts/get/30/e/20.json deleted file mode 100644 index 19765bd5..00000000 --- a/tests/res/dicts/get/30/e/20.json +++ /dev/null @@ -1 +0,0 @@ -null diff --git a/tests/res/dicts/get/30/e/30.json b/tests/res/dicts/get/30/e/30.json deleted file mode 100644 index 19765bd5..00000000 --- a/tests/res/dicts/get/30/e/30.json +++ /dev/null @@ -1 +0,0 @@ -null diff --git a/tests/res/dicts/get/30/q/10.txt b/tests/res/dicts/get/30/q/10.txt deleted file mode 100644 index d3609bc7..00000000 --- a/tests/res/dicts/get/30/q/10.txt +++ /dev/null @@ -1 +0,0 @@ -/a/1 diff --git a/tests/res/dicts/get/30/q/20.txt b/tests/res/dicts/get/30/q/20.txt deleted file mode 100644 index 62b55836..00000000 --- a/tests/res/dicts/get/30/q/20.txt +++ /dev/null @@ -1 +0,0 @@ -/a/2 diff --git a/tests/res/dicts/get/30/q/30.txt b/tests/res/dicts/get/30/q/30.txt deleted file mode 100644 index 795aaa55..00000000 --- a/tests/res/dicts/get/30/q/30.txt +++ /dev/null @@ -1 +0,0 @@ -/a/b/d/- diff --git a/tests/res/dicts/get/30/s/10.txt b/tests/res/dicts/get/30/s/10.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/res/dicts/get/30/s/20.txt b/tests/res/dicts/get/30/s/20.txt deleted file mode 100644 index 9caea63b..00000000 --- a/tests/res/dicts/get/30/s/20.txt +++ /dev/null @@ -1,2 +0,0 @@ -# maybe the error message depends on python version. -list index out of range diff --git a/tests/res/dicts/get/30/s/30.txt b/tests/res/dicts/get/30/s/30.txt deleted file mode 100644 index 9caea63b..00000000 --- a/tests/res/dicts/get/30/s/30.txt +++ /dev/null @@ -1,2 +0,0 @@ -# maybe the error message depends on python version. -list index out of range diff --git a/tests/res/dicts/merge/10/10.json b/tests/res/dicts/merge/10/10.json deleted file mode 100644 index 80aef836..00000000 --- a/tests/res/dicts/merge/10/10.json +++ /dev/null @@ -1 +0,0 @@ -{"a": 1, "b": [1, 3], "c": "abc", "f": null} diff --git a/tests/res/dicts/merge/10/e/10.json b/tests/res/dicts/merge/10/e/10.json deleted file mode 100644 index 5a10bfb8..00000000 --- a/tests/res/dicts/merge/10/e/10.json +++ /dev/null @@ -1 +0,0 @@ -{"a": 2, "b": [0, 1], "c": {"d": "d", "e": 1}, "f": null, "g": "g"} diff --git a/tests/res/dicts/merge/10/o/10.json b/tests/res/dicts/merge/10/o/10.json deleted file mode 100644 index 38ddad46..00000000 --- a/tests/res/dicts/merge/10/o/10.json +++ /dev/null @@ -1 +0,0 @@ -{"ac_merge": "replace"} diff --git a/tests/res/dicts/merge/10/s/10.json b/tests/res/dicts/merge/10/s/10.json deleted file mode 100644 index 619a5522..00000000 --- a/tests/res/dicts/merge/10/s/10.json +++ /dev/null @@ -1 +0,0 @@ -{"a": 2, "b": [0, 1], "c": {"d": "d", "e": 1}, "g": "g"} diff --git a/tests/res/dicts/merge/20/10.json b/tests/res/dicts/merge/20/10.json deleted file mode 120000 index 54f00df5..00000000 --- a/tests/res/dicts/merge/20/10.json +++ /dev/null @@ -1 +0,0 @@ -../10/10.json \ No newline at end of file diff --git a/tests/res/dicts/merge/20/e/10.json b/tests/res/dicts/merge/20/e/10.json deleted file mode 100644 index e40f0d0b..00000000 --- a/tests/res/dicts/merge/20/e/10.json +++ /dev/null @@ -1 +0,0 @@ -{"a": 1, "b": [1, 3], "c": "abc", "f": null, "g": "g"} diff --git a/tests/res/dicts/merge/20/o/10.json b/tests/res/dicts/merge/20/o/10.json deleted file mode 100644 index d21879f9..00000000 --- a/tests/res/dicts/merge/20/o/10.json +++ /dev/null @@ -1 +0,0 @@ -{"ac_merge": "noreplace"} diff --git a/tests/res/dicts/merge/20/s/10.json b/tests/res/dicts/merge/20/s/10.json deleted file mode 120000 index 7116e9cb..00000000 --- a/tests/res/dicts/merge/20/s/10.json +++ /dev/null @@ -1 +0,0 @@ -../../10/s/10.json \ No newline at end of file diff --git a/tests/res/dicts/merge/30/10.json b/tests/res/dicts/merge/30/10.json deleted file mode 120000 index 54f00df5..00000000 --- a/tests/res/dicts/merge/30/10.json +++ /dev/null @@ -1 +0,0 @@ -../10/10.json \ No newline at end of file diff --git a/tests/res/dicts/merge/30/e/10.json b/tests/res/dicts/merge/30/e/10.json deleted file mode 100644 index 5a10bfb8..00000000 --- a/tests/res/dicts/merge/30/e/10.json +++ /dev/null @@ -1 +0,0 @@ -{"a": 2, "b": [0, 1], "c": {"d": "d", "e": 1}, "f": null, "g": "g"} diff --git a/tests/res/dicts/merge/30/o/10.json b/tests/res/dicts/merge/30/o/10.json deleted file mode 100644 index 0967ef42..00000000 --- a/tests/res/dicts/merge/30/o/10.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/tests/res/dicts/merge/30/s/10.json b/tests/res/dicts/merge/30/s/10.json deleted file mode 120000 index 7116e9cb..00000000 --- a/tests/res/dicts/merge/30/s/10.json +++ /dev/null @@ -1 +0,0 @@ -../../10/s/10.json \ No newline at end of file diff --git a/tests/res/dicts/merge/40/10.json b/tests/res/dicts/merge/40/10.json deleted file mode 120000 index 54f00df5..00000000 --- a/tests/res/dicts/merge/40/10.json +++ /dev/null @@ -1 +0,0 @@ -../10/10.json \ No newline at end of file diff --git a/tests/res/dicts/merge/40/e/10.json b/tests/res/dicts/merge/40/e/10.json deleted file mode 100644 index f5b76142..00000000 --- a/tests/res/dicts/merge/40/e/10.json +++ /dev/null @@ -1 +0,0 @@ -{"a": 2, "b": [1, 3, 0], "c": {"d": "d", "e": 1}, "f": null, "g": "g"} diff --git a/tests/res/dicts/merge/40/o/10.json b/tests/res/dicts/merge/40/o/10.json deleted file mode 100644 index 2ff78a1c..00000000 --- a/tests/res/dicts/merge/40/o/10.json +++ /dev/null @@ -1 +0,0 @@ -{"ac_merge": "merge_dicts_and_lists"} diff --git a/tests/res/dicts/merge/40/s/10.json b/tests/res/dicts/merge/40/s/10.json deleted file mode 120000 index 7116e9cb..00000000 --- a/tests/res/dicts/merge/40/s/10.json +++ /dev/null @@ -1 +0,0 @@ -../../10/s/10.json \ No newline at end of file diff --git a/tests/res/dicts/mk_nested_dic/10/10.py b/tests/res/dicts/mk_nested_dic/10/10.py deleted file mode 100644 index 494f60a3..00000000 --- a/tests/res/dicts/mk_nested_dic/10/10.py +++ /dev/null @@ -1 +0,0 @@ -'a.b.c' diff --git a/tests/res/dicts/mk_nested_dic/10/20.py b/tests/res/dicts/mk_nested_dic/10/20.py deleted file mode 100644 index 9ef29c2a..00000000 --- a/tests/res/dicts/mk_nested_dic/10/20.py +++ /dev/null @@ -1 +0,0 @@ -'/a/b/c' diff --git a/tests/res/dicts/mk_nested_dic/10/e/10.json b/tests/res/dicts/mk_nested_dic/10/e/10.json deleted file mode 100644 index dd56e564..00000000 --- a/tests/res/dicts/mk_nested_dic/10/e/10.json +++ /dev/null @@ -1 +0,0 @@ -{"a": {"b": {"c": 1}}} diff --git a/tests/res/dicts/mk_nested_dic/10/e/20.json b/tests/res/dicts/mk_nested_dic/10/e/20.json deleted file mode 120000 index 0159d68f..00000000 --- a/tests/res/dicts/mk_nested_dic/10/e/20.json +++ /dev/null @@ -1 +0,0 @@ -10.json \ No newline at end of file diff --git a/tests/res/dicts/mk_nested_dic/10/o/10.json b/tests/res/dicts/mk_nested_dic/10/o/10.json deleted file mode 100644 index f44af1d3..00000000 --- a/tests/res/dicts/mk_nested_dic/10/o/10.json +++ /dev/null @@ -1 +0,0 @@ -{"seps": ["/", "."]} diff --git a/tests/res/dicts/mk_nested_dic/10/o/20.json b/tests/res/dicts/mk_nested_dic/10/o/20.json deleted file mode 120000 index 0159d68f..00000000 --- a/tests/res/dicts/mk_nested_dic/10/o/20.json +++ /dev/null @@ -1 +0,0 @@ -10.json \ No newline at end of file diff --git a/tests/res/dicts/mk_nested_dic/10/q/10.py b/tests/res/dicts/mk_nested_dic/10/q/10.py deleted file mode 100644 index d00491fd..00000000 --- a/tests/res/dicts/mk_nested_dic/10/q/10.py +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/res/dicts/mk_nested_dic/10/q/20.py b/tests/res/dicts/mk_nested_dic/10/q/20.py deleted file mode 120000 index 174e2954..00000000 --- a/tests/res/dicts/mk_nested_dic/10/q/20.py +++ /dev/null @@ -1 +0,0 @@ -10.py \ No newline at end of file