diff options
Diffstat (limited to 'testautomation/dbaccess')
61 files changed, 310 insertions, 39 deletions
diff --git a/testautomation/dbaccess/optional/dba_misc_Macros.bas b/testautomation/dbaccess/optional/dba_misc_Macros.bas index 659396bb9..659396bb9 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 000000000..abe7817c7 --- /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 020f0bb84..020f0bb84 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 9e137f4c7..b0ee0bea8 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 4b41014a2..4b41014a2 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 f51b14ea1..f51b14ea1 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 4e0cd9334..4e0cd9334 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 82fa9229b..717cf149b 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 57a7973a8..57a7973a8 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 4abf5a19b..4abf5a19b 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 49bcaceb6..2f51183a4 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 aeb14d761..aeb14d761 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 d5498582f..d5498582f 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 7b5a67e74..7b5a67e74 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 6d690a292..6d690a292 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 a41f2b396..a41f2b396 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 93f864d7e..cc3be8465 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 236b6a5e7..236b6a5e7 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 0fd0a8bcf..0fd0a8bcf 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 46dce6e90..b9d881426 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 98a94562c..98a94562c 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 87eb5e1ce..87eb5e1ce 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 6130aee37..6130aee37 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 6d675f2dd..6d675f2dd 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 061f78601..061f78601 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 74edeb1df..74edeb1df 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 630e1920c..630e1920c 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 e707682e3..e707682e3 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 7e9eabf66..7e9eabf66 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 000000000..cb7fc8ab1 --- /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 53c9570a5..53c9570a5 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 91270481c..7ba19ac8e 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 4bde542bd..4bde542bd 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 810b2168c..810b2168c 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 229aebb7f..229aebb7f 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 a7fae4c7f..a7fae4c7f 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 b3ee038a2..b3ee038a2 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 34f6cb3e3..34f6cb3e3 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 5be669dc1..df9026ba2 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 b3949b40e..b3949b40e 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 19411fd4f..19411fd4f 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 67010e64f..67010e64f 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 cce021499..cce021499 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 05f0da768..05f0da768 100755..100644 --- a/testautomation/dbaccess/optional/includes/xf_Submission.inc +++ b/testautomation/dbaccess/optional/includes/xf_Submission.inc diff --git a/testautomation/dbaccess/required/includes/DatabaseTypes.inc b/testautomation/dbaccess/required/includes/DatabaseTypes.inc index ae5688374..ae5688374 100755..100644 --- a/testautomation/dbaccess/required/includes/DatabaseTypes.inc +++ b/testautomation/dbaccess/required/includes/DatabaseTypes.inc diff --git a/testautomation/dbaccess/required/includes/Forms.inc b/testautomation/dbaccess/required/includes/Forms.inc index 45c308f2b..45c308f2b 100755..100644 --- a/testautomation/dbaccess/required/includes/Forms.inc +++ b/testautomation/dbaccess/required/includes/Forms.inc diff --git a/testautomation/dbaccess/required/includes/MainApp.inc b/testautomation/dbaccess/required/includes/MainApp.inc index fddb8d346..fddb8d346 100755..100644 --- a/testautomation/dbaccess/required/includes/MainApp.inc +++ b/testautomation/dbaccess/required/includes/MainApp.inc diff --git a/testautomation/dbaccess/required/includes/Query.inc b/testautomation/dbaccess/required/includes/Query.inc index 0fa9d6add..0fa9d6add 100755..100644 --- a/testautomation/dbaccess/required/includes/Query.inc +++ b/testautomation/dbaccess/required/includes/Query.inc diff --git a/testautomation/dbaccess/required/includes/ReportBuilder01.inc b/testautomation/dbaccess/required/includes/ReportBuilder01.inc index d1cce59d4..d1cce59d4 100755..100644 --- a/testautomation/dbaccess/required/includes/ReportBuilder01.inc +++ b/testautomation/dbaccess/required/includes/ReportBuilder01.inc diff --git a/testautomation/dbaccess/required/includes/Table.inc b/testautomation/dbaccess/required/includes/Table.inc index 6d478bd35..6d478bd35 100755..100644 --- a/testautomation/dbaccess/required/includes/Table.inc +++ b/testautomation/dbaccess/required/includes/Table.inc diff --git a/testautomation/dbaccess/required/includes/TableDesign.inc b/testautomation/dbaccess/required/includes/TableDesign.inc index 9da4d602a..9da4d602a 100755..100644 --- a/testautomation/dbaccess/required/includes/TableDesign.inc +++ b/testautomation/dbaccess/required/includes/TableDesign.inc diff --git a/testautomation/dbaccess/required/includes/Wizards.inc b/testautomation/dbaccess/required/includes/Wizards.inc index 4cde075d0..4cde075d0 100755..100644 --- a/testautomation/dbaccess/required/includes/Wizards.inc +++ b/testautomation/dbaccess/required/includes/Wizards.inc diff --git a/testautomation/dbaccess/required/includes/Xforms01.inc b/testautomation/dbaccess/required/includes/Xforms01.inc index fcf3e03a9..fcf3e03a9 100755..100644 --- a/testautomation/dbaccess/required/includes/Xforms01.inc +++ b/testautomation/dbaccess/required/includes/Xforms01.inc diff --git a/testautomation/dbaccess/tools/controltools.inc b/testautomation/dbaccess/tools/controltools.inc index 28b0583c0..28b0583c0 100755..100644 --- a/testautomation/dbaccess/tools/controltools.inc +++ b/testautomation/dbaccess/tools/controltools.inc diff --git a/testautomation/dbaccess/tools/dbcreatetools.inc b/testautomation/dbaccess/tools/dbcreatetools.inc index 2658281f6..034b1d18f 100755..100644 --- a/testautomation/dbaccess/tools/dbcreatetools.inc +++ b/testautomation/dbaccess/tools/dbcreatetools.inc @@ -1375,8 +1375,10 @@ function fRegisterDatabaseFile( sFileName, sName) NewBtn.Click sleep(1) Kontext "CreateDatabaseLink" - DatabaseFile.setText(sFileName) + RegisteredName.setText(sName) + DatabaseFile.setText(sFileName) + CreateDatabaseLink.OK sleep(1) diff --git a/testautomation/dbaccess/tools/dbinit.inc b/testautomation/dbaccess/tools/dbinit.inc index 53f192747..53f192747 100755..100644 --- a/testautomation/dbaccess/tools/dbinit.inc +++ b/testautomation/dbaccess/tools/dbinit.inc diff --git a/testautomation/dbaccess/tools/dbtools.inc b/testautomation/dbaccess/tools/dbtools.inc index 2e40a3f25..2e40a3f25 100755..100644 --- a/testautomation/dbaccess/tools/dbtools.inc +++ b/testautomation/dbaccess/tools/dbtools.inc diff --git a/testautomation/dbaccess/tools/formtools.inc b/testautomation/dbaccess/tools/formtools.inc index ef7105cce..ef7105cce 100755..100644 --- a/testautomation/dbaccess/tools/formtools.inc +++ b/testautomation/dbaccess/tools/formtools.inc diff --git a/testautomation/dbaccess/tools/querytools.inc b/testautomation/dbaccess/tools/querytools.inc index 7dc3d7278..7dc3d7278 100755..100644 --- a/testautomation/dbaccess/tools/querytools.inc +++ b/testautomation/dbaccess/tools/querytools.inc diff --git a/testautomation/dbaccess/tools/reporttools.inc b/testautomation/dbaccess/tools/reporttools.inc index 70b9ff129..70b9ff129 100755..100644 --- a/testautomation/dbaccess/tools/reporttools.inc +++ b/testautomation/dbaccess/tools/reporttools.inc diff --git a/testautomation/dbaccess/tools/tabletools.inc b/testautomation/dbaccess/tools/tabletools.inc index 1f6dd23de..3fcf1ef8e 100755..100644 --- a/testautomation/dbaccess/tools/tabletools.inc +++ b/testautomation/dbaccess/tools/tabletools.inc @@ -340,6 +340,7 @@ function fCreateTable(aFieldTypeContent(),sTableName,optional sCatalog,optional sleep 1 FieldType.TypeKeys "<RETURN>" , TRUE Description.TypeKeys "<RETURN>" , TRUE + CellDescription.TypeKeys "<RETURN>" , TRUE printlog "-------------------------------" next |