diff options
author | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-03-01 11:47:49 +0100 |
---|---|---|
committer | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-03-01 11:47:49 +0100 |
commit | a91a5fee4e2596d578907c260dbd83c4da4c95eb (patch) | |
tree | 3f944d92318ee1cf1d40f80ad9d20e7df698b98b /testautomation | |
parent | 00acc2d4a3020ac54a7d7f0aede1677b865a419a (diff) |
vitomation01: #i109696 - Remove hCloseNavigator(), use hCloseDialog() instead, eliminated function
Diffstat (limited to 'testautomation')
12 files changed, 49 insertions, 53 deletions
diff --git a/testautomation/framework/optional/includes/basic_macros.inc b/testautomation/framework/optional/includes/basic_macros.inc index 8a8b3bb1a236..eca589b6f175 100755 --- a/testautomation/framework/optional/includes/basic_macros.inc +++ b/testautomation/framework/optional/includes/basic_macros.inc @@ -70,7 +70,8 @@ testcase tMakro_In_All_Apps brc = hCloseBasicIde() printlog( "Close the navigator (Master-doc)" ) - brc = hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) printlog( "Close the document" ) FileClose @@ -94,12 +95,6 @@ endcase testcase tMakro_Dialog - if ( gBuild < 9305 ) then - warnlog( "#i87457# - Application macros assigned to userlayer" ) - goto endsub - endif - - dim brc as boolean dim cMsg as string diff --git a/testautomation/framework/optional/includes/extras_file_open.inc b/testautomation/framework/optional/includes/extras_file_open.inc index 62ad0b7e6587..87bd47fcebbb 100755 --- a/testautomation/framework/optional/includes/extras_file_open.inc +++ b/testautomation/framework/optional/includes/extras_file_open.inc @@ -179,7 +179,8 @@ testcase tOpenObjectsWithFileDialog( cCategory as string ) else printlog( "Close navigator, if open" ) - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) sFileOut = cCategory & "_" & iCurrentTemplate sFileOut = convertpath( sPathOut & sFileOut ) @@ -202,7 +203,8 @@ testcase tOpenObjectsWithFileDialog( cCategory as string ) hHandleActivesOnLoad( 0 , 2 ) printlog( "Close navigator, if open" ) - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) printlog( "Close document" ) hDestroyDocument() diff --git a/testautomation/framework/optional/includes/extras_modify_objects.inc b/testautomation/framework/optional/includes/extras_modify_objects.inc index a2593b321aea..78031855ca16 100755 --- a/testautomation/framework/optional/includes/extras_modify_objects.inc +++ b/testautomation/framework/optional/includes/extras_modify_objects.inc @@ -149,12 +149,14 @@ testcase tModifyObjects( iMode as integer, cCategory as string, sVer as string ) else printlog( "Build filename; save, reload and delete" ) sFile = sPath & cCategory & iObjectFolder & "_" & iObject - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) hFileSaveAsKill( sFile ) hDestroyDocument() hFileOpen( sFile ) hHandleActivesOnLoad( 1 , 2 ) - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) hDestroyDocument() hDeleteFile( sFile ) printlog( "Test cycle done, going for next object." ) diff --git a/testautomation/framework/optional/includes/filedlg_cjk_files.inc b/testautomation/framework/optional/includes/filedlg_cjk_files.inc index f616c6d4567a..4c16d24bb74b 100755 --- a/testautomation/framework/optional/includes/filedlg_cjk_files.inc +++ b/testautomation/framework/optional/includes/filedlg_cjk_files.inc @@ -77,7 +77,8 @@ testcase tSaveLoadDelFilesCJK() hDeleteFile( hGetWorkPath() & cStrangeName ) printlog( "Close navigator, if it exists" ) - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) next iCounter diff --git a/testautomation/framework/optional/includes/filedlg_passwords.inc b/testautomation/framework/optional/includes/filedlg_passwords.inc index 336d075ecf21..1230e3c3fc22 100755 --- a/testautomation/framework/optional/includes/filedlg_passwords.inc +++ b/testautomation/framework/optional/includes/filedlg_passwords.inc @@ -64,7 +64,8 @@ testcase tFiledlgPasswords() hCreateDocument() - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) call hChangeDoc() @@ -170,13 +171,15 @@ testcase tFiledlgPasswords() warnlog( "File Open dislog did not come up" ) endif - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) hDestroyDocument() hDeleteFile( workpath & workfile ) - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) next iCurrentFileFormat diff --git a/testautomation/framework/optional/includes/options_ooo_general.inc b/testautomation/framework/optional/includes/options_ooo_general.inc index bda3b9a24d8f..f4a7892cd60f 100755 --- a/testautomation/framework/optional/includes/options_ooo_general.inc +++ b/testautomation/framework/optional/includes/options_ooo_general.inc @@ -124,10 +124,8 @@ testcase tTextGridDialog_2 Kontext ViewNavigator Kontext "NavigatorWriter" - Seitennummer.SetText "2" - Sleep 5 - hCloseNavigator + hCloseDialog( Navigator, "close" ) '/// In No Grid mode, there should be only 1 page, the focus is before the first line Kontext "DocumentWriter" @@ -173,10 +171,8 @@ testcase tTextGridDialog_3 Kontext ViewNavigator Kontext "NavigatorWriter" - Seitennummer.SetText "2" - Sleep 5 - hCloseNavigator + hCloseDialog( Navigator, "close" ) Kontext "DocumentWriter" Call DocumentWriter.TypeKeys "<End>" @@ -224,10 +220,8 @@ testcase tTextGridDialog_4 Kontext ViewNavigator Kontext "NavigatorWriter" - Seitennummer.SetText "2" - Sleep 5 - hCloseNavigator + hCloseDialog( Navigator, "close" ) Kontext "DocumentWriter" Call DocumentWriter.TypeKeys "<End>" diff --git a/testautomation/framework/optional/includes/standardbar2.inc b/testautomation/framework/optional/includes/standardbar2.inc index c91a71b1a808..facecea769b0 100755 --- a/testautomation/framework/optional/includes/standardbar2.inc +++ b/testautomation/framework/optional/includes/standardbar2.inc @@ -96,9 +96,10 @@ testcase tStandardBar_2 sleep( 1 ) hMenuselectNr ( iNewButtonItem ) - sleep( 3 ) + hFileWait() ' was sleep( 3 ) - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) select case iNewButtonItem case 1 : Kontext "DocumentWriter" diff --git a/testautomation/framework/optional/includes/w_grid_layout1.inc b/testautomation/framework/optional/includes/w_grid_layout1.inc index b467a7be3ae1..c0d0180ba46c 100644 --- a/testautomation/framework/optional/includes/w_grid_layout1.inc +++ b/testautomation/framework/optional/includes/w_grid_layout1.inc @@ -115,10 +115,9 @@ testcase tTextGridDialog_2 Kontext ViewNavigator Kontext "NavigatorWriter" - Seitennummer.SetText "2" - Sleep 5 - hCloseNavigator + kontext "Navigator" + hCloseDialog( Navigator, "close" ) '/// In No Grid mode, there should be only 1 page, the focus is before the first line Kontext "DocumentWriter" @@ -164,10 +163,9 @@ testcase tTextGridDialog_3 Kontext ViewNavigator Kontext "NavigatorWriter" - Seitennummer.SetText "2" - Sleep 5 - hCloseNavigator + kontext "Navigator" + hCloseDialog( Navigator, "close" ) Kontext "DocumentWriter" Call DocumentWriter.TypeKeys "<End>" @@ -215,10 +213,9 @@ testcase tTextGridDialog_4 Kontext ViewNavigator Kontext "NavigatorWriter" - Seitennummer.SetText "2" - Sleep 5 - hCloseNavigator + kontext "Navigator" + hCloseDialog( Navigator, "close" ) Kontext "DocumentWriter" Call DocumentWriter.TypeKeys "<End>" @@ -413,13 +410,9 @@ testcase tFontSizeChanges_1 Kontext ViewNavigator Kontext "NavigatorWriter" - if NavigatorWriter.exists(5) then - Seitennummer.SetText "2" - Sleep 5 - else - warnlog "Navigator not available" - endif - hCloseNavigator + Seitennummer.SetText "2" + kontext "Navigator" + hCloseDialog( Navigator, "close" ) Kontext "DocumentWriter" sleep 3 @@ -505,7 +498,7 @@ testcase tIndentsTest_1 ViewNavigator Kontext "NavigatorWriter" if Seitennummer.GetText <> sCorrectPage1 then Warnlog "First test :Something wrong in indents test!" - hCloseNavigator + hCloseDialog( Navigator, "close" ) '/// press TAB in second line again Kontext "DocumentWriter" @@ -521,7 +514,7 @@ testcase tIndentsTest_1 ViewNavigator Kontext "NavigatorWriter" if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Second test :Something wrong in indents test!" - hCloseNavigator + hCloseDialog( Navigator, "close" ) Call hCloseDocument endcase @@ -547,7 +540,7 @@ testcase tObjectsTest_1 Sleep 1 Auswahlliste.TypeKeys "<Return>" Sleep 1 - hCloseNavigator + hCloseDialog( Navigator, "close" ) Kontext FormatAnchorAsCharacter @@ -559,12 +552,12 @@ testcase tObjectsTest_1 Seitennummer.SetText sCorrectPage2 Sleep 5 if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Something wrong when object is anchored as Character!" - hCloseNavigator + hCloseDialog( Navigator, "close" ) '/// If object is anchored to Character , check if it will NOT snap to the appropriate grid cell fStartupNavigator( "OLEObject" , 1 ) Auswahlliste.TypeKeys "<Return>" - hCloseNavigator + hCloseDialog( Navigator, "close" ) Kontext FormatAnchorToCharacter @@ -574,7 +567,7 @@ testcase tObjectsTest_1 Seitennummer.SetText sCorrectPage2 Sleep 5 if Seitennummer.GetText <> sCorrectPage1 then Warnlog "Something wrong when object is anchored to Character!" - hCloseNavigator + hCloseDialog( Navigator, "close" ) Kontext Call hCloseDocument diff --git a/testautomation/framework/required/includes/basic_dialog_i18n.inc b/testautomation/framework/required/includes/basic_dialog_i18n.inc index 5ac437ea1795..5da4420ae7e5 100755 --- a/testautomation/framework/required/includes/basic_dialog_i18n.inc +++ b/testautomation/framework/required/includes/basic_dialog_i18n.inc @@ -43,7 +43,8 @@ testcase tUpdtBasicDialogI18n dim brc as boolean - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) hCreateDocument()' brc = hInitFormControls( "tDialogI18n" ) diff --git a/testautomation/framework/required/includes/standard_toolbar_6.inc b/testautomation/framework/required/includes/standard_toolbar_6.inc index cefde7e900e8..acb7bcd60a71 100755 --- a/testautomation/framework/required/includes/standard_toolbar_6.inc +++ b/testautomation/framework/required/includes/standard_toolbar_6.inc @@ -122,10 +122,12 @@ testcase tStandardBar_6 kontext "documentwriter" DocumentWriter.TypeKeys( "Hallo" ) - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) hDestroyDocument() - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) hDestroyDocument() printlog " - Math" diff --git a/testautomation/framework/tools/includes/fileoperations.inc b/testautomation/framework/tools/includes/fileoperations.inc index 16f57f5cce6a..87416614af8f 100755 --- a/testautomation/framework/tools/includes/fileoperations.inc +++ b/testautomation/framework/tools/includes/fileoperations.inc @@ -70,7 +70,8 @@ function hSaveLoadDelSuccess( cFile as string ) as integer printlog( CFN & "Enter with option: " & cFile & "/" & cFileExt ) '///+<li>Close the navigator if it exists</li> - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) '///+<li>Save the current file, overwriting existing</li> brc = hSaveFileExpectSuccess( cFile , TRUE ) ' save and overwrite diff --git a/testautomation/framework/tools/includes/toolbar_tools.inc b/testautomation/framework/tools/includes/toolbar_tools.inc index 8f7eafc1572b..d8061963f2d9 100755 --- a/testautomation/framework/tools/includes/toolbar_tools.inc +++ b/testautomation/framework/tools/includes/toolbar_tools.inc @@ -79,7 +79,8 @@ function hAccessStandardBar() as boolean endif '///+<li>Close the navigator</li> - hCloseNavigator() + kontext "Navigator" + hCloseDialog( Navigator, "close,optional" ) '///+<li>Close the document</li> hDestroyDocument() |