Skip to content

Commit e787457

Browse files
committed
test_frontend: split up into multiple classes
1 parent 7e66ee5 commit e787457

File tree

1 file changed

+27
-21
lines changed

1 file changed

+27
-21
lines changed

tests/test_frontend.py

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
from pypuppetdbquery import parse, query_facts
2323

2424

25-
class FakeNode(object):
25+
class _FakeNode(object):
2626
def __init__(self, node, name, value):
2727
self.node = node
2828
self.name = name
2929
self.value = value
3030

3131

32-
class TestFrontend(unittest.TestCase):
32+
class TestFrontendParse(unittest.TestCase):
3333
"""
34-
Test cases targetting :mod:`pypuppetdbquery`, and particularly
35-
:func:`pypuppetdbquery.parse`.
34+
Test cases targetting :func:`pypuppetdbquery.parse`.
3635
"""
36+
3737
def _parse(self, s, **kwargs):
3838
return parse(
3939
s,
@@ -48,19 +48,6 @@ def _parse(self, s, **kwargs):
4848
},
4949
**kwargs)
5050

51-
def _query_facts(self, pdb, s, facts=None, raw=False):
52-
return query_facts(
53-
pdb, s, facts, raw,
54-
lex_options={
55-
'debug': False,
56-
'optimize': False,
57-
},
58-
yacc_options={
59-
'debug': False,
60-
'optimize': False,
61-
'write_tables': False,
62-
})
63-
6451
def test_empty_queries(self):
6552
out = self._parse('')
6653
self.assertTrue(out is None)
@@ -87,10 +74,29 @@ def test_simple_raw(self):
8774
['=', 'value', 'bar']]]]]
8875
self.assertEqual(out, expect)
8976

77+
78+
class TestFrontendQueryFacts(unittest.TestCase):
79+
"""
80+
Test cases targetting :func:`pypuppetdbquery.query_facts`.
81+
"""
82+
83+
def _query_facts(self, pdb, s, facts=None, raw=False):
84+
return query_facts(
85+
pdb, s, facts, raw,
86+
lex_options={
87+
'debug': False,
88+
'optimize': False,
89+
},
90+
yacc_options={
91+
'debug': False,
92+
'optimize': False,
93+
'write_tables': False,
94+
})
95+
9096
def test_query_facts_with_query_and_facts_list(self):
9197
mock_pdb = mock.NonCallableMock()
9298
mock_pdb.facts = mock.Mock(return_value=[
93-
FakeNode('alpha', 'foo', 'bar'),
99+
_FakeNode('alpha', 'foo', 'bar'),
94100
])
95101

96102
node_facts = self._query_facts(mock_pdb, 'foo=bar', ['foo'])
@@ -113,7 +119,7 @@ def test_query_facts_with_query_and_facts_list(self):
113119
def test_query_facts_with_query_and_facts_list_regex(self):
114120
mock_pdb = mock.NonCallableMock()
115121
mock_pdb.facts = mock.Mock(return_value=[
116-
FakeNode('alpha', 'foo', 'bar'),
122+
_FakeNode('alpha', 'foo', 'bar'),
117123
])
118124

119125
node_facts = self._query_facts(mock_pdb, 'foo=bar', ['/foo/'])
@@ -136,7 +142,7 @@ def test_query_facts_with_query_and_facts_list_regex(self):
136142
def test_query_facts_with_facts_list_only(self):
137143
mock_pdb = mock.NonCallableMock()
138144
mock_pdb.facts = mock.Mock(return_value=[
139-
FakeNode('alpha', 'foo', 'bar'),
145+
_FakeNode('alpha', 'foo', 'bar'),
140146
])
141147

142148
node_facts = self._query_facts(mock_pdb, '', ['foo'])
@@ -156,7 +162,7 @@ def test_query_facts_without_query_or_facts(self):
156162
def test_query_facts_in_raw_mode(self):
157163
mock_pdb = mock.NonCallableMock()
158164
mock_pdb.facts = mock.Mock(return_value=[
159-
FakeNode('alpha', 'foo', 'bar'),
165+
_FakeNode('alpha', 'foo', 'bar'),
160166
])
161167

162168
node_facts = self._query_facts(mock_pdb, 'foo=bar', raw=True)

0 commit comments

Comments
 (0)