Skip to content

Commit 96fd037

Browse files
nervonervo
authored
Merge pull request #13 from manala/path/cleanup-tests
[Path] Cleanup tests
2 parents 6975bd9 + c1aa84c commit 96fd037

4 files changed

Lines changed: 120 additions & 90 deletions

File tree

‎path/tests/unit/plugins/filter/test_extension.py‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,54 @@ def test_invalid_extension(self):
3030

3131
def test(self):
3232
self.assertEqual({
33-
'path': 'path.foo',
33+
'path': 'foo.foo',
3434
}, _filter_extension(
35-
{'path': 'path'},
35+
{'path': 'foo'},
36+
'foo',
37+
))
38+
39+
self.assertEqual([
40+
{'path': 'foo.foo'},
41+
{'path': 'foo/bar.foo'},
42+
], _filter_extension([
43+
{'path': 'foo'},
44+
{'path': 'foo/bar'},
45+
],
3646
'foo',
3747
))
3848

3949
def test_dotted_extension(self):
4050
self.assertEqual({
41-
'path': 'path.foo',
51+
'path': 'foo.foo',
4252
}, _filter_extension(
43-
{'path': 'path'},
53+
{'path': 'foo'},
54+
'.foo',
55+
))
56+
57+
self.assertEqual([
58+
{'path': 'foo.foo'},
59+
{'path': 'foo/bar.foo'},
60+
], _filter_extension([
61+
{'path': 'foo'},
62+
{'path': 'foo/bar'},
63+
],
4464
'.foo',
4565
))
4666

4767
def test_path_already_extensioned(self):
4868
self.assertEqual({
49-
'path': 'path.foo',
69+
'path': 'foo.foo',
5070
}, _filter_extension(
51-
{'path': 'path.foo'},
71+
{'path': 'foo.foo'},
72+
'foo',
73+
))
74+
75+
self.assertEqual([
76+
{'path': 'foo.foo'},
77+
{'path': 'foo/bar.foo'},
78+
], _filter_extension([
79+
{'path': 'foo.foo'},
80+
{'path': 'foo/bar.foo'},
81+
],
5282
'foo',
5383
))

‎path/tests/unit/plugins/filter/test_state.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from ansible.errors import AnsibleTemplateError
77

88

9-
class TestLabel(unittest.TestCase):
9+
class TestState(unittest.TestCase):
1010

1111
def test_invalid_inputs(self):
1212
path = NotImplemented

‎path/tests/unit/plugins/test/test_match.py‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -18,51 +18,51 @@ def test_invalid_input(self):
1818
def test_none_pattern(self):
1919
pattern = None
2020

21-
self.assertEqual(True, _test_match({'path': '/foo'}, pattern))
22-
self.assertEqual(True, _test_match({'path': '/foo/bar'}, pattern))
23-
self.assertEqual(True, _test_match({'path': '/foo/baz'}, pattern))
21+
self.assertTrue(_test_match({'path': '/foo'}, pattern))
22+
self.assertTrue(_test_match({'path': '/foo/bar'}, pattern))
23+
self.assertTrue(_test_match({'path': '/foo/baz'}, pattern))
2424

2525
def test_empty_pattern(self):
2626
pattern = ''
2727

28-
self.assertEqual(False, _test_match({'path': '/foo'}, pattern))
29-
self.assertEqual(False, _test_match({'path': '/foo/bar'}, pattern))
30-
self.assertEqual(False, _test_match({'path': '/foo/baz'}, pattern))
28+
self.assertFalse(_test_match({'path': '/foo'}, pattern))
29+
self.assertFalse(_test_match({'path': '/foo/bar'}, pattern))
30+
self.assertFalse(_test_match({'path': '/foo/baz'}, pattern))
3131

3232
def test(self):
3333
path = {'path': '/foo'}
34-
self.assertEqual(True, _test_match(path, '/foo'))
35-
self.assertEqual(False, _test_match(path, 'foo'))
36-
self.assertEqual(False, _test_match(path, '/bar'))
37-
self.assertEqual(True, _test_match(path, '/*'))
38-
self.assertEqual(True, _test_match(path, '*'))
39-
self.assertEqual(True, _test_match(path, '/foo*'))
40-
self.assertEqual(False, _test_match(path, 'foo*'))
41-
self.assertEqual(True, _test_match(path, '*foo'))
42-
self.assertEqual(False, _test_match(path, '*bar'))
43-
self.assertEqual(True, _test_match(path, '*foo*'))
44-
self.assertEqual(False, _test_match(path, '*bar*'))
45-
self.assertEqual(True, _test_match(path, '*f*'))
46-
self.assertEqual(False, _test_match(path, '*b*'))
34+
self.assertTrue(_test_match(path, '/foo'))
35+
self.assertFalse(_test_match(path, 'foo'))
36+
self.assertFalse(_test_match(path, '/bar'))
37+
self.assertTrue(_test_match(path, '/*'))
38+
self.assertTrue(_test_match(path, '*'))
39+
self.assertTrue(_test_match(path, '/foo*'))
40+
self.assertFalse(_test_match(path, 'foo*'))
41+
self.assertTrue(_test_match(path, '*foo'))
42+
self.assertFalse(_test_match(path, '*bar'))
43+
self.assertTrue(_test_match(path, '*foo*'))
44+
self.assertFalse(_test_match(path, '*bar*'))
45+
self.assertTrue(_test_match(path, '*f*'))
46+
self.assertFalse(_test_match(path, '*b*'))
4747

4848
path = {'path': '/foo/bar'}
49-
self.assertEqual(True, _test_match(path, '/foo/bar'))
50-
self.assertEqual(False, _test_match(path, 'foo'))
51-
self.assertEqual(False, _test_match(path, 'foo/bar'))
52-
self.assertEqual(False, _test_match(path, '/bar/baz'))
53-
self.assertEqual(True, _test_match(path, '/*/*'))
54-
self.assertEqual(True, _test_match(path, '/*'))
55-
self.assertEqual(True, _test_match(path, '*/*'))
56-
self.assertEqual(True, _test_match(path, '*'))
57-
self.assertEqual(True, _test_match(path, '/foo/bar*'))
58-
self.assertEqual(True, _test_match(path, '/foo/*'))
59-
self.assertEqual(False, _test_match(path, 'foo/bar*'))
60-
self.assertEqual(False, _test_match(path, 'foo*'))
61-
self.assertEqual(True, _test_match(path, '*foo/bar'))
62-
self.assertEqual(False, _test_match(path, '*foo'))
63-
self.assertEqual(True, _test_match(path, '*bar'))
64-
self.assertEqual(True, _test_match(path, '*foo/bar*'))
65-
self.assertEqual(True, _test_match(path, '*foo*'))
66-
self.assertEqual(True, _test_match(path, '*bar*'))
67-
self.assertEqual(True, _test_match(path, '*f*'))
68-
self.assertEqual(True, _test_match(path, '*b*'))
49+
self.assertTrue(_test_match(path, '/foo/bar'))
50+
self.assertFalse(_test_match(path, 'foo'))
51+
self.assertFalse(_test_match(path, 'foo/bar'))
52+
self.assertFalse(_test_match(path, '/bar/baz'))
53+
self.assertTrue(_test_match(path, '/*/*'))
54+
self.assertTrue(_test_match(path, '/*'))
55+
self.assertTrue(_test_match(path, '*/*'))
56+
self.assertTrue(_test_match(path, '*'))
57+
self.assertTrue(_test_match(path, '/foo/bar*'))
58+
self.assertTrue(_test_match(path, '/foo/*'))
59+
self.assertFalse(_test_match(path, 'foo/bar*'))
60+
self.assertFalse(_test_match(path, 'foo*'))
61+
self.assertTrue(_test_match(path, '*foo/bar'))
62+
self.assertFalse(_test_match(path, '*foo'))
63+
self.assertTrue(_test_match(path, '*bar'))
64+
self.assertTrue(_test_match(path, '*foo/bar*'))
65+
self.assertTrue(_test_match(path, '*foo*'))
66+
self.assertTrue(_test_match(path, '*bar*'))
67+
self.assertTrue(_test_match(path, '*f*'))
68+
self.assertTrue(_test_match(path, '*b*'))

‎path/tests/unit/plugins/test/test_state.py‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,30 @@ def test_invalid_input(self):
2525
def test_empty(self):
2626
path = {}
2727

28-
self.assertEqual(False, _test_file(path))
29-
self.assertEqual(False, _test_link(path))
30-
self.assertEqual(True, _test_directory(path))
28+
self.assertFalse(_test_file(path))
29+
self.assertFalse(_test_link(path))
30+
self.assertTrue(_test_directory(path))
3131

3232
def test_explicit(self):
3333
path_absent = {'path': 'path', 'state': 'absent'}
3434
path_file = {'path': 'path', 'state': 'file'}
3535
path_link = {'path': 'path', 'state': 'link'}
3636
path_directory = {'path': 'path', 'state': 'directory'}
3737

38-
self.assertEqual(False, _test_file(path_absent))
39-
self.assertEqual(True, _test_file(path_file))
40-
self.assertEqual(False, _test_file(path_link))
41-
self.assertEqual(False, _test_file(path_directory))
38+
self.assertFalse(_test_file(path_absent))
39+
self.assertTrue(_test_file(path_file))
40+
self.assertFalse(_test_file(path_link))
41+
self.assertFalse(_test_file(path_directory))
4242

43-
self.assertEqual(False, _test_link(path_absent))
44-
self.assertEqual(False, _test_link(path_file))
45-
self.assertEqual(True, _test_link(path_link))
46-
self.assertEqual(False, _test_link(path_directory))
43+
self.assertFalse(_test_link(path_absent))
44+
self.assertFalse(_test_link(path_file))
45+
self.assertTrue(_test_link(path_link))
46+
self.assertFalse(_test_link(path_directory))
4747

48-
self.assertEqual(False, _test_directory(path_absent))
49-
self.assertEqual(False, _test_directory(path_file))
50-
self.assertEqual(False, _test_directory(path_link))
51-
self.assertEqual(True, _test_directory(path_directory))
48+
self.assertFalse(_test_directory(path_absent))
49+
self.assertFalse(_test_directory(path_file))
50+
self.assertFalse(_test_directory(path_link))
51+
self.assertTrue(_test_directory(path_directory))
5252

5353
def test_implicit_file(self):
5454
path_content = {'path': 'path', 'content': 'content'}
@@ -58,45 +58,45 @@ def test_implicit_file(self):
5858
path_template = {'path': 'path', 'template': 'template'}
5959
path_template_none = {'path': 'path', 'template': None}
6060

61-
self.assertEqual(True, _test_file(path_content))
62-
self.assertEqual(False, _test_file(path_content_none))
63-
self.assertEqual(True, _test_file(path_file))
64-
self.assertEqual(False, _test_file(path_file_none))
65-
self.assertEqual(True, _test_file(path_template))
66-
self.assertEqual(False, _test_file(path_template_none))
67-
68-
self.assertEqual(False, _test_link(path_content))
69-
self.assertEqual(False, _test_link(path_content_none))
70-
self.assertEqual(False, _test_link(path_file))
71-
self.assertEqual(False, _test_link(path_file_none))
72-
self.assertEqual(False, _test_link(path_template))
73-
self.assertEqual(False, _test_link(path_template_none))
74-
75-
self.assertEqual(False, _test_directory(path_content))
76-
self.assertEqual(True, _test_directory(path_content_none))
77-
self.assertEqual(False, _test_directory(path_file))
78-
self.assertEqual(True, _test_directory(path_file_none))
79-
self.assertEqual(False, _test_directory(path_template))
80-
self.assertEqual(True, _test_directory(path_template_none))
61+
self.assertTrue(_test_file(path_content))
62+
self.assertFalse(_test_file(path_content_none))
63+
self.assertTrue(_test_file(path_file))
64+
self.assertFalse(_test_file(path_file_none))
65+
self.assertTrue(_test_file(path_template))
66+
self.assertFalse(_test_file(path_template_none))
67+
68+
self.assertFalse(_test_link(path_content))
69+
self.assertFalse(_test_link(path_content_none))
70+
self.assertFalse(_test_link(path_file))
71+
self.assertFalse(_test_link(path_file_none))
72+
self.assertFalse(_test_link(path_template))
73+
self.assertFalse(_test_link(path_template_none))
74+
75+
self.assertFalse(_test_directory(path_content))
76+
self.assertTrue(_test_directory(path_content_none))
77+
self.assertFalse(_test_directory(path_file))
78+
self.assertTrue(_test_directory(path_file_none))
79+
self.assertFalse(_test_directory(path_template))
80+
self.assertTrue(_test_directory(path_template_none))
8181

8282
def test_implicit_link(self):
8383
path_src = {'path': 'path', 'src': 'src'}
8484
path_src_none = {'path': 'path', 'src': None}
8585

86-
self.assertEqual(False, _test_file(path_src))
87-
self.assertEqual(False, _test_file(path_src_none))
86+
self.assertFalse(_test_file(path_src))
87+
self.assertFalse(_test_file(path_src_none))
8888

89-
self.assertEqual(True, _test_link(path_src))
90-
self.assertEqual(False, _test_link(path_src_none))
89+
self.assertTrue(_test_link(path_src))
90+
self.assertFalse(_test_link(path_src_none))
9191

92-
self.assertEqual(False, _test_directory(path_src))
93-
self.assertEqual(True, _test_directory(path_src_none))
92+
self.assertFalse(_test_directory(path_src))
93+
self.assertTrue(_test_directory(path_src_none))
9494

9595
def test_implicit_directory(self):
9696
path = {'path': 'path'}
9797

98-
self.assertEqual(False, _test_file(path))
98+
self.assertFalse(_test_file(path))
9999

100-
self.assertEqual(False, _test_link(path))
100+
self.assertFalse(_test_link(path))
101101

102-
self.assertEqual(True, _test_directory(path))
102+
self.assertTrue(_test_directory(path))

0 commit comments

Comments
 (0)