openstack/oslo.policy
Code Issues Proposed changes

Change assertTrue(isinstance()) by optimal assert

Browse Source 
Some of tests use different method of
assertTrue(isinstance(A, B)) or assertEqual(type(A), B).
The correct way is to use assertIsInstance(A, B) provided
by testtools

Change-Id: I391e5fd804072e2d438d5c952dc934e664505a8d
This commit is contained in:
gecong1973 2016-10-08 09:46:47 +08:00
parent e4ecd85eb0
commit 0e691f4995
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
oslo_policy/tests/test_parser.py
View File

@ -26,23 +26,23 @@ class ParseCheckTestCase(test_base.BaseTestCase):
def test_false(self): def test_false(self):
result = _parser._parse_check('!') result = _parser._parse_check('!')
self.assertTrue(isinstance(result, _checks.FalseCheck)) self.assertIsInstance(result, _checks.FalseCheck)
def test_true(self): def test_true(self):
result = _parser._parse_check('@') result = _parser._parse_check('@')
self.assertTrue(isinstance(result, _checks.TrueCheck)) self.assertIsInstance(result, _checks.TrueCheck)
def test_bad_rule(self): def test_bad_rule(self):
result = _parser._parse_check('foobar') result = _parser._parse_check('foobar')
self.assertTrue(isinstance(result, _checks.FalseCheck)) self.assertIsInstance(result, _checks.FalseCheck)
@mock.patch.object(_checks, 'registered_checks', {}) @mock.patch.object(_checks, 'registered_checks', {})
def test_no_handler(self): def test_no_handler(self):
result = _parser._parse_check('no:handler') result = _parser._parse_check('no:handler')
self.assertTrue(isinstance(result, _checks.FalseCheck)) self.assertIsInstance(result, _checks.FalseCheck)
@mock.patch.object(_checks, 'registered_checks', { @mock.patch.object(_checks, 'registered_checks', {
'spam': mock.Mock(return_value='spam_check'), 'spam': mock.Mock(return_value='spam_check'),
@ -71,21 +71,21 @@ class ParseListRuleTestCase(test_base.BaseTestCase):
def test_empty(self): def test_empty(self):
result = _parser._parse_list_rule([]) result = _parser._parse_list_rule([])
self.assertTrue(isinstance(result, _checks.TrueCheck)) self.assertIsInstance(result, _checks.TrueCheck)
self.assertEqual('@', str(result)) self.assertEqual('@', str(result))
@mock.patch.object(_parser, '_parse_check', base.FakeCheck) @mock.patch.object(_parser, '_parse_check', base.FakeCheck)
def test_oneele_zeroele(self): def test_oneele_zeroele(self):
result = _parser._parse_list_rule([[]]) result = _parser._parse_list_rule([[]])
self.assertTrue(isinstance(result, _checks.FalseCheck)) self.assertIsInstance(result, _checks.FalseCheck)
self.assertEqual('!', str(result)) self.assertEqual('!', str(result))
@mock.patch.object(_parser, '_parse_check', base.FakeCheck) @mock.patch.object(_parser, '_parse_check', base.FakeCheck)
def test_oneele_bare(self): def test_oneele_bare(self):
result = _parser._parse_list_rule(['rule']) result = _parser._parse_list_rule(['rule'])
self.assertTrue(isinstance(result, base.FakeCheck)) self.assertIsInstance(result, base.FakeCheck)
self.assertEqual('rule', result.result) self.assertEqual('rule', result.result)
self.assertEqual('rule', str(result)) self.assertEqual('rule', str(result))
@ -93,7 +93,7 @@ class ParseListRuleTestCase(test_base.BaseTestCase):
def test_oneele_oneele(self): def test_oneele_oneele(self):
result = _parser._parse_list_rule([['rule']]) result = _parser._parse_list_rule([['rule']])
self.assertTrue(isinstance(result, base.FakeCheck)) self.assertIsInstance(result, base.FakeCheck)
self.assertEqual('rule', result.result) self.assertEqual('rule', result.result)
self.assertEqual('rule', str(result)) self.assertEqual('rule', str(result))
@ -101,10 +101,10 @@ class ParseListRuleTestCase(test_base.BaseTestCase):
def test_oneele_multi(self): def test_oneele_multi(self):
result = _parser._parse_list_rule([['rule1', 'rule2']]) result = _parser._parse_list_rule([['rule1', 'rule2']])
self.assertTrue(isinstance(result, _checks.AndCheck)) self.assertIsInstance(result, _checks.AndCheck)
self.assertEqual(2, len(result.rules)) self.assertEqual(2, len(result.rules))
for i, value in enumerate(['rule1', 'rule2']): for i, value in enumerate(['rule1', 'rule2']):
self.assertTrue(isinstance(result.rules[i], base.FakeCheck)) self.assertIsInstance(result.rules[i], base.FakeCheck)
self.assertEqual(value, result.rules[i].result) self.assertEqual(value, result.rules[i].result)
self.assertEqual('(rule1 and rule2)', str(result)) self.assertEqual('(rule1 and rule2)', str(result))
@ -112,10 +112,10 @@ class ParseListRuleTestCase(test_base.BaseTestCase):
def test_multi_oneele(self): def test_multi_oneele(self):
result = _parser._parse_list_rule([['rule1'], ['rule2']]) result = _parser._parse_list_rule([['rule1'], ['rule2']])
self.assertTrue(isinstance(result, _checks.OrCheck)) self.assertIsInstance(result, _checks.OrCheck)
self.assertEqual(2, len(result.rules)) self.assertEqual(2, len(result.rules))
for i, value in enumerate(['rule1', 'rule2']): for i, value in enumerate(['rule1', 'rule2']):
self.assertTrue(isinstance(result.rules[i], base.FakeCheck)) self.assertIsInstance(result.rules[i], base.FakeCheck)
self.assertEqual(value, result.rules[i].result) self.assertEqual(value, result.rules[i].result)
self.assertEqual('(rule1 or rule2)', str(result)) self.assertEqual('(rule1 or rule2)', str(result))
@ -124,14 +124,14 @@ class ParseListRuleTestCase(test_base.BaseTestCase):
result = _parser._parse_list_rule([['rule1', 'rule2'], result = _parser._parse_list_rule([['rule1', 'rule2'],
['rule3', 'rule4']]) ['rule3', 'rule4']])
self.assertTrue(isinstance(result, _checks.OrCheck)) self.assertIsInstance(result, _checks.OrCheck)
self.assertEqual(2, len(result.rules)) self.assertEqual(2, len(result.rules))
for i, values in enumerate([['rule1', 'rule2'], ['rule3', 'rule4']]): for i, values in enumerate([['rule1', 'rule2'], ['rule3', 'rule4']]):
self.assertTrue(isinstance(result.rules[i], _checks.AndCheck)) self.assertIsInstance(result.rules[i], _checks.AndCheck)
self.assertEqual(2, len(result.rules[i].rules)) self.assertEqual(2, len(result.rules[i].rules))
for j, value in enumerate(values): for j, value in enumerate(values):
self.assertTrue(isinstance(result.rules[i].rules[j], self.assertIsInstance(result.rules[i].rules[j],
base.FakeCheck)) base.FakeCheck)
self.assertEqual(value, result.rules[i].rules[j].result) self.assertEqual(value, result.rules[i].rules[j].result)
self.assertEqual('((rule1 and rule2) or (rule3 and rule4))', self.assertEqual('((rule1 and rule2) or (rule3 and rule4))',
str(result)) str(result))
@ -360,7 +360,7 @@ class ParseTextRuleTestCase(test_base.BaseTestCase):
def test_empty(self): def test_empty(self):
result = _parser._parse_text_rule('') result = _parser._parse_text_rule('')
self.assertTrue(isinstance(result, _checks.TrueCheck)) self.assertIsInstance(result, _checks.TrueCheck)
@mock.patch.object(_parser, '_parse_tokenize', @mock.patch.object(_parser, '_parse_tokenize',
return_value=[('tok1', 'val1'), ('tok2', 'val2')]) return_value=[('tok1', 'val1'), ('tok2', 'val2')])
@ -378,7 +378,7 @@ class ParseTextRuleTestCase(test_base.BaseTestCase):
def test_fail(self, mock_parse_tokenize): def test_fail(self, mock_parse_tokenize):
result = _parser._parse_text_rule('test rule') result = _parser._parse_text_rule('test rule')
self.assertTrue(isinstance(result, _checks.FalseCheck)) self.assertIsInstance(result, _checks.FalseCheck)
mock_parse_tokenize.assert_called_once_with('test rule') mock_parse_tokenize.assert_called_once_with('test rule')
def test_A_or_B_or_C(self): def test_A_or_B_or_C(self):