CWS-TOOLING: integrate CWS automation_gapplication_unify

2009-03-24 14:40:09 +0100 jsk  r269948 : #i99878# - and another one...
2009-03-24 14:36:22 +0100 jsk  r269946 : #i99878# - another one...
2009-03-23 14:52:17 +0100 jsk  r269873 : #i99878# replace DESKTOP with BACKGROUND
2009-03-23 12:49:08 +0100 jsk  r269868 : #i99878# - special focus on database application
2009-03-23 12:46:13 +0100 jsk  r269867 : #i100474# - fix broken writer update testcase names
2009-03-20 15:44:29 +0100 jsk  r269817 : #i99878 - Step 3: Fixing round three - applications.txt
2009-03-20 15:40:43 +0100 jsk  r269816 : #i99878 - Step 3: Fixing round two - .bas-files
2009-03-20 15:19:04 +0100 jsk  r269813 : #i99878 - Step 3: Fixing round one
2009-03-20 15:01:07 +0100 jsk  r269811 : #i99878 - Step 1: rename, Step 2: Uppercase

26 files changed, 253 insertions, 253 deletions

diff --git a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
index 40cf105351a6..611778a4536e 100755
--- a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
@@ -99,7 +99,7 @@ testcase tFromText
     for i = 1 to 3
     '/// paste control from clipboard and open control property browser
         if i = 1 then 
-            gApplication = "Calc"
+            gApplication = "CALC"
                 printlog "-- Text to Calc Clipboard Test --"
                 printlog "open a new Calc document"
                 call hNewDocument
@@ -112,7 +112,7 @@ testcase tFromText
                 call hMenuSelectNr(4)
             endif
         if i = 2 then 
-            gApplication = "Draw"
+            gApplication = "DRAW"
                 printlog "-- Text to Draw Clipboard Test --"
                 printlog "open a new Draw document"
                 call hNewDocument
@@ -125,7 +125,7 @@ testcase tFromText
                 call hMenuSelectNr(2)
             endif
         if i = 3 then 
-            gApplication = "Impress"
+            gApplication = "IMPRESS"
                 printlog "-- Text to Impress Clipboard Test --"
                 printlog "open a new Impress document"
                 call hNewDocument
@@ -168,7 +168,7 @@ testcase tFromCalc
 
     '/// Open a new document and empty clipboard
         printlog "Open a new document and empty clipboard"
-        gApplication = "Calc"
+        gApplication = "CALC"
 	call hNewDocument
     Kontext "DocumentCalc"    
 	    DocumentCalc.TypeKeys "tt_doc" , true
@@ -215,7 +215,7 @@ testcase tFromCalc
     for i = 1 to 3
     '/// paste control from clipboard and open control property browser
         if i = 1 then 
-            gApplication = "Writer"
+            gApplication = "WRITER"
                 printlog "-- Calc to Text Clipboard Test --"
                 printlog "open a new Text document"
                 call hNewDocument
@@ -228,7 +228,7 @@ testcase tFromCalc
                 call hMenuSelectNr(4)
             endif
         if i = 2 then 
-            gApplication = "Draw"
+            gApplication = "DRAW"
                 printlog "-- Calc to Draw Clipboard Test --"
                 printlog "open a new Draw document"
                 call hNewDocument
@@ -241,7 +241,7 @@ testcase tFromCalc
                 call hMenuSelectNr(2)
             endif
         if i = 3 then 
-            gApplication = "Impress"
+            gApplication = "IMPRESS"
                 printlog "-- Calc to Impress Clipboard Test --"
                 printlog "open a new Impress document"
                 call hNewDocument
@@ -285,7 +285,7 @@ testcase tFromDraw
 
     '/// Open a new document and empty clipboard
         printlog "Open a new document and empty clipboard"
-        gApplication = "Draw"
+        gApplication = "DRAW"
 	call hNewDocument
     Kontext "DocumentDraw"    
 	    DocumentDraw.TypeKeys "tt_doc" , true
@@ -332,7 +332,7 @@ testcase tFromDraw
     for i = 1 to 3
     '/// paste control from clipboard and open control property browser
         if i = 1 then 
-            gApplication = "Writer"
+            gApplication = "WRITER"
                 printlog "-- Draw to Text Clipboard Test --"
                 printlog "open a new Text document"
                 call hNewDocument
@@ -345,7 +345,7 @@ testcase tFromDraw
                 call hMenuSelectNr(4)
             endif
         if i = 2 then 
-            gApplication = "Calc"
+            gApplication = "CALC"
                 printlog "-- Draw to Calc Clipboard Test --"
                 printlog "open a new Calc document"
                 call hNewDocument
@@ -358,7 +358,7 @@ testcase tFromDraw
                 call hMenuSelectNr(4)
             endif
         if i = 3 then 
-            gApplication = "Impress"
+            gApplication = "IMPRESS"
                 printlog "-- Draw to Impress Clipboard Test --"
                 printlog "open a new Impress document"
                 call hNewDocument
@@ -401,7 +401,7 @@ testcase tFromImpress
 
     '/// Open a new document and empty clipboard
         printlog "Open a new document and empty clipboard"
-        gApplication = "Impress"
+        gApplication = "IMPRESS"
 	call hNewDocument
     Kontext "DocumentImpress"    
 	    DocumentImpress.TypeKeys "tt_doc" , true
@@ -448,7 +448,7 @@ testcase tFromImpress
     for i = 1 to 3
     '/// paste control from clipboard and open control property browser
         if i = 1 then 
-            gApplication = "Writer"
+            gApplication = "WRITER"
                 printlog "-- Impress to Text Clipboard Test --"
                 printlog "open a new Text document"
                 call hNewDocument
@@ -461,7 +461,7 @@ testcase tFromImpress
                 call hMenuSelectNr(4)
             endif
         if i = 2 then 
-            gApplication = "Calc"
+            gApplication = "CALC"
                 printlog "-- Impress to Calc Clipboard Test --"
                 printlog "open a new Calc document"
                 call hNewDocument
@@ -474,7 +474,7 @@ testcase tFromImpress
                 call hMenuSelectNr(4)
             endif
         if i = 3 then 
-            gApplication = "Draw"
+            gApplication = "DRAW"
                 printlog "-- Impress to Draw Clipboard Test --"
                 printlog "open a new Draw document"
                 call hNewDocument
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc b/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc
index e8d08e0cdbe9..8cfeea2ec6ca 100755
--- a/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc
@@ -56,7 +56,7 @@ testcase tListBox
     dim i as integer
     printlog "- Formular toolbox: List box element (" & gApplication & ")"
     '/// open a spreadsheet, insert a listbox (the wizard appears)
-    gApplication = "Calc"
+    gApplication = "CALC"
     call hNewDocument
     Kontext "DocumentCalc"
     DocumentCalc.TypeKeys("Value1")
@@ -134,7 +134,7 @@ endcase
 testcase tTextBox     
     
     '/// Open a new document,
-    gApplication = "Calc"
+    gApplication = "CALC"
     printlog "Open a new document,"
 	call hNewDocument
     Kontext "DocumentCalc"       
@@ -248,14 +248,14 @@ testcase tTextBox
             warnlog "the cell bound doesn't work"
         endif
     hCloseDocument
-    gApplication = "Writer"
+    gApplication = "WRITER"
 
 endcase
 '--------------------------------------------------------------------------------------
 testcase tCheckBox     
     
     '/// Open a new document,
-    gApplication = "Calc"
+    gApplication = "CALC"
     printlog "Open a new document,"
 	call hNewDocument
     Kontext "DocumentCalc"	
@@ -378,7 +378,7 @@ testcase tCheckBox
             warnlog "the cell bound doesn't work"
         endif
     hCloseDocument
-    gApplication = "Writer"
+    gApplication = "WRITER"
 
 endcase
 '-------------------------------------------------------------------------
diff --git a/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc b/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc
index 0faaf121ab2b..2c9a352c2284 100755
--- a/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc
@@ -194,7 +194,7 @@ testcase tRichTextControlDraw
     
     '/// Open a new document,
     printlog "Open a new document,"
-	gApplication = "Draw"
+	gApplication = "DRAW"
     call hNewDocument
     Kontext "DocumentDraw"       
 	DocumentDraw.TypeKeys "tt_doc" , true
diff --git a/testautomation/dbaccess/optional/includes/db_Query.inc b/testautomation/dbaccess/optional/includes/db_Query.inc
index b5097ad69f95..d9efb9ef3802 100755
--- a/testautomation/dbaccess/optional/includes/db_Query.inc
+++ b/testautomation/dbaccess/optional/includes/db_Query.inc
@@ -46,7 +46,7 @@ function db_Query( sFileName , optional sType , optional sPassword)
         sType = UCase(sType)
         printlog sType
         select case sType
-            case "TEXT", "SPREADSHEET"
+            case "TEXT", "CALC"
                 sType = "1"
             case "ODBC", "JDBC"
                 sType = "2"
diff --git a/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc b/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc
index aec84e36ed21..8d87dd4c3507 100755
--- a/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc
+++ b/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc
@@ -52,7 +52,7 @@ testcase db_Spreadsheet
     dbok = fCreateSpreadsheetDatasource(sFileName, gOfficePath + ConvertPath(sDBURL),"tt_spreadsheet")
     if dbok = true then
             
-        call db_Query(sFileName, "spreadsheet")
+        call db_Query(sFileName, "CALC")
         
         'outcomment because of several bugs inside forms
         'use "dbaccess/optional/includes/b_lvl1_Forms.inc"
diff --git a/testautomation/dbaccess/optional/includes/db_Text.inc b/testautomation/dbaccess/optional/includes/db_Text.inc
index 1097b41fdc6a..016df0a55caa 100755
--- a/testautomation/dbaccess/optional/includes/db_Text.inc
+++ b/testautomation/dbaccess/optional/includes/db_Text.inc
@@ -51,8 +51,8 @@ testcase tCountCharacterSet(sFilename as string)
 
 	'/// open the properties dialog of the open database
     printlog "open the properties dialog of the open database"            
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(1)
@@ -85,17 +85,17 @@ endcase
 '-------------------------------------------------------------------------
 testcase tOpenUTF8File(sFilename as string)
     
-    '/// copy the file TesttoolPath + dbaccess/optional/input/text_datasource/text_database.txt" to your local wotk directory
-    printlog "copy the file TesttoolPath + dbaccess/optional/input/text_datasource/text_database.txt to your local wotk directory"
-    app.FileCopy gTesttoolPath + ConvertPath("dbaccess/optional/input/text_datasource/text_database.txt"),gOfficePath + ConvertPath("user/work/text_database.txt")
+    '/// copy the file TesttoolPath + dbaccess/optional/input/text_datasource/text_Database.txt" to your local wotk directory
+    printlog "copy the file TesttoolPath + dbaccess/optional/input/text_datasource/text_Database.txt to your local wotk directory"
+    app.FileCopy gTesttoolPath + ConvertPath("dbaccess/optional/input/text_datasource/text_Database.txt"),gOfficePath + ConvertPath("user/work/text_Database.txt")
 
     '/// open the text database create in the bas file
     call fOpendatabase(sFileName)
     
     '/// open the properties dialog of the open database
     printlog "open the properties dialog of the open database"
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(1)
diff --git a/testautomation/dbaccess/optional/includes/db_hsqldb.inc b/testautomation/dbaccess/optional/includes/db_hsqldb.inc
index c9d6dca4d6ec..fbdf1789451c 100755
--- a/testautomation/dbaccess/optional/includes/db_hsqldb.inc
+++ b/testautomation/dbaccess/optional/includes/db_hsqldb.inc
@@ -148,8 +148,8 @@ testcase tRenameTable
     fFindTable("TT_1")
     
     printlog "rename the selected table"
-    Kontext "Insight"
-        Insight.UseMenu
+    Kontext "DATABASE"
+        Database.UseMenu
         call hMenuSelectNr(2)
         call hMenuSelectNr(7)
 
@@ -213,8 +213,8 @@ testcase tRenameTableWhichUsedInViews
 
     '/// rename the selcted table
     printlog "rename the selcted table"
-    Kontext "Insight"
-        Insight.UseMenu
+    Kontext "DATABASE"
+        Database.UseMenu
         call hMenuSelectNr(2)
         call hMenuSelectNr(7)
 
diff --git a/testautomation/dbaccess/optional/includes/frm_Forms.inc b/testautomation/dbaccess/optional/includes/frm_Forms.inc
index 1d38b9ad9c1c..26445ddc0b3d 100755
--- a/testautomation/dbaccess/optional/includes/frm_Forms.inc
+++ b/testautomation/dbaccess/optional/includes/frm_Forms.inc
@@ -891,8 +891,8 @@ testcase tNewFolder
 
     '/// insert a new folder via INSERT/FOLDER menu
     printlog "insert a new folder via INSERT/FOLDER menu"
-    Kontext "Insight"
-        Insight.UseMenu
+    Kontext "DATABASE"
+        Database.UseMenu
         hMenuSelectNr(4)
         hMenuSelectNr(8)
 
@@ -944,8 +944,8 @@ testcase tRenameFolder
 
     '/// insert a new folder via INSERT/FOLDER menu
     printlog "insert a new folder via INSERT/FOLDER menu"
-    Kontext "Insight"
-        Insight.UseMenu
+    Kontext "DATABASE"
+        Database.UseMenu
         hMenuSelectNr(4)
         hMenuSelectNr(8)
 
@@ -967,8 +967,8 @@ testcase tRenameFolder
     '/// insert a new folder under the first folder
     printlog "insert a new folder under the first folder"   
     
-    Kontext "Insight"
-        Insight.UseMenu
+    Kontext "DATABASE"
+        Database.UseMenu
         hMenuSelectNr(4)
         hMenuSelectNr(8)
 
@@ -989,8 +989,8 @@ testcase tRenameFolder
 
     '/// rename the firt folder
     printlog "rename the firt folder"    
-    Kontext "Insight"
-        Insight.UseMenu
+    Kontext "DATABASE"
+        Database.UseMenu
         hMenuSelectNr(2)
         hMenuSelectNr(7)
 
diff --git a/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc b/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc
index c030bd53883c..016c7d79b2e8 100755
--- a/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc
@@ -79,10 +79,10 @@ testcase tCopy_Table_Dialog_Definition_and_data
 
     '/// press CTRL + C to copy the table and CTRL + V to paste the table again
     printlog "press CTRL + C to copy the table and CTRL + V to paste the table again"
-    Kontext "Insight"
-        Insight.typeKeys("<MOD1 C>",true)
+    Kontext "DATABASE"
+        Database.typeKeys("<MOD1 C>",true)
         sleep(1)
-        Insight.typeKeys("<MOD1 V>",true)
+        Database.typeKeys("<MOD1 V>",true)
         sleep(1)
 
     '/// the copy table dialog appear
@@ -185,10 +185,10 @@ testcase tCopy_Table_Dialog_Definition
     
     '/// press CTRL + C to copy the table and CTRL + V to paste the table again
     printlog "press CTRL + C to copy the table and CTRL + V to paste the table again"
-    Kontext "Insight"
-        Insight.typeKeys("<MOD1 C>",true)
+    Kontext "DATABASE"
+        Database.typeKeys("<MOD1 C>",true)
         sleep(1)
-        Insight.typeKeys("<MOD1 V>",true)
+        Database.typeKeys("<MOD1 V>",true)
         sleep(1)
 
 
@@ -257,10 +257,10 @@ testcase tCopy_Table_Dialog_Attach_data
     
     '/// press CTRL + C to copy the table and CTRL + V to paste the table again
     printlog "press CTRL + C to copy the table and CTRL + V to paste the table again"
-    Kontext "Insight"
-        Insight.typeKeys("<MOD1 C>",true)
+    Kontext "DATABASE"
+        Database.typeKeys("<MOD1 C>",true)
         sleep(1)
-        Insight.typeKeys("<MOD1 V>",true)
+        Database.typeKeys("<MOD1 V>",true)
         sleep(1)
 
     '/// the copy table dialog appear
@@ -311,10 +311,10 @@ testcase tCopy_Table_Dialog_Attach_data
 
     '/// press CTRL + C to copy the table and CTRL + V to paste the table again
     printlog "press CTRL + C to copy the table and CTRL + V to paste the table again"
-    Kontext "Insight"
-        Insight.typeKeys("<MOD1 C>",true)
+    Kontext "DATABASE"
+        Database.typeKeys("<MOD1 C>",true)
         sleep(1)
-        Insight.typeKeys("<MOD1 V>",true)
+        Database.typeKeys("<MOD1 V>",true)
         sleep(1)
 
     '/// the copy table dialog appear
@@ -397,8 +397,8 @@ testcase tCopy_Table_from_Text_Document
     call fFindtable("biblio")
 
     '/// press CTRL + V to paste the table
-    Kontext "Insight"
-        Insight.typeKeys("<MOD1 V>",true)
+    Kontext "DATABASE"
+        Database.typeKeys("<MOD1 V>",true)
         sleep(1)
 
     '/// the copy table dialog appear
@@ -460,7 +460,7 @@ testcase tCopy_Table_from_Calc_Document
 
     '/// open a new calc document
     printlog "open a calc new document"
-	gApplication = "Calc"
+	gApplication = "CALC"
     call hNewDocument    
 
     '/// insert some data
@@ -503,8 +503,8 @@ testcase tCopy_Table_from_Calc_Document
     call fFindtable("biblio2")
 
     '/// press CTRL + V to paste the table again
-    Kontext "Insight"
-        Insight.typeKeys("<MOD1 V>",true)
+    Kontext "DATABASE"
+        Database.typeKeys("<MOD1 V>",true)
         sleep(1)
 
     '/// the copy table dialog appear
@@ -618,7 +618,7 @@ testcase tCopy_Table_from_Calc_Document
     printlog "close the spreadsheet document"    
     call hCloseDocument
 
-    gApplication = "Writer"
+    gApplication = "WRITER"
 
 endcase
 '--------------------------------------------------------------------
@@ -639,8 +639,8 @@ testcase tCopy_Table_from_hsql_to_dBase
 
     '/// press CTRL + C to copy the table
     printlog "press CTRL + C to copy the table"
-    Kontext "Insight"
-        Insight.typeKeys("<MOD1 C>",true)
+    Kontext "DATABASE"
+        Database.typeKeys("<MOD1 C>",true)
 
     '/// open the bibliography database
     printlog "open the bibliography database"
@@ -653,8 +653,8 @@ testcase tCopy_Table_from_hsql_to_dBase
     call fFindTable("biblio")
     
     '/// press CTRL + V to paste the table
-    Kontext "Insight"
-        Insight.typeKeys("<MOD1 V>",true)
+    Kontext "DATABASE"
+        Database.typeKeys("<MOD1 V>",true)
 
     '/// the copy table dialog appear
     printlog "the copy table dialog appear"	
@@ -744,10 +744,10 @@ testcase tCopy_Table_Paste_Special
 
     '/// press CTRL + C to copy the table and CTRL + V to paste the table again
     printlog "press CTRL + C to copy the table and CTRL + V to paste the table again"
-    Kontext "Insight"
-        Insight.typeKeys("<MOD1 C>",true)
+    Kontext "DATABASE"
+        Database.typeKeys("<MOD1 C>",true)
         sleep(1) 
-        Insight.UseMenu
+        Database.UseMenu
         hMenuSelectNr(2)
         hMenuSelectNr(5)                
         sleep(1)
diff --git a/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc b/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc
index fafc237ceb22..a6b1cc788590 100755
--- a/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc
@@ -50,10 +50,10 @@ testcase tNewForm
 
     ViewForms
 
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     sleep(1)
     
     StartFormWizard
@@ -106,10 +106,10 @@ testcase tCheckTemplate
 
     ViewForms
 
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     sleep(1)
     
     StartFormWizard
@@ -222,10 +222,10 @@ testcase tStartFromTableContextMenu
 
     call fOpenDatabase(gOfficePath + ConvertPath("user/database/biblio.odb"))
         
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     sleep(1)
 
     '/// select the table biblio
diff --git a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc
index cb53cb66efde..83d3dad111fc 100755
--- a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc
@@ -49,12 +49,12 @@ testcase tNewReport
 
     call fOpenDatabase(gOfficePath + ConvertPath("user/database/biblio.odb"))
         
-    Kontext "Insight"
+    Kontext "DATABASE"
     
     ViewReports
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     sleep(1)
     
     StartReportWizard
diff --git a/testautomation/dbaccess/required/includes/DatabaseTypes.inc b/testautomation/dbaccess/required/includes/DatabaseTypes.inc
index 0285ccd50b12..7a24feb50024 100755
--- a/testautomation/dbaccess/required/includes/DatabaseTypes.inc
+++ b/testautomation/dbaccess/required/includes/DatabaseTypes.inc
@@ -79,8 +79,8 @@ testcase tMySQLODBCProperties
 
     ViewForms
     
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(2)
@@ -117,8 +117,8 @@ testcase tMySQLJDBCProperties
 
     ViewForms    
     
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(2)
@@ -165,8 +165,8 @@ testcase tAdabasProperties
 
     ViewForms    
             
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(2)
@@ -205,8 +205,8 @@ testcase tOracleJDBCProperties
 
     ViewForms    
             
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(2)
@@ -241,8 +241,8 @@ testcase tJDBCProperties
 
     ViewForms    
             
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(2)
@@ -274,8 +274,8 @@ testcase tLDAPProperties
 
     ViewForms    
             
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(2)
@@ -315,8 +315,8 @@ testcase tEvolutionProperties
 
     ViewForms    
             
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(2)
@@ -357,8 +357,8 @@ testcase tMozillaProperties
 
     ViewForms    
             
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(2)
@@ -388,25 +388,25 @@ testcase tSpreadsheetProperties
 
     ViewForms    
             
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(2)
     
     Kontext "TabGeneral"    
         call DialogTest(TabGeneral)
-        DataBaseType.select(getIdForDatabaseType("Spreadsheet"))    
+        DataBaseType.select(getIdForDatabaseType("CALC"))    
         
     Kontext "ConnectionType"        
         NextBtn.Click
         sleep(1)        
-        call fCheckConnectionTabPage("Spreadsheet")
+        call fCheckConnectionTabPage("CALC")
     
     Kontext "ConnectionType"        
         ConnectionType.Cancel
         
-    'call fCheckAdvancedDialog("Spreadsheet")
+    'call fCheckAdvancedDialog("CALC")
         
     call fCloseDatabase()  
     
@@ -418,8 +418,8 @@ testcase tTextProperties
 
     ViewForms    
             
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(2)
@@ -456,8 +456,8 @@ testcase tdBaseProperties
 
     ViewForms    
             
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(2)
@@ -494,8 +494,8 @@ testcase tODBCProperties
 
     ViewForms    
             
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(2)
@@ -549,8 +549,8 @@ function fCheckAdvancedDialog(sType as string)
     
     printlog "+Check the Advanced Settings for the datasource type " + sType
     
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(3)    
@@ -590,7 +590,7 @@ function fCheckAdvancedDialog(sType as string)
             'call fcheckControl(BooleanComparison)
             'call fcheckControl(AppendAlias)
         
-        elseif sType = "Spreadsheet" OR sType = "Mozilla" OR sType = "Evolution" OR sType = "LDAP" then            
+        elseif sType = "CALC" OR sType = "Mozilla" OR sType = "Evolution" OR sType = "LDAP" then            
            ' call fcheckControl(BooleanComparison)
            ' call fcheckControl(AppendAlias)    
         
@@ -672,7 +672,7 @@ function fCheckConnectionTabPage(sType as string)
         call fcheckControl(SelectPath)
         call fcheckControl(TestConnection)
     
-    elseif sType = "Spreadsheet" then        
+    elseif sType = "CALC" then        
         call fcheckControl(SpreadsheetPath)
         call fcheckControl(SelectPath)
         call fcheckControl(TestConnection)
diff --git a/testautomation/dbaccess/required/includes/Forms.inc b/testautomation/dbaccess/required/includes/Forms.inc
index f6358ca6cd6b..7549b63d1100 100755
--- a/testautomation/dbaccess/required/includes/Forms.inc
+++ b/testautomation/dbaccess/required/includes/Forms.inc
@@ -54,10 +54,10 @@ testcase tNewFormDesign
     printlog "open biblio database"    
     hFileOpen( gOfficePath & "user/database/biblio.odb" )
         
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     sleep(1)
 
     '/// view forms
diff --git a/testautomation/dbaccess/required/includes/MainApp.inc b/testautomation/dbaccess/required/includes/MainApp.inc
index 599c767e0b7c..a20b278a971a 100755
--- a/testautomation/dbaccess/required/includes/MainApp.inc
+++ b/testautomation/dbaccess/required/includes/MainApp.inc
@@ -69,10 +69,10 @@ testcase tTableFilters
     
     hFileOpen( gOfficePath & "user/database/biblio.odb" )
         
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     sleep(1)
     TableFilters
     sleep(1)
@@ -90,12 +90,12 @@ testcase tTableView
    
     hFileOpen( gOfficePath & "user/database/biblio.odb" )
         
-    Kontext "Insight"
+    Kontext "DATABASE"
 
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
         
-    if not InsightSwapIconView.exists(1) then        
+    if not DatabaseSwapIconView.exists(1) then        
         warnlog "InsightSwapIconView doesn't exists"
         goto endsub
     end if
@@ -124,20 +124,20 @@ testcase tMainApp
     
     hFileOpen( gOfficePath & "user/database/biblio.odb" )
 
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     
-    Kontext "Insight"
-    if Insight.exists() then
+    Kontext "DATABASE"
+    if Database.exists() then
         printlog "Insight appear"
     else
         warnlog "Insight doesn't appear"
         goto endsub
     end if
     
-    if InsightSwapView.exists() then
+    if DatabaseSwapView.exists() then
         printlog "InsightSwapView appear"        
     else
         warnlog "InsightSwapView doesn't appear"
@@ -147,7 +147,7 @@ testcase tMainApp
     '/// display Tables View
     printlog "display Tables View"
     ViewTables    
-    if InsightTablesView.exists(1) then
+    if DatabaseTablesView.exists(1) then
         printlog "InsightTablesView appear"        
     else
         warnlog "InsightTablesView doesn't appear"
@@ -164,7 +164,7 @@ testcase tMainApp
     '/// display Queries View
     printlog "display Queries View"
     ViewQueries    
-    if InsightQueriesView.exists(1) then
+    if DatabaseQueriesView.exists(1) then
         printlog "InsightQueriesView appear"        
     else
         warnlog "InsightQueriesView doesn't appear"
@@ -188,7 +188,7 @@ testcase tMainApp
         warnlog "InsightFormsView doesn't appear"
         goto endsub
     end if
-    Kontext "Insight"
+    Kontext "DATABASE"
     '/// count the items in the CreationList
     printlog "count the items in the CreationList"
     iCount = CreationList.getItemCount() 
@@ -199,7 +199,7 @@ testcase tMainApp
     '/// display Reports View
     printlog "display Reports View"
     ViewReports    
-    if InsightReportsView.exists(1) then
+    if DatabaseReportsView.exists(1) then
         printlog "InsightReportsView appear"        
     else
         warnlog "InsightReportsView doesn't appear"
@@ -227,10 +227,10 @@ testcase tPreview
 
     hFileOpen( gOfficePath & "user/database/biblio.odb" )
 
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)    
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)    
     
     ViewTables
     
@@ -239,8 +239,8 @@ testcase tPreview
     Kontext "ContainerView"        
         TableTree.select 1
     
-    Kontext "Insight"
-        Insight.UseMenu
+    Kontext "DATABASE"
+        Database.UseMenu
         hMenuSelectNr(3)
         hMenuSelectNr(4)
         hMenuSelectNr(3)
@@ -255,8 +255,8 @@ testcase tPreview
             printlog "preview displayed"
         endif    
         
-    Kontext "Insight"
-        Insight.UseMenu
+    Kontext "DATABASE"
+        Database.UseMenu
         hMenuSelectNr(3)
         hMenuSelectNr(4)
         hMenuSelectNr(1)
@@ -282,8 +282,8 @@ testcase tMainMenuBar
     
     hFileOpen( gOfficePath & "user/database/biblio.odb" )
     
-    Kontext "Insight"
-        Insight.UseMenu        
+    Kontext "DATABASE"
+        Database.UseMenu        
         '/// check if there are 11 items in the file menu.
         printlog "check if there are 11 items in the file menu."
         '/// + there different count related to the file pick list.                
@@ -311,7 +311,7 @@ testcase tMainMenuBar
         
         '/// check the FILE/AUTOPILOTS
         printlog "check the FILE/AUTOPILOTS"
-        Insight.UseMenu        
+        Database.UseMenu        
         hMenuSelectNr(1) ' the file menu
         hMenuSelectNr(4) ' the autopilots menu        
         iCount = hMenuItemGetCount()
@@ -322,7 +322,7 @@ testcase tMainMenuBar
         
         '/// check if there are 15 items in the edit menu.
         printlog "check if there are 15 items in the edit menu."
-        Insight.UseMenu 
+        Database.UseMenu 
         hMenuSelectNr(2)        
         iCount = hMenuItemGetCount()
         if (iCount <> 15) then
@@ -332,7 +332,7 @@ testcase tMainMenuBar
 
         '/// check if there are 6 items in the view menu.
         printlog "check if there are 6 items in the view menu."
-        Insight.UseMenu 
+        Database.UseMenu 
         hMenuSelectNr(3)        
         iCount = hMenuItemGetCount()
         if (iCount <> 6) then
@@ -342,7 +342,7 @@ testcase tMainMenuBar
 
         '/// check the VIEW/DATABASE OBJECTS
         printlog "check the VIEW/DATABASE OBJECTS"
-        Insight.UseMenu
+        Database.UseMenu
         hMenuSelectNr(3)
         hMenuSelectNr(1)                
         iCount = hMenuItemGetCount()        
@@ -353,7 +353,7 @@ testcase tMainMenuBar
 
         '/// check the VIEW/SORT OBJECTS
         printlog "check the VIEW/SORT OBJECTS"
-        Insight.UseMenu
+        Database.UseMenu
         hMenuSelectNr(3)
         hMenuSelectNr(5)                
         iCount = hMenuItemGetCount()        
@@ -364,7 +364,7 @@ testcase tMainMenuBar
 
         '/// check the VIEW/PREVIEW
         printlog "check the VIEW/PREVIEW"
-        Insight.UseMenu
+        Database.UseMenu
         hMenuSelectNr(3)
         hMenuSelectNr(4 )                
         iCount = hMenuItemGetCount()        
@@ -375,7 +375,7 @@ testcase tMainMenuBar
         
         '/// check if there are 8 items in the insert menu.
         printlog "check if there are 8 items in the insert menu."
-        Insight.UseMenu 
+        Database.UseMenu 
         hMenuSelectNr(4)       
         iCount = hMenuItemGetCount()
         if (iCount <> 8) then
@@ -385,7 +385,7 @@ testcase tMainMenuBar
 
         '/// check if there are 10 items in the tools menu.
         printlog "check if there are 10 items in the tools menu."        
-        Insight.UseMenu 
+        Database.UseMenu 
         hMenuSelectNr(5)        
         iCount = hMenuItemGetCount()
         if ( lcase( gPlatform ) = "osx" ) then
@@ -401,7 +401,7 @@ testcase tMainMenuBar
         
         '/// check if there are 4 items in the TOOLS/MACRO menu.
         printlog "check if there are 4 items in the TOOLS/MACRO menu."        
-        Insight.UseMenu 
+        Database.UseMenu 
         hMenuSelectNr(5)
         hMenuSelectNr(6)        
         iCount = hMenuItemGetCount()
@@ -420,12 +420,12 @@ testcase tDatabaseProperties
     
     hFileOpen( gOfficePath & "user/database/biblio.odb" )
     
-    Kontext "Insight"        
-        Insight.MouseDown(50,50)
-        Insight.MouseUp(50,50)
+    Kontext "DATABASE"        
+        Database.MouseDown(50,50)
+        Database.MouseUp(50,50)
     
-    Kontext "Insight"    
-        Insight.UseMenu    
+    Kontext "DATABASE"    
+        Database.UseMenu    
         hMenuSelectNr(2)
         hMenuSelectNr(15)
         hMenuSelectNr(1)
@@ -525,7 +525,7 @@ testcase tRegisterDatabaseDialog
     Kontext "TabRegisteredDatabase"
         call DialogTest( TabRegisteredDatabase )    
         if (RegisteredDatabases.getItemCount() = 0 ) then
-            warnlog "there are no registered databases. There should be at least a  registered 'Bibliography' database."
+            warnlog "there are no registered databases. There should be at least a  registered 'Bibliography' Database."
             Kontext "OptionenDlg"
                 OptionenDlg.Cancel
             call hCloseDocument
@@ -596,8 +596,8 @@ testcase tDatabaseBeamer
     hMenuSelectNr(1)
     WaitSlot(1)
     
-    Kontext "Insight"
-    If Insight.exists(10) then
+    Kontext "DATABASE"
+    If Database.exists(10) then
         printlog "database open -> OK"
         printlog "close the open database"
         call fCloseDatabase
diff --git a/testautomation/dbaccess/required/includes/Query.inc b/testautomation/dbaccess/required/includes/Query.inc
index 37367e6e371d..a91d28ddb39b 100755
--- a/testautomation/dbaccess/required/includes/Query.inc
+++ b/testautomation/dbaccess/required/includes/Query.inc
@@ -936,16 +936,16 @@ sub initQueryDesign
 
     hFileOpen( gOfficePath & "user/database/biblio.odb" )
         
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     
     sleep(1)
     
     NewQueryDesign
         
-    ' if not InsightSwapIconView.exists(1) then        
+    ' if not DatabaseSwapIconView.exists(1) then        
         ' warnlog "InsightSwapIconView doesn't exists"
         ' exit sub
     ' end if
@@ -953,17 +953,17 @@ sub initQueryDesign
     ' '/// display Queries View
     ' printlog "display Queries View"
     ' ViewQueries    
-    ' if InsightQueriesView.exists(1) then
+    ' if DatabaseQueriesView.exists(1) then
         ' printlog "InsightQueriesView appear"        
     ' else
         ' warnlog "InsightQueriesView doesn't appear"
         ' exit sub
     ' end if
     ' 
-    ' Kontext "Insight"
+    ' Kontext "DATABASE"
         ' CreationList.select(1)
         ' sleep(1)
-        ' Insight.TypeKeys "<TAB>" , true
-        ' Insight.TypeKeys "<RETURN>" , true
+        ' Database.TypeKeys "<TAB>" , true
+        ' Database.TypeKeys "<RETURN>" , true
         ' sleep(1)
 end sub    
diff --git a/testautomation/dbaccess/required/includes/ReportBuilder01.inc b/testautomation/dbaccess/required/includes/ReportBuilder01.inc
index 15394e2e9b05..cc774430d51b 100755
--- a/testautomation/dbaccess/required/includes/ReportBuilder01.inc
+++ b/testautomation/dbaccess/required/includes/ReportBuilder01.inc
@@ -69,10 +69,10 @@ testcase tMainMenuBar
     
     call hFileOpen(gOfficePath + ConvertPath("user/database/biblio.odb"))
         
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     sleep(1)
     
     '/// open the report designer
diff --git a/testautomation/dbaccess/required/includes/Table.inc b/testautomation/dbaccess/required/includes/Table.inc
index 01519534063d..5564ecf150fd 100755
--- a/testautomation/dbaccess/required/includes/Table.inc
+++ b/testautomation/dbaccess/required/includes/Table.inc
@@ -616,10 +616,10 @@ sub initTable
     
     hFileOpen( gOfficePath & "user/database/biblio.odb" )    
     
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     
     sleep(1)
     
diff --git a/testautomation/dbaccess/required/includes/TableDesign.inc b/testautomation/dbaccess/required/includes/TableDesign.inc
index 65eff82c0066..8cb9c3999289 100755
--- a/testautomation/dbaccess/required/includes/TableDesign.inc
+++ b/testautomation/dbaccess/required/includes/TableDesign.inc
@@ -494,10 +494,10 @@ sub initTableDesign
 
     hFileOpen( gOfficePath & "user/database/biblio.odb" )
     
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     
     sleep(1)
     
diff --git a/testautomation/dbaccess/required/includes/Wizards.inc b/testautomation/dbaccess/required/includes/Wizards.inc
index 5c8c62ea334d..c8b7d747cd29 100755
--- a/testautomation/dbaccess/required/includes/Wizards.inc
+++ b/testautomation/dbaccess/required/includes/Wizards.inc
@@ -60,10 +60,10 @@ testcase tQueryWizard
 
     hFileOpen( gOfficePath & "user/database/biblio.odb" )
         
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     sleep(1)
     
     call fStartQueryWizard
@@ -114,10 +114,10 @@ testcase tReportWizard
 
     hFileOpen( gOfficePath & "user/database/biblio.odb" )
         
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     sleep(1)
     
     StartReportWizard
@@ -166,10 +166,10 @@ testcase tTableWizard
 
     hFileOpen( gOfficePath & "user/database/biblio.odb" )
         
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     sleep(1)
 
     ViewTables
@@ -207,10 +207,10 @@ testcase tFormWizard
         
     hFileOpen( gOfficePath & "user/database/biblio.odb" )
         
-    Kontext "Insight"
+    Kontext "DATABASE"
     
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50)
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50)
     sleep(1)
     
     StartFormWizard
diff --git a/testautomation/dbaccess/tools/controltools.inc b/testautomation/dbaccess/tools/controltools.inc
index a5efe6aa23ca..f7614cba40b3 100755
--- a/testautomation/dbaccess/tools/controltools.inc
+++ b/testautomation/dbaccess/tools/controltools.inc
@@ -57,7 +57,7 @@ function fSwitchAutopilotOff(SwitchAutoOff as boolean)
                 
     '/// open a new document
     printlog "open a new document"
-    gApplication = "Writer"
+    gApplication = "WRITER"
 	call hNewDocument
     Kontext "DocumentWriter"       
 	DocumentWriter.TypeKeys "tt_doc" , true
@@ -590,12 +590,12 @@ sub hDrawingWithSelection ( iStartX, iStartY, iEndX, iEndY )
                             DocumentWriter.MouseMove ( iEndX, iEndY )
                             DocumentWriter.MouseUp ( iEndX, iEndY )
 
-      case "HTMLDOKUMENT": Kontext "DocumentWriterWeb"
+      case "HTML": Kontext "DocumentWriterWeb"
                             DocumentWriterWeb.MouseDown ( iStartX, iStartY )
                             DocumentWriterWeb.MouseMove ( iEndX, iEndY )
                             DocumentWriterWeb.MouseUp ( iEndX, iEndY )
 
-      case "GLOBALDOC"   : Kontext "DocumentMasterDoc"
+      case "MASTERDOCUMENT"   : Kontext "DocumentMasterDoc"
                             DocumentMasterDoc.MouseDown ( iStartX, iStartY )
                             DocumentMasterDoc.MouseMove ( iEndX, iEndY )
                             DocumentMasterDoc.MouseUp ( iEndX, iEndY )
diff --git a/testautomation/dbaccess/tools/dbcreatetools.inc b/testautomation/dbaccess/tools/dbcreatetools.inc
index 99de3175cd22..d0c8dba29d9e 100755
--- a/testautomation/dbaccess/tools/dbcreatetools.inc
+++ b/testautomation/dbaccess/tools/dbcreatetools.inc
@@ -859,7 +859,7 @@ function fCreateSpreadsheetDatasource(sFileName,sURL, optional sRegister) as boo
     Kontext "DatabaseWizard"    
         ConnectToDatabase.Check
         sleep(1)        
-        DatabaseType.Select (getIdForDatabaseType("Spreadsheet", DatabaseType) - 1) ' -1 because in the wizard there is on datasource less because of mysql
+        DatabaseType.Select (getIdForDatabaseType("CALC", DatabaseType) - 1) ' -1 because in the wizard there is on datasource less because of mysql
         sleep(1)
         NextBtn.Click
         sleep(1)
@@ -1512,7 +1512,7 @@ function getIdForDatabaseType(sType as String ) as Integer
         endif
     elseif (sType = "OracleJDBC") then        
         ii = 3                    
-    elseif (sType = "Spreadsheet") then
+    elseif (sType = "CALC") then        
         if gPlatform = "osx" then        
          ii = 4
         else
diff --git a/testautomation/dbaccess/tools/dbtools.inc b/testautomation/dbaccess/tools/dbtools.inc
index f2bdfb0bb796..22e16211360c 100755
--- a/testautomation/dbaccess/tools/dbtools.inc
+++ b/testautomation/dbaccess/tools/dbtools.inc
@@ -122,8 +122,8 @@ function fSelectSchemaInTableFilter(sSchema as String)
     
     dim iRem as integer
 	iRem = 0
-    Kontext "Insight"
-        Insight.useMenu
+    Kontext "DATABASE"
+        Database.useMenu
         hMenuSelectNr 5
         hMenuSelectNr 3
     
@@ -182,14 +182,14 @@ function fOpenDataBase ( sFileName , optional sPassword)
     sleep (3)
     
     'click on the main window to get the focus
-    Kontext "Insight"    
-    Insight.MouseDown(50,50)
-    Insight.MouseUp(50,50) 
+    Kontext "DATABASE"    
+    Database.MouseDown(50,50)
+    Database.MouseUp(50,50) 
     
     ViewTables
     sleep(1)
     
-    Kontext "Insight"
+    Kontext "DATABASE"
     '/// if the password is given add the password    
     if ( Not IsMissing(sPassword) ) then
         printlog "set password : " + sPassword
@@ -227,10 +227,10 @@ function fCloseDatabase(optional bSave)
     '/// <u>parameter:</u>
     '/// <b><i>optional</i>bSave:</b> if true the the database is saved if false then the changes are lost
     sleep(1)
- 	Kontext "Insight"
-        Insight.MouseDown(50,50)
-        Insight.MouseUp(50,50)
-        Insight.useMenu
+ 	Kontext "DATABASE"
+        Database.MouseDown(50,50)
+        Database.MouseUp(50,50)
+        Database.useMenu
         hMenuSelectNr 1
         hMenuSelectNr 5    
         
diff --git a/testautomation/dbaccess/tools/formtools.inc b/testautomation/dbaccess/tools/formtools.inc
index f67bed5e9df8..609f58463649 100755
--- a/testautomation/dbaccess/tools/formtools.inc
+++ b/testautomation/dbaccess/tools/formtools.inc
@@ -49,14 +49,14 @@ function fOpenNewFormDesign()
     '/// open a a new form design from an open database
     '/// <u>parameter:</u>
           
-    Kontext "Insight"    
-	    if ( Insight.NotExists(3) ) then
+    Kontext "DATABASE"    
+	    if ( Database.NotExists(3) ) then
 	        fOpenNewFormDesign = false
 	        exit function
 	    end if
 
-        Insight.MouseDown(50,50)
-        Insight.MouseUp(50,50)
+        Database.MouseDown(50,50)
+        Database.MouseUp(50,50)
     
     sleep(1)
     
diff --git a/testautomation/dbaccess/tools/querytools.inc b/testautomation/dbaccess/tools/querytools.inc
index e98e81e8d44f..8f4f181e51e2 100755
--- a/testautomation/dbaccess/tools/querytools.inc
+++ b/testautomation/dbaccess/tools/querytools.inc
@@ -100,11 +100,11 @@ function fOpenNewQueryDesign() as boolean
     '/// open a new query design 
     '/// <u>parameter:</u>    
     
-    Kontext "Insight"    
-        Insight.MouseDown(50,50)
-        Insight.MouseUp(50,50)
+    Kontext "DATABASE"    
+        Database.MouseDown(50,50)
+        Database.MouseUp(50,50)
     
-    if ( Insight.NotExists(3) ) then
+    if ( Database.NotExists(3) ) then
         fOpenNewQueryDesign = false
         warnlog "The database windows doesn't exists"
         exit function
@@ -124,11 +124,11 @@ function fOpenNewSQLQueryDesign() as boolean
     '/// open a new query design in SQL mode 
     '/// <u>parameter:</u>    
     
-    Kontext "Insight"    
-        Insight.MouseDown(50,50)
-        Insight.MouseUp(50,50)
+    Kontext "DATABASE"    
+        Database.MouseDown(50,50)
+        Database.MouseUp(50,50)
     
-    if ( Insight.NotExists(3) ) then
+    if ( Database.NotExists(3) ) then
         fOpenNewSQLQueryDesign = false
         warnlog "The database windows doesn't exists"
         exit function
@@ -148,14 +148,14 @@ function fStartQueryWizard()
     '/// start the query wizard 
     '/// <u>parameter:</u>    
 
-    Kontext "Insight"    
-	    if ( Insight.NotExists(3) ) then
+    Kontext "DATABASE"    
+	    if ( Database.NotExists(3) ) then
 	        fStartQueryWizard = false
 	        exit function
 	    end if
 
-        Insight.MouseDown(50,50)
-        Insight.MouseUp(50,50)
+        Database.MouseDown(50,50)
+        Database.MouseUp(50,50)
     
     sleep(1)
     
@@ -209,8 +209,8 @@ function fOpenQueryInSQLDesign(sQueryName as String)
     if ( fFindQuery(sQueryName) = true ) then
         printlog "Query " + sQueryName + " found -> open in sql design"    
         
-        Kontext "Insight"
-        Insight.UseMenu        
+        Kontext "DATABASE"
+        Database.UseMenu        
         
         hMenuSelectNr(2)
         hMenuSelectNr(9)
diff --git a/testautomation/dbaccess/tools/reporttools.inc b/testautomation/dbaccess/tools/reporttools.inc
index 333e5f8ccb9d..1050f6b5e5e4 100755
--- a/testautomation/dbaccess/tools/reporttools.inc
+++ b/testautomation/dbaccess/tools/reporttools.inc
@@ -56,14 +56,14 @@ function fOpenNewReportDesign()
     '/// open a a new report design from an open database
     '/// <u>parameter:</u>
           
-    Kontext "Insight"    
-	    if ( Insight.NotExists(3) ) then
+    Kontext "DATABASE"    
+	    if ( Database.NotExists(3) ) then
 	        fOpenNewReportDesign = false
 	        exit function
 	    end if
 
-        Insight.MouseDown(50,50)
-        Insight.MouseUp(50,50)
+        Database.MouseDown(50,50)
+        Database.MouseUp(50,50)
     
     sleep(1)
     
@@ -209,38 +209,38 @@ function fFindReport(sReportName as string)
     Dim iNumbersOfReports as integer
 	Dim i as integer
 	
-    Kontext "Insight"
+    Kontext "DATABASE"
     
         ViewReports        
     
         fFindReport = false
     
-        if ( Not InsightReportsView.exists(1) ) then
+        if ( Not DatabaseReportsView.exists(1) ) then
             warnlog "The Report tree doesn't exists"            
             exit function
         end if
         
-        iNumbersOfReports = InsightReportsView.getItemCount()
+        iNumbersOfReports = DatabaseReportsView.getItemCount()
 
         ' this select the first entry
-        InsightReportsView.TypeKeys "<HOME>"
-        InsightReportsView.TypeKeys "<UP>"
+        DatabaseReportsView.TypeKeys "<HOME>"
+        DatabaseReportsView.TypeKeys "<UP>"
         
         
         for i = 1 to iNumbersOfReports
             
-            InsightReportsView.TypeKeys "<ADD>"
+            DatabaseReportsView.TypeKeys "<ADD>"
             'printlog "i = " + i
             'printlog "ReportName.getItemCount = " + ReportTree.getItemCount 
-            if InsightReportsView.getItemCount >  iNumbersOfReports then
-                iNumbersOfReports = InsightReportsView.getItemCount()                    
+            if DatabaseReportsView.getItemCount >  iNumbersOfReports then
+                iNumbersOfReports = DatabaseReportsView.getItemCount()                    
             endif
             'printlog "ReportName.getSeltext = " + ReportTree.getSeltext
-            if InsightReportsView.getSeltext = sReportName then
+            if DatabaseReportsView.getSeltext = sReportName then
                 fFindReport = true    
                 exit for
             endif
-            InsightReportsView.TypeKeys "<DOWN>"
+            DatabaseReportsView.TypeKeys "<DOWN>"
         next
         sleep(1)        
     
diff --git a/testautomation/dbaccess/tools/tabletools.inc b/testautomation/dbaccess/tools/tabletools.inc
index 1bd715ed003f..0ae6f2587ae6 100755
--- a/testautomation/dbaccess/tools/tabletools.inc
+++ b/testautomation/dbaccess/tools/tabletools.inc
@@ -579,18 +579,18 @@ function fOpenRelationDesign()
     '/// open a new relation design
     '/// <u>parameter:</u>    
     
-    Kontext "Insight"    
-	    if ( Insight.NotExists(3) ) then
+    Kontext "DATABASE"    
+	    if ( Database.NotExists(3) ) then
 	        fOpenRelationDesign = false
 	        exit function
 	    end if
 
-        Insight.MouseDown(50,50)
-        Insight.MouseUp(50,50)
+        Database.MouseDown(50,50)
+        Database.MouseUp(50,50)
     
     sleep(1)
     
-    Insight.UseMenu
+    Database.UseMenu
     hMenuSelectNr(5)
     hMenuSelectNr(1)
     
@@ -631,15 +631,15 @@ end function
 function fOpenNewTableDesign
     printlog "fOpenNewTableDesign called"
 
-    printlog "check if Insight exists"
+    printlog "check if Database exists"
     
-    Kontext "Insight"    
-        Insight.MouseDown(50,50)
-        Insight.MouseUp(50,50)
+    Kontext "DATABASE"    
+        Database.MouseDown(50,50)
+        Database.MouseUp(50,50)
     
-    if ( Insight.NotExists(3) ) then
+    if ( Database.NotExists(3) ) then
         fOpenNewTableDesign = false
-        warnlog "The Insight windows doesn't exists"
+        warnlog "The Database windows doesn't exists"
         exit function
     end if
     
@@ -658,15 +658,15 @@ end function
 function fOpenTableInDesign(sTableName as String)
     printlog "fOpenTableInDesign called"
 
-    printlog "check if Insight exists"
+    printlog "check if Database exists"
     
-    Kontext "Insight"    
-        Insight.MouseDown(50,50)
-        Insight.MouseUp(50,50)
+    Kontext "DATABASE"    
+        Database.MouseDown(50,50)
+        Database.MouseUp(50,50)
     
-    if ( Insight.NotExists(3) ) then
+    if ( Database.NotExists(3) ) then
         fOpenTableInDesign = false
-        warnlog "The Insight windows doesn't exists"
+        warnlog "The Database windows doesn't exists"
         exit function
     end if
     
@@ -756,14 +756,14 @@ function fStartTableWizard()
     '/// start the table wizard 
     '/// <u>parameter:</u>    
 
-    Kontext "Insight"    
-	    if ( Insight.NotExists(3) ) then
+    Kontext "DATABASE"    
+	    if ( Database.NotExists(3) ) then
 	        fStartTableWizard = false
 	        exit function
 	    end if
 
-        Insight.MouseDown(50,50)
-        Insight.MouseUp(50,50)
+        Database.MouseDown(50,50)
+        Database.MouseUp(50,50)
     
     sleep(1)