CWS-TOOLING: integrate CWS gridcontrol_03

3 files changed, 16 insertions, 64 deletions

diff --git a/testautomation/framework/optional/includes/basic_gridcontrol.inc b/testautomation/framework/optional/includes/basic_gridcontrol.inc
index dc96ef30e16c..f2d2f74cbdd4 100644..100755
--- a/testautomation/framework/optional/includes/basic_gridcontrol.inc
+++ b/testautomation/framework/optional/includes/basic_gridcontrol.inc
@@ -54,72 +54,18 @@ testcase tGridcontrolLoad
     call sleep 1
 
     printlog "Start the macro, that performs the test"
-    printlog "Tools->Macros->Run Macro..."
-    ToolsMacrosRunMacro
-    Kontext "ScriptSelector"
-    if ScriptSelector.exists(10) then
-        x = LibraryTreeList.getItemCount
-        printlog "Look for library 'gridcontrol'"
-        for i = 1 to x
-            sTemp = LibraryTreeList.getItemText(i)
-            'printlog "("+i+"/"+x+"): '" + sTemp + "'"
-            if (instr(sTemp,"gridcontrol")>0 OR instr(sTemp,"GRIDCONTROL")) then
-                a = i
-                printlog "Found library ("+i+"/"+x+"): '" + sTemp + "'"
-            endif
+    Kontext "GridControlDialogStarter"
+    ShowGridcontrol.typeKeys "<space>"
+    Kontext "GridControlDialog"
+    if GridControlDialog.exists(5) then
+        for i=1 to gridcontrolcontrol.getcolumncount
+        for a=1 to gridcontrolcontrol.getrowcount
+            printlog " " + i + ":"+a+": '" + gridcontrolcontrol.getitemtype (i,a) + "' '" + gridcontrolcontrol.getitemtext (i,a) + "'"
+        next a
         next i
-        if 0 <> a then
-            printlog "Select the library and unfold it"
-            LibraryTreeList.select(a)
-            LibraryTreeList.typeKeys("+")
-            printlog "Go to 'Standard' and unfold"
-            LibraryTreeList.typeKeys("<down>")
-            LibraryTreeList.typeKeys("+")
-            printlog "Go to 'Module1'"
-            LibraryTreeList.typeKeys("<down>")
-
-            printlog "Select macro name 'VclTestTool'"
-            x = ScriptList.getItemCount
-            for i = 1 to x
-                sTemp = ScriptList.getItemText(i)
-                'printlog "("+i+"/"+x+"): '" + sTemp + "'"
-                if "VclTestTool" = sTemp then
-                    a = i
-                    printlog "Found macro ("+i+"/"+x+"): '" + sTemp + "'"
-                endif
-            next i
-            if (0 <> a) then
-                printlog "Select the macro"
-                ScriptList.select(a)
-                printlog "Start the macro by pressing the button 'run'"
-                ScriptSelector.ok
-                printlog "sleep... at least 60 seconds"
-                call sleep(60)
-                printlog "If macro fails for whatever reason, a message comes up"
-                Kontext
-                if active.exists() then
-                    warnlog "" + active.getText
-                    active.ok
-                    try
-                        EditCopy
-                        warnlog getclipboard()
-                    catch
-                    endcatch
-                    printlog "close basic ide"
-                    call hCloseDocument()
-                    printlog "close document"
-                    call hCloseDocument()
-                    goto endsub
-                endif
-
-            else
-                warnlog sLocation + "Macro not found: 'Main'"
-            endif
-        else
-            warnlog sLocation + "Library not found: 'gridcontrol'"
-        endif
+        GridControlDialog.close
     else
-        warnlog sLocation + "'Run macro dialog' didn't came up"
+        warnlog "Gridcontrol Dialog did not come up after pressing button"
     endif
     
     printlog "clean up"
diff --git a/testautomation/framework/optional/input/gridcontrol.odt b/testautomation/framework/optional/input/gridcontrol.odt
index b3e5c6fb40bb..d11d70cfbc09 100755
--- a/testautomation/framework/optional/input/gridcontrol.odt
+++ b/testautomation/framework/optional/input/gridcontrol.odt
diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win
index 1540dbd8743f..ab6183ad7724 100755
--- a/testautomation/global/win/dial_d_h.win
+++ b/testautomation/global/win/dial_d_h.win
@@ -483,6 +483,12 @@ Gruppenliste HID_TEMPLATE_FILTER
 Interlace filter:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED
 TransparentSpeichern filter:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT
 
+*GridControlDialogStarter ACTIVE
+ShowGridcontrol sym:showGridcontrol
+
+*GridControlDialog sym:gridcontroldialog
+gridcontrolcontrol sym:gridcontrolself
+
 *GroupingDlg HID_SC_DPDATEGROUP
 AutoStart sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOSTART
 ManualStart sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_MANSTART