summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java19
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_Several1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_Several2.inc9
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_Relations.inc14
-rwxr-xr-xtestautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc31
-rwxr-xr-xtestautomation/dbaccess/required/includes/MainApp.inc5
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/Query.inc7
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/Table.inc5
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/TableDesign.inc5
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/formtools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/reporttools.inc12
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/tabletools.inc9
-rwxr-xr-xtestautomation/global/win/edia_t_z.win2
13 files changed, 53 insertions, 69 deletions
diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
index 35d4bab25..12562abde 100644
--- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
+++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
@@ -36,6 +36,7 @@ import lib.StatusException;
import lib.Status;
import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.XPropertySet;
+import com.sun.star.sdb.SQLFilterOperator;
/**
* Testing <code>com.sun.star.sdb.XSingleSelectQueryComposer</code>
@@ -172,7 +173,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
boolean ok = true;
try{
- oObj.appendFilterByColumn(xProp, true);
+ oObj.appendFilterByColumn(xProp, true,SQLFilterOperator.EQUAL);
log.println("appendFilterByColumn: " + xQueryAna.getFilter());
ok = ok && (xQueryAna.getFilter().indexOf(colName) > 0);
@@ -183,7 +184,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
try{
- oObj.appendFilterByColumn(xProp, false);
+ oObj.appendFilterByColumn(xProp, false,SQLFilterOperator.EQUAL);
log.println("appendFilterByColumn: " + xQueryAna.getFilter());
ok = ok && (xQueryAna.getFilter().indexOf(colName) > 0);
@@ -194,8 +195,8 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
try{
XPropertySet dummy = null;
- oObj.appendFilterByColumn(dummy, true);
- log.println("unexpected Exception was not thorwn");
+ oObj.appendFilterByColumn(dummy, true,SQLFilterOperator.EQUAL);
+ log.println("expected Exception was not thrown");
tRes.tested("appendFilterByColumn()", false);
} catch (com.sun.star.sdbc.SQLException e){
@@ -227,7 +228,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
try{
XPropertySet dummy = null;
oObj.appendGroupByColumn(dummy);
- log.println("unexpected Exception was not thorwn");
+ log.println("expected Exception was not thrown");
tRes.tested("appendGroupByColumn()", false);
} catch (com.sun.star.sdbc.SQLException e){
@@ -320,7 +321,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
boolean ok = true;
try{
- oObj.appendHavingClauseByColumn(xProp, true);
+ oObj.appendHavingClauseByColumn(xProp, true,SQLFilterOperator.EQUAL);
log.println("appendHavingClauseByColumn: " + xQueryAna.getFilter());
ok = ok && (xQueryAna.getFilter().indexOf(colName) > 0);
@@ -330,8 +331,8 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
}
try{
XPropertySet dummy = null;
- oObj.appendHavingClauseByColumn(dummy, true);
- log.println("unexpected Exception was not thorwn");
+ oObj.appendHavingClauseByColumn(dummy, true,SQLFilterOperator.EQUAL);
+ log.println("expected Exception was not thrown");
tRes.tested("appendHavingClauseByColumn()", false);
} catch (com.sun.star.sdbc.SQLException e){
@@ -363,7 +364,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
try{
XPropertySet dummy = null;
oObj.appendOrderByColumn(dummy, true);
- log.println("unexpected Exception was not thorwn");
+ log.println("expected Exception was not thrown");
tRes.tested("appendOrderByColumn()", false);
} catch (com.sun.star.sdbc.SQLException e){
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc
index 71a581f52..0d7b24cbc 100644..100755
--- a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc
@@ -586,7 +586,7 @@ testcase tComboBox
endcase
'--------------------------------------------------------------------------------------
-testcase tLabelField
+testcase tLabelField
'/// Open a new document,
printlog "Open a new document,"
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc
index 182be64e9..4d49e459b 100644..100755
--- a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc
@@ -234,12 +234,9 @@ testcase tImageButton
printlog "set properties"
'to activate property: scale, following properties must be active: Graphics (with choosen path)
Kontext "TabGeneralControl"
- if gNetzInst = false then
- fsetControlProperty("ImageButton","Graphics", gOfficePath + ConvertPath("share/gallery/bullets/blkpearl.gif"))
- else
- fsetControlProperty("ImageButton","Graphics", gNetzOfficePath + ConvertPath("share/gallery/bullets/blkpearl.gif"))
- endif
- sleep(1)
+ fsetControlProperty("ImageButton","Graphics", gOfficePath + ConvertPath("share/gallery/bullets/blkpearl.gif"))
+
+ sleep(1)
TabGeneralControl.TypeKeys "<RETURN>" , true
fsetControlProperty("ImageControl","Scale","1") 'listbox content: no
'fsetControlProperty("ImageControl","Frame","4")
diff --git a/testautomation/dbaccess/optional/includes/db_Relations.inc b/testautomation/dbaccess/optional/includes/db_Relations.inc
index 3d10a132d..e04a1be4c 100644..100755
--- a/testautomation/dbaccess/optional/includes/db_Relations.inc
+++ b/testautomation/dbaccess/optional/includes/db_Relations.inc
@@ -32,8 +32,10 @@
'\***********************************************************************
function tRelation( sFileName, sPWD, sRelTable1, sRelTable2 )
'/// create an 1:1 and 1:n relation between two test tables
- Dim i, j, ix as integer 'counter
- Dim iNoDS as integer 'number of data source in listbox
+ Dim i as integer 'counter
+ Dim j as integer 'counter
+ Dim ix as integer 'counter
+ Dim iNoDS as integer 'number of data source in listbox
Dim iNoTab as integer 'number of tables in grid
Dim DSOK as boolean 'datasource present check
@@ -206,8 +208,10 @@ end function
function tDoubleRelation( sFileName, sPWD, sRelTable1, sRelTable2, sRelTable3 )
'/// create an 1:1 relation, close and save relation dialog,
'/// reopen the dialog and add an 1:n relation with third test table
- Dim i, j, ix as integer 'counter
- Dim iNoDS as integer 'number of data source in listbox
+ Dim i as integer 'counter
+ Dim j as integer 'counter
+ Dim ix as integer 'counter
+ Dim iNoDS as integer 'number of data source in listbox
Dim iNoTab as integer 'number of tables in grid
Dim DSOK as boolean 'datasource present check
@@ -351,7 +355,7 @@ function tDoubleRelation( sFileName, sPWD, sRelTable1, sRelTable2, sRelTable3 )
if breltablefound <> 1 then 'needed table not found if variable <> 1
warnlog "proper table: " + sRelTable3 + " not found - test abort"
- call fCloseRealtionDesign
+ call fCloseRelationDesign
call fCloseDatabase
exit function
else
diff --git a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
index eb8dd4a15..bd25224ba 100755
--- a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
@@ -233,38 +233,7 @@ qaerrorlog "not yet implemented"
endcase
'-------------------------------------------------------------------------
testcase tAdabas
-
- qaerrorlog "not yet implemented"
- goto endsub
-
qaerrorlog "not yet implemented"
- goto endsub
-
- if gPlatform = "x86" then
- printlog "Adabas doesn't exists under x86."
- goto endsub
- elseif gOOO then
- printlog "Adabas doesn't exists under Openoffice.org."
- goto endsub
- end if
-
- dim aDatabaseProperties(6) as string
- aDatabaseProperties() = tools_dbtools_fgetAdabasDatabaseProperties()
-
- ' 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 Adabas defiened. The Test is stopped here."
- goto endsub
- endif
-
- call fCreateAdabasDatasource( sFileName, aDatabaseProperties(2), aDatabaseProperties(3), aDatabaseProperties(4))
- call fOpendatabase(gOfficePath + "user/work/tt_adabas.odb","testuser")
-
- Kontext "ContainerView"
- ViewTables
-
- call fCloseDatabase(true)
-
endcase
'-------------------------------------------------------------------------
testcase tdBase
diff --git a/testautomation/dbaccess/required/includes/MainApp.inc b/testautomation/dbaccess/required/includes/MainApp.inc
index fa3c1a4b0..4d5855ac9 100755
--- a/testautomation/dbaccess/required/includes/MainApp.inc
+++ b/testautomation/dbaccess/required/includes/MainApp.inc
@@ -608,7 +608,10 @@ endcase
'-------------------------------------------------------------------------
function getMenuItemCount as Integer
'use this function becasue this doesn't count the pick list
- Dim i, j, Ende, nID as Integer
+ Dim i as Integer
+ Dim j as Integer
+ Dim Ende as Integer
+ Dim nID as Integer
Sleep 2
j=0
for i=1 to MenuGetItemCount
diff --git a/testautomation/dbaccess/required/includes/Query.inc b/testautomation/dbaccess/required/includes/Query.inc
index d981fd796..f6fa45acb 100644..100755
--- a/testautomation/dbaccess/required/includes/Query.inc
+++ b/testautomation/dbaccess/required/includes/Query.inc
@@ -156,7 +156,7 @@ testcase tSwitchDesign
sTableName = TableName.GetSelText
printlog "- Add 'biblio' table to query design"
if sTableName <> "biblio" then
- warnlog "It should be the 'biblio'-database table but it is the '" & SelEntry & "' database table?!"
+ warnlog "It should be the 'biblio'-database table but it is the '" & sTableName & "' database table?!"
goto endsub
else
AddTable.Click
@@ -909,7 +909,10 @@ endcase
'-------------------------------------------------------------------------
function getMenuItemCount as Integer
'use this function becasue this doesn't count the pick list
- Dim i, j, Ende, nID as Integer
+ Dim i as Integer
+ Dim j as Integer
+ Dim Ende as Integer
+ Dim nID as Integer
Sleep 2
j=0
for i=1 to MenuGetItemCount
diff --git a/testautomation/dbaccess/required/includes/Table.inc b/testautomation/dbaccess/required/includes/Table.inc
index 93c9341d5..f7a00c22f 100644..100755
--- a/testautomation/dbaccess/required/includes/Table.inc
+++ b/testautomation/dbaccess/required/includes/Table.inc
@@ -588,7 +588,10 @@ endcase
'-------------------------------------------------------------------------
function getMenuItemCount as Integer
'use this function becasue this doesn't count the pick list
- Dim i, j, Ende, nID as Integer
+ Dim i as Integer
+ Dim j as Integer
+ Dim Ende as Integer
+ Dim nID as Integer
Sleep 2
j=0
for i=1 to MenuGetItemCount
diff --git a/testautomation/dbaccess/required/includes/TableDesign.inc b/testautomation/dbaccess/required/includes/TableDesign.inc
index 42d86ccd0..9204d34de 100644..100755
--- a/testautomation/dbaccess/required/includes/TableDesign.inc
+++ b/testautomation/dbaccess/required/includes/TableDesign.inc
@@ -467,7 +467,10 @@ endcase
'-------------------------------------------------------------------------
function getMenuItemCount as Integer
'use this function becasue this doesn't count the pick list
- Dim i, j, Ende, nID as Integer
+ Dim i as Integer
+ Dim j as Integer
+ Dim Ende as Integer
+ Dim nID as Integer
Sleep 2
j=0
for i=1 to MenuGetItemCount
diff --git a/testautomation/dbaccess/tools/formtools.inc b/testautomation/dbaccess/tools/formtools.inc
index 058fa5cb5..90d29b647 100644..100755
--- a/testautomation/dbaccess/tools/formtools.inc
+++ b/testautomation/dbaccess/tools/formtools.inc
@@ -118,7 +118,7 @@ function fSaveForm( sFormName as string, optional bCloseForm as boolean )
endif
fSaveForm = true
else
- fSaveFrom = false
+ fSaveForm = false
end if
if ( IsMissing( bCloseForm ) ) then
diff --git a/testautomation/dbaccess/tools/reporttools.inc b/testautomation/dbaccess/tools/reporttools.inc
index 32a4926ed..89dd00b50 100644..100755
--- a/testautomation/dbaccess/tools/reporttools.inc
+++ b/testautomation/dbaccess/tools/reporttools.inc
@@ -138,23 +138,23 @@ function fSaveReport( sReportName as string, optional bCloseReport as boolean )
hMenuSelectNr(6) ' the Save
Kontext "ReportSaveDialog"
- if ReportSaveDialog.exists(3) then
- ReportName.setText(sReportName)
+ if FormSaveDialog.exists(3) then
+ FormName.setText(sReportName)
SaveBtn.Click
'click yes in the overwrite messages box
Kontext "MessageBox"
if MessageBox.exists(1) then
MessageBox.Yes
endif
- fSaveReport = true
+ fSaveReport = true
else
- fSaveFrom = false
+ fSaveReport = false
end if
if ( IsMissing( bCloseReport ) ) then
' nothing
else
- call fCloseReport()
+ call fCloseReportDesign()
end if
end function
@@ -167,7 +167,7 @@ function fOpenReport(sReportName as string)
if ( fFindReport(sReportName) = true ) then
printlog "Report found -> open"
Kontext "ContainerView"
- OpenReport ' uno-Slot .uno:DB/Open
+ OpenForm ' uno-Slot .uno:DB/Open
sleep(1)
fOpenReport = true
else
diff --git a/testautomation/dbaccess/tools/tabletools.inc b/testautomation/dbaccess/tools/tabletools.inc
index 44887eb78..fb354dcd4 100644..100755
--- a/testautomation/dbaccess/tools/tabletools.inc
+++ b/testautomation/dbaccess/tools/tabletools.inc
@@ -127,7 +127,7 @@ function tCompareMatrixValues(sDSName as string, sRefFileUrl as string, cTable_o
endif
else
if cTable_or_Query = "t" then warnlog "Table: " + sTableName + " not found - Test aborted"
- if cTable_or_Query = "q" then warnlog "Table: " + sQueryName + " not found - Test aborted"
+ if cTable_or_Query = "q" then warnlog "Query: " + sTableName + " not found - Test aborted"
endif
printlog "*** End Testcase"
sleep 1
@@ -203,7 +203,8 @@ function fCreateRefFile(sDSName as string, cTable_or_Query as string, sTableName
'/// reading out values from table, create a reference table and input values in
printlog "start reading out values from table and writing in ref table"
iNumber = Freefile
- dim i,j as integer 'counter
+ dim i as integer 'counter
+ dim j as integer 'counter
Open sRefFileUrl for Output as iNumber
for i = 1 to iRowAmount
for j = 1 to iColAmount
@@ -708,10 +709,10 @@ function fFindTableInBeamer(sDSName1,sTableName1)
next i
if (bfindTable = false) then
- warnlog "Datasource " + sDSName + " not found!"
+ warnlog "Datasource " + sDSName1 + " not found!"
exit function
else
- printlog "Datasource " + sDSName + " found!"
+ printlog "Datasource " + sDSName1 + " found!"
' I set the bfindTable flag again back to false
' for the next test of the table
bfindTable = false
diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win
index 099e62675..7db84bc17 100755
--- a/testautomation/global/win/edia_t_z.win
+++ b/testautomation/global/win/edia_t_z.win
@@ -2,7 +2,7 @@
TableWindow HID_CTL_TABLEEDIT
Fieldname HID_TABDESIGN_NAMECELL
FieldType HID_TABDESIGN_TYPECELL
-Description HID_TABDESIGN_COMMENTCELL
+Description HID_TABDESIGN_HELPTEXT
*TablesFilter HID_DSADMIN_TABLE_SUBSCRIPTION
Tables HID_DSADMIN_TABLE_SELECTOR
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 20:22:09 +0000