summaryrefslogtreecommitdiff
path: root/testautomation/dbaccess/optional
diff options
context:
space:
mode:
Diffstat (limited to 'testautomation/dbaccess/optional')
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/dba_misc_Macros.bas0
-rw-r--r--testautomation/dbaccess/optional/dba_rpt_Charts.bas47
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_General.inc92
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_Grid.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_Several1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_Several2.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_TextControl.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_Wizards.inc8
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_ADOAccess.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_AdabasD.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_Dbase.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_DbaseFunction.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_IndexDesign.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc12
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_Mozilla.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_Query.inc48
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_Relations.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_Spreadsheet.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_Text.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_Windows.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_hsqldb.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/frm_FormFilter.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/frm_Forms.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/misc_Macros.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc0
-rw-r--r--testautomation/dbaccess/optional/includes/rpt_Charts.inc94
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/rpt_DateTime.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc7
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/rpt_Formating.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/rpt_Grouping.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/rpt_PageNumber.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc32
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/wiz_FormWizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/wiz_TableWizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/xf_Submission.inc0
44 files changed, 306 insertions, 38 deletions
diff --git a/testautomation/dbaccess/optional/dba_misc_Macros.bas b/testautomation/dbaccess/optional/dba_misc_Macros.bas
index 659396bb98aa..659396bb98aa 100644..100755
--- a/testautomation/dbaccess/optional/dba_misc_Macros.bas
+++ b/testautomation/dbaccess/optional/dba_misc_Macros.bas
diff --git a/testautomation/dbaccess/optional/dba_rpt_Charts.bas b/testautomation/dbaccess/optional/dba_rpt_Charts.bas
new file mode 100644
index 000000000000..abe7817c7842
--- /dev/null
+++ b/testautomation/dbaccess/optional/dba_rpt_Charts.bas
@@ -0,0 +1,47 @@
+'encoding UTF-8 Do not remove or change this line!
+'**************************************************************************
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
+'/************************************************************************
+'*
+'* owner : marc.neumann@oracle.com
+'*
+'* short description : Charts in Reports
+'*
+'\***********************************************************************
+
+sub main
+
+ use "dbaccess/optional/includes/rpt_Charts.inc"
+
+ call rpt_Charts
+
+end sub
+
+sub LoadIncludeFiles
+ use "dbaccess/tools/dbinit.inc"
+ Call sDBInit
+ Call GetUseFiles
+ gApplication = "WRITER"
+end sub
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
index 020f0bb8435b..020f0bb8435b 100755..100644
--- a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
diff --git a/testautomation/dbaccess/optional/includes/ctrl_General.inc b/testautomation/dbaccess/optional/includes/ctrl_General.inc
index 9e137f4c7a70..b0ee0bea81dc 100755..100644
--- a/testautomation/dbaccess/optional/includes/ctrl_General.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_General.inc
@@ -38,13 +38,14 @@ sub ctrl_General
call tPosAndSize_Protect_Position
call tPosAndSize_Protect_Size
call tPosAndSize_Keyboard
- call tPosAndSize_Dialog
+ call tPosAndSize_Dialog
call tPosAndSize_KeepRatio
'TODO Control the Setting on tabpage Rotation & Slant (should be inactive).
call tTabStop
call tActivationOrder
call tAddFields
+ call tLabelFieldSelection
end sub
@@ -1033,7 +1034,96 @@ testcase tAddFields
call hCloseDocument
endcase
+'-------------------------------------------------------------------------
+testcase tLabelFieldSelection
+ ' check if the assignment of lables to text fields work
+ dim sLabelText as String
+
+ printlog "Open a new document,"
+ call hNewDocument
+ Kontext "DocumentWriter"
+ DocumentWriter.TypeKeys "tt_doc" , true
+ sleep(1)
+
+ printlog "open the form control toolbar"
+ call hToolbarSelect("FormControls",true)
+
+ Kontext "FormControls"
+ Label.Click
+ sleep(1)
+
+ printlog "insert a label field"
+ call hDrawingWithSelection ( 20, 20, 30, 30 )
+ sleep(2)
+
+ Kontext "FormControls"
+ Edit.Click
+ sleep(1)
+
+ printlog "insert a text field"
+ call hDrawingWithSelection ( 40, 40, 50, 50 )
+ sleep(2)
+
+ printlog "open the control property browser"
+ call fOpenControlPropertyBrowser
+
+ Kontext "ControlPropertiesTabControl"
+ ControlPropertiesTabControl.setPage TabGeneralControl 'make shure that tabpage general in property is choosen
+ sleep(2)
+
+ printlog "click on button behind the lable field to open the field selection dialog"
+ Kontext "TabGeneralControl"
+ LabelFieldButton.Click
+ sleep(1)
+
+ printlog "select the lable fiiel in the tree list box"
+ Kontext "LabelFieldSelection"
+ LabelFieldSelection.TypeKeys "<DOWN>",TRUE
+ LabelFieldSelection.TypeKeys "<DOWN>",TRUE
+ sleep(1)
+ printlog "close the field selection dialog"
+ LabelFieldSelection.OK
+ sleep(1)
+ printlog "check if the lable field property contains some text"
+ 'TODO: check for the correct text this has a language dependencie
+ Kontext "TabGeneralControl"
+ sLabelText = LabelField.getText()
+ if(sLabelText = "") then
+ warnlog "the lable for a text field is not set"
+ else
+ printlog "the label for the text field is set"
+ endif
+
+ printlog "click on button behind the lable field to open the field selection dialog"
+ Kontext "TabGeneralControl"
+ LabelFieldButton.Click
+ sleep(1)
+
+ Kontext "LabelFieldSelection"
+ LabelFieldSelection.TypeKeys "<DOWN>",TRUE
+ LabelFieldSelection.TypeKeys "<DOWN>",TRUE
+ sleep(1)
+ printlog "select the lable field and check the checkbox 'no assignment'"
+ CBNoAssignment.check
+ printlog "close the field selection dialog"
+ LabelFieldSelection.OK
+ sleep(1)
+
+ printlog "check if the lable field property contains no text"
+ Kontext "TabGeneralControl"
+ sLabelText = LabelField.getText()
+ if(sLabelText <> "") then
+ warnlog "the lable for a text field is not deleted"
+ else
+ printlog "the label for the text field is deleted"
+ endif
+
+ printlog "close the document"
+ call hCloseDocument
+
+endcase
+'-------------------------------------------------------------------------
function fOpenPositionAndSizeDialog
call hToolbarSelect("FormDesignTools",true)
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Grid.inc b/testautomation/dbaccess/optional/includes/ctrl_Grid.inc
index 4b41014a2257..4b41014a2257 100755..100644
--- a/testautomation/dbaccess/optional/includes/ctrl_Grid.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Grid.inc
diff --git a/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc b/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc
index f51b14ea191b..f51b14ea191b 100755..100644
--- a/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc
index 4e0cd9334800..4e0cd9334800 100755..100644
--- a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc
index 82fa9229b1f8..717cf149b902 100755..100644
--- a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc
@@ -293,7 +293,7 @@ testcase tImageControl
sleep(2)
'/// set HelpURL
printlog "set HelpURL"
- fsetControlProperty("ImageControl","HelpURL","HID:1234567")
+ fsetControlProperty("ImageControl","HelpURL","customcontrol2")
'/// save the document
printlog "save the document"
hFileSaveAsKill ( gOfficePath + ConvertPath("user/work/TT_ImageControl.odt"))
@@ -315,7 +315,7 @@ testcase tImageControl
Kontext "TabGeneralControl"
dim bScrOK as boolean 'control variable if all properties are correct
bScrOK = true
- if fgetControlProperty("ImageControl","HelpURL") <> "HID:1234567" then
+ if fgetControlProperty("ImageControl","HelpURL") <> "customcontrol2" then
warnlog "the imagecontrol is not saved with property: HelpURL"
bScrOK = false
endif
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc b/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc
index 57a7973a8f89..57a7973a8f89 100755..100644
--- a/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc
diff --git a/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc b/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc
index 4abf5a19b73d..4abf5a19b73d 100755..100644
--- a/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
index 49bcaceb6ac7..2f51183a40a1 100755..100644
--- a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
@@ -239,7 +239,7 @@ testcase tGroupBoxWithDatasource
Kontext "TabGeneralControl"
TabGeneralControl.TypeKeys "<TAB>" , true 'this tab is importent, I don't not why but it is.
sleep(1)
- HelpURL.setText "HID:123456"
+ HelpURL.setText "customcontrol1"
HelpURL.TypeKeys "<RETURN>",true
sleep(1)
Kontext "ControlPropertiesDialog"
@@ -276,7 +276,7 @@ testcase tGroupBoxWithDatasource
Kontext "TabGeneralControl"
TabGeneralControl.TypeKeys "<TAB>" , true 'this tab is importent, I don't not why but it is.
sleep(1)
- HelpURL.setText "HID:1234567"
+ HelpURL.setText "customcontrol2"
HelpURL.TypeKeys "<RETURN>", true
sleep(1)
Kontext "ControlPropertiesDialog"
@@ -314,7 +314,7 @@ testcase tGroupBoxWithDatasource
Kontext "TabGeneralControl"
TabGeneralControl.TypeKeys "<TAB>" , true ' this tab is importent, I don't not why but it is.
- HelpURL.setText "HID:12345678"
+ HelpURL.setText "customcontrol3"
HelpURL.TypeKeys "<RETURN>", true
sleep(1)
Kontext "ControlPropertiesDialog"
@@ -660,7 +660,7 @@ testcase tListBox
warnlog "The dropdown style is not active."
endif
sleep(1)
- fSetControlProperty("ListBox","HelpURL","HID:123456")
+ fSetControlProperty("ListBox","HelpURL","customcontrol1")
sleep(1)
'/// save the document
printlog "save the document"
diff --git a/testautomation/dbaccess/optional/includes/db_ADOAccess.inc b/testautomation/dbaccess/optional/includes/db_ADOAccess.inc
index aeb14d7616ac..aeb14d7616ac 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_ADOAccess.inc
+++ b/testautomation/dbaccess/optional/includes/db_ADOAccess.inc
diff --git a/testautomation/dbaccess/optional/includes/db_AdabasD.inc b/testautomation/dbaccess/optional/includes/db_AdabasD.inc
index d5498582fa0a..d5498582fa0a 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_AdabasD.inc
+++ b/testautomation/dbaccess/optional/includes/db_AdabasD.inc
diff --git a/testautomation/dbaccess/optional/includes/db_Dbase.inc b/testautomation/dbaccess/optional/includes/db_Dbase.inc
index 7b5a67e7496d..7b5a67e7496d 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_Dbase.inc
+++ b/testautomation/dbaccess/optional/includes/db_Dbase.inc
diff --git a/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc b/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc
index 6d690a29225a..6d690a29225a 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc
+++ b/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc
diff --git a/testautomation/dbaccess/optional/includes/db_IndexDesign.inc b/testautomation/dbaccess/optional/includes/db_IndexDesign.inc
index a41f2b396042..a41f2b396042 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_IndexDesign.inc
+++ b/testautomation/dbaccess/optional/includes/db_IndexDesign.inc
diff --git a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc
index 93f864d7e0d4..cc3be846569c 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc
+++ b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc
@@ -192,13 +192,13 @@ testcase db_JDBCMySQL
dbok = fCreateMySQL_JDBC_Datasource(sFileName,aDatabaseProperties(3),aDatabaseProperties(2),aDatabaseProperties(4),aDatabaseProperties(5))
if dbok = true then
- 'call fOpendatabase(sFileName,aDatabaseProperties(6))
- 'call fCreateTable( aFieldTypeContent(), sTableName)
- 'call fInsertIntoTable( aFieldContent(), sTableName)
- 'call fCloseDatabase
+ call fOpendatabase(sFileName,aDatabaseProperties(6))
+ call fCreateTable( aFieldTypeContent(), sTableName)
+ call fInsertIntoTable( aFieldContent(), sTableName)
+ call fCloseDatabase
- 'use "dbaccess/optional/includes/b_lvl1_Query.inc"
- 'call b_lvl1_Query(sFileName,"dbase")
+ use "dbaccess/optional/includes/db_Query.inc"
+ call db_Query(sFileName,"MYSQL_JDBC",aDatabaseProperties(6))
call tRelation( sFileName, aDatabaseProperties(6), "rel1", "rel2" )
diff --git a/testautomation/dbaccess/optional/includes/db_Mozilla.inc b/testautomation/dbaccess/optional/includes/db_Mozilla.inc
index 236b6a5e79ed..236b6a5e79ed 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_Mozilla.inc
+++ b/testautomation/dbaccess/optional/includes/db_Mozilla.inc
diff --git a/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc b/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc
index 0fd0a8bcfb5f..0fd0a8bcfb5f 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc
+++ b/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc
diff --git a/testautomation/dbaccess/optional/includes/db_Query.inc b/testautomation/dbaccess/optional/includes/db_Query.inc
index 46dce6e903c6..b9d88142698f 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_Query.inc
+++ b/testautomation/dbaccess/optional/includes/db_Query.inc
@@ -45,7 +45,9 @@ function db_Query( sFileName , optional sType , optional sPassword)
case "ODBC", "JDBC"
sType = "2"
case "HSQLDB"
- sType = "2"
+ sType = "2"
+ case "MYSQL_JDBC"
+ sType = "3"
case else
sType = "1"
end select
@@ -57,6 +59,10 @@ function db_Query( sFileName , optional sType , optional sPassword)
call tQueryJoin( sFileName , sType, sPassword )
call tQueriesInQueries(sFileName)
endif
+
+ if sType = "3" then 'run only with database type MYSQL_JDBC
+ call tCastQuery( sFileName , sPassword )
+ endif
call tSortQueryWithAlias(sFileName , sPassword)
@@ -825,6 +831,46 @@ sub tTest8
sleep(2)
end sub
'--------------------------------------------------------------------
+sub tCastQuery( sFileName , sPassword )
+
+ fOpenDatabase(sFileName,sPassword)
+
+ if ( fOpenNewQueryDesign ) then
+ if ( fChooseTableInQueryAddTableDialog("TT_Query3") ) then
+ Kontext "QueryDesignCriterion"
+ sleep(1)
+ QueryDesignCriterion.TypeKeys "<MOD1 PAGEUP>" , true
+ sleep(1)
+ QueryDesignCriterion.TypeKeys "cast(f_date_s as date)" , true
+ sleep(1)
+ QueryDesignCriterion.TypeKeys "<RETURN>" , true
+ sleep(1)
+ Kontext "Toolbar"
+ printlog "- Executing query"
+ ExecuteBtn.Click
+ sleep(5)
+
+ Kontext "TableView"
+ if TableView.Exists(3) then
+
+ DataWindow.TypeKeys "<MOD1 C>"
+ if GetClipboard <> "40219" then
+ warnlog "the result should be 40219 but it is " + GetClipboard
+ else
+ printlog "the result is OK"
+ endif
+ else
+ warnlog "Execution of a query failed!"
+ end if
+
+ call fCloseQueryDesign
+
+ endif
+ endif
+ call fCloseDatabase
+
+end sub
+'--------------------------------------------------------------------
function tSortQueryWithAlias(sFileName, optional sPassword) ' test for isse 27832
if IsMissing(sPassword) then
diff --git a/testautomation/dbaccess/optional/includes/db_Relations.inc b/testautomation/dbaccess/optional/includes/db_Relations.inc
index 98a94562c743..98a94562c743 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_Relations.inc
+++ b/testautomation/dbaccess/optional/includes/db_Relations.inc
diff --git a/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc b/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc
index 87eb5e1ce240..87eb5e1ce240 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc
+++ b/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc
diff --git a/testautomation/dbaccess/optional/includes/db_Text.inc b/testautomation/dbaccess/optional/includes/db_Text.inc
index 6130aee378b8..6130aee378b8 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_Text.inc
+++ b/testautomation/dbaccess/optional/includes/db_Text.inc
diff --git a/testautomation/dbaccess/optional/includes/db_Windows.inc b/testautomation/dbaccess/optional/includes/db_Windows.inc
index 6d675f2dd07f..6d675f2dd07f 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_Windows.inc
+++ b/testautomation/dbaccess/optional/includes/db_Windows.inc
diff --git a/testautomation/dbaccess/optional/includes/db_hsqldb.inc b/testautomation/dbaccess/optional/includes/db_hsqldb.inc
index 061f786017ba..061f786017ba 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_hsqldb.inc
+++ b/testautomation/dbaccess/optional/includes/db_hsqldb.inc
diff --git a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
index 74edeb1df3aa..74edeb1df3aa 100755..100644
--- a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
+++ b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
diff --git a/testautomation/dbaccess/optional/includes/frm_Forms.inc b/testautomation/dbaccess/optional/includes/frm_Forms.inc
index 630e1920cbce..630e1920cbce 100755..100644
--- a/testautomation/dbaccess/optional/includes/frm_Forms.inc
+++ b/testautomation/dbaccess/optional/includes/frm_Forms.inc
diff --git a/testautomation/dbaccess/optional/includes/misc_Macros.inc b/testautomation/dbaccess/optional/includes/misc_Macros.inc
index e707682e3218..e707682e3218 100755..100644
--- a/testautomation/dbaccess/optional/includes/misc_Macros.inc
+++ b/testautomation/dbaccess/optional/includes/misc_Macros.inc
diff --git a/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc b/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc
index 7e9eabf664d9..7e9eabf664d9 100755..100644
--- a/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc
+++ b/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc
diff --git a/testautomation/dbaccess/optional/includes/rpt_Charts.inc b/testautomation/dbaccess/optional/includes/rpt_Charts.inc
new file mode 100644
index 000000000000..cb7fc8ab1ce4
--- /dev/null
+++ b/testautomation/dbaccess/optional/includes/rpt_Charts.inc
@@ -0,0 +1,94 @@
+'encoding UTF-8 Do not remove or change this line!
+'**************************************************************************
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org. If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
+'/************************************************************************
+'*
+'* owner :
+'*
+'* short description :
+'*
+'\***********************************************************************
+
+sub rpt_Charts
+
+ tInsertChart
+
+end sub
+'--------------------------------------------------------------------------------------
+testcase tInsertChart
+
+ printlog "open Bibliography database"
+ call fOpenDataBase(gOfficePath + ConvertPath("user/database/biblio.odb"))
+
+ printlog "open the report designer"
+ call fOpenNewReportDesign
+
+ sleep(1)
+
+ printlog "select the first table in the content list box"
+ Kontext "ReportDataProperties"
+ Content.select 1
+ Content.typeKeys("<RETURN>",true) ' important to leave the listbox
+
+ 'close the Add Field dialog to get the focus back to the design
+ call fCloseAddFieldDialog
+
+ printlog "insert a chart"
+ Kontext "StandardBar"
+ CreateChart.Click
+ sleep(1)
+
+ Kontext "ReportDesign"
+ ReportDesign.MouseDown ( 30, 10 )
+ ReportDesign.MouseMove ( 40, 20 )
+ ReportDesign.MouseUp ( 40, 20 )
+
+ sleep(1)
+
+ '/// execute the report
+ printlog "execute the report"
+ call fExecuteReport
+
+ sleep(10)
+
+ '/// check if the report is created
+ printlog "check if the report is created"
+ Kontext "DocumentWriter"
+ if (DocumentWriter.exists(10)) then
+ hFileSaveAsKill(gOfficePath + ConvertPath("user/work/report01.odt"))
+ call fCloseReportView
+ else
+ warnlog "No report is created."
+ endif
+
+ '/// close the report designer
+ printlog "close the report designer"
+ call fCloseReportDesign
+
+ '/// close the database
+ printlog "close the database"
+ call fCloseDatabase
+
+endcase \ No newline at end of file
diff --git a/testautomation/dbaccess/optional/includes/rpt_DateTime.inc b/testautomation/dbaccess/optional/includes/rpt_DateTime.inc
index 53c9570a5d75..53c9570a5d75 100755..100644
--- a/testautomation/dbaccess/optional/includes/rpt_DateTime.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_DateTime.inc
diff --git a/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc b/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc
index 91270481ca7b..7ba19ac8e449 100755..100644
--- a/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc
@@ -40,12 +40,7 @@ end sub
'-------------------------------------------------------------------------
'-------------------------------------------------------------------------
'-------------------------------------------------------------------------
-testcase tExecute
-
- if (iSprache = 7) then
- qaerrorlog "due to issue i94729 this testcase does not work under russian."
- goto endsub
- endif
+testcase tExecute
'/// open Bibliography database
printlog "open Bibliography database"
diff --git a/testautomation/dbaccess/optional/includes/rpt_Formating.inc b/testautomation/dbaccess/optional/includes/rpt_Formating.inc
index 4bde542bd176..4bde542bd176 100755..100644
--- a/testautomation/dbaccess/optional/includes/rpt_Formating.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_Formating.inc
diff --git a/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc b/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc
index 810b2168c3ce..810b2168c3ce 100755..100644
--- a/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc
diff --git a/testautomation/dbaccess/optional/includes/rpt_Grouping.inc b/testautomation/dbaccess/optional/includes/rpt_Grouping.inc
index 229aebb7f599..229aebb7f599 100755..100644
--- a/testautomation/dbaccess/optional/includes/rpt_Grouping.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_Grouping.inc
diff --git a/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc b/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc
index a7fae4c7ffd4..a7fae4c7ffd4 100755..100644
--- a/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc
diff --git a/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc b/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc
index b3ee038a2f81..b3ee038a2f81 100755..100644
--- a/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc
diff --git a/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc b/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc
index 34f6cb3e3ecf..34f6cb3e3ecf 100755..100644
--- a/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc
diff --git a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
index 5be669dc1081..df9026ba2dd9 100755..100644
--- a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
@@ -208,27 +208,23 @@ endcase
'-------------------------------------------------------------------------
testcase tMozilla
- if(gPlatform = "osx") then
- qaerrorlog "Mozilla address book not supported under Mac."
- else
- if ( fCreateMozillaAddressbookDatasource(gOfficePath + "user/work/tt_mozilla.odb") = true) then
- if ( fOpendatabase(gOfficePath + "user/work/tt_mozilla.odb") = true) then
- Kontext "ContainerView"
- ViewTables
- else
- warnlog "mozilla database could not be open."
-
- endif
+ if ( fCreateMozillaAddressbookDatasource(gOfficePath + "user/work/tt_mozilla.odb") = true) then
+ if ( fOpendatabase(gOfficePath + "user/work/tt_mozilla.odb") = true) then
+ Kontext "ContainerView"
+ ViewTables
else
- qaerrorlog "mozilla database could not be created. Maybe you have no mozilla installed."
- Kontext "MessageBox"
- if (MessageBox.exists(1)) then
- MessageBox.OK
- endif
+ warnlog "mozilla database could not be open."
+
endif
- ' try to close the database
- call fCloseDatabase(false)
+ else
+ qaerrorlog "mozilla database could not be created. Maybe you have no mozilla installed."
+ Kontext "MessageBox"
+ if (MessageBox.exists(1)) then
+ MessageBox.OK
+ endif
endif
+ ' try to close the database
+ call fCloseDatabase(false)
endcase
'-------------------------------------------------------------------------
diff --git a/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc b/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc
index b3949b40ed49..b3949b40ed49 100755..100644
--- a/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc
diff --git a/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc b/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc
index 19411fd4f105..19411fd4f105 100755..100644
--- a/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc
diff --git a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc
index 67010e64fbfb..67010e64fbfb 100755..100644
--- a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc
diff --git a/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc b/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc
index cce02149942f..cce02149942f 100755..100644
--- a/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc
diff --git a/testautomation/dbaccess/optional/includes/xf_Submission.inc b/testautomation/dbaccess/optional/includes/xf_Submission.inc
index 05f0da768cdf..05f0da768cdf 100755..100644
--- a/testautomation/dbaccess/optional/includes/xf_Submission.inc
+++ b/testautomation/dbaccess/optional/includes/xf_Submission.inc