diff options
12 files changed, 130 insertions, 950 deletions
diff --git a/testautomation/dbaccess/required/includes/DatabaseTypes.inc b/testautomation/dbaccess/required/includes/DatabaseTypes.inc index 6d57ad4e4cc7..0285ccd50b12 100755 --- a/testautomation/dbaccess/required/includes/DatabaseTypes.inc +++ b/testautomation/dbaccess/required/includes/DatabaseTypes.inc @@ -324,7 +324,15 @@ testcase tEvolutionProperties Kontext "TabGeneral" call DialogTest(TabGeneral) try - DataBaseType.select(getIdForDatabaseType("Evolution")) + if ( DatabaseType.getItemCount() > 12 ) then + DataBaseType.select(getIdForDatabaseType("Evolution")) + Kontext "ConnectionType" + ConnectionType.OK + else + qaerrorlog "Evolution does not appear to be available on this system" + Kontext "ConnectionType" + ConnectionType.Cancel + endif catch warnlog "failed to select DataBaseType Evolution - maybe not installed or activated in this build" TabGeneral.Cancel @@ -332,9 +340,6 @@ testcase tEvolutionProperties goto endsub endcatch - Kontext "ConnectionType" - ConnectionType.OK - 'call fCheckAdvancedDialog("Evolution") call fCloseDatabase() diff --git a/testautomation/dbaccess/required/includes/ReportBuilder01.inc b/testautomation/dbaccess/required/includes/ReportBuilder01.inc index d165a613d682..15394e2e9b05 100755 --- a/testautomation/dbaccess/required/includes/ReportBuilder01.inc +++ b/testautomation/dbaccess/required/includes/ReportBuilder01.inc @@ -78,12 +78,13 @@ testcase tMainMenuBar '/// open the report designer call fOpenNewReportDesign - sleep(10) + '/// check the menu for the right entries 'file menu Kontext "ReportDesign" + if ( ReportDesign.exists( 20 ) ) then ReportDesign.UseMenu '/// check if there are 10 items in the file menu. printlog "check if there are 10 items in the file menu." @@ -239,8 +240,12 @@ testcase tMainMenuBar call hMenuClose() - '/// close the report designer - call fCloseReportDesign + '/// close the report designer + call fCloseReportDesign + + else + warnlog "The Report Designer did not open within expected timeframe" + endif '/// close the database call fCloseDatabase diff --git a/testautomation/framework/optional/includes/f_usage_tracking.inc b/testautomation/framework/optional/includes/f_usage_tracking.inc index e91a29593f30..3ba124cbd6de 100755 --- a/testautomation/framework/optional/includes/f_usage_tracking.inc +++ b/testautomation/framework/optional/includes/f_usage_tracking.inc @@ -54,7 +54,7 @@ testcase tUsageTracking1 printlog( "Test case 1: Presence of the Usage Tracking featureset (API)" ) - if ( not gOOoImprovementIsInstalled ) then + if ( not gOOoImprovementIsEnabled ) then warnlog( "Could not access API for usage tracking program" ) endif diff --git a/testautomation/framework/optional/includes/w_grid_layout1.inc b/testautomation/framework/optional/includes/w_grid_layout1.inc deleted file mode 100755 index 02f78ed3027d..000000000000 --- a/testautomation/framework/optional/includes/w_grid_layout1.inc +++ /dev/null @@ -1,579 +0,0 @@ -'encoding UTF-8 Do not remove or change this line! -'************************************************************************** -'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* -'* Copyright 2008 by Sun Microsystems, Inc. -'* -'* OpenOffice.org - a multi-platform office productivity suite -'* -'* $RCSfile: w_grid_layout1.inc,v $ -'* -'* $Revision: 1.2 $ -'* -'* last change: $Author: jsk $ $Date: 2008-06-17 07:50:24 $ -'* -'* This file is part of OpenOffice.org. -'* -'* OpenOffice.org is free software: you can redistribute it and/or modify -'* it under the terms of the GNU Lesser General Public License version 3 -'* only, as published by the Free Software Foundation. -'* -'* OpenOffice.org is distributed in the hope that it will be useful, -'* but WITHOUT ANY WARRANTY; without even the implied warranty of -'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -'* GNU Lesser General Public License version 3 for more details -'* (a copy is included in the LICENSE file that accompanied this code). -'* -'* You should have received a copy of the GNU Lesser General Public License -'* version 3 along with OpenOffice.org. If not, see -'* <http://www.openoffice.org/license.html> -'* for a copy of the LGPLv3 License. -'* -'/************************************************************************ -'* -'* owner : thorsten.bosbach@sun.com -'* -'* short description : Grid Layout for CJK test in Writer -'* -'\*********************************************************************** - -private const SOURCE_PATH = "framework\optional\input\CJK\" - -testcase tTextGridDialog_1 - -'/// Check if tabpage 'Text Grid' disappears when "Asian Language support" is NOT checked - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") - hNewDocument() - FormatPageWriter - try - Kontext - Active.SetPage TabGrid - Kontext "TabGrid" - TabGrid.Cancel - warnlog "Shouldn't get Tabpage: Grid Text" - catch - Kontext - Active.SetPage TabSeite - Kontext "TabSeite" - TabSeite.Cancel - endcatch - end if - -'/// Check if tabpage 'Text Grid' appears when "Asian Language support" is checked - Call CheckAsianLanguageSupport("On") - - sleep 5 - FormatPageWriter - Kontext - if Active.exists (10) then - try - Kontext - Active.SetPage TabGrid - Kontext "TabGrid" - TabGrid.Cancel - catch - Kontext - Active.SetPage TabSeite - Kontext "TabSeite" - TabSeite.Cancel - warnlog "Couldn't get Tabpage: Grid Text" - endcatch - else - warnlog "FormatPageWriter didn't bring up ndialog" - endif - hCloseDocument() -endcase - -'------------------------------------------------------------------------- - -testcase tTextGridDialog_2 -'/// No grid is active, no changes to existing version - Dim testFile , sCorrectResult as String - - testFile = "gridtest.sxw" - sCorrectResult = "1" - - Call hNewDocument - - '/// open a test file , and check No Grid checkbox - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - sMakeReadOnlyDocumentEditable - - FormatPageWriter - Kontext - if active.exists(5) then - Active.SetPage TabGrid - endif - Kontext "TabGrid" - NoGrid.Check - Sleep 1 - TabGrid.OK - Sleep 1 - - '/// Active navigator dialogue , set page to '2' and wait for a while - Kontext - ViewNavigator - Kontext "NavigatorWriter" - - Seitennummer.SetText "2" - Sleep 5 - fCloseNavigator - - '/// In No Grid mode, there should be only 1 page, the focus is before the first line - Kontext "DocumentWriter" - Call DocumentWriter.TypeKeys "<End>" - Sleep 1 - Call DocumentWriter.TypeKeys "<Shift Left>" - Editcopy - - if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing NoGrid option!" - - Call hCloseDocument -endcase - -'------------------------------------------------------------------------- - -testcase tTextGridDialog_3 -'/// Grid (lines only): The page is set up with a defined number of lines - Dim testFile , sCorrectResult , sLinesPerPage as String - - testFile = "gridtest.sxw" - sCorrectResult = "G" - sLinesPerPage = "10" - - Call hNewDocument - - '/// open a test file and check Grid(lines onle) checkbox , - '/// + set 10 line/page - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - sMakeReadOnlyDocumentEditable - FormatPageWriter - Kontext - if active.exists(5) then - Active.SetPage TabGrid - endif - Kontext "TabGrid" - LinesGrid.Check - LinesPerPage.SetText sLinesPerPage - Sleep 1 - TabGrid.OK - Sleep 1 - - '/// Active navigator dialogue , set page to '2' and wait for a while - Kontext - ViewNavigator - Kontext "NavigatorWriter" - - Seitennummer.SetText "2" - Sleep 5 - fCloseNavigator - - Kontext "DocumentWriter" - Call DocumentWriter.TypeKeys "<End>" - Sleep 1 - Call DocumentWriter.TypeKeys "<Shift Left>" - Editcopy - - if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing Grid(lines only) option!" - - Call hCloseDocument -endcase - -'------------------------------------------------------------------------- - -testcase tTextGridDialog_4 -'/// Grid (lines and characters): The page is set up with a defined number of lines and a defined number of characters in each line - Dim testFile , sCorrectResult as String - Dim sLinesPerPage , sCharsPerLine as String - - testFile = "gridtest.sxw" - sCorrectResult = "E" - sLinesPerPage = "10" - sCharsPerLine = "9" - - Call hNewDocument - - '/// open a test file and check Grid(lines and characters) checkbox - '/// + set 10 line/page and 9 characters/line - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - sMakeReadOnlyDocumentEditable - FormatPageWriter - Kontext - if active.exists(5) then - Active.SetPage TabGrid - endif - Kontext "TabGrid" - CharsGrid.Check - LinesPerPage.SetText sLinesPerPage - CharsPerLine.SetText sCharsPerLine - Sleep 1 - TabGrid.OK - Sleep 1 - - '/// Active navigator dialogue , set page to '2' and wait for a while - Kontext - ViewNavigator - Kontext "NavigatorWriter" - - Seitennummer.SetText "2" - Sleep 5 - fCloseNavigator - - Kontext "DocumentWriter" - Call DocumentWriter.TypeKeys "<End>" - Sleep 1 - Call DocumentWriter.TypeKeys "<Shift Left>" - Editcopy - - if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing Grid(lines and characters) option!" - - Call hCloseDocument -endcase - -'------------------------------------------------------------------------- - -testcase tGridDisplay_1 -'/// Print grid: The grid lines will be printed. Inactive if "Display grid" is inactive. - Call hNewDocument - - '/// format / page / tabpage Text grid - '/// + check "display grid" and check "print grid" - FormatPageWriter - Kontext - if active.exists(5) then - Active.SetPage TabGrid - endif - Kontext "TabGrid" - CharsGrid.Check - Display.Check - Sleep 1 - PrintGrid.Check - Sleep 1 - TabGrid.OK - Sleep 1 - - '/// Print to printer - FilePrint - Kontext "Active" - if Active.Exists(5) then - if Active.GetRT = 304 then - Active.Ok - QAErrorLog "No Default-Printer!" - Kontext "DruckenDlg" - Sleep 1 - DruckenDlg.Cancel - end if - else - Kontext "DruckenDlg" - Sleep 1 - DruckenDlg.OK - Sleep 5 - kontext - if active.exists(5) then - qaErrorLog active.getText - active.ok - end if - end if - - '/// format / page / tabpage Text grid - '/// + check "display grid" and uncheck "print grid" - FormatPageWriter - Kontext - if active.exists(5) then - Active.SetPage TabGrid - endif - Kontext "TabGrid" - CharsGrid.Check - Display.Check - Sleep 1 - PrintGrid.UnCheck - Sleep 1 - TabGrid.OK - Sleep 1 - - '/// Print to printer - FilePrint - Kontext "Active" - if Active.Exists(5) then - if Active.GetRT = 304 then - Active.Ok - QAErrorLog "No Default-Printer!" - Kontext "DruckenDlg" - Sleep 1 - DruckenDlg.Cancel - end if - else - Kontext "DruckenDlg" - Sleep 1 - DruckenDlg.OK - Sleep 5 - kontext - if active.exists(5) then - qaErrorLog active.getText - active.ok - end if - end if - - Call hCloseDocument -endcase - -'------------------------------------------------------------------------- - -testcase tUserDefineLayout_1 -'/// Decrease characters per line will cause lines per page decrease accordingly - Dim sLinesPerPage , sCharsPerLine as String - Dim sExpectLinesPerPage , sExpectLinesPerPage1 as String - - sLinesPerPage = "20" - sCharsPerLine = "2" - sExpectLinesPerPage = "2" - sExpectLinesPerPage1 = "3" - - Call hNewDocument - - '/// Format/page , set lines per page to 20, and set charsets per line to 2 - '/// + wait for a moment , then check the the number of lines per page. - FormatPageWriter - Kontext - if active.exists(5) then - Active.SetPage TabGrid - endif - Kontext "TabGrid" - CharsGrid.Check - - LinesPerPage.SetText sLinesPerPage - Sleep 2 - CharsPerLine.SetText sCharsPerLine - Sleep 2 - - 'This step is no use, just let the LinesPerPage change the number - CharsGrid.Check - - if LinesPerPage.GetText <> sExpectLinesPerPage AND LinesPerPage.GetText <> sExpectLinesPerPage1 then - Warnlog "The lines per page should be" + sExpectLinesPerPage + " OR " + sExpectLinesPerPage1 +" but get " +LinesPerPage.GetText - end if - - TabGrid.Cancel - - Call hCloseDocument -endcase - -'------------------------------------------------------------------------- - -testcase tFontSizeChanges_1 -'/// Change the font size to bigger enough will change the layout - Dim testFile , sCorrectResult as String - Dim sLinesPerPage , sCharsPerLine as String - dim sTemp as string - - testFile = "FontSizeChanges_1.sxw" - sCorrectResult = "1" - sLinesPerPage = "2" - sCharsPerLine = "9" - - '/// open a test file - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - sMakeReadOnlyDocumentEditable - Kontext "DocumentWriter" - Call DocumentWriter.TypeKeys "<Shift Right>" - - '/// set font size to 60 - Kontext "FormatObjectbar" - Schriftgroesse.Select "60" - Schriftgroesse.TypeKeys "<Return>" - Sleep 1 - - '/// Check if lines per page and charsets per line is still right - Kontext "DocumentWriter" - FormatPageWriter - Kontext - if active.exists(5) then - Active.SetPage TabGrid - endif - Kontext "TabGrid" - if TabGrid.exists(5) then - sTemp = LinesPerPage.GetText - if sTemp <> sLinesPerPage then - Warnlog "The lines per page should be: '" + sLinesPerPage + "'; but get: '" + sTemp + "'" - endif - sTemp = CharsPerLine.GetText - if sTemp <> sCharsPerLine then - Warnlog "The chars per line should be: '" + sCharsPerLine + "'; but get: '" +sTemp + "'" - endif - TabGrid.Cancel - else - warnlog "TabGrid is not available." - endif - - '/// Active navigator dialogue , set page to '2' and wait for a while - Kontext - ViewNavigator - Kontext "NavigatorWriter" - if NavigatorWriter.exists(5) then - Seitennummer.SetText "2" - Sleep 5 - else - warnlog "Navigator not available" - endif - fCloseNavigator - - Kontext "DocumentWriter" - sleep 3 - Call DocumentWriter.TypeKeys "<Shift Right>" - sleep 3 - Editcopy - sTemp = GetClipboardText - if sTemp <> sCorrectResult then - Warnlog "Don't get the expected result , hope to be: '" + sCorrectResult + "'; but get: '" + sTemp + "'" - endif - - Call hCloseDocument -endcase - -'------------------------------------------------------------------------- - -testcase tRubyText_1 -'/// If Ruby Text is applied and longer than its Base Text it will stretch over more grid cells than the base text itself. - Dim testFile , sRubyText as String - - testFile = "rubytest.sxw" - sRubyText = "Ruby Test Text ....................." - - Call hNewDocument - - '/// open a test file , and insert long ruby test text - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - sMakeReadOnlyDocumentEditable - Kontext "DocumentWriter" - Call DocumentWriter.TypeKeys "<Shift Right>" - Sleep 1 - - FormatRuby - Kontext "RubyDialog" - Sleep 3 - RubyText1.setText sRubyText - Sleep 2 - RubyDialog.OK - Sleep 2 - DialogClose.Click - Sleep 1 - - Kontext "DocumentWriter" - FormatAutoformatApply - Sleep 2 - Call DocumentWriter.TypeKeys "<End>" - Sleep 2 - Call DocumentWriter.TypeKeys "<Shift Left>" - Editcopy - - if NOT(GetClipboardText = "5" OR GetClipboardText = "6") then - Warnlog "Don't get the correct result after inserting ruby text! Get " + GetClipboardText - end if - - Call hCloseDocument -endcase - -'------------------------------------------------------------------------- - -testcase tIndentsTest_1 - '/// Indents should work and always indenting as close as possible to their measurements by snapping to the appropriate grid cell. Tabs therefore will be ignored. - Dim testFile , sCorrectPage1 , sCorrectPage2 as String - - testFile = "IndentsTest.sxw" - sCorrectPage1 = "1" - sCorrectPage2 = "2" - - Call hNewDocument - - '/// open a test file , and press TAB in second line - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - sMakeReadOnlyDocumentEditable - Kontext "DocumentWriter" - Call DocumentWriter.TypeKeys "<Down>" - Sleep 1 - Call DocumentWriter.TypeKeys "<Tab>" - Sleep 1 - Call DocumentWriter.TypeKeys "<End>" - Sleep 1 - - '/// Active navigator dialogue , check if the page number is 1 - Kontext - ViewNavigator - Kontext "NavigatorWriter" - if Seitennummer.GetText <> sCorrectPage1 then Warnlog "First test :Something wrong in indents test!" - fCloseNavigator - - '/// press TAB in second line again - Kontext "DocumentWriter" - Call DocumentWriter.TypeKeys "<Home>" - Sleep 1 - Call DocumentWriter.TypeKeys "<Tab>" - Sleep 1 - Call DocumentWriter.TypeKeys "<End>" - Sleep 1 - - '/// Active navigator dialogue , check if the page number is 2 - Kontext - ViewNavigator - Kontext "NavigatorWriter" - if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Second test :Something wrong in indents test!" - fCloseNavigator - - Call hCloseDocument -endcase - -'------------------------------------------------------------------------- - -testcase tObjectsTest_1 - '/// If objects are anchored to text they will "wander" with its surrounding text. - '/// If they are anchored as character they will snap to the appropriate grid cell (since they are a character). - Dim testFile , sCorrectPage1 , sCorrectPage2 as String - - testFile = "objectsTest.sxw" - sCorrectPage1 = "1" - sCorrectPage2 = "2" - - Call hNewDocument - - '/// open a test file , and press TAB in second line - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - - '/// If object is anchored as Character , check if it will snap to the appropriate grid cell - fStartupNavigator( "OLEObject" , 1 ) - Sleep 1 - Auswahlliste.TypeKeys "<Return>" - Sleep 1 - fCloseNavigator - Sleep 2 - - Kontext - FormatAnchorAsCharacter - Sleep 1 - - ViewNavigator - Kontext "NavigatorWriter" - Seitennummer.SetText sCorrectPage2 - Sleep 5 - if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Something wrong when object is anchored as Character!" - fCloseNavigator - - '/// If object is anchored to Character , check if it will NOT snap to the appropriate grid cell - fStartupNavigator( "OLEObject" , 1 ) - Auswahlliste.TypeKeys "<Return>" - fCloseNavigator - - Kontext - FormatAnchorToCharacter - - ViewNavigator - Kontext "NavigatorWriter" - Seitennummer.SetText sCorrectPage2 - Sleep 5 - if Seitennummer.GetText <> sCorrectPage1 then Warnlog "Something wrong when object is anchored to Character!" - fCloseNavigator - Kontext - - Call hCloseDocument -endcase - diff --git a/testautomation/framework/required/includes/wizard_firsttime.inc b/testautomation/framework/required/includes/wizard_firsttime.inc index e63364b4c711..b8560aab869c 100755 --- a/testautomation/framework/required/includes/wizard_firsttime.inc +++ b/testautomation/framework/required/includes/wizard_firsttime.inc @@ -123,7 +123,7 @@ testcase tUpdtWizardFirsttime if ( TabPersonalDataMigration.exists( 2 ) ) then call dialogtest( TabPersonalDataMigration ) printlog( "The data migration page is visible" ) - + TransferPersonalData.uncheck() '///+<li>Click the 'next' button to get to the next page</li> kontext "WelcomeDialog" NextBtn.click() diff --git a/testautomation/graphics/optional/d_updt.bas b/testautomation/graphics/optional/d_updt.bas deleted file mode 100755 index fe261d48b32b..000000000000 --- a/testautomation/graphics/optional/d_updt.bas +++ /dev/null @@ -1,95 +0,0 @@ -'encoding UTF-8 Do not remove or change this line! -'************************************************************************** -'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* -'* Copyright 2008 by Sun Microsystems, Inc. -'* -'* OpenOffice.org - a multi-platform office productivity suite -'* -'* $RCSfile: d_updt.bas,v $ -'* -'* $Revision: 1.1 $ -'* -'* last change: $Author: jsi $ $Date: 2008-06-16 10:42:35 $ -'* -'* This file is part of OpenOffice.org. -'* -'* OpenOffice.org is free software: you can redistribute it and/or modify -'* it under the terms of the GNU Lesser General Public License version 3 -'* only, as published by the Free Software Foundation. -'* -'* OpenOffice.org is distributed in the hope that it will be useful, -'* but WITHOUT ANY WARRANTY; without even the implied warranty of -'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -'* GNU Lesser General Public License version 3 for more details -'* (a copy is included in the LICENSE file that accompanied this code). -'* -'* You should have received a copy of the GNU Lesser General Public License -'* version 3 along with OpenOffice.org. If not, see -'* <http://www.openoffice.org/license.html> -'* for a copy of the LGPLv3 License. -'* -'/************************************************************************ -'* -'* Owner : wolfram.garten@sun.com -'* -'* short description : Draw Required Test -'* -'\***************************************************************** - -public glLocale (15*20) as string -global ExtensionString as String - -sub main - Printlog "--------------------- Draw Required Test ------------------- " - Call hStatusIn ( "Graphics","d_updt.bas") - - use "graphics\tools\id_tools.inc" - use "graphics\tools\id_tools_2.inc" - use "graphics\required\includes\global\id_001.inc" 'File - use "graphics\required\includes\global\id_002.inc" 'Edit - use "graphics\required\includes\global\id_003.inc" 'View - use "graphics\required\includes\global\id_004.inc" 'Insert - use "graphics\required\includes\global\id_005.inc" 'Format - use "graphics\required\includes\global\id_006.inc" 'Tools - use "graphics\required\includes\global\id_007.inc" 'Modify - use "graphics\required\includes\global\id_008.inc" 'Window - use "graphics\required\includes\global\id_009.inc" 'Help - use "graphics\required\includes\global\id_011.inc" 'Toolbars - use "graphics\required\includes\draw\d_002_.inc" - use "graphics\required\includes\draw\d_003_.inc" - use "graphics\required\includes\draw\d_005_.inc" - use "graphics\required\includes\draw\d_007.inc" - - Call D_003_ - call id_002 - call id_011 - Call D_002_ - call id_003 - call id_004 - Call D_005_ - call id_005 - call id_006 - call d_007 - call id_007 - call id_008 - call id_009 - call id_001 - Call tFileExportAsPDF - Call tExportAsPDFButton - - Call hStatusOut -end sub -'---------------------------------------------- - -sub LoadIncludeFiles - use "global\system\includes\master.inc" - use "global\system\includes\gvariabl.inc" - use "global\required\includes\g_option.inc" - use "global\required\includes\g_customize.inc" - use "global\required\includes\g_001.inc" - use "global\required\includes\g_009.inc" - Call GetUseFiles - gApplication = "Draw" -end sub - diff --git a/testautomation/graphics/optional/i_updt_1.bas b/testautomation/graphics/optional/i_updt_1.bas deleted file mode 100755 index 39c42ea7e86b..000000000000 --- a/testautomation/graphics/optional/i_updt_1.bas +++ /dev/null @@ -1,84 +0,0 @@ -'encoding UTF-8 Do not remove or change this line! -'************************************************************************** -'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* -'* Copyright 2008 by Sun Microsystems, Inc. -'* -'* OpenOffice.org - a multi-platform office productivity suite -'* -'* $RCSfile: i_updt_1.bas,v $ -'* -'* $Revision: 1.1 $ -'* -'* last change: $Author: jsi $ $Date: 2008-06-16 10:42:38 $ -'* -'* This file is part of OpenOffice.org. -'* -'* OpenOffice.org is free software: you can redistribute it and/or modify -'* it under the terms of the GNU Lesser General Public License version 3 -'* only, as published by the Free Software Foundation. -'* -'* OpenOffice.org is distributed in the hope that it will be useful, -'* but WITHOUT ANY WARRANTY; without even the implied warranty of -'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -'* GNU Lesser General Public License version 3 for more details -'* (a copy is included in the LICENSE file that accompanied this code). -'* -'* You should have received a copy of the GNU Lesser General Public License -'* version 3 along with OpenOffice.org. If not, see -'* <http://www.openoffice.org/license.html> -'* for a copy of the LGPLv3 License. -'* -'/************************************************************************ -'* -'* Owner : wolfram.garten@sun.com -'* -'* short description : Impress Required Test (Part 1) -'* -'\***************************************************************** - -public glLocale (15*20) as string -global ExtensionString as String - -sub main - Printlog " -------------------- Impress-Required-Test -----------------------------" - Call hStatusIn ( "Graphics","i_updt_1.bas") - - use "graphics\tools\id_tools.inc" - use "graphics\tools\id_tools_2.inc" - use "graphics\required\includes\global\id_002.inc" 'Edit - use "graphics\required\includes\global\id_003.inc" 'View - use "graphics\required\includes\global\id_004.inc" 'Insert - use "graphics\required\includes\global\id_005.inc" 'Format - use "graphics\required\includes\global\id_006.inc" 'Tools - use "graphics\required\includes\impress\im_003_.inc" 'Ansicht - use "graphics\required\includes\impress\im_004_.inc" 'Einfuegen - - if hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () ) = FALSE then - qaErrorLog "Locales doesn't exist in file : "+gTesttoolPath + "graphics\tools\locale_1.txt" ' this is needed for spellchecking. - endif - - call id_002 - Call im_003_ - call id_003 - Call im_004_ - call id_004 - call id_005 - call id_006 - - Call hStatusOut -end sub - -'---------------------------------------------- -sub LoadIncludeFiles - use "global\system\includes\master.inc" - use "global\system\includes\gvariabl.inc" - use "global\required\includes\g_option.inc" - use "global\required\includes\g_option2.inc" - use "global\required\includes\g_customize.inc" - use "global\required\includes\g_001.inc" - use "global\required\includes\g_009.inc" - gApplication = "IMPRESS" - Call GetUseFiles() -end sub - diff --git a/testautomation/graphics/optional/i_updt_2.bas b/testautomation/graphics/optional/i_updt_2.bas deleted file mode 100755 index b283c61f48ab..000000000000 --- a/testautomation/graphics/optional/i_updt_2.bas +++ /dev/null @@ -1,84 +0,0 @@ -'encoding UTF-8 Do not remove or change this line! -'************************************************************************** -'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* -'* Copyright 2008 by Sun Microsystems, Inc. -'* -'* OpenOffice.org - a multi-platform office productivity suite -'* -'* $RCSfile: i_updt_2.bas,v $ -'* -'* $Revision: 1.1 $ -'* -'* last change: $Author: jsi $ $Date: 2008-06-16 10:42:38 $ -'* -'* This file is part of OpenOffice.org. -'* -'* OpenOffice.org is free software: you can redistribute it and/or modify -'* it under the terms of the GNU Lesser General Public License version 3 -'* only, as published by the Free Software Foundation. -'* -'* OpenOffice.org is distributed in the hope that it will be useful, -'* but WITHOUT ANY WARRANTY; without even the implied warranty of -'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -'* GNU Lesser General Public License version 3 for more details -'* (a copy is included in the LICENSE file that accompanied this code). -'* -'* You should have received a copy of the GNU Lesser General Public License -'* version 3 along with OpenOffice.org. If not, see -'* <http://www.openoffice.org/license.html> -'* for a copy of the LGPLv3 License. -'* -'/************************************************************************ -'* -'* Owner : wolfram.garten@sun.com -'* -'* short description : Impress Required (Test Part 2) -'* -'\***************************************************************** - -public glLocale (15*20) as string -global ExtensionString as String - -sub main - Printlog " -------------------- Impress-Required-Test -----------------------------" - Call hStatusIn ( "Graphics","i_updt_2.bas") - - use "graphics\tools\id_tools.inc" - use "graphics\tools\id_tools_2.inc" - use "graphics\required\includes\global\id_001.inc" 'File - use "graphics\required\includes\global\id_007.inc" 'Kontext - use "graphics\required\includes\global\id_008.inc" 'Window - use "graphics\required\includes\global\id_009.inc" 'Help - use "graphics\required\includes\global\id_011.inc" 'Toolbars - use "graphics\required\includes\impress\im_007_.inc" 'Praesentation - - if hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () ) = FALSE then - qaErrorLog "Locales doesn't exist in file : "+gTesttoolPath + "graphics\tools\locale_1.txt" ' this is needed for spellchecking. - endif - - Call tFileExportAsPDF - Call tExportAsPDFButton - call id_001 - Call im_007_ - call id_008 - call id_009 - call id_007 - call id_011 - - Call hStatusOut -end sub - -'---------------------------------------------- -sub LoadIncludeFiles - use "global\system\includes\master.inc" - use "global\system\includes\gvariabl.inc" - use "global\required\includes\g_option.inc" - use "global\required\includes\g_option2.inc" - use "global\required\includes\g_customize.inc" - use "global\required\includes\g_001.inc" - use "global\required\includes\g_009.inc" - gApplication = "IMPRESS" - Call GetUseFiles() -end sub - diff --git a/testautomation/graphics/optional/includes/global/g_savepictureas.inc b/testautomation/graphics/optional/includes/global/g_savepictureas.inc index 209305a16ae5..3d46d6fbba23 100755 --- a/testautomation/graphics/optional/includes/global/g_savepictureas.inc +++ b/testautomation/graphics/optional/includes/global/g_savepictureas.inc @@ -333,6 +333,8 @@ testcase tContextSaveAsPicture endif hTypeKeys "<DELETE>" '/// Open the next file via Insert->Graphics From File ///' + call hCloseDocument + call hNewDocument InsertGraphicsFromFile Kontext "GrafikEinfuegenDlg" if GrafikEinfuegenDlg.exists(5) then @@ -622,7 +624,7 @@ testcase tContextSavePictureLinkAsPicture else warnlog "Ras should not have been selected when we opened a '" + Filetype + "'-file." endif - case "wmf" : if (Filetype = "wmf") then + case "wmf" : if (Filetype = "wmf") or (Filetype = "emf") then printlog " " + Filetype + " will be saved as Wmf, correct." SavedFileType = "wmf" if Filetype = "wmf" then Testsize = true @@ -780,6 +782,8 @@ testcase tContextSavePictureLinkAsPicture Kontext "DocumentDraw" endif hTypeKeys "<DELETE>" + call hCloseDocument + call hNewDocument '/// Open the next file via Insert->Graphics From File ///' InsertGraphicsFromFile Kontext "GrafikEinfuegenDlg" diff --git a/testautomation/graphics/optional/includes/impress/i_pengine2.inc b/testautomation/graphics/optional/includes/impress/i_pengine2.inc index 5c16f43722be..bac399c2f611 100755 --- a/testautomation/graphics/optional/includes/impress/i_pengine2.inc +++ b/testautomation/graphics/optional/includes/impress/i_pengine2.inc @@ -206,7 +206,9 @@ testcase tiPengineAnimationEffectsPreview sleep (2) '/// close application ///' Call hCloseDocument -endcase +endcase 'tiPengineAnimationEffectsPreview + +'------------------------------------------------------------------------------ testcase tiPengineAnimationEffectsOptions dim bError as boolean @@ -309,7 +311,7 @@ SlideShowCustomAnimation EffectRemove.Click '/// close application ///' Call hCloseDocument -endcase +endcase 'tiPengineAnimationEffectsOptions '------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -370,7 +372,7 @@ testcase tiPengineAllShapesAndEffects '/// Close Application ///' Call hCloseDocument Printlog "Finished Optional-test for Presentation-Engine" -endcase +endcase 'tiPengineAllShapesAndEffects '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -381,17 +383,17 @@ testcase tiPengine2ObjectsGetsEffects dim e as integer dim sFileName as string - '/// the Presentation-Engine consists of showing the presentation, with all it's effects. ///' + printlog "the Presentation-Engine consists of showing the presentation, with all it's effects." - '/// Create a new presentation. ///' + printlog "Create a new presentation." Call hNewDocument sleep (1) kontext "Toolbar" sleep (1) printlog "insert a Smiley." - '/// From the toolbar: Insert three objects: ///' - '/// insert a Smiley. ///' + printlog "From the toolbar: Insert three objects:" + printlog "insert a Smiley." kontext "Toolbar" if Toolbar.Exists then if Toolbar.IsVisible then @@ -414,51 +416,51 @@ testcase tiPengine2ObjectsGetsEffects kontext "SymbolShapes" SymbolShapes.Close - '/// Unmark all objects ///' + printlog "Unmark all objects" hTypeKeys "<ESCAPE>" - '/// Mark the Smiley ///' + printlog "Mark the Smiley" hTypeKeys "<TAB>" else warnlog "No toolbar visible, please notify the test-administrator" end if else - warnlog "bla bla" ' sch�nes warnlog + warnlog "toolbar not visible" end if - '/// Smiley inserted, time to add some effects. ///' + printlog "Smiley inserted, time to add some effects." - '/// Effect no 1 ///' + printlog "Effect no 1" - '/// Slide Show->Custom Animation... ///' + printlog "Slide Show->Custom Animation..." SlideShowCustomAnimation Kontext "Tasks" - '/// Click button 'Add...' ///' + printlog "Click button 'Add...'" EffectAdd.click - '/// Dialog 'Custom Animation' comes up ///' + printlog "Dialog 'Custom Animation' comes up" kontext - '/// Switch to TabPage: Entrance ///' + printlog "Switch to TabPage: Entrance" active.setPage(TabEntrance) kontext "TabEntrance" if TabEntrance.exists(5) then DialogTest(TabEntrance) - '/// Find "Dissolve-in". ///' + printlog "Find 'Dissolve-in'." TabEntrance.TypeKeys "<DOWN>", 6 Sleep (3) TabEntrance.Ok Printlog "Added effect 'Dissolve-in'" else - warnlog "uh hu?" + warnlog "Tab Entrance does not exist?" end if Kontext "Tasks" - '/// Effect no 2 ///' + printlog "Effect no 2" - '/// Add a second effect to the object ///' + printlog "Add a second effect to the object" EffectAdd.click - '/// Dialog 'Custom Animation' comes up ///' - '/// Switch to TabPage: Emphasis ///' + printlog "Dialog 'Custom Animation' comes up" + printlog "Switch to TabPage: Emphasis" kontext active.setPage(TabEmphasis) kontext "TabEmphasis" @@ -466,7 +468,7 @@ testcase tiPengine2ObjectsGetsEffects DialogTest(TabEmphasis) Effects.Select 5 'Transparency Sleep (3) - '/// Close dialog 'Custom Animation' with 'OK' ///' + printlog "Close dialog 'Custom Animation' with 'OK'" TabEmphasis.OK Printlog "Added effect 'Transparency'" else @@ -474,34 +476,34 @@ testcase tiPengine2ObjectsGetsEffects end if Kontext "Tasks" - '/// Effect no 3 ///' + printlog "Effect no 3" - '/// Insert new slide ///' + printlog "Insert new slide" InsertSlide Printlog "Inserted new Slide" kontext "Slides" - '/// Make sure the last slide is selcted ///' + printlog "Make sure the last slide is selcted" SlidesControl.TypeKeys "<TAB>" SlidesControl.TypeKeys "<PAGEDOWN>", 3 Sleep (1) - '/// Insert new object ///' + printlog "Insert new object" Call hTextrahmenErstellen ("Test text for the second slide to test the PresentationEngine", 35, 35, 70, 70) - '/// Add the Transformation-Effect "put on the brakes" ///' + printlog "Add the Transformation-Effect 'put on the brakes'" SlideShowCustomAnimation Kontext "Tasks" - '/// Click button 'Add...' ///' + printlog "Click button 'Add...'" EffectAdd.click - '/// Dialog 'Custom Animation' comes up ///' + printlog "Dialog 'Custom Animation' comes up" kontext - '/// Switch to TabPage: Entrance ///' + printlog "Switch to TabPage: Entrance" active.setPage(TabEntrance) kontext "TabEntrance" if TabEntrance.exists(5) then - '/// Add Transformation-Effect: "Put on the Breaks" ///' ' ist das Sprachabh�nig - TabEntrance.TypeKeys "<DOWN>", 30 ' ist das Sprachabh�nig + printlog "Add Transformation-Effect: 'Put on the Breaks'" + TabEntrance.TypeKeys "<DOWN>", 30 Sleep (3) TabEntrance.Ok Printlog "Added effect 'Put on the Breaks'" @@ -510,18 +512,18 @@ testcase tiPengine2ObjectsGetsEffects end if Kontext "Tasks" - '/// Effect no 4 ///' + printlog "Effect no 4" - '/// Click button 'Add...' ///' + printlog "Click button 'Add...'" EffectAdd.click - '/// Dialog 'Custom Animation' comes up ///' + printlog "Dialog 'Custom Animation' comes up" kontext - '/// Switch to TabPage: Motion Paths ///' + printlog "Switch to TabPage: Motion Paths" active.setPage(TabMotionPaths) kontext "TabMotionPaths" if TabMotionPaths.exists(5) then - '/// Add "motion-path"-effect: '"schwosch" ///' ' ist das Sprachabh�nig - TabMotionPaths.TypeKeys "<DOWN>", 66 ' ist das Sprachabh�nig + printlog "Add motion-path-effect: 'schwosch'" + TabMotionPaths.TypeKeys "<DOWN>", 66 Sleep (3) TabMotionPaths.Ok Printlog "Added effect 'Schwosch'" @@ -530,33 +532,37 @@ testcase tiPengine2ObjectsGetsEffects warnlog "Couldn't find the Tabpage: MotionPaths. Check why." end if - '/// Press 'PageUp' to get to the first slide. ///' + printlog "Press 'PageUp' to get to the first slide" hTypeKeys "<PAGEUP>" - '/// Run the slideshow. ///' + printlog "Run the slideshow with F5." hTypeKeys "<F5>" - + Sleep (5) kontext "DocumentPresentation" if DocumentPresentation.Exists (15) then - Printlog "Presentation started" + Printlog "Presentation started, calling 1st effect, 1st object." DocumentPresentation.TypeKeys "<SPACE>" sleep (5) else warnlog "Slideshow didn't start. Check why." - ' Wenn keine Slideshow vorhanden ist, - ' dann kann man auch den ganzen Test abbrechen end if - + printlog "calling 2nd effect, 1st object." DocumentPresentation.TypeKeys "<SPACE>" Sleep (5) + printlog "calling 2nd slide." DocumentPresentation.TypeKeys "<SPACE>" Sleep (5) + printlog "calling 1st effect, 2nd object" DocumentPresentation.TypeKeys "<SPACE>" Sleep (5) + printlog "calling 2nd effect, 2nd object" DocumentPresentation.TypeKeys "<SPACE>" Sleep (5) + printlog "ending presentation" DocumentPresentation.TypeKeys "<SPACE>" Sleep (5) + Kontext "DocumentPresentation" + printlog "getting back to edit view." DocumentPresentation.TypeKeys "<SPACE>" if DocumentPresentation.Exists(5) then @@ -565,10 +571,10 @@ testcase tiPengine2ObjectsGetsEffects Kontext "DocumentImpress" - '/// Close the document ///' + printlog "Close the document" Call hCloseDocument Printlog "Finished Optional-test for Presentation-Engine" -endcase +endcase 'tiPengine2ObjectsGetsEffects '------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -607,5 +613,3 @@ Function TestAnimations AutomaticPreview.Check Kontext end Function - - diff --git a/testautomation/graphics/optional/includes/impress/i_us2_present.inc b/testautomation/graphics/optional/includes/impress/i_us2_present.inc index d297b14ed0e4..8a557a4b2197 100755 --- a/testautomation/graphics/optional/includes/impress/i_us2_present.inc +++ b/testautomation/graphics/optional/includes/impress/i_us2_present.inc @@ -47,16 +47,16 @@ testcase i_us2_pres1 dim PresentationFile1 as string PresentationFile1 = (ConvertPath (gOfficePath + "user\work\PwrPres1.odp")) kontext "DocumentImpress" - '/// New - Wizard - Presentation. ///' + printlog "New - Wizard - Presentation." FileAutopilotPresentation - printlog " Called File-Autopilot-Presentation." - '/// Create from Template ///' + printlog "Called File-Autopilot-Presentation." + printlog "Create from Template" kontext "AutoPilotPraesentation1" FromTemplate.Check 'This part is for language-indepencancy if gOOO = TRUE then TemplateRegion.Select (1) - '/// Choose a Presentation ///' + printlog "Choose a Presentation" TemplateList.Select (2) else TemplateRegion.Select (1) @@ -70,10 +70,10 @@ testcase i_us2_pres1 endif endif endif - '/// Choose a Presentation ///' + printlog "Choose a Presentation" TemplateList.Select (4) endif - '/// Next ///' + printlog "Next" Nextbutton.Click sleep (1) Backbutton.Click @@ -82,9 +82,9 @@ testcase i_us2_pres1 printlog " Switched to the second Wizard-page." sleep (1) - '/// Presentations ///' + printlog "Presentations" kontext "AutoPilotPraesentation2" - '/// Output: Screen ///' + printlog "Output: Screen" if gOOO = TRUE then 'OpenOffice.org Background.Select (2) if Backgroundchoice.GetItemCount < 2 then @@ -110,42 +110,43 @@ testcase i_us2_pres1 Backgroundchoice.Select (5) endif Screen.Check - '/// Next ///' + printlog "Next" Nextbutton.Click printlog " Switched to the third Wizard-page." sleep (1) kontext "AutoPilotPraesentation3" - '/// Random Effect. Random Speed. Click through every choice. ///' + printlog "Random Effect. Random Speed. Click through every choice." Effect.Select (15) Speed.Select (3) + WaitSlot (5000) Automatic.Check Timebutton.SetText "00:00:15" Break.SetText "00:00:20" Logo.Check - '/// Next ///' + printlog "Next" Nextbutton.Click printlog " Switched to the fourth Wizard-page." sleep (1) kontext "AutoPilotPraesentation4" - '/// Fill in some company-name-subject-text ///' + printlog "Fill in some company-name-subject-text" AddName.SetText "Lala1" AddTopic.SetText "Lala2" Askinformation.SetText "Lala3" - '/// Next ///' + printlog "Next" Nextbutton.Click printlog " Switched to the fifth Wizard-page." sleep (1) kontext "AutoPilotPraesentation5" Summary.Check - '/// Create ///' + printlog "Create" WaitSlot (2000) AutoPilotPraesentation5.OK sleep (1) printlog " Pressed 'Create'." - '/// Add a Slide via Insert - Slide. ///' + printlog "Add a Slide via Insert - Slide." Kontext "DocumentImpress" hTypeKeys "What we will talk about" gMouseClick 1,1 @@ -159,22 +160,22 @@ testcase i_us2_pres1 SlidesControl.TypeKeys "<HOME><RETURN>" kontext "DocumentImpress" DocumentImpress.TypeKeys "<TAB>Text we just wrote..." - '/// Switch to the second slide. ///' + printlog "Switch to the second slide." kontext "Slides" SlidesControl.TypeKeys "<DOWN><RETURN>" SlidesControl.TypeKeys "<RETURN>" kontext "DocumentImpress" - '/// Insert three lines with text, all with different formatting. ///' + printlog "Insert three lines with text, all with different formatting." call hTextrahmenErstellen ("First line with text",20,50,70,50) call hTextrahmenErstellen ("Second line with text",20,60,70,60) call hTextrahmenErstellen ("Third line with text",20,70,70,70) - '/// Go down to the eleventh slide. ///' + printlog "Go down to the eleventh slide." kontext "Slides" SlidesControl.TypeKeys "<HOME>" SlidesControl.TypeKeys "<PAGEDOWN>", 10 SlidesControl.TypeKeys "<RETURN>" - '/// Insert Smiley, + two circles around the eyes, + two new pupils, ///' - '/// placed at some interesteing place inside the circles. ///' + printlog "Insert Smiley, + two circles around the eyes, + two new pupils," + printlog "placed at some interesteing place inside the circles." Kontext "Toolbar" SymbolShapes.TearOff sleep (1) @@ -183,7 +184,8 @@ testcase i_us2_pres1 sleep (1) kontext "DrawingObjectbar" AreaFilling.TypeKeys "<HOME>" - AreaFilling.TypeKeys "<DOWN>", 10 'Select (11) 'Lime-Green + AreaFilling.TypeKeys "<DOWN>", 10 + printlog "Select (11) 'Lime-Green" AreaFilling.TypeKeys "<RETURN>" sleep (1) gMouseMove (53,50,90,80) @@ -192,79 +194,80 @@ testcase i_us2_pres1 kontext "SymbolShapes" SymbolShapes.Close Kontext "DocumentImpress" - gMouseMove (60,43,70,65) 'Right eye + gMouseMove (60,43,70,65) hTypeKeys "<Escape>" Kontext "Toolbar" Ellipsen.Click - gMouseMove (65,57,69,63) 'Right pupil + gMouseMove (65,57,69,63) hTypeKeys "<Escape>" Kontext "Toolbar" Ellipsen.Click - gMouseMove (70,50,82,65) 'Left eye + gMouseMove (70,50,82,65) hTypeKeys "<Escape>" Kontext "Toolbar" Ellipsen.Click - gMouseMove (77,57,80,63) 'Left pupil + gMouseMove (77,57,80,63) hTypeKeys "<Escape>" sleep (1) - '/// Insert new slide. ///' + printlog "Insert new slide." kontext "Slides" - SlidesControl.TypeKeys "<PAGEDOWN>", 15 'To get to the last slide. + printlog "get to the last slide." + SlidesControl.TypeKeys "<PAGEDOWN>", 15 SlidesControl.TypeKeys "<RETURN>" - '/// Delete the two fields the stylist has. ///' + printlog "Delete the two fields the stylist has." kontext "DocumentImpress" gMouseClick 1,1 EditSelectAll DocumentImpress.TypeKeys "<DELETE>" - '/// Insert-Picture-From File. (some crazy picture which fits the theme) ///' + printlog "Insert-Picture-From File. (some crazy picture which fits the theme)" InsertGraphicsFromFile Kontext "GrafikEinfuegenDlg" - '/// Open graphic ///' + printlog "Open graphic" Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\ball.eps") Oeffnen.Click gMouseClick 1,1 - '/// Add a text above the picture. 'There is movement...' ///' + printlog "Add a text above the picture. 'There is movement..." call hTextrahmenErstellen ("There is movement...",20,20,70,30) - '/// Add a new slide. ///' + printlog "Add a new slide." InsertSlide printlog " Inserted new slide." kontext "DocumentImpress" EditSelectAll DocumentImpress.TypeKeys "<DELETE>" - '/// Bla bla about everything... ///' + printlog "Bla bla about everything..." call hTextrahmenErstellen ("Bla bla about everything...",20,20,70,30) - '/// Add a new slide. ///' + printlog "Add a new slide." InsertSlide printlog " Inserted new slide." kontext "DocumentImpress" EditSelectAll DocumentImpress.TypeKeys "<DELETE>" - '/// Write text: Q & A ///' + printlog "Write text: Q & A" call hTextrahmenErstellen ("Q & A",20,20,70,30) DocumentImpress.TypeKeys "<SHIFT HOME>" sleep (1) - '/// Add a new slide. ///' + printlog "Add a new slide." InsertSlide kontext "DocumentImpress" EditSelectAll DocumentImpress.TypeKeys "<DELETE>" - '/// Thanks for listening, time for coffee... (ending) ///' + printlog "Thanks for listening, time for coffee... (ending)" call hTextrahmenErstellen ("Class dismissed...",20,20,70,30) - '/// Save Document ///' + printlog "Save Document" call hFileSaveAsKill (PresentationFile1) printlog "OK saved at ", PresentationFile1 sleep (1) - '/// Close Document ///' + printlog "Close Document" Call hCloseDocument -endcase +endcase 'i_us2_pres1 -'00oo...//==---...---...---...---....---...---...---...---...---...---...--..--.--.-.-.-.-....---.... +'------------------------------------------------------------------------------ testcase i_us2_pres2 qaerrorlog "not yet ready." @@ -275,10 +278,10 @@ testcase i_us2_pres2 PresentationFile1 = (ConvertPath (gTesttoolPath + "graphics\required\input\rightfont.odp")) PresentationFile2 = (ConvertPath (gOfficePath + "user\work\xxxxxx9.odp")) kontext "DocumentImpress" - '/// New - Wizard - Presentation ///' + printlog "New - Wizard - Presentation" FileAutopilotPresentation printlog " Called File-Autopilot-Presentation." - '/// Create from Template ///' + printlog "Create from Template" kontext "AutoPilotPraesentation1" EmptyPresentation.Check AutoPilotPraesentation1.TypeKeys "<DOWN>" @@ -289,9 +292,9 @@ testcase i_us2_pres2 else warnlog " Pressing down didnt work as expected." endif - '/// Click the Open-button ///' + printlog "Click the Open-button" ExistingOpen.Click - '/// Check if the Open-dialogue is there ///' + printlog "Check if the Open-dialogue is there" kontext "GeneralFileDialog" if GeneralFileDialog.Exists(10) = FALSE then warnlog " Open-file-dialogue didnt show up." @@ -332,11 +335,11 @@ testcase i_us2_pres2 if DocumentImpress.StatusIsProgress then sleep (5) endif - '/// Save Document ///' + printlog "Save Document" call hFileSaveAsKill (PresentationFile2) printlog "OK saved at ", PresentationFile2 sleep (1) - '/// Close Document ///' + printlog "Close Document" Call hCloseDocument -endcase +endcase 'i_us2_pres2 diff --git a/testautomation/graphics/tools/id_tools.inc b/testautomation/graphics/tools/id_tools.inc index c32f7b4b5d2c..ac61d8fc0513 100755 --- a/testautomation/graphics/tools/id_tools.inc +++ b/testautomation/graphics/tools/id_tools.inc @@ -979,6 +979,7 @@ function fGetSlideNumber (optional sCompare as integer) as integer printlog "If Navigator is not open, opening it now." ViewNavigator endif + WaitSlot (2000) printlog "Getting current slide number from navigator." fGetSlideNumber = val (right (Liste.GetSelText, 1)) printlog "fGetSlideNumber has the value " & fGetSlideNumber |