Skip to content

Commit 4e70c41

Browse files
author
fkromer
committed
change: refactoring self->cls
1 parent 6b02979 commit 4e70c41

File tree

1 file changed

+44
-42
lines changed

1 file changed

+44
-42
lines changed

test_proxy.py

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,93 +11,95 @@
1111
else:
1212
import unittest
1313

14+
1415
class ProxyTest(unittest.TestCase):
1516

1617
@classmethod
17-
def setUpClass(self):
18+
def setUpClass(cls):
1819
""" Class scope setup. """
19-
self.p = Proxy()
20+
cls.p = Proxy()
2021

21-
def setUp(self):
22+
def setUp(cls):
2223
""" Function/test case scope setup. """
23-
self.output = StringIO()
24-
self.saved_stdout = sys.stdout
25-
sys.stdout = self.output
24+
cls.output = StringIO()
25+
cls.saved_stdout = sys.stdout
26+
sys.stdout = cls.output
2627

27-
def tearDown(self):
28+
def tearDown(cls):
2829
""" Function/test case scope teardown. """
29-
self.output.close()
30-
sys.stdout = self.saved_stdout
30+
cls.output.close()
31+
sys.stdout = cls.saved_stdout
3132

32-
def test_sales_manager_shall_work_through_proxy_with_delay(self):
33-
self.p.busy = 'No'
33+
def test_sales_manager_shall_work_through_proxy_with_delay(cls):
34+
cls.p.busy = 'No'
3435
start_time = time()
35-
self.p.work()
36+
cls.p.work()
3637
end_time = time()
3738
execution_time = end_time - start_time
38-
print_output = self.output.getvalue()
39+
print_output = cls.output.getvalue()
3940
expected_print_output = 'Proxy checking for Sales Manager availability\n\
4041
Sales Manager ready to talk\n'
41-
self.assertEqual(print_output, expected_print_output)
42+
cls.assertEqual(print_output, expected_print_output)
4243
expected_execution_time = 2
43-
self.assertEqual(int(execution_time), expected_execution_time)
44+
cls.assertEqual(int(execution_time), expected_execution_time)
4445

45-
def test_sales_manager_shall_respond_through_proxy_with_delay(self):
46-
self.p.busy = 'Yes'
46+
def test_sales_manager_shall_respond_through_proxy_with_delay(cls):
47+
cls.p.busy = 'Yes'
4748
start_time = time()
48-
self.p.work()
49+
cls.p.work()
4950
end_time = time()
5051
execution_time = end_time - start_time
51-
print_output = self.output.getvalue()
52+
print_output = cls.output.getvalue()
5253
expected_print_output = 'Proxy checking for Sales Manager availability\n\
5354
Sales Manager is busy\n'
54-
self.assertEqual(print_output, expected_print_output)
55+
cls.assertEqual(print_output, expected_print_output)
5556
expected_execution_time = 2
56-
self.assertEqual(int(execution_time), expected_execution_time)
57+
cls.assertEqual(int(execution_time), expected_execution_time)
58+
5759

5860
class NoTalkProxyTest(unittest.TestCase):
5961

6062
@classmethod
61-
def setUpClass(self):
63+
def setUpClass(cls):
6264
""" Class scope setup. """
63-
self.ntp = NoTalkProxy()
65+
cls.ntp = NoTalkProxy()
6466

65-
def setUp(self):
67+
def setUp(cls):
6668
""" Function/test case scope setup. """
67-
self.output = StringIO()
68-
self.saved_stdout = sys.stdout
69-
sys.stdout = self.output
69+
cls.output = StringIO()
70+
cls.saved_stdout = sys.stdout
71+
sys.stdout = cls.output
7072

71-
def tearDown(self):
73+
def tearDown(cls):
7274
""" Function/test case scope teardown. """
73-
self.output.close()
74-
sys.stdout = self.saved_stdout
75+
cls.output.close()
76+
sys.stdout = cls.saved_stdout
7577

76-
def test_sales_manager_shall_not_work_through_proxy_with_delay(self):
77-
self.ntp.busy = 'No'
78+
def test_sales_manager_shall_not_work_through_proxy_with_delay(cls):
79+
cls.ntp.busy = 'No'
7880
start_time = time()
79-
self.ntp.work()
81+
cls.ntp.work()
8082
end_time = time()
8183
execution_time = end_time - start_time
82-
print_output = self.output.getvalue()
84+
print_output = cls.output.getvalue()
8385
expected_print_output = 'Proxy checking for Sales Manager availability\n\
8486
This Sales Manager will not talk to you whether he/she is busy or not\n'
85-
self.assertEqual(print_output, expected_print_output)
87+
cls.assertEqual(print_output, expected_print_output)
8688
expected_execution_time = 2
87-
self.assertEqual(int(execution_time), expected_execution_time)
89+
cls.assertEqual(int(execution_time), expected_execution_time)
8890

89-
def test_sales_manager_shall_not_respond_through_proxy_with_delay(self):
90-
self.ntp.busy = 'Yes'
91+
def test_sales_manager_shall_not_respond_through_proxy_with_delay(cls):
92+
cls.ntp.busy = 'Yes'
9193
start_time = time()
92-
self.ntp.work()
94+
cls.ntp.work()
9395
end_time = time()
9496
execution_time = end_time - start_time
95-
print_output = self.output.getvalue()
97+
print_output = cls.output.getvalue()
9698
expected_print_output = 'Proxy checking for Sales Manager availability\n\
9799
This Sales Manager will not talk to you whether he/she is busy or not\n'
98-
self.assertEqual(print_output, expected_print_output)
100+
cls.assertEqual(print_output, expected_print_output)
99101
expected_execution_time = 2
100-
self.assertEqual(int(execution_time), expected_execution_time)
102+
cls.assertEqual(int(execution_time), expected_execution_time)
101103

102104
if __name__ == "__main__":
103105
unittest.main()

0 commit comments

Comments
 (0)