Skip to content

Commit ccaa7c5

Browse files
committed
Add unittest for env_value_to_dict
Optimise import
1 parent ab80427 commit ccaa7c5

2 files changed

Lines changed: 15 additions & 7 deletions

File tree

apluslms_roman/builder.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import logging
2-
from os import environ, getuid, getegid
3-
from os.path import isdir, join
2+
from os import getuid, getegid
3+
from os.path import isdir
44

5+
from apluslms_yamlidator.utils.collections import OrderedDict
56
from apluslms_yamlidator.utils.decorator import cached_property
6-
from apluslms_yamlidator.utils.collections import OrderedDict, ChangesDict
7-
from apluslms_roman.utils.path_mapping import get_host_path, load_from_env, get_pair_form_env
87

8+
from apluslms_roman.utils.path_mapping import load_from_env
99
from .backends import BACKENDS, BuildTask, BuildStep, Environment
1010
from .observer import StreamObserver
1111
from .utils.importing import import_string
1212
from .utils.translation import _
1313

14-
1514
logger = logging.getLogger(__name__)
1615
logger.setLevel(logging.DEBUG)
1716

tests/test_json_regex.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import re
21
import unittest
32
from json import loads, dumps
3+
from apluslms_roman.utils.path_mapping import json_re, env_value_to_dict
44

5-
json_re = re.compile(r'^(?:["[{]|(?:-?[1-9]\d*(?:\.\d+)?|null|true|false)$)')
65
test_case_loadable = (
76
True,
87
False,
@@ -23,6 +22,7 @@
2322
"0123123",
2423
)
2524

25+
2626
def try_loads_json(json_str):
2727
try:
2828
data = loads(json_str)
@@ -53,3 +53,12 @@ def test_not_loadable_equal(self):
5353
with self.subTest(i=i):
5454
self.assertNotEqual(try_loads_json(dumps(case)), -1, msg="Testing:{}".format(case))
5555

56+
def test_loadable_type(self):
57+
for i, case in enumerate(test_case_loadable):
58+
with self.subTest(i=i):
59+
self.assertNotEqual(env_value_to_dict(dumps(case)), dumps(case), msg="Testing:{}".format(case))
60+
61+
def test_not_loadable_type(self):
62+
for i, case in enumerate(test_case_not_loadable):
63+
with self.subTest(i=i):
64+
self.assertEqual(env_value_to_dict(case), case, msg="Testing:{}".format(case))

0 commit comments

Comments
 (0)