diff options
Diffstat (limited to 'testautomation/math/optional')
| -rwxr-xr-x[-rw-r--r--] | testautomation/math/optional/includes/m_101_.inc | 28 | ||||
| -rwxr-xr-x[-rw-r--r--] | testautomation/math/optional/includes/m_105.inc | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | testautomation/math/optional/includes/m_106_.inc | 2 | ||||
| -rwxr-xr-x | testautomation/math/optional/m_lvl1.bas | 2 |
4 files changed, 16 insertions, 22 deletions
diff --git a/testautomation/math/optional/includes/m_101_.inc b/testautomation/math/optional/includes/m_101_.inc index e529119e0bfc..989857403546 100644..100755 --- a/testautomation/math/optional/includes/m_101_.inc +++ b/testautomation/math/optional/includes/m_101_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : thorsten.bosbach@sun.com +'* Owner : thorsten.bosbach@oracle.com '* '* short description : '* @@ -280,7 +280,11 @@ testcase tFilePassword printlog " Check: (" + i + "/" + x +"): " +sTemp if Passwort.isEnabled then if NOT((instr(sTemp,gMathFilter) = 1)OR(instr(sTemp," (.sxm)") > 1)) then - warnlog "(" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled" + if (4=i) then + warnlog "#i112895# (" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled" + else + warnlog "(" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled" + endif endif else if (instr(sTemp,gMathFilter) = 1)OR(instr(sTemp," (.sxm)") > 1) then @@ -429,7 +433,7 @@ testcase tFilePrint DokumentWriter.MouseUp 99,99 sFileName = convertpath( gOfficePath + "user/work/math/level1/ftc_a.odt") - if (hFileExists(sFileName)) then + if (FileExists(sFileName)) then '/// goto end of page; insert page break ///' kontext "DokumentWriter" DokumentWriter.typeKeys "<mod1 end>" @@ -660,20 +664,12 @@ function hSpeichernUnterMitFilterKillTBO (sFileName as String, sFilterName, opti Dim bAlienNotAllowed as boolean sDerName = ConvertPath (sFileName) - - if hFileExists (sDerName) = TRUE then - try - app.kill (sDerName) - catch - Exceptlog - endcatch - end if - - if FileExists(sDerName) then - warnlog "file '" & sDerName & "' couldn't be deleted. Exiting function now..." + if ( not hDeleteFile( sDerName ) ) then + warnlog( "Aborting function because the file could not be deleted: " & sDerName ) + hSpeichernUnterMitFilterKillTBO() = FALSE exit function - end if - + endif + sleep (1) FileSaveAs Kontext "SpeichernDlg" diff --git a/testautomation/math/optional/includes/m_105.inc b/testautomation/math/optional/includes/m_105.inc index 3bfac36f6f25..9d35f36ffdea 100644..100755 --- a/testautomation/math/optional/includes/m_105.inc +++ b/testautomation/math/optional/includes/m_105.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : thorsten.bosbach@sun.com +'* Owner : thorsten.bosbach@oracle.com '* '* short description : '* @@ -487,8 +487,6 @@ testcase tToolsCatalog endcase testcase tToolsCatalogNew - qaerrorlog "#i64504# Symbol set name is not saved on exiting OOo" -goto endsub dim i, j as integer dim sTemp as string dim iStartingSymbolSetCount as integer @@ -626,7 +624,7 @@ goto endsub SymbolSet.select "" endcatch i = Symbol.getItemCount - if i <> 1 then + if i < 2 then warnlog "Symbol not available in new Symbolset: intsead of 1: " + i endif SymbolSet.setText "TBOnewSymbolSetdelete" diff --git a/testautomation/math/optional/includes/m_106_.inc b/testautomation/math/optional/includes/m_106_.inc index 87f6b3969f2b..6136ebfdeb9f 100644..100755 --- a/testautomation/math/optional/includes/m_106_.inc +++ b/testautomation/math/optional/includes/m_106_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : thorsten.bosbach@sun.com +'* Owner : thorsten.bosbach@oracle.com '* '* short description : '* diff --git a/testautomation/math/optional/m_lvl1.bas b/testautomation/math/optional/m_lvl1.bas index 64cee873575d..95815c34f89e 100755 --- a/testautomation/math/optional/m_lvl1.bas +++ b/testautomation/math/optional/m_lvl1.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : thorsten.bosbach@sun.com +'* Owner : thorsten.bosbach@oracle.com '* '* short description : Math Function Test '* |