eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make the timer-start and timer-restart action name the timer in the same way

This commit is contained in:
Vincent Sanders 2019-06-12 22:45:07 +01:00
parent c1dc4e61bd
commit c90bd806a6
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/monkey-tests/cache-test.yaml
View File

@ -4,7 +4,7 @@ steps:
- action: launch
language: en
- action: timer-start
tag: timer1
timer: timer1
- action: window-new
tag: win1
- action: navigate
@ -17,7 +17,7 @@ steps:
- action: timer-stop
timer: timer1
- action: timer-start
tag: timer2
timer: timer2
- action: window-new
tag: win2
- action: navigate

32
test/monkey_driver.py
View File

@ -301,7 +301,10 @@ def run_test_step_action_plot_check(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
assert_browser(ctx)
win = ctx['windows'][step['window']]
checks = step['checks']
if 'checks' in step.keys():
checks = step['checks']
else:
checks = {}
all_text = []
bitmaps = []
for plot in win.redraw():
@ -310,23 +313,22 @@ def run_test_step_action_plot_check(ctx, step):
if plot[0] == 'BITMAP':
bitmaps.append(plot[1:])
all_text = " ".join(all_text)
if checks is not None:
for check in checks:
if 'text-contains' in check.keys():
print("Check {} in {}".format(repr(check['text-contains']),repr(all_text)))
assert(check['text-contains'] in all_text)
elif 'text-not-contains' in check.keys():
print("Check {} NOT in {}".format(repr(check['text-not-contains']),repr(all_text)))
assert(check['text-not-contains'] not in all_text)
elif 'bitmap-count' in check.keys():
print("Check bitmap count is {}".format(int(check['bitmap-count'])))
assert(len(bitmaps) == int(check['bitmap-count']))
else:
raise AssertionError("Unknown check: {}".format(repr(check)))
for check in checks:
if 'text-contains' in check.keys():
print("Check {} in {}".format(repr(check['text-contains']),repr(all_text)))
assert(check['text-contains'] in all_text)
elif 'text-not-contains' in check.keys():
print("Check {} NOT in {}".format(repr(check['text-not-contains']),repr(all_text)))
assert(check['text-not-contains'] not in all_text)
elif 'bitmap-count' in check.keys():
print("Check bitmap count is {}".format(int(check['bitmap-count'])))
assert(len(bitmaps) == int(check['bitmap-count']))
else:
raise AssertionError("Unknown check: {}".format(repr(check)))
def run_test_step_action_timer_start(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
tag = step['tag']
tag = step['timer']
assert_browser(ctx)
assert(ctx['timers'].get(tag) is None)
ctx['timers'][tag] = {}