@@ -11,23 +11,21 @@ class ExampleAllFailTest(unittest.TestCase):
11
11
def test_hello (self ):
12
12
input_data = [15 , 23 , 33 , 39 ]
13
13
result_data = [("Hello, World!" , param ) for param in input_data ]
14
- number_of_variants = range (1 , len (input_data ) + 1 )
15
14
16
- for variant , param , result in zip (number_of_variants , input_data , result_data ):
15
+ for variant , (param , result ) in enumerate (zip (input_data , result_data ), start = 1 ):
16
+ failure_msg = f'Expected: { result } but got something else instead.'
17
17
with self .subTest (f"variation #{ variant } " , param = param , result = result ):
18
- self .assertEqual (hello (param ), result ,
19
- msg = f'Expected: { result } but got something else instead.' )
18
+ self .assertEqual (hello (param ), result , msg = failure_msg )
20
19
21
20
@pytest .mark .task (taskno = 1 )
22
21
def test_abc (self ):
23
22
input_data = ['frog' , 'fish' , 'coconut' , 'pineapple' , 'carrot' , 'cucumber' , 'grass' , 'tree' ]
24
23
result_data = [("Hello, World!" , param ) for param in input_data ]
25
- number_of_variants = range (1 , len (input_data ) + 1 )
26
24
27
- for variant , param , result in zip (number_of_variants , input_data , result_data ):
25
+ for variant , (param , result ) in enumerate (zip (input_data , result_data ), start = 1 ):
26
+ failure_msg = f'Expected: { result } but got something else instead.'
28
27
with self .subTest (f"variation #{ variant } " , param = param , result = result ):
29
- self .assertEqual (hello (param ), result ,
30
- msg = f'Expected: { result } but got something else instead.' )
28
+ self .assertEqual (hello (param ), result , msg = failure_msg )
31
29
32
30
33
31
class ExampleAllFailOtherTest (unittest .TestCase ):
@@ -36,24 +34,18 @@ class ExampleAllFailOtherTest(unittest.TestCase):
36
34
def test_dummy (self ):
37
35
input_data = ['frog' , 'fish' , 'coconut' , 'pineapple' , 'carrot' , 'cucumber' , 'grass' , 'tree' ]
38
36
result_data = [("Hello, World!" , param ) for param in input_data ]
39
- number_of_variants = range (1 , len (input_data ) + 1 )
40
37
41
- for variant , param , result in zip (number_of_variants , input_data , result_data ):
38
+ for variant , (param , result ) in enumerate (zip (input_data , result_data ), start = 1 ):
39
+ failure_msg = f'Expected: { result } but got something else instead.'
42
40
with self .subTest (f"variation #{ variant } " , param = param , result = result ):
43
- self .assertEqual (hello (param ), result ,
44
- msg = f'Expected: { result } but got something else instead.' )
41
+ self .assertEqual (hello (param ), result , msg = failure_msg )
45
42
46
43
@pytest .mark .task (taskno = 2 )
47
44
def test_hello (self ):
48
45
input_data = [1 , 2 , 5 , 10 ]
49
46
result_data = [("Hello, World!" , param ) for param in input_data ]
50
- number_of_variants = range (1 , len (input_data ) + 1 )
51
47
52
- for variant , param , result in zip (number_of_variants , input_data , result_data ):
48
+ for variant , (param , result ) in enumerate (zip (input_data , result_data ), start = 1 ):
49
+ failure_msg = f'Expected: { result } but got something else instead.'
53
50
with self .subTest (f"variation #{ variant } " , param = param , result = result ):
54
- self .assertEqual (hello (param ), result ,
55
- msg = f'Expected: { result } but got something else instead.' )
56
-
57
-
58
- if __name__ == "__main__" :
59
- unittest .main ()
51
+ self .assertEqual (hello (param ), result , msg = failure_msg )
0 commit comments