Replace asserts with exceptions in generate_test_code.py
diff --git a/tests/scripts/test_generate_test_code.py b/tests/scripts/test_generate_test_code.py
index a4debba..9964ab9 100755
--- a/tests/scripts/test_generate_test_code.py
+++ b/tests/scripts/test_generate_test_code.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# Unit test for generate_test_code.py
#
# Copyright (C) 2018, ARM Limited, All Rights Reserved
@@ -857,7 +858,7 @@
/* END_CASE */
'''
s = StringIOWrapper('test_suite_ut.function', data)
- self.assertRaises(AssertionError, parse_functions, s)
+ self.assertRaises(GeneratorInputError, parse_functions, s)
class ExcapedSplit(TestCase):
@@ -994,7 +995,7 @@
def test_no_args(self):
"""
- Test AssertionError is raised when test function name and args line is missing.
+ Test GeneratorInputError is raised when test function name and args line is missing.
:return:
"""
data = """
@@ -1011,13 +1012,13 @@
try:
for x, y, z, a in parse_test_data(s):
pass
- except AssertionError, e:
+ except GeneratorInputError as e:
pass
- self.assertEqual(type(e), AssertionError)
+ self.assertEqual(type(e), GeneratorInputError)
def test_incomplete_data(self):
"""
- Test AssertionError is raised when test function name and args line is missing.
+ Test GeneratorInputError is raised when test function name and args line is missing.
:return:
"""
data = """
@@ -1029,9 +1030,9 @@
try:
for x, y, z, a in parse_test_data(s):
pass
- except AssertionError, e:
+ except GeneratorInputError as e:
pass
- self.assertEqual(type(e), AssertionError)
+ self.assertEqual(type(e), GeneratorInputError)
class GenDepCheck(TestCase):
@@ -1080,14 +1081,14 @@
Test invalid dependency input.
:return:
"""
- self.assertRaises(AssertionError, gen_dep_check, 5, '!')
+ self.assertRaises(GeneratorInputError, gen_dep_check, 5, '!')
def test_negative_dep_id(self):
"""
Test invalid dependency input.
:return:
"""
- self.assertRaises(AssertionError, gen_dep_check, -1, 'YAHOO')
+ self.assertRaises(GeneratorInputError, gen_dep_check, -1, 'YAHOO')
class GenExpCheck(TestCase):
@@ -1114,14 +1115,14 @@
Test invalid expression input.
:return:
"""
- self.assertRaises(AssertionError, gen_expression_check, 5, '')
+ self.assertRaises(GeneratorInputError, gen_expression_check, 5, '')
def test_negative_exp_id(self):
"""
Test invalid expression id.
:return:
"""
- self.assertRaises(AssertionError, gen_expression_check, -1, 'YAHOO')
+ self.assertRaises(GeneratorInputError, gen_expression_check, -1, 'YAHOO')
class WriteDeps(TestCase):
@@ -1437,7 +1438,7 @@
out_data_f = StringIOWrapper('test_suite_ut.datax', '')
func_info = {'test_func2': (1, ('int',))}
suite_deps = []
- self.assertRaises(AssertionError, gen_from_test_data, data_f, out_data_f, func_info, suite_deps)
+ self.assertRaises(GeneratorInputError, gen_from_test_data, data_f, out_data_f, func_info, suite_deps)
def test_different_func_args(self):
"""
@@ -1453,7 +1454,7 @@
out_data_f = StringIOWrapper('test_suite_ut.datax', '')
func_info = {'test_func2': (1, ('int','hex'))}
suite_deps = []
- self.assertRaises(AssertionError, gen_from_test_data, data_f, out_data_f, func_info, suite_deps)
+ self.assertRaises(GeneratorInputError, gen_from_test_data, data_f, out_data_f, func_info, suite_deps)
def test_output(self):
"""