Skip to content

Commit 23c7c62

Browse files
sneakers-the-ratsneakers-the-rat
committed
convert string comparison tests to instance comparisons
1 parent 9613bd4 commit 23c7c62

File tree

2 files changed

+84
-64
lines changed

2 files changed

+84
-64
lines changed

‎tests/test_utils/test_inlined_as_dict_forms.py‎

Lines changed: 46 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ class InlinedAsDictTestcase(unittest.TestCase):
99
""" Test the various YAML forms for inlined_as_dict entries"""
1010
def test_list_variations(self):
1111
v = E()
12-
self.assertEqual("E(ev={})", str(v), "No entries, period")
12+
self.assertEqual(v.ev, {}, "No entries, period")
1313
v = E({})
14-
self.assertEqual("E(ev={})", str(v), "Default is empty dictionary")
14+
self.assertEqual(v.ev, {}, "Default is empty dictionary")
1515
v = E([])
16-
self.assertEqual('E(ev={})', str(v), "Empty list becomes empty dictionary")
16+
self.assertEqual(v.ev, {}, "Empty list becomes empty dictionary")
1717
v = E(JsonObj())
18-
self.assertEqual('E(ev={})', str(v), "Empty JsonObj becomes empty dictionary")
18+
self.assertEqual(v.ev, {}, "Empty JsonObj becomes empty dictionary")
1919
# Form 5 -- list of keys
2020
v1 = JsonObj(["k1", "k2"])
2121
v = E(v1)
22-
self.assertEqual("E(ev={'k1': EInst(s1='k1', s2=None, s3=None), 'k2': EInst(s1='k2', s2=None, s3=None)})",
23-
str(v))
22+
self.assertEqual(v.ev, {'k1': EInst(s1='k1'), 'k2': EInst(s1='k2')})
2423
# Form 4: -- list of key/object pairs
2524
v = E([{"k1": {"s1": "k1", "s2": "v21", "s3": "v23"}},
2625
{"k2": {"s2": "v22", "s3": "v23"}},
2726
{"k3": {}}])
28-
self.assertEqual("E(ev={'k1': EInst(s1='k1', s2='v21', s3='v23'),"
29-
" 'k2': EInst(s1='k2', s2='v22', s3='v23'),"
30-
" 'k3': EInst(s1='k3', s2=None, s3=None)})", str(v),
27+
self.assertEqual(v.ev,
28+
{'k1': EInst(s1='k1', s2='v21', s3='v23'),
29+
'k2': EInst(s1='k2', s2='v22', s3='v23'),
30+
'k3': EInst(s1='k3', s2=None, s3=None)},
3131
"List of key value constructors")
3232

3333
with self.assertRaises(ValueError) as e:
@@ -41,28 +41,34 @@ def test_list_variations(self):
4141
v = E([{"k1": EInst(s1="k1", s2="v21", s3="v23")},
4242
{"k2": JsonObj({"s2": "v22", "s3": "v23"})},
4343
{"k3": None}])
44-
self.assertEqual("E(ev={'k1': EInst(s1='k1', s2='v21', s3='v23'),"
45-
" 'k2': EInst(s1='k2', s2='v22', s3='v23'),"
46-
" 'k3': EInst(s1='k3', s2=None, s3=None)})", str(v))
44+
self.assertEqual(v.ev,
45+
{
46+
'k1': EInst(s1='k1', s2='v21', s3='v23'),
47+
'k2': EInst(s1='k2', s2='v22', s3='v23'),
48+
'k3': EInst(s1='k3', s2=None, s3=None)
49+
})
4750

4851
# More Form 5 variations
4952
v = E(["k1", "k2", {"k3": "v3"}, ["k4", "v4"], {"s1": "k5", "s2": "v52"}])
50-
self.assertEqual("E(ev={'k1': EInst(s1='k1', s2=None, s3=None), "
51-
"'k2': EInst(s1='k2', s2=None, s3=None), "
52-
"'k3': EInst(s1='k3', s2='v3', s3=None), "
53-
"'k4': EInst(s1='k4', s2='v4', s3=None), "
54-
"'k5': EInst(s1='k5', s2='v52', s3=None)})", str(v), "Key value tuples")
53+
self.assertEqual(v.ev,
54+
{'k1': EInst(s1='k1', s2=None, s3=None),
55+
'k2': EInst(s1='k2', s2=None, s3=None),
56+
'k3': EInst(s1='k3', s2='v3', s3=None),
57+
'k4': EInst(s1='k4', s2='v4', s3=None),
58+
'k5': EInst(s1='k5', s2='v52', s3=None)}, "Key value tuples")
5559

5660
# Form 6 - list of positional object values
5761
v = E([["k1", "v12", "v13"], ["k2", "v22"], ["k3"]])
58-
self.assertEqual("E(ev={'k1': EInst(s1='k1', s2='v12', s3='v13'), "
59-
"'k2': EInst(s1='k2', s2='v22', s3=None), "
60-
"'k3': EInst(s1='k3', s2=None, s3=None)})", str(v), "Positional objects")
62+
self.assertEqual(v.ev,
63+
{'k1': EInst(s1='k1', s2='v12', s3='v13'),
64+
'k2': EInst(s1='k2', s2='v22', s3=None),
65+
'k3': EInst(s1='k3', s2=None, s3=None)}, "Positional objects")
6166

6267
# Form 7 - list of kv dictionaries
6368
v = E([{"s1": "v11", "s2": "v12"}, {"s1": "v21", "s2": "v22", "s3": "v23"}])
64-
self.assertEqual("E(ev={'v11': EInst(s1='v11', s2='v12', s3=None), "
65-
"'v21': EInst(s1='v21', s2='v22', s3='v23')})", str(v), "List of dictionaries")
69+
self.assertEqual(v.ev,
70+
{'v11': EInst(s1='v11', s2='v12', s3=None),
71+
'v21': EInst(s1='v21', s2='v22', s3='v23')}, "List of dictionaries")
6672

6773

6874
def test_dict_variations(self):
@@ -72,23 +78,30 @@ def test_dict_variations(self):
7278
"k2": JsonObj({"s2": "v22", "s3": "v23"}),
7379
"k3": {"s2": "v32", "s3": "v33"},
7480
"k4": {"s1": "k4"}})
75-
self.assertEqual(("E(ev={'k1': EInst(s1='k1', s2='v21', s3='v23'), "
76-
"'k2': EInst(s1='k2', s2='v22', s3='v23'), "
77-
"'k3': EInst(s1='k3', s2='v32', s3='v33'), "
78-
"'k4': EInst(s1='k4', s2=None, s3=None)})"), str(v), "Dictionary of key/object entries")
81+
self.assertEqual(v.ev,
82+
{'k1': EInst(s1='k1', s2='v21', s3='v23'),
83+
'k2': EInst(s1='k2', s2='v22', s3='v23'),
84+
'k3': EInst(s1='k3', s2='v32', s3='v33'),
85+
'k4': EInst(s1='k4', s2=None, s3=None)},
86+
"Dictionary of key/object entries")
7987

8088
# Form 2: key/value tuples (only works when at most two values are required
8189
v = E(ev={"k1": "v11", "k2": "v21", "k3": {}})
82-
self.assertEqual("E(ev={'k1': EInst(s1='k1', s2='v11', s3=None),"
83-
" 'k2': EInst(s1='k2', s2='v21', s3=None), "
84-
"'k3': EInst(s1='k3', s2=None, s3=None)})", str(v), "Dictionary of two-key entries")
90+
expected = ("E({ 'ev': { 'k1': {'s1': 'k1', 's2': 'v11'},\n"
91+
" 'k2': {'s1': 'k2', 's2': 'v21'},\n"
92+
" 'k3': {'s1': 'k3'}}})")
93+
self.assertEqual(v.ev,
94+
{'k1': EInst(s1='k1', s2='v11', s3=None),
95+
'k2': EInst(s1='k2', s2='v21', s3=None),
96+
'k3': EInst(s1='k3', s2=None, s3=None)},
97+
"Dictionary of two-key entries")
8598

8699
# Form 3: Basic single object (differentiated from form2 by the presence of the key name
87100
v = E({"s1": "k1"})
88-
self.assertEqual("E(ev={'k1': EInst(s1='k1', s2=None, s3=None)})",
89-
str(v), "Single entry dictionary")
101+
self.assertEqual(v.ev, {'k1': EInst(s1='k1', s2=None, s3=None)},
102+
"Single entry dictionary")
90103
v = E({"s1": "k1", "s2": "v12"})
91-
self.assertEqual("E(ev={'k1': EInst(s1='k1', s2='v12', s3=None)})", str(v), "Single entry dictionary")
104+
self.assertEqual(v.ev, {'k1': EInst(s1='k1', s2='v12', s3=None)}, "Single entry dictionary")
92105

93106
def test_isempties(self):
94107
base = E()
@@ -106,3 +119,4 @@ def test_isempties(self):
106119

107120
if __name__ == '__main__':
108121
unittest.main()
122+

‎tests/test_utils/test_inlined_as_list_forms.py‎

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ class InlinedAsListTestcase(unittest.TestCase):
99
""" Test the various YAML forms for inlined_as_list entries"""
1010
def test_list_variations(self):
1111
v = E()
12-
self.assertEqual("E(ev=[])", str(v), "No entries, period")
12+
self.assertEqual(v.ev, [], "No entries, period")
1313
v = E({})
14-
self.assertEqual("E(ev=[])", str(v), "Default is empty dictionary")
14+
self.assertEqual(v.ev, [], "Default is empty dictionary")
1515
v = E([])
16-
self.assertEqual('E(ev=[])', str(v), "Empty list becomes empty dictionary")
16+
self.assertEqual(v.ev, [], "Empty list becomes empty dictionary")
1717
v = E(JsonObj())
18-
self.assertEqual('E(ev=[])', str(v), "Empty JsonObj becomes empty dictionary")
18+
self.assertEqual(v.ev, [], "Empty JsonObj becomes empty dictionary")
1919
# Form 5 -- list of keys
2020
v1 = JsonObj(["k1", "k2"])
2121
v = E(v1)
22-
self.assertEqual("E(ev=[EInst(s1='k1', s2=None, s3=None), EInst(s1='k2', s2=None, s3=None)])",
23-
str(v))
22+
self.assertEqual(v.ev, [EInst(s1='k1', s2=None, s3=None), EInst(s1='k2', s2=None, s3=None)])
2423
# Form 4: -- list of key/object pairs
2524
v = E([{"k1": {"s1": "k1", "s2": "v21", "s3": "v23"}},
2625
{"k2": {"s2": "v22", "s3": "v23"}},
2726
{"k3": {}}])
28-
self.assertEqual("E(ev=[EInst(s1='k1', s2='v21', s3='v23'),"
29-
" EInst(s1='k2', s2='v22', s3='v23'),"
30-
" EInst(s1='k3', s2=None, s3=None)])", str(v),
27+
self.assertEqual(v.ev,
28+
[EInst(s1='k1', s2='v21', s3='v23'),
29+
EInst(s1='k2', s2='v22', s3='v23'),
30+
EInst(s1='k3', s2=None, s3=None)],
3131
"List of key value constructors")
3232

3333
with self.assertRaises(ValueError) as e:
@@ -41,28 +41,32 @@ def test_list_variations(self):
4141
v = E([{"k1": EInst(s1="k1", s2="v21", s3="v23")},
4242
{"k2": JsonObj({"s2": "v22", "s3": "v23"})},
4343
{"k3": None}])
44-
self.assertEqual("E(ev=[EInst(s1='k1', s2='v21', s3='v23'),"
45-
" EInst(s1='k2', s2='v22', s3='v23'),"
46-
" EInst(s1='k3', s2=None, s3=None)])", str(v))
44+
self.assertEqual(v.ev,
45+
[EInst(s1='k1', s2='v21', s3='v23'),
46+
EInst(s1='k2', s2='v22', s3='v23'),
47+
EInst(s1='k3', s2=None, s3=None)])
4748

4849
# More Form 5 variations
4950
v = E(["k1", "k2", {"k3": "v3"}, ["k4", "v4"], {"s1": "k5", "s2": "v52"}])
50-
self.assertEqual("E(ev=[EInst(s1='k1', s2=None, s3=None), "
51-
"EInst(s1='k2', s2=None, s3=None), "
52-
"EInst(s1='k3', s2='v3', s3=None), "
53-
"EInst(s1='k4', s2='v4', s3=None), "
54-
"EInst(s1='k5', s2='v52', s3=None)])", str(v), "Key value tuples")
51+
self.assertEqual(v.ev,
52+
[EInst(s1='k1', s2=None, s3=None),
53+
EInst(s1='k2', s2=None, s3=None),
54+
EInst(s1='k3', s2='v3', s3=None),
55+
EInst(s1='k4', s2='v4', s3=None),
56+
EInst(s1='k5', s2='v52', s3=None)], "Key value tuples")
5557

5658
# Form 6 - list of positional object values
5759
v = E([["k1", "v12", "v13"], ["k2", "v22"], ["k3"]])
58-
self.assertEqual("E(ev=[EInst(s1='k1', s2='v12', s3='v13'), "
59-
"EInst(s1='k2', s2='v22', s3=None), "
60-
"EInst(s1='k3', s2=None, s3=None)])", str(v), "Positional objects")
60+
self.assertEqual(v.ev,
61+
[EInst(s1='k1', s2='v12', s3='v13'),
62+
EInst(s1='k2', s2='v22', s3=None),
63+
EInst(s1='k3', s2=None, s3=None)], "Positional objects")
6164

6265
# Form 7 - list of kv dictionaries
6366
v = E([{"s1": "v11", "s2": "v12"}, {"s1": "v21", "s2": "v22", "s3": "v23"}])
64-
self.assertEqual("E(ev=[EInst(s1='v11', s2='v12', s3=None), "
65-
"EInst(s1='v21', s2='v22', s3='v23')])", str(v), "List of dictionaries")
67+
self.assertEqual(v.ev,
68+
[EInst(s1='v11', s2='v12', s3=None),
69+
EInst(s1='v21', s2='v22', s3='v23')], "List of dictionaries")
6670

6771

6872
def test_dict_variations(self):
@@ -72,23 +76,25 @@ def test_dict_variations(self):
7276
"k2": JsonObj({"s2": "v22", "s3": "v23"}),
7377
"k3": {"s2": "v32", "s3": "v33"},
7478
"k4": {"s1": "k4"}})
75-
self.assertEqual(("E(ev=[EInst(s1='k1', s2='v21', s3='v23'), "
76-
"EInst(s1='k2', s2='v22', s3='v23'), "
77-
"EInst(s1='k3', s2='v32', s3='v33'), "
78-
"EInst(s1='k4', s2=None, s3=None)])"), str(v), "Dictionary of key/object entries")
79+
self.assertEqual(v.ev,
80+
[EInst(s1='k1', s2='v21', s3='v23'),
81+
EInst(s1='k2', s2='v22', s3='v23'),
82+
EInst(s1='k3', s2='v32', s3='v33'),
83+
EInst(s1='k4', s2=None, s3=None)], "Dictionary of key/object entries")
7984

8085
# Form 2: key/value tuples (only works when at most two values are required
8186
v = E(ev={"k1": "v11", "k2": "v21", "k3": {}})
82-
self.assertEqual("E(ev=[EInst(s1='k1', s2='v11', s3=None),"
83-
" EInst(s1='k2', s2='v21', s3=None), "
84-
"EInst(s1='k3', s2=None, s3=None)])", str(v), "Dictionary of two-key entries")
87+
self.assertEqual(v.ev,
88+
[EInst(s1='k1', s2='v11', s3=None),
89+
EInst(s1='k2', s2='v21', s3=None),
90+
EInst(s1='k3', s2=None, s3=None)], "Dictionary of two-key entries")
8591

8692
# Form 3: Basic single object (differentiated from form2 by the presence of the key name
8793
v = E({"s1": "k1"})
88-
self.assertEqual("E(ev=[EInst(s1='k1', s2=None, s3=None)])",
89-
str(v), "Single entry dictionary")
94+
self.assertEqual(v.ev, [EInst(s1='k1', s2=None, s3=None)],
95+
"Single entry dictionary")
9096
v = E({"s1": "k1", "s2": "v12"})
91-
self.assertEqual("E(ev=[EInst(s1='k1', s2='v12', s3=None)])", str(v), "Single entry dictionary")
97+
self.assertEqual(v.ev, [EInst(s1='k1', s2='v12', s3=None)], "Single entry dictionary")
9298

9399

94100
if __name__ == '__main__':

0 commit comments

Comments
 (0)