summaryrefslogtreecommitdiff
path: root/testautomation/dbaccess/optional/includes
diff options
context:
space:
mode:
Diffstat (limited to 'testautomation/dbaccess/optional/includes')
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_General.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_Wizards.inc23
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc122
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/frm_FormFilter.inc18
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/misc_Macros.inc12
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc71
6 files changed, 169 insertions, 79 deletions
diff --git a/testautomation/dbaccess/optional/includes/ctrl_General.inc b/testautomation/dbaccess/optional/includes/ctrl_General.inc
index 647390c5845c..00c1b17e4c4b 100644..100755
--- a/testautomation/dbaccess/optional/includes/ctrl_General.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_General.inc
@@ -1025,7 +1025,7 @@ testcase tAddFields
Liste.TypeKeys "<DOWN>" , 4, true
sControlName2 = Liste.getSelText
if sControlName1 <> sControlName2 then
- qaerrorlog "#i98316# The control name is not the same as the fieldname."
+ warnlog "The control name is not the same as the fieldname. controlname = " + sControlName2 + " fieldname = " + sControlName1
endif
sleep (2)
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
index 80fc0ff8d08b..7c48e78e149d 100644..100755
--- a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
@@ -96,7 +96,7 @@ testcase tGroupBoxWithDatasource
printlog "insert password 'testtool' into login dialog"
Kontext "LoginDialog"
if LoginDialog.Exists then
- Password.setText "testtool"
+ LoginPassword.setText "testtool"
LoginDialog.OK
sleep(1)
else
@@ -104,7 +104,7 @@ testcase tGroupBoxWithDatasource
endif
Kontext "LoginDialog"
if LoginDialog.Exists then
- Password.setText "testtool"
+ LoginPassword.setText "testtool"
LoginDialog.OK
sleep(1)
else
@@ -112,9 +112,10 @@ testcase tGroupBoxWithDatasource
endif
Kontext "TabDataForm"
'/// set the table TT_Control
- printlog "set the table TT_Control"
- Content.setText("TT_Control")
- Content.TypeKeys "<RETURN>" , true
+ printlog "set the table TT_Control"
+ Content.setText("TT_Control")
+ Content.TypeKeys "<RETURN>" , true
+ sleep(1)
Kontext "ControlPropertiesDialog"
ControlPropertiesDialog.Close
sleep(3)
@@ -587,12 +588,12 @@ testcase tListBox
Kontext "TabListBoxData"
'/// choose database TT & click next
DataSource.Select(sDSName)
- Kontext "LoginDialog"
+ Kontext "LoginDialog"
if LoginDialog.Exists(3) then
- printlog "login dialog"
- Password.SetText "testtool"
- LoginDialog.OK
- sleep 1
+ printlog "login dialog"
+ LoginPassword.SetText "testtool"
+ LoginDialog.OK
+ sleep 1
end if
'/// choose table TPCoA-1 & click next
Kontext "TabListBoxData"
@@ -814,7 +815,7 @@ testcase tTableControl
Kontext "LoginDialog"
if LoginDialog.Exists(3) then
printlog "login dialog"
- Password.SetText "testtool"
+ LoginPassword.SetText "testtool"
LoginDialog.OK
sleep (1)
end if
diff --git a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc
index 1c3766b4e200..bf2b9892d118 100644..100755
--- a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc
+++ b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc
@@ -36,27 +36,44 @@ testcase db_JDBCMySQL
' databases specific settings for JDBC MySQL
' **************************************************
- qaerrorlog "due to issue 98387 this test will not work anymore."
- goto endsub
-
- Dim sFileName as string
+ dim sDBConfigFile as string
+
+ sDBConfigFile = environ ( "VTT_DB_CONFIG_FILE" )
+
+ printlog sDBConfigFile
+
+ if (sDBConfigFile = "") then
+ qaerrorlog "settings for external databases not found. see wiki page. This test ist stopped now"
+ goto endsub
+ else
+ if Dir( sDBConfigFile ) = "" then ' the file does not exists
+ qaerrorlog "settings for external databases not found. see wiki page. This test ist stopped now"
+ else
+ ' file exists , so we can do th next step
+ endif
+
+ endif
+
+
+
+ Dim sFileName as string
sFileName = gOfficePath + Convertpath("user/work/TT_JDBC-MYSQL.odb")
-
- Dim sTableName as string
- sTableName = "tt_test_create-table"
-
- Dim sUser as string
- sUser = "testtool"
-
- Dim sPWD as string
- sPWD = "testtool"
-
- dim sCatalog as string
- sCatalog = " " ' not used in this ds
-
- dim sSchema as string
- sSchema = " " ' not used in this ds
-
+
+ Dim sTableName as string
+ sTableName = "tt_test_create-table"
+
+ Dim sUser as string
+ sUser = "testtool"
+
+ Dim sPWD as string
+ sPWD = "testtool"
+
+ dim sCatalog as string
+ sCatalog = " " ' not used in this ds
+
+ dim sSchema as string
+ sSchema = " " ' not used in this ds
+
Dim aFieldTypeContent(30,2) as string 'database specific data matrix
aFieldTypeContent(1,1)="tt_bool"
@@ -156,39 +173,38 @@ testcase db_JDBCMySQL
aFieldContent(1,4)="1"
aFieldContent(1,5)="1"
aFieldContent(1,6)="1"
-
- call fSetJDBCDriverFiles(gTesttoolPath + Convertpath("dbaccess/optional/input/driver/mysql_jconnector.jar"))
- 'after changing the classpath the office has to be restarted.
- call ExitRestartTheOffice
- dim dbok as boolean
- dbok = false
-
- dim aDatabaseProperties(5) as string
- aDatabaseProperties() = tools_dbtools_fgetMySQLJDBCDatabaseProperties()
-
- ' if and only if no properties are defined in the environment file the test is stopped
- if(aDatabaseProperties(1) = "no") then
- qaerrorlog "No database properties from Mysql defiened. The Test is stopped here."
- goto endsub
- endif
-
- 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
-
- 'use "dbaccess/optional/includes/b_lvl1_Query.inc"
- 'call b_lvl1_Query(sFileName,"dbase")
-
- call tRelation( sFileName, aDatabaseProperties(6), "rel1", "rel2" )
-
- else
- warnlog "Data Source could not be created - beyond testcases stopped"
- endif
-
+ dim aDatabaseProperties(7) as string
+ aDatabaseProperties() = tools_dbtools_fgetMySQLJDBCDatabaseProperties(sDBConfigFile)
+
+ call fSetJDBCDriverFiles(aDatabaseProperties(7))
+ 'after changing the classpath the office has to be restarted.
+ call ExitRestartTheOffice
+
+ dim dbok as boolean
+ dbok = false
+
+ ' if and only if no properties are defined in the environment file the test is stopped
+ if(aDatabaseProperties(1) = "no") then
+ qaerrorlog "No database properties from Mysql defiened. The Test is stopped here."
+ goto endsub
+ endif
+
+ 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
+
+ 'use "dbaccess/optional/includes/b_lvl1_Query.inc"
+ 'call b_lvl1_Query(sFileName,"dbase")
+
+ call tRelation( sFileName, aDatabaseProperties(6), "rel1", "rel2" )
+
+ else
+ warnlog "Data Source could not be created - beyond testcases stopped"
+ endif
+
endcase
diff --git a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
index 43a52dba3ed2..7a73842c62eb 100644..100755
--- a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
+++ b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
@@ -66,7 +66,7 @@ testcase tLoadForm
printlog "execute the form filter"
FM_FF_Execute
wait(1000)
- qaerrorlog "workarounf issue 102010"
+ printlog "workaround issue 102010"
DocumentWriter.TypeKeys "<MOD1 F6>" , true
sleep(1)
DocumentWriter.TypeKeys "<MOD1 F5>" , true
@@ -99,7 +99,7 @@ testcase tLoadForm
FM_FF_Execute
wait(1000)
- qaerrorlog "workarounf issue 102010"
+ printlog "workaround issue 102010"
DocumentWriter.TypeKeys "<MOD1 F6>" , true
sleep(1)
DocumentWriter.TypeKeys "<MOD1 F5>" , true
@@ -141,11 +141,7 @@ testcase tFF_Navigator
printlog "activate the form based filter"
FM_FormFilter_Start
wait(1000)
- '/// open the FormFilterNavigator
- printlog "open the FormFilterNavigator"
- FM_FF_Navigator
- wait(1000)
- Kontext "DocumentWriter"
+ Kontext "DocumentWriter"
'/// press CTRL + F5 to get into the first textbox
printlog "press CTRL + F5 to get into the first textbox"
DocumentWriter.TypeKeys "<MOD1 F5>" , true
@@ -161,7 +157,13 @@ testcase tFF_Navigator
DocumentWriter.TypeKeys "like '%value%'" , true
DocumentWriter.TypeKeys "<RETURN>" , true
wait(1000)
- Kontext "FilterNavigator"
+ Kontext "FilterNavigator"
+ '/// open the FormFilterNavigator
+ printlog "open the FormFilterNavigator"
+ if( NOT FilterNavigator.exists(3)) then
+ FM_FF_Navigator
+ endif
+ wait(1000)
'/// check if the filter criterion is insert in the form filter navigator
printlog "check if the filter criterion is insert in the form filter navigator"
FilterNavigator.TypeKeys "<END>"
diff --git a/testautomation/dbaccess/optional/includes/misc_Macros.inc b/testautomation/dbaccess/optional/includes/misc_Macros.inc
index bfe849d00ba9..dc14c715c305 100644..100755
--- a/testautomation/dbaccess/optional/includes/misc_Macros.inc
+++ b/testautomation/dbaccess/optional/includes/misc_Macros.inc
@@ -33,7 +33,7 @@
sub misc_Macros
- printlog "------------------- misc_Macros.inc ------------------------"
+ printlog "------------------- misc_Macros.inc ------------------------"
call tMacros
@@ -80,11 +80,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
@@ -105,7 +105,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/dbaccess/optional/includes/wiz_DatabaseWizard.inc b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
index 09063abbff28..eb8dd4a15c35 100644..100755
--- a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
@@ -34,6 +34,7 @@ sub wiz_DatabaseWizard
call tNewDatabase
call tOpenDatabase
call tOpenNoneDatabaseDocument
+ call tStartTableWizardFromWizard
call tODBC
call tEvolution
call tMozilla
@@ -306,3 +307,73 @@ testcase tOracleJDBC
qaerrorlog "not yet implemented"
endcase
'-------------------------------------------------------------------------
+testcase tStartTableWizardFromWizard
+
+ printlog "start database wizard via FILE / NEW / DATABASE"
+ Kontext "DocumentWriter"
+ if (DocumentWriter.exists(1)) then
+ DocumentWriter.UseMenu
+ else
+ Kontext "DocumentBackground"
+ DocumentBackground.UseMenu
+ endif
+ hMenuSelectNr(1)
+ hMenuSelectNr(1)
+ hMenuSelectNr(5)
+
+ sleep(10)
+
+ Kontext "DatabaseWizard"
+ printlog "check create new database"
+ CreateNewDatabase.Check
+ sleep(1)
+ printlog "click next button"
+ NextBtn.Click
+ sleep(1)
+ printlog "check the 'Create Table with wizard' option"
+ StartTableWizard.check()
+ printlog "click finished button"
+ FinishBtn.Click
+ sleep(1)
+
+ Kontext "SpeichernDlg"
+ printlog "click save in the save as dialog"
+ if ( Dateiname.getSelText() = "" ) then
+ warnlog "#i58413# Default filename is missing"
+ Dim sFileName as String
+ sFileName = ConvertPath(gOfficePath + "user/work/TTDB1.odb")
+ if ( app.Dir( ConvertPath(sFileName) ) ) <> "" then
+ app.kill(ConvertPath(sFileName))
+ endif
+ Dateiname.setText(sFileName)
+ endif
+ Speichern.click
+ sleep(10)
+
+ Kontext "MessageBox"
+ if MessageBox.exists then
+ MessageBox.yes
+ end if
+
+ sleep(5)
+
+ Kontext "TableWizard"
+ printlog "check if the table wizard appear"
+ if( TableWizard.exists(10) ) then
+ printlog "the table wizard appear."
+ CancelBtn.click()
+ else
+ warnlog "the table wizard does not appear."
+ endif
+
+ Kontext "ContainerView"
+
+ ViewTables
+
+ sleep(1)
+
+ printlog "close the database"
+ call fCloseDatabase(true)
+
+endcase
+'-------------------------------------------------------------------------
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 19:20:28 +0000