summaryrefslogtreecommitdiff
path: root/uitest
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-05-11 01:44:00 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-06-18 17:02:16 +0200
commit8ee75350a9bd5e5b3d4183ef0168c717896f202a (patch)
tree8cfe467b997c539621860f5e6dd54b512644bfab /uitest
parent0c5abdea5fe40350df6234e71b70cab1f11764ac (diff)
uitest: close all the documents in the tests
Change-Id: I4ad9c2603edbf3ac6fc4db60481dc93c16ea63ff
Diffstat (limited to 'uitest')
-rw-r--r--uitest/demo_ui/checkbox.py3
-rw-r--r--uitest/demo_ui/combobox.py3
-rw-r--r--uitest/demo_ui/edit.py2
-rw-r--r--uitest/demo_ui/listbox.py6
-rw-r--r--uitest/demo_ui/tabdialog.py6
5 files changed, 18 insertions, 2 deletions
diff --git a/uitest/demo_ui/checkbox.py b/uitest/demo_ui/checkbox.py
index 8a8bf08ee1da..5cc456bc4f19 100644
--- a/uitest/demo_ui/checkbox.py
+++ b/uitest/demo_ui/checkbox.py
@@ -34,6 +34,9 @@ def toggle_checkbox(xContext):
xNegativeNumRedCB = xCellsDlg.getChild("negnumred")
xNegativeNumRedCB.executeAction("CLICK",tuple())
+ okBtn = xCellsDlg.getChild("ok")
+ okBtn.executeAction("CLICK", tuple())
+
ui_test.close_doc()
# vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uitest/demo_ui/combobox.py b/uitest/demo_ui/combobox.py
index ba917bbbab12..6df980be9af8 100644
--- a/uitest/demo_ui/combobox.py
+++ b/uitest/demo_ui/combobox.py
@@ -25,6 +25,9 @@ def select_entry_pos(xContext):
actionProps = mkPropertyValues(props)
scopeCB.executeAction("SELECT", actionProps)
+ xCancelBtn = xAddNameDlg.getChild("cancel")
+ xCancelBtn.executeAction("CLICK", tuple())
+
ui_test.close_doc()
# vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uitest/demo_ui/edit.py b/uitest/demo_ui/edit.py
index 2b44f202cbfa..f418a3600e63 100644
--- a/uitest/demo_ui/edit.py
+++ b/uitest/demo_ui/edit.py
@@ -39,8 +39,6 @@ def type_text(xContext):
xAddBtn = xAddNameDlg.getChild("cancel")
xAddBtn.executeAction("CLICK", tuple())
- xUITest.executeCommand(".uno:CloseDoc")
-
ui_test.close_doc()
# vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uitest/demo_ui/listbox.py b/uitest/demo_ui/listbox.py
index 21b19d40ce7f..03a4c9e0a9ed 100644
--- a/uitest/demo_ui/listbox.py
+++ b/uitest/demo_ui/listbox.py
@@ -25,6 +25,9 @@ def select_entry_pos(xContext):
actionProps = mkPropertyValues(props)
categoryLB.executeAction("SELECT", actionProps)
+ xOkBtn = xCellsDlg.getChild("ok")
+ xOkBtn.executeAction("CLICK", tuple())
+
ui_test.close_doc()
def select_entry_text(xContext):
@@ -44,6 +47,9 @@ def select_entry_text(xContext):
actionProps = mkPropertyValues(props)
categoryLB.executeAction("SELECT", actionProps)
+ xOkBtn = xCellsDlg.getChild("ok")
+ xOkBtn.executeAction("CLICK", tuple())
+
ui_test.close_doc()
# vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uitest/demo_ui/tabdialog.py b/uitest/demo_ui/tabdialog.py
index 9a6f720244c0..09bf600424cf 100644
--- a/uitest/demo_ui/tabdialog.py
+++ b/uitest/demo_ui/tabdialog.py
@@ -26,6 +26,9 @@ def select_tab_page_pos(xContext):
propsUNO = mkPropertyValues(props)
xCellsDlg.executeAction("SELECT", propsUNO)
+ xOkBtn = xCellsDlg.getChild("ok")
+ xOkBtn.executeAction("CLICK", tuple())
+
ui_test.close_doc()
def select_tab_page_name(xContext):
@@ -43,6 +46,9 @@ def select_tab_page_name(xContext):
propsUNO = mkPropertyValues(props)
xCellsDlg.executeAction("SELECT", propsUNO)
+ xOkBtn = xCellsDlg.getChild("ok")
+ xOkBtn.executeAction("CLICK", tuple())
+
ui_test.close_doc()
# vim:set shiftwidth=4 softtabstop=4 expandtab: */