Skip to content

Commit f187d7f

Browse files
jwaldenjwalden
committed
In unit tests, replaced occurrences of assertTrue(a,b) which does not
compare the values a and b with assertEqual(a,b) which does compare the two values. Signed-off-by: James Walden <[email protected]>
1 parent 3b82d0a commit f187d7f

File tree

12 files changed

+152
-152
lines changed

12 files changed

+152
-152
lines changed

‎tests/test_bandit.py‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -46,44 +46,44 @@ def test_analyze_details(self):
4646
result = bandit.analyze(**kwargs)
4747

4848
self.assertIn('loc_analyzed', result)
49-
self.assertTrue(type(result['loc_analyzed']), int)
49+
self.assertEqual(type(result['loc_analyzed']), int)
5050
self.assertIn('num_vulns', result)
51-
self.assertTrue(type(result['num_vulns']), int)
51+
self.assertEqual(type(result['num_vulns']), int)
5252
self.assertIn('by_severity', result)
53-
self.assertTrue(type(result['by_severity']), dict)
53+
self.assertEqual(type(result['by_severity']), dict)
5454
self.assertIn('undefined', result['by_severity'])
55-
self.assertTrue(type(result['by_severity']['undefined']), int)
55+
self.assertEqual(type(result['by_severity']['undefined']), int)
5656
self.assertIn('low', result['by_severity'])
57-
self.assertTrue(type(result['by_severity']['low']), int)
57+
self.assertEqual(type(result['by_severity']['low']), int)
5858
self.assertIn('medium', result['by_severity'])
59-
self.assertTrue(type(result['by_severity']['medium']), int)
59+
self.assertEqual(type(result['by_severity']['medium']), int)
6060
self.assertIn('high', result['by_severity'])
61-
self.assertTrue(type(result['by_severity']['high']), int)
61+
self.assertEqual(type(result['by_severity']['high']), int)
6262

6363
self.assertIn('by_confidence', result)
64-
self.assertTrue(type(result['by_confidence']), dict)
64+
self.assertEqual(type(result['by_confidence']), dict)
6565
self.assertIn('undefined', result['by_confidence'])
66-
self.assertTrue(type(result['by_confidence']['undefined']), int)
66+
self.assertEqual(type(result['by_confidence']['undefined']), int)
6767
self.assertIn('low', result['by_confidence'])
68-
self.assertTrue(type(result['by_confidence']['low']), int)
68+
self.assertEqual(type(result['by_confidence']['low']), int)
6969
self.assertIn('medium', result['by_confidence'])
70-
self.assertTrue(type(result['by_confidence']['medium']), int)
70+
self.assertEqual(type(result['by_confidence']['medium']), int)
7171
self.assertIn('high', result['by_confidence'])
72-
self.assertTrue(type(result['by_confidence']['high']), int)
72+
self.assertEqual(type(result['by_confidence']['high']), int)
7373

7474
self.assertIn('vulns', result)
7575

7676
vd = result['vulns'][0]
7777
self.assertIn('file', vd)
78-
self.assertTrue(type(vd['file']), str)
78+
self.assertEqual(type(vd['file']), str)
7979
self.assertIn('line', vd)
80-
self.assertTrue(type(vd['line']), int)
80+
self.assertEqual(type(vd['line']), int)
8181
self.assertIn('severity', vd)
82-
self.assertTrue(type(vd['severity']), str)
82+
self.assertEqual(type(vd['severity']), str)
8383
self.assertIn('confidence', vd)
84-
self.assertTrue(type(vd['confidence']), str)
84+
self.assertEqual(type(vd['confidence']), str)
8585
self.assertIn('descr', vd)
86-
self.assertTrue(type(vd['descr']), str)
86+
self.assertEqual(type(vd['descr']), str)
8787

8888
def test_analyze_no_details(self):
8989
"""Test whether bandit returns the expected fields data"""
@@ -96,30 +96,30 @@ def test_analyze_no_details(self):
9696
result = bandit.analyze(**kwargs)
9797

9898
self.assertIn('loc_analyzed', result)
99-
self.assertTrue(type(result['loc_analyzed']), int)
99+
self.assertEqual(type(result['loc_analyzed']), int)
100100
self.assertIn('num_vulns', result)
101-
self.assertTrue(type(result['num_vulns']), int)
101+
self.assertEqual(type(result['num_vulns']), int)
102102
self.assertIn('by_severity', result)
103-
self.assertTrue(type(result['by_severity']), dict)
103+
self.assertEqual(type(result['by_severity']), dict)
104104
self.assertIn('undefined', result['by_severity'])
105-
self.assertTrue(type(result['by_severity']['undefined']), int)
105+
self.assertEqual(type(result['by_severity']['undefined']), int)
106106
self.assertIn('low', result['by_severity'])
107-
self.assertTrue(type(result['by_severity']['low']), int)
107+
self.assertEqual(type(result['by_severity']['low']), int)
108108
self.assertIn('medium', result['by_severity'])
109-
self.assertTrue(type(result['by_severity']['medium']), int)
109+
self.assertEqual(type(result['by_severity']['medium']), int)
110110
self.assertIn('high', result['by_severity'])
111-
self.assertTrue(type(result['by_severity']['high']), int)
111+
self.assertEqual(type(result['by_severity']['high']), int)
112112

113113
self.assertIn('by_confidence', result)
114-
self.assertTrue(type(result['by_confidence']), dict)
114+
self.assertEqual(type(result['by_confidence']), dict)
115115
self.assertIn('undefined', result['by_confidence'])
116-
self.assertTrue(type(result['by_confidence']['undefined']), int)
116+
self.assertEqual(type(result['by_confidence']['undefined']), int)
117117
self.assertIn('low', result['by_confidence'])
118-
self.assertTrue(type(result['by_confidence']['low']), int)
118+
self.assertEqual(type(result['by_confidence']['low']), int)
119119
self.assertIn('medium', result['by_confidence'])
120-
self.assertTrue(type(result['by_confidence']['medium']), int)
120+
self.assertEqual(type(result['by_confidence']['medium']), int)
121121
self.assertIn('high', result['by_confidence'])
122-
self.assertTrue(type(result['by_confidence']['high']), int)
122+
self.assertEqual(type(result['by_confidence']['high']), int)
123123

124124
self.assertNotIn('vulns', result)
125125

‎tests/test_cloc.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ def test_analyze(self):
5353
result = cloc.analyze(**kwargs)
5454

5555
self.assertIn('blanks', result)
56-
self.assertTrue(type(result['blanks']), int)
57-
self.assertTrue(result['blanks'], 27)
56+
self.assertEqual(type(result['blanks']), int)
57+
self.assertEqual(result['blanks'], 27)
5858
self.assertIn('comments', result)
59-
self.assertTrue(type(result['comments']), int)
60-
self.assertTrue(result['comments'], 31)
59+
self.assertEqual(type(result['comments']), int)
60+
self.assertEqual(result['comments'], 31)
6161
self.assertIn('loc', result)
62-
self.assertTrue(type(result['loc']), int)
63-
self.assertTrue(result['loc'], 67)
62+
self.assertEqual(type(result['loc']), int)
63+
self.assertEqual(result['loc'], 67)
6464

6565
def test_analyze_repository_level(self):
6666
"""Test whether cloc returns the expected fields data for repository level"""
@@ -74,13 +74,13 @@ def test_analyze_repository_level(self):
7474
result = results[next(iter(results))]
7575

7676
self.assertIn('blanks', result)
77-
self.assertTrue(type(result['blanks']), int)
77+
self.assertEqual(type(result['blanks']), int)
7878
self.assertIn('comments', result)
79-
self.assertTrue(type(result['comments']), int)
79+
self.assertEqual(type(result['comments']), int)
8080
self.assertIn('loc', result)
81-
self.assertTrue(type(result['loc']), int)
81+
self.assertEqual(type(result['loc']), int)
8282
self.assertIn('total_files', result)
83-
self.assertTrue(type(result['total_files']), int)
83+
self.assertEqual(type(result['total_files']), int)
8484

8585
@unittest.mock.patch('subprocess.check_output')
8686
def test_analyze_error(self, check_output_mock):

‎tests/test_codep.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,16 @@ def test_fetch(self):
125125
self.assertEqual(commit['category'], CATEGORY_CODEP_PYREVERSE)
126126
result = commit['data']['analysis']
127127
self.assertIn('classes', result)
128-
self.assertTrue(type(result['classes']), dict)
128+
self.assertEqual(type(result['classes']), dict)
129129
self.assertIn('nodes', result['classes'])
130-
self.assertTrue(type(result['classes']['nodes']), list)
130+
self.assertEqual(type(result['classes']['nodes']), list)
131131
self.assertIn('links', result['classes'])
132-
self.assertTrue(type(result['classes']['links']), list)
132+
self.assertEqual(type(result['classes']['links']), list)
133133
self.assertIn('packages', result)
134-
self.assertTrue(type(result['packages']), dict)
135-
self.assertTrue(type(result['packages']['nodes']), list)
134+
self.assertEqual(type(result['packages']), dict)
135+
self.assertEqual(type(result['packages']['nodes']), list)
136136
self.assertIn('links', result['packages'])
137-
self.assertTrue(type(result['packages']['links']), list)
137+
self.assertEqual(type(result['packages']['links']), list)
138138

139139
def test_fetch_not_existing_module(self):
140140
"""Test whether warning messages are logged when a module is not found"""
@@ -294,11 +294,11 @@ def test_analyze_pyreverse(self):
294294
result = dep_analyzer.analyze(module_path)
295295

296296
self.assertIn('classes', result)
297-
self.assertTrue(type(result['classes']), dict)
297+
self.assertEqual(type(result['classes']), dict)
298298
self.assertIn('nodes', result['classes'])
299-
self.assertTrue(type(result['classes']['nodes']), list)
299+
self.assertEqual(type(result['classes']['nodes']), list)
300300
self.assertIn('links', result['classes'])
301-
self.assertTrue(type(result['classes']['links']), list)
301+
self.assertEqual(type(result['classes']['links']), list)
302302

303303
def test_analyze_jadolint(self):
304304
"""Test whether the analyze method works"""

‎tests/test_colang.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ def test_fetch_cloc(self):
8888
result = results[next(iter(results))]
8989

9090
self.assertIn('blanks', result)
91-
self.assertTrue(type(result['blanks']), int)
91+
self.assertEqual(type(result['blanks']), int)
9292
self.assertIn('comments', result)
93-
self.assertTrue(type(result['comments']), int)
93+
self.assertEqual(type(result['comments']), int)
9494
self.assertIn('loc', result)
95-
self.assertTrue(type(result['loc']), int)
95+
self.assertEqual(type(result['loc']), int)
9696
self.assertIn('total_files', result)
97-
self.assertTrue(type(result['total_files']), int)
97+
self.assertEqual(type(result['total_files']), int)
9898

9999
def test_fetch_unknown(self):
100100
"""Test whether commits are properly processed"""
@@ -187,20 +187,20 @@ def test_analyze(self):
187187
result = repo_analyzer.analyze(self.origin_path)
188188
self.assertNotIn('breakdown', result)
189189
self.assertIn('Python', result)
190-
self.assertTrue(type(result['Python']), float)
190+
self.assertEqual(type(result['Python']), float)
191191

192192
repo_analyzer = RepositoryAnalyzer(kind=CLOC)
193193
results = repo_analyzer.analyze(self.origin_path)
194194
result = results[next(iter(results))]
195195

196196
self.assertIn('blanks', result)
197-
self.assertTrue(type(result['blanks']), int)
197+
self.assertEqual(type(result['blanks']), int)
198198
self.assertIn('comments', result)
199-
self.assertTrue(type(result['comments']), int)
199+
self.assertEqual(type(result['comments']), int)
200200
self.assertIn('loc', result)
201-
self.assertTrue(type(result['loc']), int)
201+
self.assertEqual(type(result['loc']), int)
202202
self.assertIn('total_files', result)
203-
self.assertTrue(type(result['total_files']), int)
203+
self.assertEqual(type(result['total_files']), int)
204204

205205

206206
class TestCoLangCommand(unittest.TestCase):

‎tests/test_coqua.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ def test_fetch_pylint(self):
8282
result = commit['data']['analysis']
8383
self.assertNotIn('modules', result)
8484
self.assertIn('quality', result)
85-
self.assertTrue(type(result['quality']), str)
85+
self.assertEqual(type(result['quality']), str)
8686
self.assertIn('num_modules', result)
87-
self.assertTrue(type(result['num_modules']), int)
87+
self.assertEqual(type(result['num_modules']), int)
8888
self.assertIn('warnings', result)
89-
self.assertTrue(type(result['warnings']), int)
89+
self.assertEqual(type(result['warnings']), int)
9090

9191
def test_fetch_flake8(self):
9292
"""Test whether commits are properly processed"""
@@ -104,7 +104,7 @@ def test_fetch_flake8(self):
104104
self.assertEqual(commit['category'], CATEGORY_COQUA_FLAKE8)
105105
result = commit['data']['analysis']
106106
self.assertIn('warnings', result)
107-
self.assertTrue(type(result['warnings']), int)
107+
self.assertEqual(type(result['warnings']), int)
108108
self.assertNotIn('lines', result)
109109

110110
def test_fetch_error(self):
@@ -390,17 +390,17 @@ def test_analyze(self):
390390
result = mod_analyzer.analyze(module_path, self.worktree_path)
391391
self.assertNotIn('modules', result)
392392
self.assertIn('quality', result)
393-
self.assertTrue(type(result['quality']), str)
393+
self.assertEqual(type(result['quality']), str)
394394
self.assertIn('num_modules', result)
395-
self.assertTrue(type(result['num_modules']), int)
395+
self.assertEqual(type(result['num_modules']), int)
396396
self.assertIn('warnings', result)
397-
self.assertTrue(type(result['warnings']), int)
397+
self.assertEqual(type(result['warnings']), int)
398398

399399
mod_analyzer = ModuleAnalyzer(kind=FLAKE8)
400400
result = mod_analyzer.analyze(module_path, self.worktree_path)
401401
self.assertNotIn('lines', result)
402402
self.assertIn('warnings', result)
403-
self.assertTrue(type(result['warnings']), int)
403+
self.assertEqual(type(result['warnings']), int)
404404

405405

406406
class TestCoDepCommand(unittest.TestCase):

‎tests/test_covuln.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -71,30 +71,30 @@ def test_fetch(self):
7171
result = commit['data']['analysis']
7272

7373
self.assertIn('loc_analyzed', result)
74-
self.assertTrue(type(result['loc_analyzed']), int)
74+
self.assertEqual(type(result['loc_analyzed']), int)
7575
self.assertIn('num_vulns', result)
76-
self.assertTrue(type(result['num_vulns']), int)
76+
self.assertEqual(type(result['num_vulns']), int)
7777
self.assertIn('by_severity', result)
78-
self.assertTrue(type(result['by_severity']), dict)
78+
self.assertEqual(type(result['by_severity']), dict)
7979
self.assertIn('undefined', result['by_severity'])
80-
self.assertTrue(type(result['by_severity']['undefined']), int)
80+
self.assertEqual(type(result['by_severity']['undefined']), int)
8181
self.assertIn('low', result['by_severity'])
82-
self.assertTrue(type(result['by_severity']['low']), int)
82+
self.assertEqual(type(result['by_severity']['low']), int)
8383
self.assertIn('medium', result['by_severity'])
84-
self.assertTrue(type(result['by_severity']['medium']), int)
84+
self.assertEqual(type(result['by_severity']['medium']), int)
8585
self.assertIn('high', result['by_severity'])
86-
self.assertTrue(type(result['by_severity']['high']), int)
86+
self.assertEqual(type(result['by_severity']['high']), int)
8787

8888
self.assertIn('by_confidence', result)
89-
self.assertTrue(type(result['by_confidence']), dict)
89+
self.assertEqual(type(result['by_confidence']), dict)
9090
self.assertIn('undefined', result['by_confidence'])
91-
self.assertTrue(type(result['by_confidence']['undefined']), int)
91+
self.assertEqual(type(result['by_confidence']['undefined']), int)
9292
self.assertIn('low', result['by_confidence'])
93-
self.assertTrue(type(result['by_confidence']['low']), int)
93+
self.assertEqual(type(result['by_confidence']['low']), int)
9494
self.assertIn('medium', result['by_confidence'])
95-
self.assertTrue(type(result['by_confidence']['medium']), int)
95+
self.assertEqual(type(result['by_confidence']['medium']), int)
9696
self.assertIn('high', result['by_confidence'])
97-
self.assertTrue(type(result['by_confidence']['high']), int)
97+
self.assertEqual(type(result['by_confidence']['high']), int)
9898

9999

100100
class TestModuleAnalyzer(TestCaseAnalyzer):
@@ -135,30 +135,30 @@ def test_analyze(self):
135135
result = vuln_analyzer.analyze(module_path)
136136

137137
self.assertIn('loc_analyzed', result)
138-
self.assertTrue(type(result['loc_analyzed']), int)
138+
self.assertEqual(type(result['loc_analyzed']), int)
139139
self.assertIn('num_vulns', result)
140-
self.assertTrue(type(result['num_vulns']), int)
140+
self.assertEqual(type(result['num_vulns']), int)
141141
self.assertIn('by_severity', result)
142-
self.assertTrue(type(result['by_severity']), dict)
142+
self.assertEqual(type(result['by_severity']), dict)
143143
self.assertIn('undefined', result['by_severity'])
144-
self.assertTrue(type(result['by_severity']['undefined']), int)
144+
self.assertEqual(type(result['by_severity']['undefined']), int)
145145
self.assertIn('low', result['by_severity'])
146-
self.assertTrue(type(result['by_severity']['low']), int)
146+
self.assertEqual(type(result['by_severity']['low']), int)
147147
self.assertIn('medium', result['by_severity'])
148-
self.assertTrue(type(result['by_severity']['medium']), int)
148+
self.assertEqual(type(result['by_severity']['medium']), int)
149149
self.assertIn('high', result['by_severity'])
150-
self.assertTrue(type(result['by_severity']['high']), int)
150+
self.assertEqual(type(result['by_severity']['high']), int)
151151

152152
self.assertIn('by_confidence', result)
153-
self.assertTrue(type(result['by_confidence']), dict)
153+
self.assertEqual(type(result['by_confidence']), dict)
154154
self.assertIn('undefined', result['by_confidence'])
155-
self.assertTrue(type(result['by_confidence']['undefined']), int)
155+
self.assertEqual(type(result['by_confidence']['undefined']), int)
156156
self.assertIn('low', result['by_confidence'])
157-
self.assertTrue(type(result['by_confidence']['low']), int)
157+
self.assertEqual(type(result['by_confidence']['low']), int)
158158
self.assertIn('medium', result['by_confidence'])
159-
self.assertTrue(type(result['by_confidence']['medium']), int)
159+
self.assertEqual(type(result['by_confidence']['medium']), int)
160160
self.assertIn('high', result['by_confidence'])
161-
self.assertTrue(type(result['by_confidence']['high']), int)
161+
self.assertEqual(type(result['by_confidence']['high']), int)
162162

163163

164164
class TestCoVulnCommand(unittest.TestCase):

‎tests/test_flake8.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ def test_analyze_details(self):
5151
result = flake8.analyze(**kwargs)
5252

5353
self.assertIn('lines', result)
54-
self.assertTrue(type(result['lines']), list)
54+
self.assertEqual(type(result['lines']), list)
5555
self.assertIn('warnings', result)
56-
self.assertTrue(type(result['warnings']), int)
56+
self.assertEqual(type(result['warnings']), int)
5757

5858
def test_analyze_no_details(self):
5959
"""Test whether flake8 returns the expected fields data"""
@@ -68,7 +68,7 @@ def test_analyze_no_details(self):
6868

6969
self.assertNotIn('lines', result)
7070
self.assertIn('warnings', result)
71-
self.assertTrue(type(result['warnings']), int)
71+
self.assertEqual(type(result['warnings']), int)
7272

7373
@unittest.mock.patch('subprocess.check_output')
7474
def test_analyze_error(self, check_output_mock):

‎tests/test_linguist.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ def test_analyze_details(self):
4343
result = linguist.analyze(**kwargs)
4444

4545
self.assertIn('breakdown', result)
46-
self.assertTrue(type(result['breakdown']), dict)
46+
self.assertEqual(type(result['breakdown']), dict)
4747
self.assertIn('Python', result)
48-
self.assertTrue(type(result['Python']), float)
48+
self.assertEqual(type(result['Python']), float)
4949

5050
def test_analyze_no_details(self):
5151
"""Test whether linguist returns the expected fields data"""
@@ -59,7 +59,7 @@ def test_analyze_no_details(self):
5959

6060
self.assertNotIn('breakdown', result)
6161
self.assertIn('Python', result)
62-
self.assertTrue(type(result['Python']), float)
62+
self.assertEqual(type(result['Python']), float)
6363

6464
@unittest.mock.patch('subprocess.check_output')
6565
def test_analyze_error(self, check_output_mock):

0 commit comments

Comments
 (0)