Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
PAL: suite visitor
[csit.git]
/
resources
/
tools
/
presentation
/
input_data_parser.py
diff --git
a/resources/tools/presentation/input_data_parser.py
b/resources/tools/presentation/input_data_parser.py
index
67aec2f
..
556eab1
100644
(file)
--- a/
resources/tools/presentation/input_data_parser.py
+++ b/
resources/tools/presentation/input_data_parser.py
@@
-1043,6
+1043,8
@@
class ExecutionChecker(ResultVisitor):
}
suite.setup.visit(self)
}
suite.setup.visit(self)
+ suite.body.visit(self)
+ suite.teardown.visit(self)
def end_suite(self, suite):
"""Called when suite ends.
def end_suite(self, suite):
"""Called when suite ends.
@@
-1060,7
+1062,9
@@
class ExecutionChecker(ResultVisitor):
:returns: Nothing.
"""
if self.start_test(test) is not False:
:returns: Nothing.
"""
if self.start_test(test) is not False:
+ test.setup.visit(self)
test.body.visit(self)
test.body.visit(self)
+ test.teardown.visit(self)
self.end_test(test)
def start_test(self, test):
self.end_test(test)
def start_test(self, test):
@@
-1254,9
+1258,9
@@
class ExecutionChecker(ResultVisitor):
:returns: Nothing.
"""
try:
:returns: Nothing.
"""
try:
- if keyword.type
== u"setup"
:
+ if keyword.type
in ("setup", "SETUP")
:
self.visit_setup_kw(keyword)
self.visit_setup_kw(keyword)
- elif keyword.type
== u"teardown"
:
+ elif keyword.type
in ("teardown", "TEARDOWN")
:
self.visit_teardown_kw(keyword)
else:
self.visit_test_kw(keyword)
self.visit_teardown_kw(keyword)
else:
self.visit_test_kw(keyword)
@@
-1325,6
+1329,10
@@
class ExecutionChecker(ResultVisitor):
if self.start_setup_kw(keyword) is not False:
self.visit_setup_kw(keyword)
self.end_setup_kw(keyword)
if self.start_setup_kw(keyword) is not False:
self.visit_setup_kw(keyword)
self.end_setup_kw(keyword)
+ for keyword in setup_kw.body:
+ if self.start_setup_kw(keyword) is not False:
+ self.visit_setup_kw(keyword)
+ self.end_setup_kw(keyword)
def start_setup_kw(self, setup_kw):
"""Called when teardown keyword starts. Default implementation does
def start_setup_kw(self, setup_kw):
"""Called when teardown keyword starts. Default implementation does