[ooo-build-commit] Branch 'ooo/master' - 3 commits - testautomation/chart2 testautomation/global testautomation/graphics testautomation/spreadsheet
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Jun 4 18:57:41 PDT 2009
testautomation/chart2/required/includes/ch2_format1.inc | 159 +--
testautomation/global/hid/hid.lst | 2
testautomation/global/win/etab_a_d.win | 2
testautomation/graphics/optional/includes/global/g_shaddow.inc | 9
testautomation/graphics/required/includes/global/id_001.inc | 144 +--
testautomation/graphics/required/includes/global/id_002.inc | 299 +++---
testautomation/graphics/required/includes/global/id_003.inc | 214 ++--
testautomation/graphics/tools/id_tools.inc | 479 ++++------
testautomation/graphics/tools/id_tools_2.inc | 128 +-
testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc | 2
10 files changed, 735 insertions(+), 703 deletions(-)
New commits:
commit ba45e5c26b10a274f3d11f4777b2a26d4c5dcc04
Author: Kurt Zenker <kz at openoffice.org>
Date: Thu Jun 4 19:32:40 2009 +0000
CWS-TOOLING: integrate CWS automationdev300m48cat3
2009-06-02 09:47:08 +0200 oc r272481 : #i102430#
2009-05-29 12:59:34 +0200 wg r272453 : i102361
2009-05-29 12:47:37 +0200 wg r272451 : i102360
2009-05-29 12:38:40 +0200 wg r272449 : i102360
2009-05-29 12:32:30 +0200 wg r272448 : i102360
2009-05-29 12:31:56 +0200 wg r272447 : i102334
2009-05-28 15:54:46 +0200 wg r272410 : i102334
2009-05-28 13:20:41 +0200 wg r272404 : i102323
2009-05-28 13:03:10 +0200 wg r272403 : i102323
diff --git a/testautomation/graphics/required/includes/global/id_001.inc b/testautomation/graphics/required/includes/global/id_001.inc
index 3066372..995de9f 100755
--- a/testautomation/graphics/required/includes/global/id_001.inc
+++ b/testautomation/graphics/required/includes/global/id_001.inc
@@ -52,9 +52,6 @@
' #1 tmFilePrinterSetting
'\**********************************************************************************
-'/// used Documents ///'
-'///"graphics\required\input\tbo_alf_.od?" ///
-
testcase tiFileSaveAs
dim sFileName as string ' test document & new created doc
@@ -78,8 +75,7 @@ testcase tiFileSaveAs
end if
sFilter (0) = 0 ' initalize ;-)...
- '/// used document: "graphics\required\input\tbo_alf_.od?" ///
-
+ printlog " used document: graphics\required\input\tbo_alf_.od?"
sFileName = "graphics\required\input\tbo_alf_." + ExtensionString ' this is the file with all features
printlog "FileName is " + sFileName
sFile = "isas_" ' this is the filename of the export files
@@ -89,7 +85,7 @@ testcase tiFileSaveAs
app.mkdir (sPath)
end if
- Printlog "'/// deleting all files in output directory: \\user\\work\\graphics\\required\\gApplication gPlatform isas_* ///'"
+ printlog " deleting all files in output directory: \\user\\work\\graphics\\required\\gApplication gPlatform isas_*"
if gSamePC = TRUE then ' delete export directory
GetFileList ( sPath, sFile+"*", Exlist() )
if KillFileList ( Exlist() ) <> TRUE then
@@ -186,42 +182,42 @@ testcase tiFileReload
if app.dir(ConvertPath (gOfficePath + "user/work/graphics/required/")) = "" then
app.mkdir (ConvertPath (gOfficePath + "user/work/graphics/required/"))
end if
-'/// open application ///'
+printlog " open application"
Call hNewDocument
WaitSlot (2000)
-'/// save document "..." ///'
+printlog " save document ..."
Call hFileSaveAsKill (Datei$)
WaitSlot (2000)
-'/// close document ///'
+printlog " close document "
Call hCloseDocument
-'/// load document again ///'
+printlog " load document again "
Call hFileOpen (Datei$)
WaitSlot (2000)
-'/// type something in document ///'
+printlog " type something in document "
call hTBOtypeInDoc
WaitSlot (2000)
-'/// File->Reload ///'
+printlog " File->Reload "
FileReload
WaitSlot (2000)
-'/// Messagebox has to come up; say NO ///'
+printlog " Messagebox has to come up; say NO"
Kontext "Messagebox"
sleep 2
Messagebox.No
WaitSlot (2000)
-'/// File->Reload ///'
+printlog " File->Reload "
FileReload
WaitSlot (2000)
Kontext "Messagebox"
sleep 2
-'/// Messagebox has to come up; say YES ///'
+printlog " Messagebox has to come up; say YES"
Messagebox.Yes
WaitSlot (1000)
-'/// close document ///'
+printlog " close document"
Call hCloseDocument
-'/// delete document ///'
+printlog " delete document"
if Dir (Datei$) <> "" AND gSamePC = TRUE then kill Datei$
endcase 'tiFileReload
@@ -242,22 +238,22 @@ testcase tiFileVersion
Datei$= (ConvertPath (gOfficePath + "user/work/graphics/required/erwin." + ExtensionString))
'if dir (ConvertPath (gOfficePath + "user/work/graphics/required/")) = "" then
if dir (Datei$) = "" then app.mkdir (ConvertPath (gOfficePath + "user/work/graphics/required/"))
-'/// open application ///'
+printlog " open application"
Call hNewDocument
WaitSlot (1000)
-'/// save document as "..." ///'
+printlog " save document as ..."
Call hFileSaveAsKill (Datei$)
WaitSlot (1000)
-'/// close document ///'
+printlog " close document"
Call hCloseDocument
-'/// open document again ///'
+printlog " open document again"
Call hFileOpen (Datei$)
WaitSlot (1000)
-'/// type something in document ///'
+printlog " type something in document"
call hTBOtypeInDoc
WaitSlot (1000)
-'/// File->Versions ///'
+printlog " File->Versions "
try
FileVersions
catch
@@ -267,17 +263,17 @@ testcase tiFileVersion
Kontext "Versionen"
Call DialogTest ( Versionen )
-'/// in Versions dialog press "save" ///'
+printlog " in Versions dialog press save "
Speichern.Click
-'/// type a comment ///'
+printlog " type a comment"
Kontext "VersionskommentarEingeben"
Call DialogTest ( VersionskommentarEingeben )
-'/// exit comment dialog with cancel ///'
+printlog " exit comment dialog with cancel"
VersionskommentarEingeben.Cancel
Kontext "Versionen"
-'/// close version dialog ///'
+printlog " close version dialog"
Versionen.Close
-'/// close document ///'
+printlog " close document"
Call hCloseDocument
' if Dir (Datei$) <> "" AND gSamePC = TRUE then kill Datei$
@@ -309,13 +305,13 @@ testcase tiFilePassword
ExtensionString = "odg"
end if
-'/// save file to: "graphics\required\output\"+gApplication+"\"+ gPlatform+"\"isp__" ///'
+printlog " save file to: graphics\required\output\" + gApplication + "\" + gPlatform + "\"
sFile = "isp__" ' this is the filename of the export files
sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+gApplication+"\"+ gPlatform+"\") ' this is the export path
mkdir (sPath)
if dir (sPath) = "" then app.mkdir (sPath)
sFileIn = (sPath + sFile + "." + ExtensionString)
- Printlog "'/// deleting all files in output directory: \\graphics\required\output\\impress\\ gPlatform isp_* ///'"
+ printlog " deleting all files in output directory: \\graphics\required\output\\impress\\ gPlatform isp_* "
if gSamePC = TRUE then ' delete export directory
GetFileList ( sPath, sFile+"*", Exlist() )
if KillFileList ( Exlist() ) <> TRUE then
@@ -326,10 +322,10 @@ testcase tiFilePassword
end if
end if
-'/// open application ///'
+printlog " open application "
Call hNewDocument
WaitSlot (1000)
-'/// File->SaveAs ///'
+printlog " File->SaveAs "
FileSaveAs
Kontext "SpeichernDlg"
Datei$ = ConvertPath ( sFileIn )
@@ -337,37 +333,37 @@ testcase tiFilePassword
if Dir (Datei$) <> "" then
kill Datei$
end if
- '/// check 'password' ///'
+ printlog " check 'password'"
Passwort.Check
- '/// set 'filename' ///'
+ printlog " set 'filename'"
Dateiname.SetText Datei$
- '/// press 'save' ///'
+ printlog " press 'save'"
Speichern.Click
WaitSlot (2000)
Kontext "Passwort"
- '/// type password "12345", confirm password: "54321" -> WRONG ///'
+ printlog " type password 12345, confirm password: 54321 -> WRONG "
PasswortName.SetText "12345"
PasswortBestaetigen.Settext "54321"
Passwort.OK
WaitSlot (2000)
Kontext "Messagebox"
- '/// messagebox has to show up, say OK, if messagebox doesnt come up -> ERROR ///'
+ printlog " messagebox has to show up, say OK, if messagebox doesnt come up -> ERROR "
if Messagebox.Exists(1) then
Messagebox.OK
else
Warnlog "- Wrong password not recognized"
end if
Kontext "Passwort"
- '/// type password "12345", confirm password: "12345" -> RIGHT ///'
+ printlog " type password 12345, confirm password: 12345 -> RIGHT "
PasswortName.SetText "12345"
PasswortBestaetigen.SetText "12345"
Passwort.OK
- '/// close document ///'
+ printlog " close document"
sleep 2
FileClose
sleep 2
- '/// open document ///'
+ printlog " open document"
FileOpen
Kontext "OeffnenDlg"
WaitSlot (2000)
@@ -375,7 +371,7 @@ testcase tiFilePassword
Oeffnen.Click
WaitSlot (2000)
Kontext "PasswordFileOpen"
- '/// type password: "34567" -> WRONG ///'
+ printlog " type password: 34567 -> WRONG "
PasswortName.SetText "34567"
try
PasswordFileOpen.OK
@@ -383,7 +379,7 @@ testcase tiFilePassword
Printlog "- Wrong password not accepted"
endcatch
Kontext
- '/// messagebox has to show up, say OK, if messagebox doesn't come up -> ERROR ///'
+ printlog " messagebox has to show up, say OK, if messagebox doesn't come up -> ERROR "
if Not Messagebox.Exists(1) then
Warnlog "Wrong password while loading not recognized"
else
@@ -392,42 +388,42 @@ testcase tiFilePassword
end if
WaitSlot (3000)
Kontext "PasswordFileOpen"
- '/// type password: "12345" -> RIGHT ///'
+ printlog " type password: 12345 -> RIGHT"
PasswortName.SetText "12345"
PasswordFileOpen.OK
WaitSlot (5000)
- '/// File->SaveAs ///'
+ printlog " File->SaveAs "
FileSaveAs
Kontext "SpeichernDlg"
Dateiname.SetText Datei$
if (Passwort.IsChecked <> TRUE) then
Warnlog "Password has to be checked! :-("
end if
- '/// press 'save', without changing any checkbox! -> file has to be saved WITH password protection ///'
+ printlog " press 'save', without changing any checkbox! -> file has to be saved WITH password protection "
Speichern.Click
WaitSlot (1000)
Kontext "Messagebox"
- '/// (if messagebox comes up, say YES) ///'
+ printlog " (if messagebox comes up, say YES)"
if Messagebox.Exists(5) then
Messagebox.Yes
end if
- '/// password dialog has to show up! ///'
+ printlog " password dialog has to show up!"
Kontext "Passwort"
if (Passwort.Exists(5) = FALSE)then
Warnlog "- Password dialog Didn't pop up after pressing save"
else
Kontext "Passwort"
- '/// type password "a12345", confirm password: "a12345" -> RIGHT ///'
+ printlog " type password a12345, confirm password: a12345 -> RIGHT"
WaitSlot (1000)
PasswortName.SetText "a12345"
PasswortBestaetigen.SetText "a12345"
Passwort.OK
WaitSlot (1000)
- '/// close document ///'
+ printlog " close document"
FileClose
WaitSlot (1000)
end if
- '/// open document ///'
+ printlog " open document"
FileOpen
WaitSlot (2000)
Kontext "OeffnenDlg"
@@ -435,11 +431,11 @@ testcase tiFilePassword
Oeffnen.Click
Kontext "PasswordFileOpen"
WaitSlot (1000)
- '/// type password: "a12345" -> RIGHT ///'
+ printlog " type password: a12345 -> RIGHT"
PasswortName.SetText "a12345"
PasswordFileOpen.OK
WaitSlot (5000)
- '/// File->SaveAs ///'
+ printlog " File->SaveAs "
FileSaveAs
Kontext "SpeichernDlg"
Dateiname.SetText Datei$
@@ -447,21 +443,21 @@ testcase tiFilePassword
Warnlog "Password has to be checked! :-("
end if
Passwort.UnCheck
- '/// press 'save', without changing any checkbox! -> file has to be saved WITH password protection ///'
+ printlog " press 'save', without changing any checkbox! -> file has to be saved WITH password protection "
Speichern.Click
Kontext "Messagebox"
- '/// (if messagebox comes up, say YES) ///'
+ printlog " (if messagebox comes up, say YES)"
if Messagebox.Exists(5) then Messagebox.Yes
- '/// password dialog needn't to show up! ///'
+ printlog " password dialog needn't to show up!"
Kontext "Passwort"
if (Passwort.Exists(5))then
Warnlog "- Password dialog didn't pop up after pressing save"
Kontext "Passwort"
password.cancel
- '/// close document ///'
+ printlog " close document "
FileClose
else
- '/// close document ///'
+ printlog " close document"
hCloseDocument
end if
endcase 'tiFilePassword
@@ -543,8 +539,8 @@ endcase 'tiFileTemplates
testcase tiFilePrint
Call hNewDocument
-'/// open application ///'
-'/// File->Print ///'
+printlog " open application"
+printlog " File->Print"
FilePrint
WaitSlot (1000)
kontext
@@ -555,19 +551,19 @@ testcase tiFilePrint
WaitSlot (2000)
Kontext "DruckenDlg"
Call DialogTest (DruckenDlg)
- '/// click 'options' ///'
+ printlog " click 'options'"
WaitSlot (2000)
Zusaetze.Click
Kontext "DruckerZusaetzeDraw"
Call DialogTest (DruckerZusaetzeDraw)
DruckerZusaetzeDraw.Cancel
- '/// close options dialog with 'cancel' ///'
+ printlog " close options dialog with 'cancel'"
Kontext "DruckenDlg"
- '/// close print dialog with 'cancel' ///'
+ printlog " close print dialog with 'cancel'"
DruckenDlg.Cancel
WaitSlot (2000)
-'/// close application ///'
+printlog " close application"
Call hCloseDocument
endcase 'tiFilePrint
@@ -576,10 +572,10 @@ endcase 'tiFilePrint
testcase tmFileNewFromTemplate
Call hNewDocument
FileNewFromTemplate
- '/// Open dialog with File / New / From Template ///
+ printlog " Open dialog with File / New / From Template"
WaitSlot (5000)
Kontext "TemplateAndDocuments"
- '/// Check if dialog has been opened ///
+ printlog " Check if dialog has been opened"
if TemplateAndDocuments.NotExists then
Warnlog "Dialog Templates and Documents are not up!"
goto endsub
@@ -613,14 +609,14 @@ endcase 'tmFileOpen
testcase tmFileClose
printlog "- File Close"
- hNewDocument ' just for the records: I open ONE document
+ hNewDocument
call hTBOtypeInDoc
WaitSlot (2000)
FileClose
- Kontext ' Expecting "Modified, do you want to close?"
+ Kontext
if active.exists (5) then
printlog " Ok, active came up: " + active.gettext
- Active.Cancel ' No, not this time
+ Active.Cancel
else
warnlog "active missing (1)"
end if
@@ -628,7 +624,7 @@ testcase tmFileClose
FileClose
Kontext
- Active.Yes ' but now - records: this document is closed
+ Active.Yes
WaitSlot (2000)
Kontext "SpeichernDlg"
@@ -636,7 +632,7 @@ testcase tmFileClose
SpeichernDlg.Cancel
WaitSlot (2000)
- FileClose ' now the office gets closed! (if there were no modifications!)
+ FileClose
Kontext
Active.No
WaitSlot (2000)
@@ -800,7 +796,7 @@ endcase 'tmFilePrinterSetting
testcase tdFileExport
goto endsub
dim x as integer
-'/// just call File->Export and exit ///'
+printlog " just call File->Export and exit "
Call hNewDocument
WaitSlot (3000)
FileExport
@@ -808,9 +804,9 @@ testcase tdFileExport
Call DialogTest ( ExportierenDlg )
UebergeordneterOrdner.Click
Kontext "SpeichernDlg"
- '/// check number of available export filters. it has to be 17 ///'
- '///+ this is also done in the 'first test', I provide it just as an additional info here.///'
- '///+ testcase: ExFilterCountCompare ///'
+ printlog " check number of available export filters. it has to be 17 "
+ printlog "+ this is also done in the 'first test', I provide it just as an additional info here"
+ printlog "+ testcase: ExFilterCountCompare"
x=Dateityp.getitemcount
if x <> 18 then warnlog "the number of filters is not 18, it is: " + x
SpeichernDlg.Cancel
diff --git a/testautomation/graphics/required/includes/global/id_002.inc b/testautomation/graphics/required/includes/global/id_002.inc
index 50df3c2..024c0f4 100755
--- a/testautomation/graphics/required/includes/global/id_002.inc
+++ b/testautomation/graphics/required/includes/global/id_002.inc
@@ -31,7 +31,7 @@
'*
'/************************************************************************
'*
-'* Owner : wolfram.garten at sun.com
+'* Owner : wolfram.garten at sun.com
'*
'* short description :
'*
@@ -52,12 +52,11 @@
' #1 tiEditHyperlink
' #1 tEditPoints
'\**********************************************************************************
-
testcase tiEditUndoRedo
- '/// open application ///'
- '/// Type a sentence into the document and do : ///'
- '/// Edit / Undo and Edit / Redo ///
+ printlog " open application"
+ printlog " Type a sentence into the document and do :"
+ printlog " Edit / Undo and Edit / Redo"
hNewDocument
call hTBOtypeInDoc
@@ -65,16 +64,18 @@ testcase tiEditUndoRedo
WaitSlot (2000)
EditRedo
WaitSlot (2000)
- '/// close application ///'
+ printlog " close application"
Call hCloseDocument
-endcase
-
+
+endcase 'tiEditUndoRedo
+'---------------------------------------------------------
testcase tiEditRepeat
+
goto endsub 'Quaste, ask FHA
- '/// open application ///'
+ printlog " open application"
Call hNewDocument
-'/// create 3 rectangles ///'
+printlog " create 3 rectangles"
gMouseClick 50,50
Call hRechteckErstellen ( 30, 10, 70, 30 )
WaitSlot (1000)
@@ -82,24 +83,26 @@ testcase tiEditRepeat
WaitSlot (1000)
Call hRechteckErstellen ( 80, 50, 40, 20 )
WaitSlot (1000)
- '/// [Modify | ContextMenu]->Arrange->SendBackward ///'
+ printlog " [Modify | ContextMenu]->Arrange->SendBackward"
ContextArrangeBringBackward
WaitSlot (2000)
- '/// Edit->Repeat ///'
+ printlog " Edit->Repeat"
try
EditRepeat
catch
Warnlog " Menu entry is disabled #i26129#"
endcatch
- '/// close application ///'
+ printlog " close application"
Call hCloseDocument
-endcase
-
+
+endcase 'tiEditRepeat
+'---------------------------------------------------------
testcase tiEditCutPasteCopySelectall
- '/// open application ///'
- '/// Type a sentence into the dokument and do : ///'
- '/// edit-> (Cut | Paste | Copy | SelectAll | Cut | Paste | DeleteContents) ///'
+
+ printlog " open application"
+ printlog " Type a sentence into the dokument and do : "
+ printlog " edit-> (Cut | Paste | Copy | SelectAll | Cut | Paste | DeleteContents) "
Call hNewDocument
call hTBOtypeInDoc
@@ -120,139 +123,154 @@ testcase tiEditCutPasteCopySelectall
sleep (1)
EditDeleteContents
sleep (1)
- '/// close application ///'
+ printlog " close application"
Call hCloseDocument
-endcase
-
+
+endcase 'tiEditCutPasteCopySelectall
+'---------------------------------------------------------
testcase tiEditPasteSpecial
- '/// open application ///'
+
+ printlog " open application"
Call hNewDocument
- '/// put some words into the clipboard ///'
+ printlog " put some words into the clipboard "
SetClipboard "This is a Text in the Clipboard"
- '/// Edit->PasteSpecial ///'
+ printlog " Edit->PasteSpecial"
EditPasteSpecial
WaitSlot (1000)
Kontext "InhaltEinfuegen"
DialogTest ( InhaltEinfuegen )
- '/// close the dialog without inserting something ///'
+ printlog " close the dialog without inserting something"
InhaltEinfuegen.Cancel
WaitSlot (1000)
- '/// close application ///'
+ printlog " close application"
Call hCloseDocument
-endcase
-
+
+endcase 'tiEditPasteSpecial
+'---------------------------------------------------------
testcase tiEditSearchAndReplace
- '/// open application ///'
+
+ printlog " open application"
Call hNewDocument
try
- '/// Edit->Find & Replace ///'
+ printlog " Edit->Find & Replace"
EditSearchAndReplace
WaitSlot (1000)
Kontext "FindAndReplace"
DialogTest ( FindAndReplace )
- '/// click on "More Options" ///'
+ printlog " click on More Options"
More.Click
- '/// check 'similarity search' ///'
+ printlog " check 'similarity search' "
SimilaritySearch.Check ' culprint for errors if not resetted !
WaitSlot (1000)
- '/// click '...' :-) ///'
+ printlog " click '...' "
SimilaritySearchFor.Click
Kontext "Aehnlichkeitssuche"
DialogTest (Aehnlichkeitssuche )
Aehnlichkeitssuche.Cancel
- '/// close dialog 'similarity search' ///'
+ printlog " close dialog 'similarity search' "
Kontext "FindAndReplace"
- '/// UNcheck 'similarity search' ///'
+ printlog " UNcheck 'similarity search' "
SimilaritySearch.UnCheck
- '/// click on "More Options" ///'
+ printlog " click on More Options"
More.Click
- '/// close dialog 'Find & Replace' ///'
+ printlog " close dialog 'Find & Replace'"
FindAndReplace.Close
catch
Warnlog "EditSearchAndReplace caused an error"
endcatch
- '/// close application ///'
+ printlog " close application"
Call hCloseDocument
-endcase
-
+
+endcase 'tiEditSearchAndReplace
+'---------------------------------------------------------
testcase tiEditDuplicate
- '/// open application ///'
+
+ printlog " open application "
Call hNewDocument
- '/// create a rectangle ///'
+ printlog " create a rectangle"
call hTBOtypeInDoc
- '/// 'Edit->Select All' ///'
+ printlog " 'Edit->Select All' "
EditSelectAll
- '/// Edit->Duplicate ///'
+ printlog " Edit->Duplicate "
EditDuplicate
Kontext "Duplizieren"
Call DialogTest ( Duplizieren )
- '/// cancel dialog 'duplicate' ///'
+ printlog " cancel dialog 'duplicate'"
Duplizieren.Cancel
Call hCloseDocument
- '/// close application ///'
-endcase
-
+ printlog " close application"
+
+endcase 'tiEditDuplicate
+'---------------------------------------------------------
testcase tEditPoints
- '/// open application ///'
+
+ printlog " open application "
Call hNewDocument
- '/// create a rectangle ///'
+ printlog " create a rectangle"
call hTBOtypeInDoc
- '/// 'Edit->Points' ///'
+ printlog " 'Edit->Points'"
FormatEditPoints
- '/// 'Edit->Glue Points' ///'
+ printlog " 'Edit->Glue Points'"
EditGluePoints
- '/// close application ///'
+ printlog " close application"
Call hCloseDocument
-endcase
-
+
+endcase 'tEditPoints
+'---------------------------------------------------------
testcase tiEditFields
- '/// open application ///'
+
+ printlog " open application "
Call hNewDocument
WaitSlot (2000)
- '/// insert something to be able to use this function ///'
- '///+ Insert->Fields->Date (fixed) ///'
- '///+ deselect object, select, editmode ///'
+ printlog " insert something to be able to use this function"
+ printlog "+ Insert->Fields->Date (fixed)"
+ printlog "+ deselect object, select, editmode "
InsertFieldsDateFix
WaitSlot (1000)
gMouseDoubleClick 10,10
hTypeKeys "<ESCAPE>"
- hTypeKeys "<Tab>" ' With a Tab catches we always the Object
- hTypeKeys "<F2>" ' Here we enter Edit-Mode and therefore also the right place
- hTypeKeys "<Home>" ' Here we enter Edit-Mode and therefore also the right place
+ printlog "With a Tab we catch always the Object"
+ hTypeKeys "<Tab>"
+ printlog "Here we enter Edit-Mode and therefore also the right place"
+ hTypeKeys "<F2>"
+ printlog "Here we enter Edit-Mode and therefore also the right place"
+ hTypeKeys "<Home>"
try
- '/// Edit->Fields ///'
+ printlog " Edit->Fields"
EditFieldsDraw
Kontext "FeldbefehlBearbeitenDraw"
Call DialogTest ( FeldbefehlBearbeitenDraw )
- '/// cancel dialog 'Edit->Field' ///'
+ printlog " cancel dialog 'Edit->Field' "
FeldbefehlBearbeitenDraw.Close
catch
Warnlog "- Slot could not be accessed"
endcatch
-'/// close application ///'
+printlog " close application"
Call hCloseDocument
-endcase
-
+
+endcase 'tiEditFields
+'--------------------------------------------------------
testcase tdEditDeleteSlide
-'/// open application ///'
+
+printlog " open application "
Call hNewDocument
-'/// Insert->Slide ///'
+printlog " Insert->Slide"
InsertSlide
WaitSlot (2000)
hTypekeys "<Pagedown>"
WaitSlot (2000)
- '/// check with navigator, if slide is inserted ///'
- '/// check state of navigator ! expected: closed ///'
+ printlog " check with navigator, if slide is inserted "
+ printlog " check state of navigator ! expected: closed "
Kontext "Navigator"
sleep (2)
if Navigator.exists then
@@ -271,23 +289,26 @@ testcase tdEditDeleteSlide
goto endsub
else
Liste.Select 2
- Liste.Typekeys "<RETURN>" '/// Press Return to go to the selected slide ///'
+ printlog " Press Return to go to the selected slide"
+ Liste.Typekeys "<RETURN>"
Kontext "Navigator"
Navigator.Close
end if
WaitSlot (2000)
- '/// Edit->Delete Slide ///'
+ printlog " Edit->Delete Slide"
EditDeleteSlide
WaitSlot (2000)
- '/// close application ///'
+ printlog " close application "
Call hCloseDocument
-endcase
-
+
+endcase 'tdEditDeleteSlide
+'---------------------------------------------------------
testcase tiEditLinks
- '/// open application ///'
+
+ printlog " open application "
Call hNewDocument
- '/// Insert a linked graphic : "global\input\graf_inp\stabler.tif" ///'
+ printlog " Insert a linked graphic : global\input\graf_inp\stabler.tif"
InsertGraphicsFromFile
Kontext "GrafikEinfuegenDlg"
try
@@ -306,7 +327,7 @@ testcase tiEditLinks
InsertGraphicsFromFile
Kontext "GrafikEinfuegenDlg"
Link.Check
- '/// Insert a linked graphic : "global\input\graf_inp\desp.bmp" ///'
+ printlog " Insert a linked graphic : global\input\graf_inp\desp.bmp"
Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
Oeffnen.Click
sleep 2
@@ -322,27 +343,29 @@ testcase tiEditLinks
WaitSlot (2000)
try
- '/// Edit->Links ///'
+ printlog " Edit->Links "
EditLinksDraw
WaitSlot (2000)
Kontext "VerknuepfungenBearbeiten"
Call DialogTest ( VerknuepfungenBearbeiten )
- '/// close dialog 'Edit Links' ///'
+ printlog " close dialog 'Edit Links' "
VerknuepfungenBearbeiten.Close
WaitSlot (1000)
catch
Warnlog "- EditLinks could not be executed, could be the graphic was not imported"
endcatch
- '/// close application ///'
+ printlog " close application "
Call hCloseDocument
-endcase
-
+
+endcase 'tiEditLinks
+'---------------------------------------------------------
testcase tiEditImageMap
- '/// open application ///'
+
+ printlog " open application "
Call hNewDocument
- '/// Edit->Image Map ///'
+ printlog " Edit->Image Map "
EditImageMap
Kontext "ImageMapEditor"
sleep (1)
@@ -350,7 +373,7 @@ testcase tiEditImageMap
printlog "- ImageMap exists"
DialogTest ( ImageMapEditor )
try
- '/// Close dialog 'Image Map Editor' ///'
+ printlog " Close dialog 'Image Map Editor' "
ImageMapEditor.Close
Printlog "ImageMap closed using the close button"
catch
@@ -360,63 +383,67 @@ testcase tiEditImageMap
else
warnlog "ImageMap didn't come up!"
end if
- '/// close application ///'
+ printlog " close application "
Call hCloseDocument
-endcase
-
+
+endcase 'tiEditImageMap
+'---------------------------------------------------------
testcase tiEditObjectProperties
+
dim i as integer
- '/// for every object, there are several edit options: ///'
- '///+ starting with FloatingFrame->Properties ///'
- '///+ file used for input in frame: global\input\graf_inp\desp.bmp ///
+ printlog " for every object, there are several edit options: "
+ printlog "+ starting with FloatingFrame->Properties "
+ printlog "+ file used for input in frame: global\input\graf_inp\desp.bmp"
- '/// open application ///'
+ printlog " open application "
Call hNewDocument
- '/// Insert->Floating Frame ///'
+ printlog " Insert->Floating Frame "
InsertFloatingFrame
WaitSlot (2000)
Kontext "TabEigenschaften"
FrameName.SetText "Hello"
- '/// insert an picture into the frame (embedded into draw application :-)) ///'
+ printlog " insert an picture into the frame (embedded into draw application"
Inhalt.SetText ConvertPath ( gTesttoolpath + "global\input\graf_inp\desp.bmp" )
WaitSlot (2000)
TabEigenschaften.OK
WaitSlot (2000)
gMouseDoubleClick 1,1
- '/// select frame ///'
+ printlog " select frame "
hTypekeys "<tab>"
- '/// Edit->Object->Properties ///'
+ printlog " Edit->Object->Properties "
kontext
WaitSlot (2000)
EditObjectProperties
WaitSlot (1000)
Kontext "TabEigenschaften"
DialogTest ( TabEigenschaften )
- '/// open Contents File Dialog ///'
+ printlog " open Contents File Dialog "
sleep(1)
Oeffnen.Click
Kontext "OeffnenDlg"
Call DialogTest ( OeffnenDlg )
- '/// Cancel 'Select File for Floating Frame' ///'
+ printlog " Cancel 'Select File for Floating Frame'"
OeffnenDlg.Cancel
Kontext "TabEigenschaften"
TabEigenschaften.Cancel
- '/// close application ///'
+ printlog " close application "
Call hCloseDocument
-endcase
-
+
+endcase 'tiEditObjectProperties
+'---------------------------------------------------------
testcase tiEditObjectEdit
- '/// OLE: edit & save copy as... ///'
- '/// open application ///'
+
+ printlog " OLE: edit & save copy as..."
+ printlog " open application "
dim i as integer
Call hNewDocument
- '/// Insert->Object->OLE Object; select the first one in list, usually: 'StarOffice 6.0 Spreadsheet' ///'
+ printlog " Insert->Object->OLE Object; select the first one in list, usually: 'StarOffice 6.0 Spreadsheet' "
InsertObjectOLEObject
WaitSlot (1000)
Kontext "OLEObjektEinfuegen"
@@ -426,43 +453,45 @@ testcase tiEditObjectEdit
gMouseClick 20,1
- '/// select object ///'
+ printlog " select object "
hTypekeys "<tab>"
- '/// Edit->Object->Edit ///'
+ printlog " Edit->Object->Edit "
EditObjectEdit
- ' try EditObjectEdit again, to see, if it is in edit mode !
+ printlog "try EditObjectEdit again, to see, if it is in edit mode !"
WaitSlot (2000)
try
ContextNameObject
warnlog " Couldn't get into edit mode!"
catch
printlog "Reached edit mode - ok :-)"
- '/// exit edit mode, by clicking outside the object ///'
+ printlog " exit edit mode, by clicking outside the object "
gMouseClick 20,1
endcatch
- '/// select object ///'
+ printlog " select object "
EditSelectAll
- '/// Edit->Object->Save Copy As ///'
+ printlog " Edit->Object->Save Copy As "
EditObjectSaveCopyAs
Kontext "SpeichernDlg"
Call DialogTest ( SpeichernDlg )
- '/// cancel dialog 'Save As' ///'
+ printlog " cancel dialog 'Save As' "
SpeichernDlg.Cancel
WaitSlot (2000)
Kontext "Active"
if Active.Exists(2) then Active.No
- '/// close application ///'
+ printlog " close application "
Call hCloseDocument
-endcase
-
+
+endcase'tiEditObjectEdit
+'---------------------------------------------------------
testcase tiEditPlugIn
- '/// open application ///'
+
+ printlog " open application "
Call hNewDocument
- '/// Insert->Object->Plugin ///'
+ printlog " Insert->Object->Plugin "
InsertObjectPlugin
Kontext "PlugInEinfuegen"
' DialogTest ( PlugInEinfuegen)
@@ -477,9 +506,9 @@ testcase tiEditPlugIn
WaitSlot (5000)
Kontext "PlugInEinfuegen"
if PlugInEinfuegen.exists then
- '/// insert a '.mov' file : "graphics\required\input\sample.mov" ///'
+ printlog " insert a '.mov' file : graphics\required\input\sample.mov"
DateiUrl.SetText (ConvertPath ( gTesttoolpath + "graphics\required\input\sample.mov" ))
- '/// Type something into the option field, and delete it - quite usefull, heh ?! ///'
+ printlog " Type something into the option field, and delete it "
Optionen.SetText "Fiddler's Green"
Optionen.TypeKeys "<HOME>"
@@ -495,18 +524,20 @@ testcase tiEditPlugIn
warnlog "Messagebox: " + Messagebox.gettext
Messagebox.ok
end if
- '/// Edit->Plugin ///'
+ printlog " Edit->Plugin "
EditPlugIn
printlog "Editplugin works!"
- '/// close application ///'
+ printlog " close application "
Call hCloseDocument
-endcase
-
+
+endcase 'tiEditPlugIn
+'---------------------------------------------------------
testcase tiEditHyperlink
- '/// open application ///'
+
+ printlog " open application"
hNewDocument
- '/// Insert->Hyperlink ///'
+ printlog " Insert->Hyperlink"
InsertHyperlink
WaitSlot (5000)
Kontext "Hyperlink"
@@ -517,27 +548,27 @@ testcase tiEditHyperlink
sleep 3
Kontext "TabHyperlinkInternet"
- 'Workaround to get rid of a Focusing-problem...
+ printlog "Workaround to get rid of a Focusing-problem..."
NameText.Typekeys "alal <RETURN>"
NameText.Typekeys "<MOD1 A><DELETE>"
TabHyperlinkInternet.Typekeys "<TAB>", 6
TabHyperlinkInternet.Typekeys "<LEFT>", 3
- 'End of workaround...
+ printlog "End of workaround"
Internet.Check 'Just to make sure the radio-button is addressable.
ZielUrl.Settext "http://www.liegerad-fahrer.de"
Kontext "Hyperlink"
Uebernehmen.Click
Hyperlink.Close
- '/// presupposition to enable edit->hyperlink: <TAB><F2><STRG+a>///'
+ printlog " presupposition to enable edit->hyperlink: <TAB><F2><STRG+a>"
hTypeKeys "<TAB><F2>"
EditSelectAll
try
- '/// Edit->Hyperlink ///'
+ printlog " Edit->Hyperlink "
EditHyperlinkDraw
Kontext "Hyperlink"
if Hyperlink.Exists then
- '/// close dialog 'Hyperlink' ///'
+ printlog " close dialog 'Hyperlink'"
Hyperlink.Close
else
Warnlog "- Hyperlinkdialog not up"
@@ -546,6 +577,8 @@ testcase tiEditHyperlink
Warnlog "- Not able to edit Hyperlink!"
endcatch
- '/// close application ///'
+ printlog " close application "
Call hCloseDocument
-endcase
+
+endcase 'tiEditHyperlink
+'---------------------------------------------------------
diff --git a/testautomation/graphics/required/includes/global/id_003.inc b/testautomation/graphics/required/includes/global/id_003.inc
index 036acbd..0d24147 100755
--- a/testautomation/graphics/required/includes/global/id_003.inc
+++ b/testautomation/graphics/required/includes/global/id_003.inc
@@ -44,13 +44,13 @@
' #1 tViewSnapLines
' #1 tViewGrid
'\**********************************************************************************
-
testcase tiViewNavigator
- '/// open application ///'
+
+ printlog " open application "
Call hNewDocument
Kontext "NavigatorDraw"
- '/// if 'Navigator' isn't already open, open it (View->Navigator)///'
+ printlog " if 'Navigator' isn't already open, open it (View->Navigator)"
if Not NavigatorDraw.Exists Then
ViewNavigator
end if
@@ -59,175 +59,175 @@ testcase tiViewNavigator
try
Kontext "Navigator"
- '/// close 'Navigator' ///'
+ printlog " close 'Navigator' "
Navigator.Close
catch
Errorlog " Navigator wasn't closed, second try with Menu"
ViewNavigator
endcatch
- '/// close application ///'
+ printlog " close application "
Call hCloseDocument
-endcase
-
+
+endcase 'tiViewNavigator
'-------------------------------------------------------------------------
-
testcase tiViewZoom
-'/// open application ///'
- Call hNewDocument
- UseBindings
- ViewZoom
- Kontext "Massstab"
- DialogTest ( Massstab )
- Massstab.Cancel
-'/// close application ///'
- Call hCloseDocument
-endcase
+ printlog " open application "
+ Call hNewDocument
+ UseBindings
+ ViewZoom
+ Kontext "Massstab"
+ DialogTest ( Massstab )
+ Massstab.Cancel
+ printlog " close application "
+ Call hCloseDocument
+
+endcase 'tiViewZoom
'-------------------------------------------------------------------------
-
testcase tiViewToolbar
-'/// including ruler & statusbar ///'
-'/// open application ///'
+
+ printlog " including ruler & statusbar "
+ printlog " open application "
Call hNewDocument
-'/// View->Toolbars->ThreeDSettings ///'
+ printlog " View->Toolbars->ThreeDSettings "
ViewToolbarsThreeDSettings
WaitSlot (1000)
-'/// View->Toolbars->ThreeDSettings ///'
+ printlog " View->Toolbars->ThreeDSettings "
ViewToolbarsThreeDSettings
WaitSlot (1000)
-'/// View->Toolbars->Align ///'
+ printlog " View->Toolbars->Align "
ViewToolbarsAlign
WaitSlot (1000)
-'/// View->Toolbars->Align ///'
+ printlog " View->Toolbars->Align "
ViewToolbarsAlign
WaitSlot (1000)
-'/// View->Toolbars->Tools ///'
+ printlog " View->Toolbars->Tools "
ViewToolbarsTools
WaitSlot (1000)
-'/// View->Toolbars->Tools ///'
+ printlog " View->Toolbars->Tools "
ViewToolbarsTools
WaitSlot (1000)
-'/// View->Toolbars->Bezier ///'
+ printlog " View->Toolbars->Bezier "
ViewToolbarsBezier
WaitSlot (1000)
-'/// View->Toolbars->Bezier ///'
+ printlog " View->Toolbars->Bezier "
ViewToolbarsBezier
WaitSlot (1000)
-'/// View->Toolbars->Fontwork ///'
+ printlog " View->Toolbars->Fontwork "
ViewToolbarsFontwork
WaitSlot (1000)
-'/// View->Toolbars->Fontwork ///'
+ printlog " View->Toolbars->Fontwork "
ViewToolbarsFontwork
WaitSlot (1000)
' if gApplication = "IMPRESS" then
- '/// View->Toolbars->Presentation ///'
+ printlog " View->Toolbars->Presentation "
' ViewToolbarsPresentation ' only in impress, not draw
- '/// View->Toolbars->Presentation ///'
+ printlog " View->Toolbars->Presentation "
' ViewToolbarsPresentation
' endif
-'/// View->Toolbars->Form Controls ///'
+ printlog " View->Toolbars->Form Controls "
ViewToolbarsFormControls
WaitSlot (1000)
-'/// View->Toolbars->Form Controls ///'
+ printlog " View->Toolbars->Form Controls "
ViewToolbarsFormControls
WaitSlot (1000)
'-----------------
-'/// View->Toolbars->Form Design ///'
+ printlog " View->Toolbars->Form Design "
ViewToolbarsFormDesign
WaitSlot (1000)
-'/// View->Toolbars->Form Design ///'
+ printlog " View->Toolbars->Form Design "
ViewToolbarsFormDesign
WaitSlot (1000)
-'/// View->Toolbars->FormNavigation ///'
+ printlog " View->Toolbars->FormNavigation "
ViewToolbarsFormNavigation
WaitSlot (1000)
-'/// View->Toolbars->FormNavigation ///'
+ printlog " View->Toolbars->FormNavigation "
ViewToolbarsFormNavigation
WaitSlot (1000)
-'/// View->Toolbars->Gluepoints ///'
+ printlog " View->Toolbars->Gluepoints "
ViewToolbarsGluepoints
WaitSlot (1000)
-'/// View->Toolbars->Gluepoints ///'
+ printlog " View->Toolbars->Gluepoints "
ViewToolbarsGluepoints
WaitSlot (1000)
-'/// View->Toolbars->Insert ///'
+ printlog " View->Toolbars->Insert "
ViewToolbarsInsert
WaitSlot (1000)
-'/// View->Toolbars->Insert ///'
+ printlog " View->Toolbars->Insert "
ViewToolbarsInsert
WaitSlot (1000)
-'/// View->Toolbars->Graphic ///'
+ printlog " View->Toolbars->Graphic "
ViewToolbarsGraphic
WaitSlot (1000)
-'/// View->Toolbars->Graphic ///'
+ printlog " View->Toolbars->Graphic "
ViewToolbarsGraphic
WaitSlot (1000)
-'/// View->Toolbars->MediaPlayback ///'
+ printlog " View->Toolbars->MediaPlayback "
ViewToolbarsMediaPlayback
WaitSlot (1000)
-'/// View->Toolbars->MediaPlayback ///'
+ printlog " View->Toolbars->MediaPlayback "
ViewToolbarsMediaPlayback
WaitSlot (1000)
-'/// View->Toolbars->Optionbar ///'
+ printlog " View->Toolbars->Optionbar "
ViewToolbarsOptionbar
WaitSlot (1000)
-'/// View->Toolbars->Optionbar ///'
+ printlog " View->Toolbars->Optionbar "
ViewToolbarsOptionbar
WaitSlot (1000)
-'/// View->Toolbars->Picture ///'
+ printlog " View->Toolbars->Picture "
ViewToolbarsPicture
WaitSlot (1000)
-'/// View->Toolbars->Picture ///'
+ printlog " View->Toolbars->Picture "
ViewToolbarsPicture
WaitSlot (1000)
-'/// View->Toolbars->Standard ///'
+ printlog " View->Toolbars->Standard "
ViewToolbarsStandard
WaitSlot (1000)
-'/// View->Toolbars->Standard ///'
+ printlog " View->Toolbars->Standard "
ViewToolbarsStandard
WaitSlot (1000)
-'/// View->Toolbars->Standard View ///'
+ printlog " View->Toolbars->Standard View "
ViewToolbarsStandardView
WaitSlot (1000)
-'/// View->Toolbars->Standard View ///'
+ printlog " View->Toolbars->Standard View "
ViewToolbarsStandardView
WaitSlot (1000)
-'/// View->Toolbars->Hyperlinkbar ///'
+ printlog " View->Toolbars->Hyperlinkbar "
ViewToolbarsHyperlinkbar
WaitSlot (1000)
-'/// View->Toolbars->Hyperlinkbar ///'
+ printlog " View->Toolbars->Hyperlinkbar "
ViewToolbarsHyperlinkbar
WaitSlot (1000)
-'/// View->Toolbars->ColorBar ///'
+ printlog " View->Toolbars->ColorBar "
ViewToolbarsColorBar
WaitSlot (1000)
-'/// View->Toolbars->ColorBar ///'
+ printlog " View->Toolbars->ColorBar "
ViewToolbarsColorBar
WaitSlot (1000)
-'/// View->Toolbars->Customize ///'
+ printlog " View->Toolbars->Customize "
ViewToolbarsCustomize
WaitSlot (1000)
Kontext
- '/// switch to tabpage 'Menus' ///'
+ printlog " switch to tabpage 'Menus' "
try
Messagebox.SetPage TabCustomizeMenu ' 1 ------------------
catch
@@ -239,13 +239,13 @@ testcase tiViewToolbar
Menu.typeKeys("<down>")
Entries.typeKeys("<down>")
sleep 2
- '/// click button 'new' ///'
+ printlog " click button 'new' "
BtnNew.Click
sleep 1
- '/// Dialog 'New Menu' comes up ///'
+ printlog " Dialog 'New Menu' comes up "
Kontext "MenuOrganiser"
Call DialogTest ( MenuOrganiser )
- '/// Cancel dialog 'New Menu' ///'
+ printlog " Cancel dialog 'New Menu' "
MenuOrganiser.cancel
sleep 1
Kontext "TabCustomizeMenu"
@@ -253,21 +253,21 @@ testcase tiViewToolbar
end if
sleep (1)
-'/// close application ///'
- Call hCloseDocument
-endcase
-
+ printlog " close application "
+ Call hCloseDocument
+
+endcase 'tiViewToolbar
'-------------------------------------------------------------------------
-
testcase tiViewDisplayQuality
- '/// open application ///'
+
+ printlog " open application "
Call hNewDocument
- '/// create a rectangle ///'
+ printlog " create a rectangle "
Call hRechteckErstellen 20,20,40,40
try
- '/// View->Display Quality->Black and White ///'
+ printlog " View->Display Quality->Black and White "
ViewQualityBlackWhite
Printlog "- Quality set to black and white"
catch
@@ -275,7 +275,7 @@ testcase tiViewDisplayQuality
endcatch
WaitSlot (1000)
try
- '/// View->Display Quality->Greyscale ///'
+ printlog " View->Display Quality->Greyscale "
ViewQualityGreyscale
Printlog "- View quality set to greyscale"
catch
@@ -283,75 +283,75 @@ testcase tiViewDisplayQuality
endcatch
WaitSlot (1000)
try
- '/// View->Display Quality->Colour ///'
+ printlog " View->Display Quality->Colour "
ViewQualityColour
Printlog "- View quality set to colour"
catch
Warnlog "- View quality colour could not be accessed"
endcatch
- '/// close application ///'
+ printlog " close application "
Call hClosedocument
-endcase
-
+
+endcase 'tiViewDisplayQuality
'-------------------------------------------------------------------------
-
testcase tiViewLayer
- '/// open application ///'
+
+ printlog " open application "
Call hNewDocument
- '/// Insert->Layer / in impress: ???? ///'
+ printlog " Insert->Layer / in impress: ???? "
- '/// View->Layer ///'
+ printlog " View->Layer "
ViewLayer
WaitSlot (1000)
- '/// View->Layer ///'
+ printlog " View->Layer "
ViewLayer
- '/// close application ///'
+ printlog " close application "
Call hCloseDocument
-endcase
-
+
+endcase 'tiViewLayer
'-------------------------------------------------------------------------
-
testcase tViewGrid
- '/// open application ///'
+
+ printlog " open application "
Call hNewDocument
- '/// View->Grid-> ///'
+ printlog " View->Grid-> "
ViewGridVisible
- '/// View->Grid-> ///'
+ printlog " View->Grid-> "
ViewGridUse
- '/// View->Grid-> ///'
+ printlog " View->Grid-> "
ViewGridFront
- '/// View->Grid-> ///'
+ printlog " View->Grid-> "
ViewGridVisible
- '/// View->Grid-> ///'
+ printlog " View->Grid-> "
ViewGridUse
- '/// View->Grid-> ///'
+ printlog " View->Grid-> "
ViewGridFront
WaitSlot (1000)
- '/// close application ///'
+ printlog " close application "
Call hCloseDocument
-endcase
-
+
+endcase 'tViewGrid
'-------------------------------------------------------------------------
-
testcase tViewSnapLines
- '/// open application ///'
+
+ printlog " open application "
Call hNewDocument
- '/// View->Snap Lines-> ///'
+ printlog " View->Snap Lines-> "
ViewSnapLinesVisible
- '/// View->Snap Lines-> ///'
+ printlog " View->Snap Lines-> "
ViewSnapLinesUse
- '/// View->Snap Lines-> ///'
+ printlog " View->Snap Lines-> "
ViewSnapLinesFront
- '/// View->Snap Lines-> ///'
+ printlog " View->Snap Lines-> "
ViewSnapLinesVisible
- '/// View->Snap Lines-> ///'
+ printlog " View->Snap Lines-> "
ViewSnapLinesUse
- '/// View->Snap Lines-> ///'
+ printlog " View->Snap Lines-> "
ViewSnapLinesFront
WaitSlot (1000)
- '/// close application ///'
+ printlog " close application "
Call hCloseDocument
-endcase
-
+
+endcase 'tViewSnapLines
diff --git a/testautomation/graphics/tools/id_tools.inc b/testautomation/graphics/tools/id_tools.inc
index 51dcb9e..87c2911 100755
--- a/testautomation/graphics/tools/id_tools.inc
+++ b/testautomation/graphics/tools/id_tools.inc
@@ -78,33 +78,33 @@
'\*****************************************************************
function hFindSpellHypLanguage (optional sBooks()) as string
-'/// print all available languages that have a 'language module' ///'
+ printlog "print all available languages that have a language module"
dim iListLength as integer
dim i as integer
dim sTemp as string
- '/// only necessarry for asian languages ///'
+ printlog "only necessary for asian languages"
if (bAsianLan or (iSprache=55)) then
- '/// Tools->Options ///'
+ printlog "Tools->Options"
ToolsOptions
- '/// select from section 'Language Settings' the item 'Writing Aids' ///'
+ printlog "select from section 'Language Settings' the item 'Writing Aids'"
hToolsOptions ("LANGUAGESETTINGS","WRITINGAIDS")
- '/// click button 'Edit...' in section 'Available language modules' ///'
+ printlog "click button 'Edit...' in section 'Available language modules'"
SprachmoduleBearbeiten.click
kontext "ModuleBearbeiten"
- '/// print all entries from listbox 'Language' ///'
+ printlog "print all entries from listbox 'Language'"
for i = 1 to Sprache.GetItemCount
sTemp = Sprache.GetItemText(i)
if (NOT isMissing(sBooks())) then
listAppend(sBooks(), sTemp)
endif
- '/// return the first entry in the listbox ///'
+ printlog " return the first entry in the listbox "
if i = 1 then hFindSpellHypLanguage = sTemp
next i
- '/// close dialog 'Edit Modules' ///'
+ printlog "close dialog 'Edit Modules'"
ModuleBearbeiten.Close
Kontext "ExtrasOptionenDlg"
- '/// close dialog 'Options - ' ///'
+ printlog "close dialog 'Options - '"
ExtrasOptionenDlg.OK
sleep 1
endif
@@ -113,81 +113,76 @@ end function
'-------------------------------------------------------------------------------
function GetDecimalSeperator ( sDummy$ ) as String
-'/// Input : number with fractionmark from 'NumericField' as String ///'
-'///+ Output: '.' or ',' as String ///'
- dim i1, i2 as integer
-
-' get position of fraction mark / get IT
- i1 = instr (sDummy$, ",")
- i2 = instr (sDummy$, ".")
- if i1 > i2 then GetDecimalSeperator = "," else GetDecimalSeperator = "."
+ printlog "Input : number with fractionmark from 'NumericField' as String "
+ printlog "+ Output: '.' or ',' as String "
+ dim i1, i2 as integer
+
+ printlog "get position of fraction mark / get IT"
+ i1 = instr (sDummy$, ",")
+ i2 = instr (sDummy$, ".")
+ if i1 > i2 then GetDecimalSeperator = "," else GetDecimalSeperator = "."
end function
'-------------------------------------------------------------------------------
function LiberalMeasurement ( sShould$, sActual$) as Boolean
- '/// Input : (1. Should, 2. Actual) as Number with or without MeasurementUnit 'NumericField' as String ///'
- '///+ if input has no MeasurementUnit i take it as 'cm' (was the default in old tests) ///'
- '///+ Output: Boolean are they likely the same?
- '/// NEEDED: mathematical proofment of iTolerance, by now just some guesses :-| ///'
- '/// reason for this function:///'
- '///+ because SO counts internaly in 'twip???s' 'twentieth of a point' there are some rounding errors ///'
- '///+ there are also some rounding errors because of the internal representatio of floating point numbers in computers ///'
- '///+ now lets try to get rid of them and have a nicer output in tests... ///'
- '/// measurement units are defined in http://gsl.openoffice.org/source/browse/gsl/vcl/source/src/units.src ///'
+ printlog " Input : (1. Should, 2. Actual) as Number with or without MeasurementUnit 'NumericField' as String "
+ printlog "+ if input has no MeasurementUnit i take it as 'cm' (was the default in old tests) "
+ printlog "+ Output: Boolean are they likely the same?"
+ printlog " NEEDED: mathematical proofment of iTolerance, by now just some guesses :-| "
+ printlog " reason for this function:"
+ printlog "+ because SO counts internaly in 'twip???s' 'twentieth of a point' there are some rounding errors "
+ printlog "+ there are also some rounding errors because of the internal representatio of floating point numbers in computers "
+ printlog "+ now lets try to get rid of them and have a nicer output in tests... "
+ printlog " measurement units are defined in http://gsl.openoffice.org/source/browse/gsl/vcl/source/src/units.src "
dim iTolerance as Double
- LiberalMeasurement = False ' worst case
+ LiberalMeasurement = False
- 'trivial
if (sShould$ = sActual$) then
- LiberalMeasurement = True
+ LiberalMeasurement = True
else
- ' check if measunit is the same !!
- if (GetMeasUnit(sShould$) <> GetMeasUnit(sActual$) ) then
- warnlog "In function LiberalMeasurement the measUnit is different, compare not possible yet"
- else
- ' set factor for liberality ;-)
- ' took units from http://gsl.openoffice.org/source/browse/gsl/vcl/source/src/units.src
- select case GetMeasUnit(sShould$)
- case "mm", "ミリ", "公厘" : iTolerance = 2.0 '01, 81, 88
- case "cm","センãƒ","厘米","公分" : iTolerance = 0.5 '01, 81, 86, 88
- case chr$(34) : iTolerance = 2.5
- case "pi","ピクセル" : iTolerance = 2.5 '01, 81
- case "pt", "ãƒã‚¤ãƒ³ãƒˆ" : iTolerance = 2.5 '01, 81
- case "" : iTolerance = 1.5 ' cm is presubposition in old functions
- case else
- iTolerance = 2.5
- qaErrorLog "This Unit is not available in this function. '" + GetMeasUnit(sShould$) + "'"
- end select
- ' have to get the measurem unit, cause the offset is different for each :-(
- ' !!! val(str()) is important because of double calculating actions !!! #110996#
- if ( val(str(StrToDouble(sShould$)+iTolerance)) >= StrToDouble(sActual$) ) AND (val(str(StrToDouble ( sShould$ )-iTolerance)) <= StrToDouble ( sActual$ )) then
- LiberalMeasurement = True
- else
- LiberalMeasurement = False
- 'printlog "LM: ---------------------------: "+sShould$ +":"+sActual$
- end if
- 'printlog "### LibMeas: "+ (StrToDouble(sShould$) + iTolerance) +" - "+ StrToDouble(sShould$) +" - "+ (StrToDouble ( sShould$ ) - iTolerance)+" ; '"+GetMeasUnit(sShould$)+"'"
- end if
+ printlog "check if measunit is the same"
+ if (GetMeasUnit(sShould$) <> GetMeasUnit(sActual$) ) then
+ warnlog "In function LiberalMeasurement the measUnit is different, compare not possible yet"
+ else
+ printlog "set factor for liberality ;-)
+ printlog "took units from http://gsl.openoffice.org/source/browse/gsl/vcl/source/src/units.src"
+ select case GetMeasUnit(sShould$)
+ case "mm", "ミリ", "公厘" : iTolerance = 2.0 '01, 81, 88
+ case "cm","センãƒ","厘米","公分" : iTolerance = 0.5 '01, 81, 86, 88
+ case chr$(34) : iTolerance = 2.5
+ case "pi","ピクセル" : iTolerance = 2.5 '01, 81
+ case "pt", "ãƒã‚¤ãƒ³ãƒˆ" : iTolerance = 2.5 '01, 81
+ case "" : iTolerance = 1.5 ' cm is presubposition in old functions
+ case else
+ iTolerance = 2.5
+ qaErrorLog "This Unit is not available in this function. '" + GetMeasUnit(sShould$) + "'"
+ end select
+ printlog "have to get the measurem unit, cause the offset is different for each"
+ printlog "!!! val(str()) is important because of double calculating actions !!! #110996#"
+ if ( val(str(StrToDouble(sShould$)+iTolerance)) >= StrToDouble(sActual$) ) AND (val(str(StrToDouble ( sShould$ )-iTolerance)) <= StrToDouble ( sActual$ )) then
+ LiberalMeasurement = True
+ else
+ LiberalMeasurement = False
+ end if
+ end if
end if
- 'Printlog "+++++++++++++++++++++++++++++++++++++meas lib was here: "+LiberalMeasurement
end function
'-------------------------------------------------------------------------------
function GetMeasUnit ( sWert$ ) as String
dim iBounder as integer
- '/// Input : Number with or without MeasurementUnit 'NumericField' as String ///'
- '///+ Output: Initials of MeasurementUnit as String or "" when only a number ///'
+ printlog " Input : Number with or without MeasurementUnit 'NumericField' as String "
+ printlog "+ Output: Initials of MeasurementUnit as String or "" when only a number "
iBounder = -1
do
inc iBounder
loop until ( isNumeric(mid (sWert$, len(sWert$)-iBounder, 1)) OR (len(sWert$) <= (iBounder + 1)) )
- ' printlog right (sWert$, iBounder)
if (len(sWert$) <= (iBounder + 1)) then
if isNumeric(left (sWert$, 1)) then
GetMeasUnit = right (sWert$, iBounder)
@@ -209,37 +204,37 @@ function StrToDouble ( sWert$ ) as Double
dim c as double
dim n as integer
- '/// Input : {'a[. ,]b[mm cm " pi pt]' with a, b as integer} as String ///'
- '///+ Output: a[. , ]b as double ///'
+ printlog " Input : {'a[. ,]b[mm cm pi pt]' with a, b as integer} as String "
+ printlog "+ Output: a[. , ]b as double "
- ' get rid of measure unit, the only single character is '"' all others are two chars
- ' there was a problem, if there is NO meas.unit!!!
- if (isNumeric (sWert$) = FALSE) then
- if ( StrComp (right (sWert$, 1), chr$(34) ) = 0 ) then
- sDummy$ = Left ( sWert$, Len(sWert$)-1 )
- else
- sDummy$ = Left ( sWert$, Len(sWert$)-2 )
- endif
- else
- sDummy$ = sWert$
- endif
- ' get position of fraction mark
- i1 = instr (sDummy$, ",") ' wrong output
- i2 = instr (sDummy$, ".")
- if i1 > i2 then i = i1 else i = i2
- ' in front of decimal seperator
- try
+ printlog "get rid of measure unit, the only single character is '' all others are two chars"
+ printlog "there was a problem, if there is NO meas.unit!!"
+ if (isNumeric (sWert$) = FALSE) then
+ if ( StrComp (right (sWert$, 1), chr$(34) ) = 0 ) then
+ sDummy$ = Left ( sWert$, Len(sWert$)-1 )
+ else
+ sDummy$ = Left ( sWert$, Len(sWert$)-2 )
+ endif
+ else
+ sDummy$ = sWert$
+ endif
+ printlog "get position of fraction mark"
+ i1 = instr (sDummy$, ",") ' wrong output
+ i2 = instr (sDummy$, ".")
+ if i1 > i2 then i = i1 else i = i2
+ printlog " in front of decimal seperator:"
+ try
a = val (left (sDummy$,i-1))
- catch
- 'printlog sWert$ + ":" + sDummy$ + ":" + i + ":" + i1+ ":" + i2
- endcatch
- ' after the decimal seperator
- n = (len (sDummy$)-i)
- b = val (right (sDummy$, n) )
- c = b * 10 ^ -n
- 'printlog "-------------- :"+sWert$ +" :'"+a+"' :"+n+" :"+b+" :'"+c+"':"
- ' !!! val(str()) is important because of double calculating actions !!! #110996#
- StrToDouble = val(str(a + c))
+ catch
+ 'printlog sWert$ + ":" + sDummy$ + ":" + i + ":" + i1+ ":" + i2
+ endcatch
+ printlog "after the decimal seperator"
+ n = (len (sDummy$)-i)
+ b = val (right (sDummy$, n) )
+ c = b * 10 ^ -n
+ 'printlog "-------------- :"+sWert$ +" :'"+a+"' :"+n+" :"+b+" :'"+c+"':"
+ ' !!! val(str()) is important because of double calculating actions !!! #110996#
+ StrToDouble = val(str(a + c))
end function
'-------------------------------------------------------------------------------
@@ -265,11 +260,11 @@ end function
'-------------------------------------------------------------------------------
function setStartCurrentPage(optional bState as boolean) as boolean
- '/// tools->options ///'
+ printlog " tools->options "
ToolsOptions
- '///+ select in section 'Presentation' tabpage 'general' ///'
+ printlog "+ select in section 'Presentation' tabpage 'general' "
hToolsOptions ("IMPRESS","General")
- '///+ check the checkbox 'Always with current page' ///'
+ printlog "+ check the checkbox 'Always with current page' "
setStartCurrentPage = MitAktuellerSeite.isChecked
if bState then
MitAktuellerSeite.Check
@@ -277,17 +272,17 @@ function setStartCurrentPage(optional bState as boolean) as boolean
MitAktuellerSeite.UnCheck
endif
Kontext "ExtrasOptionenDlg"
- '///+ close dialog 'Options - Presenation - General' with OK ///'
+ printlog "+ close dialog 'Options - Presenation - General' with OK "
ExtrasOptionenDlg.OK
end function
'-------------------------------------------------------------------------------
function fIsDocumentWritable() as boolean
- '/// check if a document is writeable
- '/// <u>parameter:</u>
- '/// <u>return:</u>
- '/// true if the document is writeable otherwise false
+ printlog " check if a document is writeable
+ printlog " <u>parameter:</u>
+ printlog " <u>return:</u>
+ printlog " true if the document is writeable otherwise false
Kontext "Standardbar"
if Bearbeiten.GetState(2) <> 1 then
@@ -301,10 +296,10 @@ end function
'-------------------------------------------------------------------------------
function fMakeDocumentWritable() as boolean
- '/// make a document is writeable
- '/// <u>parameter:</u>
- '/// <u>return:</u>
- '/// true if the document can make writeable otherwise false
+ printlog " make a document is writeable
+ printlog " <u>parameter:</u>
+ printlog " <u>return:</u>
+ printlog " true if the document can make writeable otherwise false
Kontext "Standardbar"
sleep (1)
@@ -471,16 +466,16 @@ end function
'-------------------------------------------------------------------------------
function hScreenFontAntialiasing (bEnable as boolean) as boolean
- ToolsOptions
- hToolsOptions ("STAROFFICE", "VIEW")
- hScreenFontAntialiasing = FontAntiAliasing.IsChecked
- if (bEnable) then
- FontAntiAliasing.Check
- else
- FontAntiAliasing.Uncheck
- endif
- Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
+ ToolsOptions
+ hToolsOptions ("STAROFFICE", "VIEW")
+ hScreenFontAntialiasing = FontAntiAliasing.IsChecked
+ if (bEnable) then
+ FontAntiAliasing.Check
+ else
+ FontAntiAliasing.Uncheck
+ endif
+ Kontext "ExtrasOptionenDlg"
+ ExtrasOptionenDlg.OK
end function
'-------------------------------------------------------------------------------
@@ -501,17 +496,17 @@ function fSaveLoadAllFormats (NewFileDir as String)
kontext "ExportierenDlg"
endif
Dateiname.SetText (ConvertPath (NewFileDir) + "file" + iFileTypeCounter)
- Dateityp.Select (iFileTypeCounter)
- sleep (1)
- Printlog " Saving file: " + (ConvertPath (NewFileDir) + ("file" + (iFileTypeCounter) + "." + left(right(Dateityp.GetSelText,4),3)))
- SavedFile(iFileTypeCounter) = ("file" + (iFileTypeCounter) + "." + left(right(Dateityp.GetSelText,4),3))
- Speichern.Click
- Kontext "Active"
- if Active.Exists(2) then Active.Yes ' File already exists, overwrite?
- ' printlog " Saved file ( SavedFile(" + iFileTypeCounter + ") ) as: '" + SavedFile(iFileTypeCounter) +"'."
- Kontext "AlienWarning"
- if AlienWarning.Exists(2) then AlienWarning.OK
- kontext "DocumentImpress"
+ Dateityp.Select (iFileTypeCounter)
+ sleep (1)
+ Printlog " Saving file: " + (ConvertPath (NewFileDir) + ("file" + (iFileTypeCounter) + "." + left(right(Dateityp.GetSelText,4),3)))
+ SavedFile(iFileTypeCounter) = ("file" + (iFileTypeCounter) + "." + left(right(Dateityp.GetSelText,4),3))
+ Speichern.Click
+ Kontext "Active"
+ if Active.Exists(2) then Active.Yes ' File already exists, overwrite?
+ 'printlog " Saved file ( SavedFile(" + iFileTypeCounter + ") ) as: '" + SavedFile(iFileTypeCounter) +"'."
+ Kontext "AlienWarning"
+ if AlienWarning.Exists(2) then AlienWarning.OK
+ kontext "DocumentImpress"
Next iFileTypeCounter
printlog "Close the file."
FileClose
@@ -567,22 +562,22 @@ end function
'-------------------------------------------------------------------------------
function toggleGermanSpellchecking as string
-
- '/// activate old german spellchecking ///'
- '///+ Tools->Options ///'
+
+ printlog " activate old german spellchecking "
+ printlog "+ Tools->Options "
ToolsOptions
- '///+ select tabpage 'writing aids' in category 'Languagesettings' ///'
+ printlog "+ select tabpage 'writing aids' in category 'Languagesettings' "
hToolsOptions("LANGUAGESETTINGS","WRITINGAIDS")
kontext "TabLinguistik"
- '///+ hopefully it never changes for any reason between the languages!: select the 8th entry 'German spelling - old' ///'
- printlog " - 'German Spelling - old' ?= " + Optionen.getItemText(8)
- Optionen.select(8)
- '///+ default is 'unselected' - i can't check it automatically - so i depend on it! ///'
- '///+ press [space] to select it///'
+ printlog "+ hopefully it never changes for any reason between the languages!: select the 8th entry 'German spelling - old' "
+ printlog " - 'German Spelling - old' ?= " + Optionen.getItemText(8)
+ Optionen.select(8)
+ printlog "+ default is 'unselected' - i can't check it automatically - so i depend on it! "
+ printlog "+ press [space] to select it"
Optionen.typeKeys "<space>"
Kontext "ExtrasOptionenDlg"
- '///+ close options with OK button ///'
- ExtrasOptionenDlg.OK
+ printlog "+ close options with OK button "
+ ExtrasOptionenDlg.OK
end function
'-------------------------------------------------------------------------------
@@ -602,14 +597,14 @@ function sAnalyseContextMenu(iItems as integer, optional iError as long) as inte
dim bDifferent as boolean
dim iInternError as long
dim iError1 as long ' misplaced
-' i22192: context menu opens not on cursor position
+ 'i22192: context menu opens not on cursor position
dim iError2 as long ' no context menu
- '/// goto start of textbox ///'
+ printlog "goto start of textbox "
call hTypeKeys "<mod1 home>"
- '/// for every word, check the context menu to get suggestions for correction ///'
+ printlog "for every word, check the context menu to get suggestions for correction "
for i = 0 to (iItems-1)
- '/// copy current word to clipboard ///'
+ printlog " copy current word to clipboard "
call hTypeKeys "<Shift mod1 right>"
EditCopy
sCandidates(1) = getClipboardText()
@@ -617,7 +612,7 @@ function sAnalyseContextMenu(iItems as integer, optional iError as long) as inte
sCandidates(1) = left(sCandidates(1),len(sCandidates(1))-1)
end if
call hTypeKeys "<mod1 left>"
- '/// open context menu ///'
+ printlog " open context menu "
printlog " About to call the ContextMenu."
call hOpenContextMenu()
sleep 3
@@ -625,7 +620,7 @@ function sAnalyseContextMenu(iItems as integer, optional iError as long) as inte
' collecting criteria for underlining:
' 1st one: is word selected? yes: underlined;
- '/// If the string "vnd.sun.search:SubMenu" (the SunSearch-menu) is found in the menu, we'll skip that word. ///'
+ printlog " If the string "vnd.sun.search:SubMenu" (the SunSearch-menu) is found in the menu, we'll skip that word. "
'Get first entry.
f = MenuGetItemCommand (MenuGetItemID (1))
@@ -669,15 +664,15 @@ function sAnalyseContextMenu(iItems as integer, optional iError as long) as inte
' if context menu open do....
if (not bNoContextMenu) then
' printlog ""+i+" C: " + x + ";------ " + getClipboardText + " -------- " + hMenuItemGetText(1)
- '/// analyze context menu entries ///'
+ printlog " analyze context menu entries "
for y = 1 to x
z = hMenuGetItemId(y)
if (1 = y) then iSlot = z ' criteria for WorkAround
if (z = 27019) then iSpecialCharacterEntry = y ' entry to select for WorkAround
Printlog ("---i: "+ y +"; " + z + " ; " +hMenuItemGetText(y) + " ; " + hMenuGetItemCommand(y))
next y
- '/// if first slot not a spelling suggestion -> WorkAround 112919 ///'
- '/// close Context Menu ///'
+ printlog " if first slot not a spelling suggestion -> WorkAround 112919 "
+ printlog " close Context Menu "
if (iSlot <> 10456) then
if (not bDifferent) then ' WorkAround ##
' qaerrorlog "" + iSlot + " UNDERLINED"
@@ -697,10 +692,10 @@ function sAnalyseContextMenu(iItems as integer, optional iError as long) as inte
call hMenuClose()
end if
Sleep (1)
- '/// goto next word with keys [strg]+[right] ///'
+ printlog " goto next word with keys [strg]+[right] "
call hTypeKeys "<mod1 right>"
next i
- '/// leave textbox edit mode ///'
+ printlog " leave textbox edit mode "
iInternError = iError1 OR iError2
if (iError1 > 0) then
@@ -768,20 +763,20 @@ function fGetIntoDictionary as boolean
dim bFound as boolean
dim iBooks as integer
dim i as integer
-
+
iBooks = Benutzerwoerterbuch.GetItemCount
i=0
bFound=TRUE
while (bFound AND (i < iBooks))
- inc i
- Benutzerwoerterbuch.select i
- printlog Benutzerwoerterbuch.getSelText + i
- try
- Bearbeiten.Click
- bFound = FALSE
- catch
- printLog "wIgLi" + i
- endcatch
+ inc i
+ Benutzerwoerterbuch.select i
+ printlog Benutzerwoerterbuch.getSelText + i
+ try
+ Bearbeiten.Click
+ bFound = FALSE
+ catch
+ printLog "wIgLi" + i
+ endcatch
wend
fGetIntoDictionary = bFound
end function
@@ -789,15 +784,15 @@ end function
'-------------------------------------------------------------------------------
function hSelectInList (window, sEntry as String) as Boolean
-'/// alternativ method to 'hDoubleClickInList' (without mouse) ///'
-'///+ window: name of list ///'
-'///+ sEntry: string to find in list ///'
-'///+ ReturnValue: if found: TRUE; else FALSE ///'
+printlog " alternativ method to 'hDoubleClickInList' (without mouse) "
+printlog "+ window: name of list "
+printlog "+ sEntry: string to find in list "
+printlog "+ ReturnValue: if found: TRUE; else FALSE "
Dim i as Integer
Dim sTemp as String
Dim sLastTemp as String
- '/// go through list from bottom and stop on the entry sEntry ///'
+ printlog " go through list from bottom and stop on the entry sEntry "
window.TypeKeys "<End>"
sTemp = ""
do
@@ -805,7 +800,7 @@ function hSelectInList (window, sEntry as String) as Boolean
sTemp = window.GetText
window.TypeKeys "<Up>"
loop while ((sEntry <> sTemp) AND (sLastTemp <> sTemp))
- '/// press key [Return] ///'
+ printlog " press key [Return] "
if (sEntry = sTemp) then
window.TypeKeys "<Return>"
hSelectInList = TRUE
@@ -825,7 +820,7 @@ function hWalkTheStyles2 (atemp)
dim aSettings(5,5)
' dim atemp
- '/// Organizer ///'
+ printlog " Organizer "
i=1
Kontext
printlog aSettings(i,3)
@@ -833,12 +828,11 @@ function hWalkTheStyles2 (atemp)
printlog val(aSettings(i,1))
printlog atemp
Messagebox.SetPage TabArea
- kontext "TabArea"
- 'press button standard :-))))))
+ kontext "TabArea"
atemp = Hatching
printlog atemp
- if aSettings(i,3) then
+ if aSettings(i,3) then
itemp = val(aSettings(i,1))
printlog isobject(atemp)
printlog isNumeric(atemp)
@@ -848,108 +842,107 @@ function hWalkTheStyles2 (atemp)
else
' aSettings(i,1).Uncheck
endif
- 'print "baeh"
i=2
Kontext
Messagebox.SetPage TabSchatten
- kontext "TabSchatten"
+ kontext "TabSchatten"
Kontext
Messagebox.SetPage TabVerwalten
- kontext "TabVerwalten"
- '/// Line ///'
+ kontext "TabVerwalten"
+ printlog " Line "
i=2
Kontext
Messagebox.SetPage TabLinie
- kontext "TabLinie"
- 'Context: *Line; Line Styles; Arrow Styles
- '/// Area ///'
+ kontext "TabLinie"
+ 'Context: *Line; Line Styles; Arrow Styles
+ printlog " Area "
i=3
Kontext
Messagebox.SetPage TabArea
- kontext "TabArea"
- 'Context: *Area; *Shadow; Transparency; Colors; Gradients; Hatching; Bitmaps
- '/// Shadowing ///'
+ kontext "TabArea"
+ 'Context: *Area; *Shadow; Transparency; Colors; Gradients; Hatching; Bitmaps
+ printlog " Shadowing "
i=4
Kontext
Messagebox.SetPage TabSchatten
- kontext "TabSchatten"
- '/// Transparency ///'
+ kontext "TabSchatten"
+ printlog " Transparency "
i=5
Kontext
Messagebox.SetPage TabTransparenz
- kontext "TabTransparenz"
- '/// Font ///'
+ kontext "TabTransparenz"
+ printlog " Font "
i=6
Kontext
Messagebox.SetPage TabFont
- kontext "TabFont"
- 'Context: *Font; *Font Effect; Position
- '/// Font Effect ///'
+ kontext "TabFont"
+ 'Context: *Font; *Font Effect; Position
+ printlog " Font Effect "
i=7
Kontext
Messagebox.SetPage TabFontEffects
- kontext "TabFontEffects"
- '/// Indents & Spacing ///'
+ kontext "TabFontEffects"
+ printlog " Indents & Spacing "
i=8
Kontext
Messagebox.SetPage TabEinzuegeUndAbstaende
- kontext "TabEinzuegeUndAbstaende"
- 'Context: *Indents & Spacing; *Alignment; *Tabs
- '/// Text ///'
+ kontext "TabEinzuegeUndAbstaende"
+ 'Context: *Indents & Spacing; *Alignment; *Tabs
+ printlog " Text "
i=9
Kontext
Messagebox.SetPage TabText
- Kontext "TabText"
- 'Context: *Text; *Text Animation
- '/// Text Animation ///'
+ Kontext "TabText"
+ 'Context: *Text; *Text Animation
+ printlog " Text Animation "
i=10
Kontext
Messagebox.SetPage TabLauftext
- Kontext "TabLauftext"
- '/// Dimensioning ///'
+ Kontext "TabLauftext"
+ printlog " Dimensioning "
i=11
Kontext
Messagebox.SetPage TabBemassung
- Kontext "TabBemassung"
- '/// Connector ///'
+ Kontext "TabBemassung"
+ printlog " Connector "
i=12
Kontext
Messagebox.setpage TabVerbinder
- Kontext "TabVerbinder"
- '/// Alignment ///'
+ Kontext "TabVerbinder"
+ printlog " Alignment "
i=13
Kontext
Messagebox.setpage TabAusrichtungAbsatz
- Kontext "TabAusrichtungAbsatz"
- '/// Tabs ///'
+ Kontext "TabAusrichtungAbsatz"
+ printlog " Tabs "
i=14
Kontext
Messagebox.setpage TabTabulator
- Kontext "TabTabulator"
+ Kontext "TabTabulator"
-' '/// switch to tabpage 'Bullets' ///'
+' printlog " switch to tabpage 'Bullets' "
' Messagebox.SetPage TabBullet
' Kontext "TabBullet"
' sleep 1
' Call DialogTest (TabBullet)
' sleep 1
' Kontext
-' '/// switch to tabpage 'Numbering Type' ///'
+' printlog " switch to tabpage 'Numbering Type' "
' Messagebox.SetPage TabNumerierungsart
' Kontext "TabNumerierungsart"
' sleep 1
' Call DialogTest (TabNumerierungsart)
' sleep 1
' Kontext
-' '/// switch to tabpage 'Graphics' ///'
+' printlog " switch to tabpage 'Graphics' "
' Messagebox.SetPage TabGrafiken
' Kontext "TabGrafiken"
' sleep 1
' Call DialogTest (TabGrafiken)
' sleep 1
' Kontext
-' '/// switch to tabpage 'Customize' ///'
+' printlog " switch to tabpage 'Customize' "
' Messagebox.SetPage TabOptionenNumerierung
' Kontext "TabOptionenNumerierung"
' sleep 1
@@ -960,11 +953,11 @@ end function
'-------------------------------------------------------------------------------
function fGetSlideNumber (optional sCompare as integer) as integer
- '/// PRESUPPOSITION: open Navigator ///'
- '///+ ENTRY: with or without a string ///'
- '///+ if string is given, it is compared with the actual selected slidename in the navigator, if not equal print warnlog ///'
- '///+ RETURN: selected slidename in the navigator / empty string if navvigator is not open ///'
- '///+ EXIT: kontext on DocumentPresentation ///'
+ printlog " PRESUPPOSITION: open Navigator "
+ printlog "+ ENTRY: with or without a string "
+ printlog "+ if string is given, it is compared with the actual selected slidename in the navigator, if not equal print warnlog "
+ printlog "+ RETURN: selected slidename in the navigator / empty string if navvigator is not open "
+ printlog "+ EXIT: kontext on DocumentPresentation "
Kontext "NavigatorDraw"
printlog "Checking if navigator is open, closing and opening for updating.."
@@ -973,7 +966,7 @@ function fGetSlideNumber (optional sCompare as integer) as integer
sleep 3
ViewNavigator
sleep 3
- '/// check in list, if the page changed ///'
+ printlog " check in list, if the page changed "
else
printlog "If Navigator is not open, opening it now."
@@ -996,12 +989,12 @@ end function
'-------------------------------------------------------------------------------
function fGetSlideCount (optional iCount as integer) as integer
- '/// purpose: open navigator in impress and check/get number of slides from listbox ///'
- '///+ input : optional number of slides, to compare to: if different warnlog ///'
- '///+ output : number of slides in presentation ///'
+ printlog " purpose: open navigator in impress and check/get number of slides from listbox "
+ printlog "+ input : optional number of slides, to compare to: if different warnlog "
+ printlog "+ output : number of slides in presentation "
dim i as integer
- '/// open navigator ///'
+ printlog " open navigator "
Kontext "Navigator"
if Navigator.exists then
Printlog "Navigator: open :-)"
@@ -1010,7 +1003,7 @@ function fGetSlideCount (optional iCount as integer) as integer
ViewNavigator
endif
Sleep 1
- '/// count rows in list of navigator: usually number of slides ///'
+ printlog " count rows in list of navigator: usually number of slides "
Kontext "NavigatorDraw"
i = Liste.GetItemCount
if (isMissing(iCount) = FALSE) then
@@ -1020,7 +1013,7 @@ function fGetSlideCount (optional iCount as integer) as integer
Printlog "ok"
endif
endif
- '/// close navigator ///'
+ printlog " close navigator "
ViewNavigator
fGetSlideCount = i
end function
@@ -1028,13 +1021,13 @@ end function
'-------------------------------------------------------------------------------
function fGetSlideName (optional sCompare as string) as string
-'/// PRESUPPOSITION: open Navigator ///'
-'///+ ENTRY: with or without a string ///'
-'///+ if string is given, it is compared with the actual selected slidename in the navigator, if not equal print warnlog ///'
-'///+ RETURN: selected slidename in the navigator / empty string if navvigator is not open ///'
-'///+ EXIT: kontext on DocumentPresentation ///'
+ printlog " PRESUPPOSITION: open Navigator "
+ printlog "+ ENTRY: with or without a string "
+ printlog "+ if string is given, it is compared with the actual selected slidename in the navigator, if not equal print warnlog "
+ printlog "+ RETURN: selected slidename in the navigator / empty string if navvigator is not open "
+ printlog "+ EXIT: kontext on DocumentPresentation "
- Kontext "NavigatorDraw"
+ Kontext "NavigatorDraw"
if NavigatorDraw.exists (5) then
sleep 3
printlog "check in list, if the page changed"
@@ -1056,13 +1049,13 @@ end function
'------------------------------------------------------------------------------
function fGetSetPageBackground (iSelect as integer, iWhere as integer) as integer
+
+ printlog " Get or Set the Page Background via stylist (iWhere = 0) or format menue (...= 1) "
+ printlog "+ if iSelect > 0 then set, else get "
+ printlog "+ return selected color number or -1 on error "
-'/// Get or Set the Page Background via stylist (iWhere = 0) or format menue (...= 1) ///'
-'///+ if iSelect > 0 then set, else get ///'
-'///+ return selected color number or -1 on error ///'
-
- if (iWhere = 0) then
- '/// Stylist -> Background -> Kontext menu -> modify -> Area -> Color ///'
+ if (iWhere = 0) then
+ printlog " Stylist -> Background -> Kontext menu -> modify -> Area -> Color "
fGetSetPageBackground = -1 ' worst case
Kontext "Stylist"
if Stylist.NotExists (5) then
@@ -1079,13 +1072,13 @@ function fGetSetPageBackground (iSelect as integer, iWhere as integer) as intege
sleep 1
hMenuSelectNr (1)
else
- '/// Format -> Page -> Background -> Color ///''FormatPage
+ printlog " Format -> Page -> Background -> Color "'FormatPage
sleep 1
try ' this was just paranoia to find a not mentioned messagebox
FormatSlideDraw
- catch
- warnlog "slooooow slot TBO :-("
- exit function
+ catch
+ warnlog "slooooow slot TBO :-("
+ exit function
endcatch
sleep 1
Kontext
@@ -1140,7 +1133,7 @@ function fGetSetPageBackground (iSelect as integer, iWhere as integer) as intege
endif
if (iWhere = 0) then
- sleep 1 ' ABSOLUT NECESSARRY !!! (TBO) else crash on UNIX on following command!!!!
+ sleep 1 ' ABSOLUT NECESSARY !!! (TBO) else crash on UNIX on following command!!!!
FormatStylist ' closing
endif
sleep 4
@@ -1157,13 +1150,13 @@ function CreateTextSetEffectAndAngle
WaitSlot (1000)
EffectAdd.Click
kontext
- '/// Switch to TabPage: Entrance ///'
+ printlog " Switch to TabPage: Entrance "
active.setPage(TabEntrance)
kontext "TabEntrance"
if TabEntrance.exists(5) then
- '/// select in the listbox 'Effects' the second entry///'
+ printlog " select in the listbox 'Effects' the second entry"
Effects.select (24)
- '/// select speed 'Fast' -> fourth item in list ///'
+ printlog " select speed 'Fast' -> fourth item in list "
Speed.Select 2
TabEntrance.OK
end if
@@ -1186,14 +1179,14 @@ end function
'-------------------------------------------------------------------------------
function fGetPresentationStyle (optional sCompare as integer) as integer
- '///+ ENTRY: with or without a string ///'
- '///+ if string is given, it is compared with the LAST CHARACTER of the actual selected style in the stylist, if not equal print warnlog ///'
- '///+ RETURN: LAST CHARACTER of the actual selected style in the stylist ///'
+ printlog "+ ENTRY: with or without a string "
+ printlog "+ if string is given, it is compared with the LAST CHARACTER of the actual selected style in the stylist, if not equal print warnlog "
+ printlog "+ RETURN: LAST CHARACTER of the actual selected style in the stylist "
dim sTemp as integer
dim sTemp0 as string
sTemp = (-1)
- '/// open stylist if not already open: Format->Stylist ///'
+ printlog " open stylist if not already open: Format->Stylist "
kontext "Stylist"
if (Stylist.exists = FALSE) then
try
@@ -1332,7 +1325,7 @@ function optionstest
for ota = 1 to TextAnimation.GetItemCount
TextAnimation.Select ota
next ota
- '/// switch to TabPage 'Timing' ///'
+ printlog " switch to TabPage 'Timing' "
Kontext
Active.SetPage TabTiming
kontext "TabTiming"
@@ -1373,7 +1366,7 @@ function optionstest
else
warnlog "Impress:Tasks Pane:Custom Animation:Effect Options: Timing TabPage didn't work."
endif
- '/// switch to TabPage 'Timing' ///'
+ printlog " switch to TabPage 'Timing' "
Kontext
active.setPage TabTextAnimation
kontext "TabTextAnimation"
@@ -1434,7 +1427,7 @@ function optionstest2
if Play.IsEnabled then
Play.Click
else
- warnlog " Play should have been enabled after selecting a sound."
+ warnlog "Play should have been enabled after selecting a sound."
endif
AfterAnimation.Select 2
if DimColor.isEnabled then
@@ -1448,7 +1441,7 @@ function optionstest2
else
Warnlog "DelayBetweenCharacters should have been enabled"
endif
- '/// switch to TabPage 'Timing' ///'
+ printlog " switch to TabPage 'Timing' "
Kontext
Active.SetPage TabTiming
kontext "TabTiming"
@@ -1510,7 +1503,7 @@ function optionstest2
else
warnlog "Impress:Tasks Pane:Custom Animation:Effect Options: Timing TabPage didn't work."
endif
- '/// switch to TabPage 'Timing' ///'
+ printlog " switch to TabPage 'Timing' "
Kontext
active.setPage TabTextAnimation
kontext "TabTextAnimation"
diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc
index afae1b5..0cdb904 100755
--- a/testautomation/graphics/tools/id_tools_2.inc
+++ b/testautomation/graphics/tools/id_tools_2.inc
@@ -91,8 +91,8 @@
sub sFileExport
- '/// just exporting is done in qatesttool/framework/first test: 'tGraphicExport' but there is no loading, ///'
- '///+ of the created files and the items on the dialogs are not checked completely ///'
+ printlog " just exporting is done in qatesttool/framework/first test: 'tGraphicExport' but there is no loading, "
+ printlog "+ of the created files and the items on the dialogs are not checked completely "
Dim ExZaehler as Integer
Dim ExPath as String
Dim Liste( 50 ) as String
@@ -103,10 +103,10 @@ sub sFileExport
ExtensionString = "odg"
end if
- '///- all files are saved in [StarOfficePath]/user/work/[applicatoion]/export ///'
+ printlog "- all files are saved in [StarOfficePath]/user/work/[application]/export "
ExPath = ConvertPath (gOfficePath + "user\work\" + gApplication + "\export\" )
OutputGrafikTBO = ExPath & "expo"
- Printlog "Create the export-dir for the graphics ( " + ExPath + " )"
+ Printlog "Create the export-dir for the graphics ( + ExPath + )"
try
app.mkDir ( ExPath )
ExZaehler = GetFileList ( ExPath , "*.*" , Liste() )
@@ -121,7 +121,7 @@ sub sFileExport
exit sub
endcatch
- '///+ open the test document qatesttool/graphics/required/input/graphicexport.od ? ] ///'
+ printlog "+ open the test document qatesttool/graphics/required/input/graphicexport.od ? ] "
end sub
@@ -216,9 +216,9 @@ sub sPrintCheckOrder (optional bcheck as boolean)
dim sTemp as string
dim sTemp2 as string
dim i as integer
- '/// deselect all ///'
+ printlog " deselect all "
Printlog "-----------------------------------"
- '/// select in default order and take Position X in mind ;-) ///'
+ printlog " select in default order and take Position X in mind ;-) "
hTypeKeys ("<escape><escape>")
for i = 1 to 3
hTypeKeys ("<TAB>")
@@ -295,7 +295,7 @@ end sub
'-------------------------------------------------------------------------------
sub Select_Copy
- '/// Select and copy ///'
+ printlog " Select and copy "
Sleep 10
if gApplication = "DRAW" then
EditSelectAll
@@ -323,7 +323,7 @@ sub SaveMeasurementSetFirst
elseIf (gApplication = "CALC") then
sApplication = "CALC"
endif
- printlog " '/// - save states ///'"
+ printlog " printlog " - save states ""
ToolsOptions
hToolsOptions (sApplication,"General")
ReferenceOld = Masseinheit.GetSelText
@@ -375,7 +375,7 @@ sub ResetMeasurement
elseIf (gApplication = "CALC") then
sApplication = "CALC"
endif
- printlog "'/// - Reset states back to what they were before ///'"
+ printlog "printlog " - Reset states back to what they were before ""
ToolsOptions
hToolsOptions (sApplication,"General")
if Masseinheit.GetSelText <> ReferenceOld then 'find the right one.
@@ -398,19 +398,19 @@ sub SetKontextApplication
Select Case gApplication
Case "DRAW"
Kontext "DocumentDraw"
- ' Printlog "gApplication / Kontext is now: DocumentDraw"
+ 'Printlog "gApplication / Kontext is now: DocumentDraw"
sleep 1
Case "IMPRESS"
Kontext "DocumentImpress"
- ' Printlog "gApplication / Kontext is now is now: DocumentImpress"
+ 'Printlog "gApplication / Kontext is now is now: DocumentImpress"
sleep 1
Case "WRITER"
Kontext "DocumentWriter"
- ' Printlog "gApplication / Kontext is now is now: DocumentWriter"
+ 'Printlog "gApplication / Kontext is now is now: DocumentWriter"
sleep 1
Case "CALC"
Kontext "DocumentCalc"
- ' Printlog "gApplication / Kontext is now is now: DocumentCalc"
+ 'Printlog "gApplication / Kontext is now is now: DocumentCalc"
sleep 1
end select
sleep 1
@@ -419,33 +419,33 @@ end sub
'-------------------------------------------------------------------------------
sub hSetSpellHypLanguage
-'/// select a language with a dictionary, used for spellcheck, thesaurus and hyphenation ///'
+printlog " select a language with a dictionary, used for spellcheck, thesaurus and hyphenation "
dim sTrieit as string
' only for asian languages i need to set the default language for the current document to 'English(USA)'
' in all other languages the default has a dictionary
if (bAsianLan or (iSprache=55)) then
- '/// Tools->Options ///'
+ printlog " Tools->Options "
ToolsOptions
- '/// select from section 'Language Settings' the item 'Languages' ///'
+ printlog " select from section 'Language Settings' the item 'Languages' "
hToolsOptions ("LANGUAGESETTINGS","LANGUAGES")
- '/// check checkbox 'For the current document only' in section 'Default languages for document' ///'
+ printlog " check checkbox 'For the current document only' in section 'Default languages for document' "
AktuellesDokument.Check
- '/// If there is no Language defined in 'locale-file' (in same directory as this file is) be smart and select one that supports spellchecking ///'
+ printlog " If there is no Language defined in 'locale-file' (in same directory as this file is) be smart and select one that supports spellchecking "
if (glLocale(4) = "") then
Kontext "ExtrasOptionenDlg"
- '///+ cancel dialog 'Options - ' ///'
+ printlog "+ cancel dialog 'Options - ' "
ExtrasOptionenDlg.Cancel
- '///+ call the smart subroutine that tells you a valid language with an dictionary ///'
+ printlog "+ call the smart subroutine that tells you a valid language with an dictionary "
sTrieit = hFindSpellHypLanguage
- '///+ Tools->Options ///'
+ printlog "+ Tools->Options "
ToolsOptions
- '///+ select from section 'Language Settings' the item 'Languages' ///'
+ printlog "+ select from section 'Language Settings' the item 'Languages' "
hToolsOptions ("LANGUAGESETTINGS","LANGUAGES")
- '///+ check checkbox 'For the current document only' in section 'Default languages for document' ///'
+ printlog "+ check checkbox 'For the current document only' in section 'Default languages for document' "
AktuellesDokument.Check
- '/// if smart routine found something, select it in section 'Default languages for document' listbox 'Western' ///'
- '///+ (manual users just select a language that has an icon in front of it ('ABC' with a checkmark) ///'
+ printlog " if smart routine found something, select it in section 'Default languages for document' listbox 'Western' "
+ printlog "+ (manual users just select a language that has an icon in front of it ('ABC' with a checkmark) "
if (sTrieit <> "") then
try
Westlich.Select sTrieit
@@ -456,11 +456,11 @@ sub hSetSpellHypLanguage
qaErrorLog "Sorry no spellbook found: id_tools.inc::hSetSpellHypLanguage"
endif
else
- '/// if a Language is already defined in the textfile ///'
+ printlog " if a Language is already defined in the textfile "
printlog glLocale (4)
try
- '/// select it in section 'Default languages for document' listbox 'Western' ///'
- '///+ (manual users just select a language that has an icon in front of it ('ABC' with a checkmark) ///'
+ printlog " select it in section 'Default languages for document' listbox 'Western' "
+ printlog "+ (manual users just select a language that has an icon in front of it ('ABC' with a checkmark) "
try
Westlich.Select glLocale (4)
catch
@@ -478,7 +478,7 @@ sub hSetSpellHypLanguage
printlog "selected: '" + Asiatisch.GetSelText + "'"
endcatch
Kontext "ExtrasOptionenDlg"
- '///+ close dialog 'Options - ' with OK ///'
+ printlog "+ close dialog 'Options - ' with OK "
ExtrasOptionenDlg.OK
endif
end sub
@@ -546,7 +546,7 @@ sub mouseclickinpresentation
Kontext "DocumentPresentation"
autoexecute=false
- DocumentPresentation.MouseDown ( 50, 50 ) '/// switch slides using mouse clicks ///'
+ DocumentPresentation.MouseDown ( 50, 50 ) printlog " switch slides using mouse clicks "
DocumentPresentation.MouseUp ( 50, 50 )
autoexecute=true
end sub
@@ -837,7 +837,7 @@ sub id_005
call tiFormatStylesSlideDesign
call tiFormatFontwork
call tiFormatGroup
- '/// format->group is also modify->group ///'
+ printlog " format->group is also modify->group "
' tiFormatLayer ' not in impress
end sub
@@ -931,58 +931,58 @@ sub hWalkTheStyles (optional a as integer,optional b as integer)
i=1
if a <= i AND i <= b then
Kontext
- '/// switch to tabpage 'Line' ///'
+ printlog " switch to tabpage 'Line' "
Messagebox.SetPage TabLinie
kontext "TabLinie"
Call DialogTest ( TabLinie )
Kontext
- '/// switch to tabpage 'Area' ///'
+ printlog " switch to tabpage 'Area' "
Messagebox.SetPage TabArea
kontext "TabArea"
Call DialogTest ( TabArea )
- '/// select radio button 'none' ///'
+ printlog " select radio button 'none' "
NoFill.Check
Call DialogTest ( TabArea, 1 )
- '/// select radio button 'color' ///'
+ printlog " select radio button 'color' "
Color.Check
Call DialogTest ( TabArea, 2 )
- '/// select radio button 'gradient' ///'
+ printlog " select radio button 'gradient' "
Gradient.Check
Call DialogTest ( TabArea, 3 )
- '/// select radio button 'hatching' ///'
+ printlog " select radio button 'hatching' "
Hatching.Check
Call DialogTest ( TabArea, 4 )
- '/// select radio button 'bitmap' ///'
+ printlog " select radio button 'bitmap' "
Bitmap.Check
Call DialogTest ( TabArea, 5 )
Kontext
- '/// switch to tabpage 'shadowing' ///'
+ printlog " switch to tabpage 'shadowing' "
Messagebox.SetPage TabSchatten
kontext "TabSchatten"
- '/// check 'use shadow' ///'
+ printlog " check 'use shadow' "
Anzeigen.check
Call DialogTest ( TabSchatten )
Kontext
- '/// switch to tabpage 'Transparency' ///'
+ printlog " switch to tabpage 'Transparency' "
Messagebox.SetPage TabTransparenz
kontext "TabTransparenz"
- '/// check 'No transparency' ///'
+ printlog " check 'No transparency' "
KeineTransparenz.Check
- '/// check 'Transparency' ///'
+ printlog " check 'Transparency' "
LineareTransparenz.Check
- '/// check 'Gradient' ///'
+ printlog " check 'Gradient' "
Transparenzverlauf.Check
Kontext
- '/// switch to tabpage 'Font' ///'
+ printlog " switch to tabpage 'Font' "
Messagebox.SetPage TabFont
kontext "TabFont"
Call DialogTest ( TabFont )
Kontext
- '/// switch to tabpage 'Font Effect' ///'
+ printlog " switch to tabpage 'Font Effect' "
Messagebox.SetPage TabFontEffects
kontext "TabFontEffects"
Kontext
- '/// switch to tabpage 'indents & spacing' ///'
+ printlog " switch to tabpage 'indents & spacing' "
Messagebox.SetPage TabEinzuegeUndAbstaende
kontext "TabEinzuegeUndAbstaende"
Call DialogTest ( TabEinzuegeUndAbstaende )
@@ -990,32 +990,32 @@ sub hWalkTheStyles (optional a as integer,optional b as integer)
i=2
if a <= i AND i <= b then
Kontext
- '/// switch to tabpage 'Organize' ///'
+ printlog " switch to tabpage 'Organize' "
Messagebox.SetPage TabVerwalten
kontext "TabVerwalten"
Call DialogTest ( TabVerwalten )
Kontext
- '/// switch to tabpage 'text' ///'
+ printlog " switch to tabpage 'text' "
Messagebox.SetPage TabText
Kontext "TabText"
Call DialogTest ( TabText )
Kontext
- '/// switch to tabpage 'text animation' ///'
+ printlog " switch to tabpage 'text animation' "
Messagebox.SetPage TabLauftext
Kontext "TabLauftext"
Call DialogTest ( TabLauftext )
Kontext
- '/// switch to tabpage 'dimension' ///'
+ printlog " switch to tabpage 'dimension' "
Messagebox.SetPage TabBemassung
Kontext "TabBemassung"
Call DialogTest ( TabBemassung )
Kontext
- '/// switch to tabpage 'connector' ///'
+ printlog " switch to tabpage 'connector' "
Messagebox.setpage TabVerbinder
Kontext "TabVerbinder"
Call Dialogtest ( TabVerbinder )
Kontext
- '/// switch to tabpage 'alignment' ///'
+ printlog " switch to tabpage 'alignment' "
Messagebox.setpage TabAusrichtungAbsatz
Kontext "TabAusrichtungAbsatz"
Links.Check
@@ -1023,44 +1023,44 @@ sub hWalkTheStyles (optional a as integer,optional b as integer)
Zentriert.Check
Blocksatz.Check
Kontext
- '/// switch to tabpage 'Tabs' ///'
+ printlog " switch to tabpage 'Tabs' "
Messagebox.setpage TabTabulator
Kontext "TabTabulator"
- '/// click 'new' ///'
+ printlog " click 'new' "
Neu.click
- '/// ' MAYBE CHECK COUNT OF THIS ?? Position svx:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS ///'
- '/// click 'delete all' ///'
+ printlog " ' MAYBE CHECK COUNT OF THIS ?? Position svx:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS "
+ printlog " click 'delete all' "
AlleLoeschen.click
- '/// click 'new' ///'
+ printlog " click 'new' "
Neu.click
- '/// click 'delete' ///'
+ printlog " click 'delete' "
Loeschen.click
endif
i=3
if a <= i AND i <= b then
Kontext
- '/// switch to tabpage 'Bullets' ///'
+ printlog " switch to tabpage 'Bullets' "
Messagebox.SetPage TabBullet
Kontext "TabBullet"
sleep 1
Call DialogTest (TabBullet)
sleep 1
Kontext
- '/// switch to tabpage 'Numbering Type' ///'
+ printlog " switch to tabpage 'Numbering Type' "
Messagebox.SetPage TabNumerierungsart
Kontext "TabNumerierungsart"
sleep 1
Call DialogTest (TabNumerierungsart)
sleep 1
Kontext
- '/// switch to tabpage 'Graphics' ///'
+ printlog " switch to tabpage 'Graphics' "
Messagebox.SetPage TabGrafiken
Kontext "TabGrafiken"
sleep 1
Call DialogTest (TabGrafiken)
sleep 1
Kontext
- '/// switch to tabpage 'Customize' ///'
+ printlog " switch to tabpage 'Customize' "
Messagebox.SetPage TabOptionenNumerierung
Kontext "TabOptionenNumerierung"
sleep 1
diff --git a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc
index 484aa30..84da963 100755
--- a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc
+++ b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc
@@ -140,7 +140,7 @@ testcase tIBIS111158
'/// Enter in 'Help URL' as value exactly 'HID:123456'
TabGeneralControl.TypeKeys "<TAB>" , true
HelpURL.setText "HID:123456"
- TabGeneralControl.TypeKeys "<RETURN>",true
+ HelpURL.TypeKeys "<RETURN>",true
if HelpURL.GetText <> "HID:123456" then
warnlog "'HID:123456' has not been accepted as 'Help URL' value."
end if
commit bf5ba74d61fd1a3138e47376ea7a0fc462cd0c0c
Author: Kurt Zenker <kz at openoffice.org>
Date: Thu Jun 4 16:21:29 2009 +0000
CWS-TOOLING: integrate CWS clnoundo
2009-05-18 09:40:22 +0200 wg r271998 : i102011
2009-04-28 12:20:24 +0200 cl r271318 : CWS-TOOLING: rebase CWS clnoundo to trunk at 270723 (milestone: DEV300:m46)
2009-04-02 11:37:14 +0200 cl r270388 : #i100371# check valid positions all the time to avoid crashes during model lock
2009-03-30 13:02:27 +0200 cl r270219 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:59:41 +0200 cl r270218 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:55:06 +0200 cl r270217 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:53:27 +0200 cl r270216 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:49:28 +0200 cl r270215 : #i100371# added EnableUndo() and IsUndoEnabled()
diff --git a/testautomation/graphics/optional/includes/global/g_shaddow.inc b/testautomation/graphics/optional/includes/global/g_shaddow.inc
index 47ef12a..d0cc89f 100755
--- a/testautomation/graphics/optional/includes/global/g_shaddow.inc
+++ b/testautomation/graphics/optional/includes/global/g_shaddow.inc
@@ -305,9 +305,6 @@ testcase tiShaddow
LineareTransparenz.Check
shadowtransparencyvalue = MFLinTransparenz.GetText
- '/// Transparency doesnt exist in powerpoint. And only one corner-style is allowed. ///'
- '/// Therefore should transparency disappear and the cornerstyle change when we reload. ///'
-
sleep 2
Kontext
active.SetPage TabSchatten
@@ -401,9 +398,9 @@ testcase tiShaddow
end if
endif
if (gApplication = "IMPRESS") then
- if LineareTransparenz.Ischecked <> FALSE then
- warnlog "Transparency should NOT have been checked!"
- if MFLinTransparenz.GetText <> shadowtransparencyvalue then warnlog "Transparency-value should NOT have changed"
+ if LineareTransparenz.Ischecked =TRUE then
+ printlog "Transparency contained in newer ppt files, ok.!"
+ if MFLinTransparenz.GetText <> shadowtransparencyvalue then warnlog "Transparency-value should NOT have changed"
KeineTransparenz.Check
end if
endif
commit bc54eb4c1c98010eac0b029e69ba9c57ec0d415f
Author: Kurt Zenker <kz at openoffice.org>
Date: Thu Jun 4 09:41:18 2009 +0000
CWS-TOOLING: integrate CWS chart37
2009-05-22 09:10:36 +0200 iha r272170 : #i102130# color of pies is not loaded correctly
2009-04-27 17:16:20 +0200 iha r271294 : #i24203# compiler problem
2009-04-27 16:43:21 +0200 iha r271292 : #i101281# missing API documentation for secondary axis title properties
2009-04-27 15:26:05 +0200 hde r271276 : #i100987
2009-04-27 15:24:42 +0200 hde r271273 : #i100987
2009-04-24 15:08:33 +0200 iha r271214 : #i100995# crash with some logarithmic scalings
2009-04-22 18:50:56 +0200 dr r271134 : #i82177# write out deleted point labels
2009-04-22 18:40:48 +0200 iha r271133 : #i101281# missing API documentation for secondary axis title properties
2009-04-22 16:39:42 +0200 dr r271128 : #i82177# extensions for bubble charts
2009-04-22 14:37:00 +0200 dr r271114 : #i82177# import/export data label type and separator
2009-04-22 14:36:24 +0200 dr r271113 : #i82177# import/export data label type and separator
2009-04-21 15:25:26 +0200 dr r271038 : #i82177# import data label type and separator from BIFF8 CHFR records
2009-04-21 14:37:16 +0200 dr r271037 : #i82177# dump BIFF8 chart future records
2009-04-20 17:44:27 +0200 iha r271002 : #i96898# reduce library exports
2009-04-20 13:01:13 +0200 iha r270975 : #i24203# rotate data labels - help ids
2009-04-20 11:40:33 +0200 dr r270969 : #i96600# export of axis scaling/positioning properties
2009-04-16 16:02:31 +0200 dr r270892 : #i69599# keep Y axis left in 3d charts
2009-04-15 18:16:46 +0200 dr r270859 : #i69599# import of axis position settings
2009-04-15 18:16:01 +0200 dr r270858 : #i69599# correct handling of logarithmic crossing axes
2009-04-14 16:27:48 +0200 dr r270794 : #i96599# handle auto axis position on logarithmic axes
2009-04-09 19:59:51 +0200 dr r270722 : #i96599# import axis crossing settings, fix import of logarithmic scaling settings
2009-04-09 18:26:00 +0200 iha r270720 : #i96898# reduce library exports
2009-04-09 15:17:04 +0200 iha r270710 : #i96898# reduce library exports
2009-04-09 10:50:14 +0200 dr r270682 : #i24203# import/export of data label rotation, fixed some other broken stuff too
2009-04-08 16:54:54 +0200 dr r270657 : #i24203# import rotation for data point labels
2009-04-06 18:19:17 +0200 iha r270571 : #i100876# Axis scaling settings dialog wrong after API usage (anys different from double type)
2009-04-06 15:57:05 +0200 iha r270567 : #i100105# #i58585# leftover ->
2009-04-06 15:55:48 +0200 iha r270564 : #i58585# leftover ->
2009-04-02 16:41:07 +0200 iha r270422 : #i99721# remove unused code
2009-04-02 14:29:03 +0200 iha r270407 : #i99721# remove unused code
2009-03-26 10:58:23 +0100 iha r270059 : #i96898# reduce library exports
2009-03-26 10:13:49 +0100 iha r270055 : #i96898# reduce library exports
2009-03-25 09:39:13 +0100 iha r269998 : CWS-TOOLING: rebase CWS chart37 to trunk at 269781 (milestone: DEV300:m44)
2009-03-24 17:56:56 +0100 iha r269986 : #i96898# reduce library exports
2009-03-24 16:56:44 +0100 iha r269974 : #i99721# remove unused code
2009-03-24 16:48:48 +0100 iha r269970 : #i89731# remove unused string
2009-03-24 15:44:04 +0100 iha r269961 : remove unused code
2009-03-24 15:22:45 +0100 iha r269959 : remove unused code
2009-03-24 15:17:17 +0100 iha r269957 : remove unused code
2009-03-24 11:14:53 +0100 iha r269923 : #i24203# rotate data labels
2009-03-09 12:10:25 +0100 hde r269076 : #i99300#
2009-03-06 15:56:26 +0100 iha r269011 : #i93953# Source Format for secondary axis without data
2009-02-17 15:59:05 +0100 iha r268177 : avoid warning during build
2009-02-17 15:01:59 +0100 iha r268173 : avoid warning during build
2009-02-13 09:39:03 +0100 ufi r267693 : i96999
2009-02-11 15:12:35 +0100 iha r267604 : removed unused string
2009-02-11 14:00:29 +0100 iha r267600 : #i96999# Corrected wording from 'correlation coefficient' to 'coefficient of determination'
2009-02-11 10:56:45 +0100 iha r267584 : #i89731# typo in resource string
2009-02-11 10:01:29 +0100 iha r267582 : #i89031# compile error on asian windows systems
2009-02-10 16:15:16 +0100 iha r267552 : #i24203# rotate data labels
2009-02-04 18:00:33 +0100 iha r267395 : #i98893# don't export defaults to file
2009-02-04 15:48:15 +0100 iha r267390 : #i92128# asian typography for chart elements
2009-02-04 15:17:41 +0100 iha r267386 : #i92128# asian typography for chart elements
2009-01-30 14:41:10 +0100 iha r267197 : CWS-TOOLING: rebase CWS chart37 to trunk at 267171 (milestone: DEV300:m41)
diff --git a/testautomation/chart2/required/includes/ch2_format1.inc b/testautomation/chart2/required/includes/ch2_format1.inc
index e85e215..b45d701 100755
--- a/testautomation/chart2/required/includes/ch2_format1.inc
+++ b/testautomation/chart2/required/includes/ch2_format1.inc
@@ -427,87 +427,96 @@ testcase tFormatAllAxesGrids
endcase
'-------------------------------------------------------------
testcase tFormatLegend
-'///<u><b>Dialog test after invoking Format::Legend</b></u>
+ '///<u><b>Dialog test after invoking Format::Legend</b></u>
-'///<ul>
- '///+<li>Load simple chart document</li>
- if fLoadVerySimpleChartAndSaveLocal() > 0 then
- warnlog "Loading test document seems to have failed -> Check this out!"
- goto endsub
- endif
- '///+<li>Select chart using navigator</li>
- call fSelectFirstOLE
- '///+<li>Invoke Edit::Object::Edit to enter Inplace Mode</li>
- EditObjectEdit
- sleep(1)
- '///+<li>Invoke Format::Chart Type</li>
- if fInvokeChartTypeDialog() > 0 then
- warnlog "Something went wrong trying to invoke the Chart Types dialog -> Check this out! (Previous log may help you)"
- Call hCloseDocument
- goto endsub
- endif
- '///+<li>Change Chart type to PIE</li>
- if fSetChartType( "pie" ) > 0 then
- warnlog "Something went wrong setting chart type to PIE -> Check this out! (Previous log may help you)"
- Call hCloseDocument
- goto endsub
- endif
- '///+<li>Close Chart Type dialog</li>
- if fCloseChartTypeDialogOK() > 0 then
- warnlog "Something went wrong trying to close the Chart Type dialog -> Check this out! (Previous log may help you)"
- Call hCloseDocument
- goto endsub
- endif
- '///+<li>Invoke Format::Legend</li>
- FormatLegend
- '///+<li>Goto tab-page Borders</li>
- Kontext
- active.SetPage TabFormatChartBorders
- '///+<li>Check if tab-page Borders exists</li>
- Kontext "TabFormatChartBorders"
- call DialogTest ( TabFormatChartBorders )
+ '///<ul>
+ '///+<li>Load simple chart document</li>
+ if fLoadVerySimpleChartAndSaveLocal() > 0 then
+ warnlog "Loading test document seems to have failed -> Check this out!"
+ goto endsub
+ endif
+ '///+<li>Select chart using navigator</li>
+ call fSelectFirstOLE
+ '///+<li>Invoke Edit::Object::Edit to enter Inplace Mode</li>
+ EditObjectEdit
+ sleep(1)
+ '///+<li>Invoke Format::Chart Type</li>
+ if fInvokeChartTypeDialog() > 0 then
+ warnlog "Something went wrong trying to invoke the Chart Types dialog -> Check this out! (Previous log may help you)"
+ Call hCloseDocument
+ goto endsub
+ endif
+ '///+<li>Change Chart type to PIE</li>
+ if fSetChartType( "pie" ) > 0 then
+ warnlog "Something went wrong setting chart type to PIE -> Check this out! (Previous log may help you)"
+ Call hCloseDocument
+ goto endsub
+ endif
+ '///+<li>Close Chart Type dialog</li>
+ if fCloseChartTypeDialogOK() > 0 then
+ warnlog "Something went wrong trying to close the Chart Type dialog -> Check this out! (Previous log may help you)"
+ Call hCloseDocument
+ goto endsub
+ endif
+ '///+<li>Invoke Format::Legend</li>
+ FormatLegend
+ '///+<li>Goto tab-page Borders</li>
+ Kontext
+ active.SetPage TabFormatChartBorders
+ '///+<li>Check if tab-page Borders exists</li>
+ Kontext "TabFormatChartBorders"
+ call DialogTest ( TabFormatChartBorders )
- '///+<li>Goto tab-page Area</li>
- Kontext
- active.SetPage TabArea
- '///+<li>Check if tab-page Area exists</li>
- Kontext "TabArea"
- call DialogTest ( TabArea )
+ '///+<li>Goto tab-page Area</li>
+ Kontext
+ active.SetPage TabArea
+ '///+<li>Check if tab-page Area exists</li>
+ Kontext "TabArea"
+ call DialogTest ( TabArea )
- '///+<li>Goto tab-page Transparency</li>
- Kontext
- active.SetPage TabTransparency
- '///+<li>Check if tab-page Transparency exists</li>
- Kontext "TabTransparency"
- call DialogTest ( TabTransparency )
+ '///+<li>Goto tab-page Transparency</li>
+ Kontext
+ active.SetPage TabTransparency
+ '///+<li>Check if tab-page Transparency exists</li>
+ Kontext "TabTransparency"
+ call DialogTest ( TabTransparency )
- '///+<li>Goto tab-page Characters</li>
- Kontext
- active.SetPage TabFont
- '///+<li>Check if tab-page Characters exists</li>
- Kontext "TabFont"
- call DialogTest ( TabFont )
+ '///+<li>Goto tab-page Characters</li>
+ Kontext
+ active.SetPage TabFont
+ '///+<li>Check if tab-page Characters exists</li>
+ Kontext "TabFont"
+ call DialogTest ( TabFont )
- '///+<li>Goto tab-page Font Effects</li>
- Kontext
- active.SetPage TabFontEffects
- '///+<li>Check if tab-page Font Effects exists</li>
- Kontext "TabFontEffects"
- call DialogTest ( TabFontEffects )
+ '///+<li>Goto tab-page Font Effects</li>
+ Kontext
+ active.SetPage TabFontEffects
+ '///+<li>Check if tab-page Font Effects exists</li>
+ Kontext "TabFontEffects"
+ call DialogTest ( TabFontEffects )
- '///+<li>Goto tab-page Position</li>
- Kontext
- active.SetPage TabLegendPosition
- '///+<li>Check if tab-page Alignment exists</li>
- Kontext "TabLegendPosition"
- call DialogTest ( TabLegendPosition )
- '///+<li>Close dialog</li>
- TabLegendPosition.Cancel
- '///+<li>Close document</li>
- Kontext "DocumentCalc"
- DocumentCalc.TypeKeys "<Escape>"
- Call hCloseDocument
-'///</ul>
+ '///+<li>Goto tab-page Position</li>
+ Kontext
+ active.SetPage TabLegendPosition
+ '///+<li>Check if tab-page Alignment exists</li>
+ Kontext "TabLegendPosition"
+ call DialogTest ( TabLegendPosition )
+
+ if gAsianSup = true then
+ Kontext
+ Active.SetPage TabAsianTypography
+ Kontext "TabAsianTypography"
+ call DialogTest ( TabAsianTypography )
+ TabAsianTypography.Cancel
+ else
+ '///+<li>Close dialog</li>
+ TabLegendPosition.Cancel
+ endif
+ '///+<li>Close document</li>
+ Kontext "DocumentCalc"
+ DocumentCalc.TypeKeys "<Escape>"
+ Call hCloseDocument
+ '///</ul>
endcase
'-------------------------------------------------------------
diff --git a/testautomation/global/hid/hid.lst b/testautomation/global/hid/hid.lst
index df469cf..5ef80ca 100755
--- a/testautomation/global/hid/hid.lst
+++ b/testautomation/global/hid/hid.lst
@@ -3411,6 +3411,8 @@ HID_SCH_CTL_DATA 63290
HID_SCH_CTL_TYPE 63293
HID_SCH_CTL_VARIANT 63294
HID_SCH_CT_INDICATE 63291
+HID_SCH_DATALABEL_ROTATION_KNOB 63398
+HID_SCH_DATALABEL_ROTATION_EDIT 63399
HID_SCH_DATALABEL_NUMBER 63356
HID_SCH_DATALABEL_PERCENT 63357
HID_SCH_DATALABEL_PLACEMENT 63371
diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win
index 319423e..93ee445 100755
--- a/testautomation/global/win/etab_a_d.win
+++ b/testautomation/global/win/etab_a_d.win
@@ -434,6 +434,8 @@ PercentageFormat HID_SCH_PB_PERCENT_NUMBERFORMAT
Separator HID_SCH_DATALABEL_SEPARATOR
Placement HID_SCH_DATALABEL_PLACEMENT
TextDirection HID_SCH_TEXTDIRECTION
+RotateAngle HID_SCH_DATALABEL_ROTATION_KNOB
+RotateDegrees HID_SCH_DATALABEL_ROTATION_EDIT
+TabDataPointLabels TabDataSeriesLabels
More information about the ooo-build-commit
mailing list