Commits

Anonymous committed f1f009f Merge
  • Participants
  • Parent commits d8f72fd, 5eb6084

Comments (0)

Files changed (12)

File testautomation/dbaccess/optional/includes/ctrl_Several1.inc

 endcase
 '--------------------------------------------------------------------------------------
 
-testcase tLabelField	
+testcase tLabelField
     
     '/// Open a new document,
     printlog "Open a new document,"

File testautomation/dbaccess/optional/includes/ctrl_Several2.inc

          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")

File testautomation/dbaccess/optional/includes/db_Relations.inc

 '\***********************************************************************
 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      
     
 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      
     
         
         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

File testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc

 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

File testautomation/dbaccess/required/includes/MainApp.inc

 '-------------------------------------------------------------------------
 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

File testautomation/dbaccess/required/includes/Query.inc

             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
 '-------------------------------------------------------------------------
 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

File testautomation/dbaccess/required/includes/Table.inc

 '-------------------------------------------------------------------------
 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

File testautomation/dbaccess/required/includes/TableDesign.inc

 '-------------------------------------------------------------------------
 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

File testautomation/dbaccess/tools/formtools.inc

                 endif
             fSaveForm = true    
         else
-            fSaveFrom = false
+            fSaveForm = false
         end if
      
      if ( IsMissing( bCloseForm ) ) then

File testautomation/dbaccess/tools/reporttools.inc

         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
     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

File testautomation/dbaccess/tools/tabletools.inc

         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	
         '/// 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
 	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

File testautomation/global/win/edia_t_z.win

 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