diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-02-10 10:55:17 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-02-10 10:55:17 +0100 |
| commit | 6fb267d99999d95197faab8de049aaa500356705 (patch) | |
| tree | aede2440c42613d56c400c6d9abdf768c21b2c8d | |
| parent | 7ac0030b242d47e7aed9b9e8fb02853327d3383f (diff) | |
| parent | 570baa3577c359fae42ee0689d1751f876dd7648 (diff) | |
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba33e
| -rwxr-xr-x | testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc | 10 | ||||
| -rwxr-xr-x | testautomation/dbaccess/optional/includes/misc_Macros.inc | 12 | ||||
| -rwxr-xr-x | testautomation/global/win/edia_i_o.win | 1 |
3 files changed, 12 insertions, 11 deletions
diff --git a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc index d5db37e4f527..5fdd5887b7f5 100755 --- a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc +++ b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc @@ -198,15 +198,15 @@ 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") - 'call tRelation( sFileName, aDatabaseProperties(6), "rel1", "rel2" ) + call tRelation( sFileName, aDatabaseProperties(6), "rel1", "rel2" ) else warnlog "Data Source could not be created - beyond testcases stopped" diff --git a/testautomation/dbaccess/optional/includes/misc_Macros.inc b/testautomation/dbaccess/optional/includes/misc_Macros.inc index 3b2ab6bf2345..b18421428dc9 100755 --- a/testautomation/dbaccess/optional/includes/misc_Macros.inc +++ b/testautomation/dbaccess/optional/includes/misc_Macros.inc @@ -39,7 +39,7 @@ sub misc_Macros - printlog "------------------- misc_Macros.inc ------------------------" + printlog "------------------- misc_Macros.inc ------------------------" call tMacros @@ -86,11 +86,11 @@ testcase tMacros endif NextButton.click + + BackupLocation.settext sFileName + "backup.odb" - DatabaseFile.settext sFileName + "backup.odb" - - NextButton.click - sleep(20) + NextButton.click + sleep(20) MacroMigration.OK call fCloseDatabase @@ -111,7 +111,7 @@ testcase tMacros if (MessageBox.exists(1)) then warnlog "MessageBox about macros appear. Should not after migration." else - 'nothing + 'nothing endif call fCloseDatabase diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win index 17e3e286f237..e6fe0b91b8fc 100755 --- a/testautomation/global/win/edia_i_o.win +++ b/testautomation/global/win/edia_i_o.win @@ -184,6 +184,7 @@ DatabaseFile SID_OPENURL Browse dbaccess:PushButton:TP_SAVE_DBDOC_AS:PB_BROWSE_SAVE_AS_LOCATION BackButton HID_WIZARD_PREVIOUS NextButton HID_WIZARD_NEXT +BackupLocation HID_MACRO_MIGRATION_BACKUP_LOCATION *MailMerge HID_MAIL_MERGE_CREATE_FROM ThisDocument sw:RadioButton:DLG_MERGE_CREATE:RB_THISDOC |