From d8b376adba93a48e77ec9e81c96744d1e4997d88 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Wed, 22 Jun 2016 05:46:59 +0200
Subject: uitest: convert all calc demos to the unittest based approach

Change-Id: I6ad7898f92c74f37ed2936337d6570904860d535
---
 uitest/calc_tests/gridwindow.py | 46 +++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

(limited to 'uitest/calc_tests/gridwindow.py')

diff --git a/uitest/calc_tests/gridwindow.py b/uitest/calc_tests/gridwindow.py
index 1f01ec9d8622..1b63fe544fee 100644
--- a/uitest/calc_tests/gridwindow.py
+++ b/uitest/calc_tests/gridwindow.py
@@ -11,6 +11,8 @@ from helper import mkPropertyValues
 
 from uihelper.calc import enter_text_to_cell
 
+from UITestCase import UITestCase
+
 import time
 
 try:
@@ -23,43 +25,37 @@ except ImportError:
     print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
     raise
 
-def input(xContext):
-    xUITest = xContext.ServiceManager.createInstanceWithContext(
-            "org.libreoffice.uitest.UITest", xContext)
-
-    ui_test = UITest(xUITest, xContext)
+class GridWindowTest(UITestCase):
 
-    ui_test.create_doc_in_start_center("calc")
-    xTopWindow = xUITest.getTopFocusWindow()
+    def test_input(self):
 
-    xGridWindow = xTopWindow.getChild("grid_window")
+        self.ui_test.create_doc_in_start_center("calc")
+        xTopWindow = self.xUITest.getTopFocusWindow()
 
-    enter_text_to_cell(xGridWindow, "C3", "=A1")
-    enter_text_to_cell(xGridWindow, "A1", "2")
+        xGridWindow = xTopWindow.getChild("grid_window")
 
-    time.sleep(2)
+        enter_text_to_cell(xGridWindow, "C3", "=A1")
+        enter_text_to_cell(xGridWindow, "A1", "2")
 
-    ui_test.close_doc()
+        time.sleep(2)
 
-def special_keys(xContext):
-    xUITest = xContext.ServiceManager.createInstanceWithContext(
-            "org.libreoffice.uitest.UITest", xContext)
+        self.ui_test.close_doc()
 
-    ui_test = UITest(xUITest, xContext)
+    def test_special_keys(self):
 
-    ui_test.create_doc_in_start_center("calc")
-    xTopWindow = xUITest.getTopFocusWindow()
+        self.ui_test.create_doc_in_start_center("calc")
+        xTopWindow = self.xUITest.getTopFocusWindow()
 
-    xGridWindow = xTopWindow.getChild("grid_window")
+        xGridWindow = xTopWindow.getChild("grid_window")
 
-    selectProps = mkPropertyValues({"CELL": "C3"})
-    xGridWindow.executeAction("SELECT", selectProps)
+        selectProps = mkPropertyValues({"CELL": "C3"})
+        xGridWindow.executeAction("SELECT", selectProps)
 
-    typeProps = mkPropertyValues({"KEYCODE": "CTRL+DOWN"})
-    xGridWindow.executeAction("TYPE", typeProps)
+        typeProps = mkPropertyValues({"KEYCODE": "CTRL+DOWN"})
+        xGridWindow.executeAction("TYPE", typeProps)
 
-    time.sleep(2)
+        time.sleep(2)
 
-    ui_test.close_doc()
+        self.ui_test.close_doc()
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit