Skip to content

Commit b8f7b54

Browse files
committed
utest cleanup
1 parent c405ee8 commit b8f7b54

1 file changed

Lines changed: 30 additions & 32 deletions

File tree

utest/result/test_resultbuilder.py

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ def setUp(self):
2525
self.result = ExecutionResult(StringIO(GOLDEN_XML))
2626
self.suite = self.result.suite
2727
self.test = self.suite.tests[0]
28-
self.keyword = self.test.body[0]
29-
self.user_keyword = self.test.body[1]
30-
self.message = self.keyword.messages[0]
31-
self.setup = self.suite.setup
32-
self.errors = self.result.errors
3328

3429
def test_suite_is_built(self):
3530
assert_equal(self.suite.source, 'normal.html')
@@ -53,41 +48,44 @@ def test_testcase_is_built(self):
5348
assert_equal(self.test.endtime, '20111024 13:41:20.934')
5449

5550
def test_keyword_is_built(self):
56-
assert_equal(self.keyword.name, 'BuiltIn.Log')
57-
assert_equal(self.keyword.doc, 'Logs the given message with the given level.')
58-
assert_equal(self.keyword.args, ('Test 1',))
59-
assert_equal(self.keyword.assign, ())
60-
assert_equal(self.keyword.status, 'PASS')
61-
assert_equal(self.keyword.starttime, '20111024 13:41:20.926')
62-
assert_equal(self.keyword.endtime, '20111024 13:41:20.928')
63-
assert_equal(self.keyword.timeout, None)
64-
assert_equal(len(self.keyword.body), 1)
65-
assert_equal(self.keyword.body[0].type, self.keyword.body[0].MESSAGE)
51+
keyword = self.test.body[0]
52+
assert_equal(keyword.name, 'BuiltIn.Log')
53+
assert_equal(keyword.doc, 'Logs the given message with the given level.')
54+
assert_equal(keyword.args, ('Test 1',))
55+
assert_equal(keyword.assign, ())
56+
assert_equal(keyword.status, 'PASS')
57+
assert_equal(keyword.starttime, '20111024 13:41:20.926')
58+
assert_equal(keyword.endtime, '20111024 13:41:20.928')
59+
assert_equal(keyword.timeout, None)
60+
assert_equal(len(keyword.body), 1)
61+
assert_equal(keyword.body[0].type, keyword.body[0].MESSAGE)
6662

6763
def test_user_keyword_is_built(self):
68-
assert_equal(self.user_keyword.name, 'logs on trace')
69-
assert_equal(self.user_keyword.doc, '')
70-
assert_equal(self.user_keyword.args, ())
71-
assert_equal(self.user_keyword.assign, ('${not really in source}',))
72-
assert_equal(self.user_keyword.status, 'PASS')
73-
assert_equal(self.user_keyword.starttime, '20111024 13:41:20.930')
74-
assert_equal(self.user_keyword.endtime, '20111024 13:41:20.933')
75-
assert_equal(self.user_keyword.timeout, None)
76-
assert_equal(len(self.user_keyword.messages), 0)
77-
assert_equal(len(self.user_keyword.body), 1)
64+
user_keyword = self.test.body[1]
65+
assert_equal(user_keyword.name, 'logs on trace')
66+
assert_equal(user_keyword.doc, '')
67+
assert_equal(user_keyword.args, ())
68+
assert_equal(user_keyword.assign, ('${not really in source}',))
69+
assert_equal(user_keyword.status, 'PASS')
70+
assert_equal(user_keyword.starttime, '20111024 13:41:20.930')
71+
assert_equal(user_keyword.endtime, '20111024 13:41:20.933')
72+
assert_equal(user_keyword.timeout, None)
73+
assert_equal(len(user_keyword.messages), 0)
74+
assert_equal(len(user_keyword.body), 1)
7875

7976
def test_message_is_built(self):
80-
assert_equal(self.message.message, 'Test 1')
81-
assert_equal(self.message.level, 'INFO')
82-
assert_equal(self.message.timestamp, '20111024 13:41:20.927')
77+
message = self.test.body[0].messages[0]
78+
assert_equal(message.message, 'Test 1')
79+
assert_equal(message.level, 'INFO')
80+
assert_equal(message.timestamp, '20111024 13:41:20.927')
8381

8482
def test_suite_setup_is_built(self):
85-
assert_equal(len(self.setup.body), 0)
86-
assert_equal(len(self.setup.messages), 0)
83+
assert_equal(len(self.suite.setup.body), 0)
84+
assert_equal(len(self.suite.setup.messages), 0)
8785

8886
def test_errors_are_built(self):
89-
assert_equal(len(self.errors.messages), 1)
90-
assert_equal(self.errors.messages[0].message,
87+
assert_equal(len(self.result.errors.messages), 1)
88+
assert_equal(self.result.errors.messages[0].message,
9189
"Error in file 'normal.html' in table 'Settings': "
9290
"Resource file 'nope' does not exist.")
9391

0 commit comments

Comments
 (0)