diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-09 18:56:58 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-09 18:56:58 +0200 |
| commit | dce6af656db3514606fefb395fafbc8faa1ff076 (patch) | |
| tree | 51b0be157c3ba45641a48939caa3f772d306a17a /testautomation/graphics | |
| parent | 48394896ff0211501a1b4991c662f84ee51d96d7 (diff) | |
| parent | 664c84c6d716e0ec08d1bd95719ea9aa8ecc4dcb (diff) | |
CWS changehid: resync to m89
Diffstat (limited to 'testautomation/graphics')
187 files changed, 1288 insertions, 1900 deletions
diff --git a/testautomation/graphics/optional/d_export_graphic_a.bas b/testautomation/graphics/optional/d_export_graphic_a.bas index 406571f06a96..b5968240e024 100755 --- a/testautomation/graphics/optional/d_export_graphic_a.bas +++ b/testautomation/graphics/optional/d_export_graphic_a.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Export Test - A-tests. (More durable ones) '* diff --git a/testautomation/graphics/optional/d_export_graphic_b.bas b/testautomation/graphics/optional/d_export_graphic_b.bas index a239feedf95c..97560705afc4 100755 --- a/testautomation/graphics/optional/d_export_graphic_b.bas +++ b/testautomation/graphics/optional/d_export_graphic_b.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Export Test - B-tests. (the usual suspects) '* diff --git a/testautomation/graphics/optional/export_graphic_a.bas b/testautomation/graphics/optional/export_graphic_a.bas index 2460058af521..9dee4114b37f 100755 --- a/testautomation/graphics/optional/export_graphic_a.bas +++ b/testautomation/graphics/optional/export_graphic_a.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Export Test - A-tests. (More durable ones) '* diff --git a/testautomation/graphics/optional/export_graphic_b.bas b/testautomation/graphics/optional/export_graphic_b.bas index 65dd8ae13621..9502b5005625 100755 --- a/testautomation/graphics/optional/export_graphic_b.bas +++ b/testautomation/graphics/optional/export_graphic_b.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Export Test - B-tests. (the usual suspects) '* diff --git a/testautomation/graphics/optional/g_accessability.bas b/testautomation/graphics/optional/g_accessability.bas index fc03755763b5..1113dcb4324f 100644..100755 --- a/testautomation/graphics/optional/g_accessability.bas +++ b/testautomation/graphics/optional/g_accessability.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Accessability '* diff --git a/testautomation/graphics/optional/g_area.bas b/testautomation/graphics/optional/g_area.bas index 069066050810..3ad024ced1f6 100755 --- a/testautomation/graphics/optional/g_area.bas +++ b/testautomation/graphics/optional/g_area.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Format Area '* diff --git a/testautomation/graphics/optional/g_arrangealign.bas b/testautomation/graphics/optional/g_arrangealign.bas index cfe68eb49a67..3d9f2e2ab4ab 100755 --- a/testautomation/graphics/optional/g_arrangealign.bas +++ b/testautomation/graphics/optional/g_arrangealign.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Arrange and Align '* diff --git a/testautomation/graphics/optional/g_autocorrection.bas b/testautomation/graphics/optional/g_autocorrection.bas index f00e0eb136f3..b4fb2af0b472 100755 --- a/testautomation/graphics/optional/g_autocorrection.bas +++ b/testautomation/graphics/optional/g_autocorrection.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphic Function: Tools - Autocorrect '* diff --git a/testautomation/graphics/optional/g_character.bas b/testautomation/graphics/optional/g_character.bas index fcd4dff6907e..e13eccb813c3 100755 --- a/testautomation/graphics/optional/g_character.bas +++ b/testautomation/graphics/optional/g_character.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Format - Character '* diff --git a/testautomation/graphics/optional/g_clipboard.bas b/testautomation/graphics/optional/g_clipboard.bas index 3f542e9964ea..47b48949a162 100755 --- a/testautomation/graphics/optional/g_clipboard.bas +++ b/testautomation/graphics/optional/g_clipboard.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Clipboard '* diff --git a/testautomation/graphics/optional/g_clipexport.bas b/testautomation/graphics/optional/g_clipexport.bas index b1d25469e758..d75eef694394 100755 --- a/testautomation/graphics/optional/g_clipexport.bas +++ b/testautomation/graphics/optional/g_clipexport.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Clipboard export Test '* diff --git a/testautomation/graphics/optional/g_convertto.bas b/testautomation/graphics/optional/g_convertto.bas index 4a1e76cfe04d..8283981462ee 100644..100755 --- a/testautomation/graphics/optional/g_convertto.bas +++ b/testautomation/graphics/optional/g_convertto.bas @@ -1,73 +1,73 @@ -'encoding UTF-8 Do not remove or change this line!
-'**************************************************************************
-' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'
-' Copyright 2000, 2010 Oracle and/or its affiliates.
-'
-' OpenOffice.org - a multi-platform office productivity suite
-'
-' 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 : Graphics Function: Convert to ...
-'*
-'\******************************************************************
-
-global Ueber_Text_1 as string
-global Ueber_Text_2 as string
-global Ueber_Text_3 as string
-
-sub main
- PrintLog "------------------------- g_convertto test -------------------------"
- Call hStatusIn ( "Graphics","g_convertto.bas")
-
- use "graphics\tools\id_tools.inc"
- use "graphics\tools\id_tools_2.inc"
- use "graphics\optional\includes\global\g_convertto.inc"
-
- PrintLog "-------------------------" + gApplication + "-------------------"
- Call tiModifyConvertToPolygon
- ' Call tdContextConvertIntoBitmap
- Call tiAendernUmwandelnInKurve
- Call tiAendernUmwandelnInPolygonGrafik
- 'Call tiAendernUmwandelnIn3D
- 'Call tiAendernUmwandelnIn3DRotationsKoerper
- 'Call tiAendernUmwandelnInMetaFile
-
- gApplication = "DRAW"
- PrintLog "-------------------------" + gApplication + "-------------------"
- 'Call tiModifyConvertToPolygon
- 'Call tdContextConvertIntoBitmap
- 'Call tiAendernUmwandelnInKurve
- 'Call tiAendernUmwandelnInPolygonGrafik
- 'Call tiAendernUmwandelnIn3D
- 'Call tiAendernUmwandelnIn3DRotationsKoerper
- 'Call tiAendernUmwandelnInMetaFile
-
- Call hStatusOut
-end sub
-
-sub LoadIncludeFiles
- use "global\system\includes\master.inc"
- use "global\system\includes\gvariabl.inc"
- gApplication = "IMPRESS"
- Call GetUseFiles
-end sub
+'encoding UTF-8 Do not remove or change this line! +'************************************************************************** +' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +' +' Copyright 2000, 2010 Oracle and/or its affiliates. +' +' OpenOffice.org - a multi-platform office productivity suite +' +' 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@oracle.com +'* +'* short description : Graphics Function: Convert to ... +'* +'\****************************************************************** + +global Ueber_Text_1 as string +global Ueber_Text_2 as string +global Ueber_Text_3 as string + +sub main + PrintLog "------------------------- g_convertto test -------------------------" + Call hStatusIn ( "Graphics","g_convertto.bas") + + use "graphics\tools\id_tools.inc" + use "graphics\tools\id_tools_2.inc" + use "graphics\optional\includes\global\g_convertto.inc" + + PrintLog "-------------------------" + gApplication + "-------------------" + Call tiModifyConvertToPolygon + Call tdContextConvertIntoBitmap + Call tiAendernUmwandelnInKurve + Call tiAendernUmwandelnInPolygonGrafik + Call tiAendernUmwandelnIn3D + Call tiAendernUmwandelnIn3DRotationsKoerper + Call tiAendernUmwandelnInMetaFile + + gApplication = "DRAW" + PrintLog "-------------------------" + gApplication + "-------------------" + Call tiModifyConvertToPolygon + Call tdContextConvertIntoBitmap + Call tiAendernUmwandelnInKurve + Call tiAendernUmwandelnInPolygonGrafik + Call tiAendernUmwandelnIn3D + Call tiAendernUmwandelnIn3DRotationsKoerper + Call tiAendernUmwandelnInMetaFile + + Call hStatusOut +end sub + +sub LoadIncludeFiles + use "global\system\includes\master.inc" + use "global\system\includes\gvariabl.inc" + gApplication = "IMPRESS" + Call GetUseFiles +end sub diff --git a/testautomation/graphics/optional/g_crossfading.bas b/testautomation/graphics/optional/g_crossfading.bas index 1520f995e8ab..0c8102e70bde 100644..100755 --- a/testautomation/graphics/optional/g_crossfading.bas +++ b/testautomation/graphics/optional/g_crossfading.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphic Optional Test for Edit/Crossfading '* diff --git a/testautomation/graphics/optional/g_customshapes.bas b/testautomation/graphics/optional/g_customshapes.bas index f759be72f680..960fb7a2e19b 100644..100755 --- a/testautomation/graphics/optional/g_customshapes.bas +++ b/testautomation/graphics/optional/g_customshapes.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Customshapes '* diff --git a/testautomation/graphics/optional/g_demoguide.bas b/testautomation/graphics/optional/g_demoguide.bas index 62e0e487ca89..c3a8fe861724 100755 --- a/testautomation/graphics/optional/g_demoguide.bas +++ b/testautomation/graphics/optional/g_demoguide.bas @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : testcase to check the demo guide '* diff --git a/testautomation/graphics/optional/g_dimensions.bas b/testautomation/graphics/optional/g_dimensions.bas index 1ebbb15e3c31..3644dfd3b0d8 100755 --- a/testautomation/graphics/optional/g_dimensions.bas +++ b/testautomation/graphics/optional/g_dimensions.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Dimensioning Line '* diff --git a/testautomation/graphics/optional/g_edit.bas b/testautomation/graphics/optional/g_edit.bas index f99f9e34e0fc..305967f73112 100755 --- a/testautomation/graphics/optional/g_edit.bas +++ b/testautomation/graphics/optional/g_edit.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Edit '* diff --git a/testautomation/graphics/optional/g_export_html.bas b/testautomation/graphics/optional/g_export_html.bas index c561f244c214..faa2783b6d2f 100755 --- a/testautomation/graphics/optional/g_export_html.bas +++ b/testautomation/graphics/optional/g_export_html.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Export to HTML '* diff --git a/testautomation/graphics/optional/g_findreplace.bas b/testautomation/graphics/optional/g_findreplace.bas index 55cd9ee405d1..9de7acfa2bc5 100755 --- a/testautomation/graphics/optional/g_findreplace.bas +++ b/testautomation/graphics/optional/g_findreplace.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Optional Find and Replace Test '* diff --git a/testautomation/graphics/optional/g_format.bas b/testautomation/graphics/optional/g_format.bas index 1ee537573a5f..1c03f7bf8801 100755 --- a/testautomation/graphics/optional/g_format.bas +++ b/testautomation/graphics/optional/g_format.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Format '* diff --git a/testautomation/graphics/optional/g_group.bas b/testautomation/graphics/optional/g_group.bas index f8d16e653c9c..93f542bcc027 100644..100755 --- a/testautomation/graphics/optional/g_group.bas +++ b/testautomation/graphics/optional/g_group.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Group '* diff --git a/testautomation/graphics/optional/g_imagemap.bas b/testautomation/graphics/optional/g_imagemap.bas index 20a785548c7c..b2dd4a62c182 100755 --- a/testautomation/graphics/optional/g_imagemap.bas +++ b/testautomation/graphics/optional/g_imagemap.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: ImageMap '* diff --git a/testautomation/graphics/optional/g_insert.bas b/testautomation/graphics/optional/g_insert.bas index bae6d277c98f..a006e2f04c3e 100755 --- a/testautomation/graphics/optional/g_insert.bas +++ b/testautomation/graphics/optional/g_insert.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Insert '* diff --git a/testautomation/graphics/optional/g_line.bas b/testautomation/graphics/optional/g_line.bas index 867621aa88b0..c1327e21bc96 100644..100755 --- a/testautomation/graphics/optional/g_line.bas +++ b/testautomation/graphics/optional/g_line.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Format - Line '* diff --git a/testautomation/graphics/optional/g_load_save.bas b/testautomation/graphics/optional/g_load_save.bas index 5ee50f636ea7..b68da93657fc 100755 --- a/testautomation/graphics/optional/g_load_save.bas +++ b/testautomation/graphics/optional/g_load_save.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Load and Save '* diff --git a/testautomation/graphics/optional/g_mediaplayer.bas b/testautomation/graphics/optional/g_mediaplayer.bas index 3e25c88b3e1f..e237ce752a2d 100755 --- a/testautomation/graphics/optional/g_mediaplayer.bas +++ b/testautomation/graphics/optional/g_mediaplayer.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Mediaplayer-functionallity '* diff --git a/testautomation/graphics/optional/g_navigator.bas b/testautomation/graphics/optional/g_navigator.bas index 41b1babec1ed..cc165c76b37e 100755 --- a/testautomation/graphics/optional/g_navigator.bas +++ b/testautomation/graphics/optional/g_navigator.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Navigator '* diff --git a/testautomation/graphics/optional/g_ole.bas b/testautomation/graphics/optional/g_ole.bas index 6409388ef2f6..98f99e4ab931 100644..100755 --- a/testautomation/graphics/optional/g_ole.bas +++ b/testautomation/graphics/optional/g_ole.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Ole-behaviour '* diff --git a/testautomation/graphics/optional/g_paneview.bas b/testautomation/graphics/optional/g_paneview.bas index da1043ba6e63..021a95cfbfad 100755 --- a/testautomation/graphics/optional/g_paneview.bas +++ b/testautomation/graphics/optional/g_paneview.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Paneview-behaviour '* diff --git a/testautomation/graphics/optional/g_paragraph.bas b/testautomation/graphics/optional/g_paragraph.bas index e45fa68c7ce4..502728773a6e 100755 --- a/testautomation/graphics/optional/g_paragraph.bas +++ b/testautomation/graphics/optional/g_paragraph.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Format - Paragraph '* diff --git a/testautomation/graphics/optional/g_savepictureas.bas b/testautomation/graphics/optional/g_savepictureas.bas index e3c5f3fc5b8d..332632dcdac6 100644..100755 --- a/testautomation/graphics/optional/g_savepictureas.bas +++ b/testautomation/graphics/optional/g_savepictureas.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Contextmenu-SaveAs Picture -Test '* diff --git a/testautomation/graphics/optional/g_shaddow.bas b/testautomation/graphics/optional/g_shaddow.bas index cdfc24c2ea90..c6e963ae1658 100755 --- a/testautomation/graphics/optional/g_shaddow.bas +++ b/testautomation/graphics/optional/g_shaddow.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ ' * -' * Owner : wolfram.garten@sun.com +' * Owner : wolfram.garten@oracle.com ' * ' * short description : Shaddow Optional Test ' * diff --git a/testautomation/graphics/optional/g_slidelayer.bas b/testautomation/graphics/optional/g_slidelayer.bas index ba444adbd71c..3ffd9a4ab37a 100755 --- a/testautomation/graphics/optional/g_slidelayer.bas +++ b/testautomation/graphics/optional/g_slidelayer.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Slide and Layer '* diff --git a/testautomation/graphics/optional/g_spellcheck.bas b/testautomation/graphics/optional/g_spellcheck.bas index bc975337b1d9..f8a8eb6c0668 100755 --- a/testautomation/graphics/optional/g_spellcheck.bas +++ b/testautomation/graphics/optional/g_spellcheck.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Tools - Spellcheck '* @@ -42,19 +42,16 @@ sub main use "graphics\optional\includes\global\g_spellcheck.inc" hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () ) - - PrintLog "-------------------------" + gApplication + "-------------------" - Call tiToolsSpellcheckCorrect - Call tiToolsSpellcheckError - Call tiToolsSpellcheckCheck - Call tToolsSpellcheckAutoSpellcheck + PrintLog "-------------------------" + gApplication + "-------------------" + call tiToolsSpellcheckCheck_AlwaysIgnore + call tiToolsSpellcheckCheck_Change + call tiToolsSpellcheckCheck_ChangeAll gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" - Call tiToolsSpellcheckCorrect - Call tiToolsSpellcheckError - Call tiToolsSpellcheckCheck - Call tToolsSpellcheckAutoSpellcheck + call tiToolsSpellcheckCheck_AlwaysIgnore + call tiToolsSpellcheckCheck_Change + call tiToolsSpellcheckCheck_ChangeAll Call hStatusOut end sub diff --git a/testautomation/graphics/optional/g_stylist.bas b/testautomation/graphics/optional/g_stylist.bas index 0e3b66922af2..50da6610c41a 100755 --- a/testautomation/graphics/optional/g_stylist.bas +++ b/testautomation/graphics/optional/g_stylist.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Stylist '* diff --git a/testautomation/graphics/optional/g_tables.bas b/testautomation/graphics/optional/g_tables.bas index 4d4979631839..dee2e14c67a5 100755 --- a/testautomation/graphics/optional/g_tables.bas +++ b/testautomation/graphics/optional/g_tables.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : Testing of impress tables '* diff --git a/testautomation/graphics/optional/g_toolbars.bas b/testautomation/graphics/optional/g_toolbars.bas index 12ff49f97cc9..b643e02c9e9b 100755 --- a/testautomation/graphics/optional/g_toolbars.bas +++ b/testautomation/graphics/optional/g_toolbars.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Toolbars '* diff --git a/testautomation/graphics/optional/g_tools.bas b/testautomation/graphics/optional/g_tools.bas index 272840602ac4..4e79a89ca469 100644..100755 --- a/testautomation/graphics/optional/g_tools.bas +++ b/testautomation/graphics/optional/g_tools.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Tools '* diff --git a/testautomation/graphics/optional/g_zoom.bas b/testautomation/graphics/optional/g_zoom.bas index 204338131c63..1b494950ce44 100755 --- a/testautomation/graphics/optional/g_zoom.bas +++ b/testautomation/graphics/optional/g_zoom.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Zoom '* diff --git a/testautomation/graphics/optional/gallery.bas b/testautomation/graphics/optional/gallery.bas index c26526ee7791..9b81954f8902 100755 --- a/testautomation/graphics/optional/gallery.bas +++ b/testautomation/graphics/optional/gallery.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : (quick test) Checking functionality and all Gallery themes '* diff --git a/testautomation/graphics/optional/gallery2.bas b/testautomation/graphics/optional/gallery2.bas index ca0ef0ad3bcb..d467b0a74876 100755 --- a/testautomation/graphics/optional/gallery2.bas +++ b/testautomation/graphics/optional/gallery2.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : (long duration! > 6h) Testing all Gallery items '* diff --git a/testautomation/graphics/optional/i_animation.bas b/testautomation/graphics/optional/i_animation.bas index 6b2c4851a28a..85503fc790c1 100644..100755 --- a/testautomation/graphics/optional/i_animation.bas +++ b/testautomation/graphics/optional/i_animation.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Function: Animation '* diff --git a/testautomation/graphics/optional/i_headerfooter.bas b/testautomation/graphics/optional/i_headerfooter.bas index 2ed85c89553c..e050b914ca9e 100755 --- a/testautomation/graphics/optional/i_headerfooter.bas +++ b/testautomation/graphics/optional/i_headerfooter.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Header and Footer '* diff --git a/testautomation/graphics/optional/i_only_updt_1.bas b/testautomation/graphics/optional/i_only_updt_1.bas index cd14cca268dc..98d226424f00 100755 --- a/testautomation/graphics/optional/i_only_updt_1.bas +++ b/testautomation/graphics/optional/i_only_updt_1.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Only Required Test (Part 1) '* @@ -58,7 +58,7 @@ sub main call im_004_ call id_004 call id_005 - call id_006 + call id_Tools Call hStatusOut end sub diff --git a/testautomation/graphics/optional/i_only_updt_2.bas b/testautomation/graphics/optional/i_only_updt_2.bas index 13faba0d6f2f..7b35dbab5740 100755 --- a/testautomation/graphics/optional/i_only_updt_2.bas +++ b/testautomation/graphics/optional/i_only_updt_2.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Only Required (Test Part 2) '* diff --git a/testautomation/graphics/optional/i_pengine.bas b/testautomation/graphics/optional/i_pengine.bas index 994d3486736e..5ddefe26ca94 100755 --- a/testautomation/graphics/optional/i_pengine.bas +++ b/testautomation/graphics/optional/i_pengine.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ ' * -' * Owner : wolfram.garten@sun.com +' * Owner : wolfram.garten@oracle.com ' * ' * short description : Presentation-Engine Optional Test ' * diff --git a/testautomation/graphics/optional/i_saveloadlayout.bas b/testautomation/graphics/optional/i_saveloadlayout.bas index 08fc52a44270..137007da7c8f 100644..100755 --- a/testautomation/graphics/optional/i_saveloadlayout.bas +++ b/testautomation/graphics/optional/i_saveloadlayout.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Save & Load testing of Layout -templates. '* diff --git a/testautomation/graphics/optional/i_shape.bas b/testautomation/graphics/optional/i_shape.bas index e92e97898448..0ebb3c1e4864 100755 --- a/testautomation/graphics/optional/i_shape.bas +++ b/testautomation/graphics/optional/i_shape.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : Import presentations with shapes in .ppt format '* diff --git a/testautomation/graphics/optional/i_slidecopy.bas b/testautomation/graphics/optional/i_slidecopy.bas index cc1ac3f9d7bd..c780904e542d 100644..100755 --- a/testautomation/graphics/optional/i_slidecopy.bas +++ b/testautomation/graphics/optional/i_slidecopy.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Slidecopy-behaviour '* diff --git a/testautomation/graphics/optional/i_slideshow.bas b/testautomation/graphics/optional/i_slideshow.bas index 30d309dc41f9..8a9062c87c05 100755 --- a/testautomation/graphics/optional/i_slideshow.bas +++ b/testautomation/graphics/optional/i_slideshow.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Slideshow '* diff --git a/testautomation/graphics/optional/i_us_presentation.bas b/testautomation/graphics/optional/i_us_presentation.bas index a9f95f97d23c..fc1196fdb182 100755 --- a/testautomation/graphics/optional/i_us_presentation.bas +++ b/testautomation/graphics/optional/i_us_presentation.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics User-scenario-test: 2 Users creates Presentations. '* diff --git a/testautomation/graphics/optional/i_view.bas b/testautomation/graphics/optional/i_view.bas index eab1e9fdfc06..7dacea82d1b2 100755 --- a/testautomation/graphics/optional/i_view.bas +++ b/testautomation/graphics/optional/i_view.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Function: View '* diff --git a/testautomation/graphics/optional/includes/draw/d_002_.inc b/testautomation/graphics/optional/includes/draw/d_002_.inc index d3d0ee81a9c3..9b2f267a0729 100644 --- a/testautomation/graphics/optional/includes/draw/d_002_.inc +++ b/testautomation/graphics/optional/includes/draw/d_002_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/draw/d_003_.inc b/testautomation/graphics/optional/includes/draw/d_003_.inc index 3a7c7da12c38..744461061559 100644 --- a/testautomation/graphics/optional/includes/draw/d_003_.inc +++ b/testautomation/graphics/optional/includes/draw/d_003_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/draw/d_005_.inc b/testautomation/graphics/optional/includes/draw/d_005_.inc index 046e0bd76a30..6c3e7b2484df 100644 --- a/testautomation/graphics/optional/includes/draw/d_005_.inc +++ b/testautomation/graphics/optional/includes/draw/d_005_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/draw/d_007.inc b/testautomation/graphics/optional/includes/draw/d_007.inc index 6582ff2c34c1..89fef373f161 100644 --- a/testautomation/graphics/optional/includes/draw/d_007.inc +++ b/testautomation/graphics/optional/includes/draw/d_007.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc index e1d1479f5ee1..f4c34ec36795 100644 --- a/testautomation/graphics/optional/includes/global/export_graphic.inc +++ b/testautomation/graphics/optional/includes/global/export_graphic.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Export A-tests '* @@ -43,34 +43,24 @@ testcase tEPS hFileOpen( gTesttoolPath + "graphics\required\input\graphicexport." + ExtensionString ) if ( hCallExport ( OutputGrafikTBO , sFilter ) ) then - Kontext "EPSOptionen" - if ( EPSOptionen.Exists( 2 ) ) then + Kontext "EPSOptions" + if ( EPSOptions.Exists( 2 ) ) then printlog "check if all properties have the right count, and depend on each other" - ' they do not affect annything, i can check (TBO) - ' VorschauTIF.Check - ' InterchangeEPSI.Check + Level1.Check - if Farbe.IsEnabled then warnlog " :-(" - if Graustufen.IsEnabled then warnlog " :-(" - if LZWKodierung.IsEnabled then warnlog " :-(" - if Keine.IsEnabled then warnlog " :-(" - ' if (TextEinstellungen.IsEnabled <> TRUE) then warnlog " :-(" + if Color.IsEnabled then warnlog " :-(" + if Greyscale.IsEnabled then warnlog " :-(" + if LZWEncoding.IsEnabled then warnlog " :-(" + if NoneCompression.IsEnabled then warnlog " :-(" + Level2.Check - if (Farbe.IsEnabled <> TRUE) then warnlog " :-(" - if (Graustufen.IsEnabled <> TRUE) then warnlog " :-(" - if (LZWKodierung.IsEnabled <> TRUE) then warnlog " :-(" - if (Keine.IsEnabled <> TRUE) then warnlog " :-(" - ' if (TextEinstellungen.IsEnabled <> TRUE) then warnlog " :-(" - printlog "'Color Resolution' listbox contains eight items" - ' x = TextEinstellungen.GetItemCount - ' if x <> 2 then warnlog "'TextEinstellungen' Count is wrong; should:2, is:" + x - ' for i = 1 to x - ' TextEinstellungen.Select i - ' sleep 1 - ' Printlog " - " + i + ": '" +TextEinstellungen.GetSelText + "'" - ' next i + if (Color.IsEnabled <> TRUE) then warnlog " :-(" + if (Greyscale.IsEnabled <> TRUE) then warnlog " :-(" + if (LZWEncoding.IsEnabled <> TRUE) then warnlog " :-(" + if (NoneCompression.IsEnabled <> TRUE) then warnlog " :-(" + printlog "leave dialog with cancel -> there has to be no file created!" - hCloseDialog( EPSOptionen, "cancel" ) + hCloseDialog( EPSOptions, "cancel" ) if ( FileExists( OutputGrafikTBO+sExt ) ) then ' inspired by bug #99932 Graphic is exported though cancel is pressed warnlog "Dialog was canceled, but file got saved, too :-( - i35177" @@ -89,10 +79,9 @@ testcase tEPS printlog( "Save the file" ) if ( hCallExport( OutputGrafikTBO, sFilter ) ) then - Kontext "EPSOptionen" - if ( EPSOptionen.Exists( 2 ) ) then - printlog "TextEinstellungen.select 2" - hCloseDialog( EPSOptionen, "ok" ) + Kontext "EPSOptions" + if ( EPSOptions.Exists( 2 ) ) then + hCloseDialog( EPSOptions, "ok" ) else warnlog( "No export options dialog was displayed" ) endif @@ -127,24 +116,13 @@ testcase tPCT printlog "open the document" sDocument = convertpath( gTesttoolPath + "graphics\required\input\graphicexport." + ExtensionString ) hFileOpen( sDocument ) - + printlog "----------1st: Trying export and canceling it." if ( hCallExport( OutputGrafikTBO , sFilter ) ) then - - Kontext "PICTOptionen" + Kontext "PCTOptions" printlog( "Export options dialog" ) - if ( PICTOptionen.Exists( 2 ) ) then - - printlog "check if all properties have the right count, and depend on each other" - Original.Check - if Breite.IsEnabled then warnlog " :-(" - if Hoehe.IsEnabled then warnlog " :-(" - Groesse.Check - Breite.More - Hoehe.Less - + if PCTOptions.Exists(2) then printlog "leave dialog with cancel -> there has to be no file created!" - hCloseDialog( PICTOptionen, "cancel" ) - + hCloseDialog( PCTOptions, "cancel" ) if ( FileExists( OutputGrafikTBO + sExt ) ) then warnlog( "#i35177# - dialog <PictOptions> canceled, still the file was saved" ) endif @@ -157,33 +135,25 @@ testcase tPCT Warnlog " '" + sFilter + "' has a problem" Active.OK end if - end if - printlog " now save it realy and load the file afterwards" + printlog "----------2nd: now save it really and load the file afterwards" if ( hCallExport( OutputGrafikTBO, sFilter ) ) then - Kontext "PICTOptionen" + Kontext "PCTOptions" printlog( "Export options dialog" ) - if ( PICTOptionen.Exists( 2 ) ) then - Groesse.Check - Breite.Less - Hoehe.More - hCloseDialog( PICTOptionen, "ok" ) + if ( PCTOptions.Exists( 2 ) ) then + hCloseDialog( PCTOptions, "ok" ) else warnlog( "No export options dialog was displayed" ) endif - sOutputFile = OutputGrafikTBO+sExt - if ( hWaitForOutputFile( sOutputFile ) ) then - - printlog( "Close file and re-insert graphics into new document" ) + printlog "Close file and re-insert graphics into new document" hInsertGraphicsToNewFile( sOutputFile ) ' local helper function, see bottom of this file else warnlog( "File was not saved: " & sOutputFile ) endif - endif hFileReOpen( sDocument ) @@ -197,16 +167,16 @@ testcase tPCT endif endif + printlog "----------3rd: exporting part of the picture and inserting into new file." hTypeKeys ("<escape><tab>") fGetSizeXY sx1, sY, TRUE if ( hCallExport( OutputGrafikTBO + "1", sFilter, TRUE ) ) then - Kontext "PICTOptionen" + Kontext "PCTOptions" printlog( "Export options dialog" ) - if ( PICTOptionen.Exists( 2 ) ) then - Original.Check - hCloseDialog( PICTOptionen, "ok" ) + if ( PCTOptions.Exists( 2 ) ) then + hCloseDialog( PCTOptions, "ok" ) else warnlog( "No export options dialog was displayed" ) endif @@ -226,22 +196,29 @@ testcase tPCT endif hFileReOpen( "" ) + printlog "----------4th: exporting rectangle and reload file." hRechteckErstellen ( 10, 10, 30, 40 ) if ( hCallExport( OutputGrafikTBO + "2" , sFilter, TRUE ) ) then - Kontext "PICTOptionen" + Kontext "PCTOptions" printlog( "Export options dialog" ) - if ( PICTOptionen.Exists( 2 ) ) then - Groesse.Check - Breite.SetText "9" - Hoehe.SetText "9" - Groesse.Check - - printlog "Check 'Size' one more time to make the change go through" - sx1 = Breite.GetText - sY = Hoehe.GetText - hCloseDialog( PICTOptionen, "ok" ) + if ( PCTOptions.Exists( 2 ) ) then + Exportwidth.SetText "9" + if Exportmeasurement.GetSelText = "inches" then + sx1 = (Exportwidth.GetText)+ """" + printlog "sx1= " & sx1 + else + sx1 = (Exportwidth.GetText)+ "cm" + endif + + if Exportmeasurement.GetSelText = "inches" then + sY = (Exportheight.GetText)+ """" + printlog "sY= " & sY + else + sY = (Exportheight.GetText)+ "cm" + endif + hCloseDialog( PCTOptions, "ok" ) else warnlog( "No export options dialog was displayed" ) endif @@ -262,34 +239,6 @@ testcase tPCT if ( not bTemp ) then warnlog "Selected original size NOT OK :-(" endif - if ( hCallExport( OutputGrafikTBO + "3", sFilter, TRUE ) ) then - - Kontext "PICTOptionen" - printlog( "Export options dialog" ) - if ( PICTOptionen.Exists( 2 ) ) then - Groesse.Check - sX2 = Breite.GetText - if (LiberalMeasurement(sx1, sX2)) <> TRUE then - if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then - Printlog "Width was ok. Expected: " + sx1 + "' was: '" + sX2 + "'" - else - warnLog "Width is different expected: '" + sx1 + "' is: '" + sX2 + "'" - endif - endif - sY2 = Hoehe.GetText - if (LiberalMeasurement(sY, sY2)) <> TRUE then - if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then - Printlog "Height was ok. Expected: " + sY + "' was: '" + sY2 + "'" - else - warnLog "Height is different expected: '" + sY + "' is: '" + sY2 + "'" - endif - endif - hCloseDialog( PICTOptionen, "cancel" ) - else - warnlog( "No export options dialog was displayed" ) - endif - endif - call hCloseDocument endcase 'tPCT @@ -305,15 +254,17 @@ testcase tPBM printlog "Save it" if ( hCallExport (OutputGrafikTBO , sFilter ) ) then - Kontext "PBMOptionen" - if ( PBMOptionen.Exists( 2 ) ) then - Ascii.Check - hCloseDialog( PBMOptionen, "ok" ) + Kontext "PBMOptions" + if ( PBMOptions.Exists( 2 ) ) then + QualityBinary.Check + QualityText.Check + hCloseDialog( PBMOptions, "ok" ) else warnlog( "No export options dialog was displayed" ) endif printlog( "Close file and re-insert graphics into new document" ) + sleep (1) hInsertGraphicsToNewFile( OutputGrafikTBO + sExt ) ' local helper function, see bottom of this file endif @@ -333,10 +284,11 @@ testcase tPGM printlog "Save it" if ( hCallExport (OutputGrafikTBO , sFilter ) ) then - Kontext "PGMOptionen" - if ( PGMOptionen.Exists( 2 ) ) then - Ascii.Check - hCloseDialog( PGMOptionen, "ok" ) + Kontext "PGMOptions" + if ( PGMOptions.Exists( 2 ) ) then + QualityBinary.Check + QualityText.Check + hCloseDialog( PGMOptions, "ok" ) else warnlog( "No export options dialog was displayed" ) endif @@ -361,10 +313,11 @@ testcase tPPM printlog "Save it" if ( hCallExport (OutputGrafikTBO , sFilter ) ) then - Kontext "PPMOptionen" - if ( PPMOptionen.Exists( 2 ) ) then - Ascii.Check - hCloseDialog( PPMOptionen, "ok" ) + Kontext "PPMOptions" + if ( PPMOptions.Exists( 2 ) ) then + QualityBinary.Check + QualityText.Check + hCloseDialog( PPMOptions, "ok" ) else warnlog( "No export options dialog was displayed" ) endif @@ -452,16 +405,17 @@ testcase tGIF printlog "save it" if ( hCallExport( OutputGrafikTBO, sFilter ) ) then - Kontext "GIFOptionen" - if GIFOptionen.Exists (2) then - Interlace.Uncheck - TransparentSpeichern.UnCheck - hCloseDialog( GIFOptionen, "ok" ) + Kontext "GIFOptions" + if GIFOptions.Exists (2) then + Interlaced.Uncheck + Transparency.UnCheck + hCloseDialog( GIFOptions, "ok" ) else warnlog( "No export options dialog was displayed" ) endif printlog( "Close file and re-insert graphics into new document" ) + sleep (1) hInsertGraphicsToNewFile( OutputGrafikTBO + sExt ) ' local helper function, see bottom of this file endif @@ -481,11 +435,10 @@ testcase tJPEG printlog " save it " if ( hCallExport( OutputGrafikTBO , sFilter ) ) then - Kontext "JpegOptionen" - if ( JpegOptionen.Exists( 2 ) ) then - Echtfarben.Check - Qualitaet.ToMin - hCloseDialog( JpegOptionen, "ok" ) + Kontext "JPGOptions" + if ( JPGOptions.Exists( 2 ) ) then + Quality.ToMin + hCloseDialog( JPGOptions, "ok" ) else warnlog( "No export options dialog was displayed" ) endif @@ -502,7 +455,7 @@ endcase 'tJPEG '******************************************************************************* function hInsertGraphicsToNewFile( sOutputFile as string ) - + sleep (1) if ( FileExists( sOutputFile ) ) then hFileReOpen( "" ) Call hGrafikEinfuegen( sOutputFile ) diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc index 2a2cbac2020a..3beefb13dd64 100644 --- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc +++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Export B-tests. (the usual suspects) '* @@ -44,13 +44,13 @@ testcase tPNG hFileOpen( gTesttoolPath & "graphics\required\input\graphicexport." & ExtensionString ) if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then - Kontext "PNGOptionen" - if PNGOptionen.Exists (2) then - Kompression.ToMax + Kontext "PNGOptions" + if PNGOptions.Exists (2) then + Compression.ToMax Interlaced.UnCheck - PNGOptionen.OK + PNGOptions.OK iWaitIndex = 0 - do while PNGOptionen.Exists AND iWaitIndex < 30 + do while PNGOptions.Exists AND iWaitIndex < 30 sleep (1) iWaitIndex = iWaitIndex + 1 loop @@ -87,25 +87,19 @@ testcase tSVM sFilter = "SVM - StarView Metafile (.svm)" sExt = ".svm" - + printlog "opening test file" sDocument = ConvertPath ( gTesttoolPath & "graphics\required\input\graphicexport." & ExtensionString) hFileOpen sDocument + printlog "Trying export and canceling it.." if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Original.Check - if Breite.IsEnabled then - warnlog " :-(" - endif - if Hoehe.IsEnabled then - warnlog " :-(" - endif - Groesse.Check - Breite.More - Hoehe.Less - SVMOptionen.Cancel + Kontext "SVMOptions" + if SVMOptions.Exists (2) then + Exportwidth.More + Exportheight.Less + SVMOptions.Cancel sleep 5 + printlog "Checking if directory is still empty.." if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed Printlog "ok :-)" else @@ -122,13 +116,14 @@ testcase tSVM Active.OK end if end if + + printlog "Doing real SVM export." if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Groesse.Check - Breite.Less - Hoehe.More - SVMOptionen.OK + Kontext "SVMOptions" + if SVMOptions.Exists (2) then + Exportwidth.Less + Exportheight.More + SVMOptions.OK sleep 5 endif if ( dir(OutputGrafikTBO+sExt) <> "") then @@ -136,56 +131,77 @@ testcase tSVM else warnlog "File didn't get saved :-(" endif - hCloseDocument () - sleep 5 - hNewDocument() - sleep 5 - Call hGrafikEinfuegen ( OutputGrafikTBO+sExt ) endif + printlog "Closing TestDoc." hCloseDocument () + sleep 5 + printlog "Opening new doc and inserting exported file." + hNewDocument() + sleep 5 + Call hGrafikEinfuegen ( OutputGrafikTBO+sExt ) + printlog "Closing doc with inserted file." + hCloseDocument () + + printlog "Loading testdoc." hFileOpen (sDocument) sleep (10) - + printlog "Making doc editable." call fMakeDocumentWritable - + printlog "Selecting part of doc." hTypeKeys ("<escape><tab>") + printlog "getting size of part. " fGetSizeXY sx1, sY, TRUE + printlog "exporting part of doc." if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Original.Check - SVMOptionen.OK - sleep 5 - endif + Kontext "SVMOptions" + SVMOptions.OK + sleep 5 if ( dir(OutputGrafikTBO & "1" & sExt) <> "") then Printlog "Ok :-) Saved as: '" & OutputGrafikTBO & "1" & sExt & "'" else warnlog "File didn't get saved :-(" endif + printlog "Closing testdoc." hCloseDocument () sleep 5 + printlog "Opening new doc." hNewDocument() sleep 5 + printlog "Inserting exported part of Testdoc." Call hGrafikEinfuegen ( OutputGrafikTBO & "1" & sExt ) bTemp = FALSE + printlog "checking size of inserted file." fGetSizeXY sx1, sY, bTemp if (bTemp = FALSE) then warnlog "Selected original size NOT OK :-(" endif endif + printlog "closing doc." hCloseDocument () + + printlog "opening new doc." hNewDocument() + printlog "inserting Rectangle." hRechteckErstellen ( 10, 10, 30, 40 ) + printlog "Exporting Rectangle" if hCallExport (OutputGrafikTBO & "2" , sFilter, TRUE ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Groesse.Check - Breite.SetText "9" - Hoehe.SetText "9" - Groesse.Check 'Check to make settings go throught - sx1 = Breite.GetText - sY = Hoehe.GetText - SVMOptionen.OK + Kontext "SVMOptions" + if SVMOptions.Exists (2) then + Exportwidth.SetText "9" + if Exportmeasurement.GetSelText = "inches" then + sx1 = (Exportwidth.GetText)+ """" + printlog "sx1= " & sx1 + else + sx1 = (Exportwidth.GetText)+ "cm" + endif + + if Exportmeasurement.GetSelText = "inches" then + sY = (Exportheight.GetText)+ """" + printlog "sY= " & sY + else + sY = (Exportwidth.GetText)+ "cm" + endif + SVMOptions.OK sleep 5 endif if ( dir(OutputGrafikTBO & "2" & sExt) <> "") then @@ -193,8 +209,10 @@ testcase tSVM else warnlog "File didn't get saved :-(" endif + printlog "Closing doc." hCloseDocument () sleep 5 + printlog "Opening exported rectangle." hFileOpen (OutputGrafikTBO & "2" & sExt) kontext "Filterauswahl" if Filterauswahl.exists then @@ -204,6 +222,7 @@ testcase tSVM endif kontext "DocumentDraw" DocumentDraw.TypeKeys ("<escape><tab>") + printlog "Selecting and checking size.." ContextOriginalSize bTemp = FALSE fGetSizeXY sx1, sY, bTemp @@ -211,31 +230,8 @@ testcase tSVM warnlog "Selected original size NOT OK :-(" endif endif - if hCallExport (OutputGrafikTBO & "3" , sFilter, TRUE ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Groesse.Check - sX2 = Breite.GetText - if (LiberalMeasurement(sx1, sX2)) <> TRUE then - if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then - Printlog "Width was ok. Expected: " & sx1 & "' was: '" & sX2 & "'" - else - warnLog "Width is different expected: '" & sx1 & "' is: '" & sX2 & "'" - endif - endif - sY2 = Hoehe.GetText - if (LiberalMeasurement(sY, sY2)) <> TRUE then - if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then - Printlog "Height was ok. Expected: " & sY & "' was: '" & sY2 & "'" - else - warnLog "Height is different expected: '" & sY & "' is: '" & sY2 & "'" - endif - endif - SVMOptionen.Cancel - sleep 5 - endif - endif + printlog "Closing doc." call hCloseDocument endcase 'tSVM @@ -657,7 +653,7 @@ endcase 'tSVG '------------------------------------------------------------------------------- testcase tBMP -qaerrorlog + dim x as integer dim i as integer dim bTemp as boolean @@ -668,50 +664,24 @@ qaerrorlog dim sY2 as string dim sDocument as string - '/// open the document + printlog "open the Test-document" sDocument = ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString) hFileOpen sDocument - if hCallExport (OutputGrafikTBO , "BMP - Windows Bitmap (.bmp)" ) = TRUE then - Kontext "BMPOptionen" - if BMPOptionen.Exists (2) then - '/// check if all properties have the right count, and depend on each other ///' - '/// 'Color Resolution' listbox contains eight items ///' - x = Farbaufloesung.GetItemCount - if x <> 8 then warnlog "Color Resolution Count is wrong; should be:8, is:" + x + printlog "Trying to export and canceling.." + if hCallExport (OutputGrafikTBO , "BMP - Windows Bitmap (.bmp)" ) = TRUE then + Kontext "BMPOptions" + if BMPOptions.Exists (2) then + x = Colordepth.GetItemCount + if x <> 7 then warnlog "Color Resolution Count is wrong; should be:7, is:" + x for i = 1 to x - Farbaufloesung.Select i + Colordepth.Select i sleep 1 - Printlog " - " + i + ": '" +Farbaufloesung.GetSelText + "'" - '/// checkbox RLE coding has to be enabled only for '4 and 8 bit' color palettes ///' - if ((i > 3) AND (i < 8)) then - if RLEKodierung.IsEnabled <> TRUE then warnlog "'RLE coding' is not checkable :-(" - else - if RLEKodierung.IsEnabled <> FALSE then warnlog "'RLE coding' is checkable :-(" - endif + Printlog " - " + i + ": '" +Colordepth.GetSelText + "'" next i - '/// if Mode 'original' is selected, DPI///' - Original.Check - if DPI.IsEnabled then warnlog " :-(" - if Breite.IsEnabled then warnlog " :-(" - if Hoehe.IsEnabled then warnlog " :-(" - Aufloesung.Check - x = DPI.GetItemCount - '/// 'DPI' listbox contains eight items ///' - if x <> 4 then warnlog "'DPI' Count is wrong; should be:4, is:" + x - for i = 1 to x - DPI.Select i - Printlog " - " + i + ": '" +DPI.GetSelText + "'" - next i - if Breite.IsEnabled then warnlog " :-(" - if Hoehe.IsEnabled then warnlog " :-(" - Groesse.Check - if DPI.IsEnabled then warnlog " :-(" - Breite.More - Hoehe.Less Sleep 1 - '/// leave dialog with cancel -> there has to be no file created! ///' - BMPOptionen.Cancel + printlog "Leave dialog with cancel -> there has to be no file created!" + BMPOptions.Cancel sleep 5 if ( dir(OutputGrafikTBO+".bmp") = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed Printlog "ok :-)" @@ -729,15 +699,14 @@ qaerrorlog Active.OK end if end if - Printlog "'/// now save it realy and load the file afterwards ///'" + + Printlog " now save it really and load the file afterwards" if hCallExport (OutputGrafikTBO , "BMP - Windows Bitmap (.bmp)" ) = TRUE then - Kontext "BMPOptionen" - if BMPOptionen.Exists (2) then - Farbaufloesung.Select 7 - RLEKodierung.Check - Aufloesung.Check - DPI.Select 3 - BMPOptionen.OK + Kontext "BMPOptions" + if BMPOptions.Exists (2) then + Colordepth.Select 7 + Compression.Check + BMPOptions.OK sleep 5 endif if ( dir(OutputGrafikTBO+".bmp") <> "") then @@ -745,14 +714,18 @@ qaerrorlog else warnlog "File didn't get saved :-(" endif + printlog "Closing doc." hCloseDocument () sleep 5 + printlog "Opening new doc." hNewDocument() sleep 5 + printlog "Inserting exported file." Call hGrafikEinfuegen ( OutputGrafikTBO+".bmp" ) endif + printlog "Closing doc again." hCloseDocument () - Printlog "'/// now save a SELECTION in ORIGINAL SIZE and load the file afterwards ///'" + Printlog "Now save a SELECTION in and load the file afterwards" hFileOpen (sDocument) kontext "Filterauswahl" @@ -762,51 +735,58 @@ qaerrorlog goto endsub endif - ' check if the document is writable + printlog "check if the document is writable" call fMakeDocumentWritable hTypeKeys ("<escape><tab>") fGetSizeXY sx1, sy, TRUE - if hCallExport (OutputGrafikTBO + "1" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then - Kontext "BMPOptionen" - if BMPOptionen.Exists (2) then - Original.Check - BMPOptionen.OK - sleep 5 - endif - if ( dir(OutputGrafikTBO + "1"+".bmp") <> "") then - Printlog "Ok :-) Saved as: '" + OutputGrafikTBO + "1"+".bmp" + "'" - else - warnlog "File didn't get saved :-(" - endif - hCloseDocument () - sleep 5 - hNewDocument() - sleep 5 - Call hGrafikEinfuegen ( OutputGrafikTBO + "1"+".bmp" ) - bTemp = FALSE - fGetSizeXY sx1, sY, bTemp - if (bTemp = FALSE) then - warnlog "Selected original size NOT OK :-(" + if hCallExport (OutputGrafikTBO + "1" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then + Kontext "BMPOptions" + if BMPOptions.Exists (2) then + BMPOptions.OK + sleep 5 + endif + if ( dir(OutputGrafikTBO + "1"+".bmp") <> "") then + Printlog "Ok :-) Saved as: '" + OutputGrafikTBO + "1"+".bmp" + "'" + else + warnlog "File didn't get saved :-(" + endif + hCloseDocument () + sleep 5 + hNewDocument() + sleep 5 + Call hGrafikEinfuegen ( OutputGrafikTBO + "1"+".bmp" ) + bTemp = FALSE + fGetSizeXY sx1, sY, bTemp + if (bTemp = FALSE) then + warnlog "Selected original size NOT OK :-(" endif endif hCloseDocument () - Printlog "'/// now CREATE a rectangle, select it, save it in SIZE and load the file afterwards ///'" + Printlog "Now create a rectangle, select it, save it in SIZE and load the file afterwards" hNewDocument() hTypeKeys "<TAB>" gMouseClick 50, 50 hRechteckErstellen ( 10, 10, 30, 40 ) if hCallExport (OutputGrafikTBO + "2" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then - Kontext "BMPOptionen" - if BMPOptionen.Exists (2) then - Groesse.Check - Breite.SetText "9" - Hoehe.SetText "9" - Groesse.Check 'Press "Size" one more time in order to make the change go through" - sx1 = Breite.GetText - sY = Hoehe.GetText - BMPOptionen.OK + Kontext "BMPOptions" + if BMPOptions.Exists (2) then + Exportwidth.SetText "9" + if Exportmeasurement.GetSelText = "inches" then + sx1 = (Exportwidth.GetText)+ """" + printlog "sx1= " & sx1 + else + sx1 = (Exportwidth.GetText)+ "cm" + endif + + if Exportmeasurement.GetSelText = "inches" then + sY = (Exportheight.GetText)+ """" + printlog "sY= " & sY + else + sY = (Exportwidth.GetText)+ "cm" + endif + BMPOptions.OK sleep 5 endif if ( dir(OutputGrafikTBO + "2"+".bmp") <> "") then @@ -814,6 +794,7 @@ qaerrorlog else warnlog "File didn't get saved :-(" endif + printlog "Closing doc." hCloseDocument () sleep 5 hFileOpen (OutputGrafikTBO + "2"+".bmp") @@ -834,31 +815,6 @@ qaerrorlog endif endif - if hCallExport (OutputGrafikTBO + "3" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then - Kontext "BMPOptionen" - if BMPOptionen.Exists (2) then - Groesse.Check - sX2 = Breite.GetText - if (LiberalMeasurement(sx1, sX2)) <> TRUE then - if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then - Printlog "Width was ok. Expected: " + sx1 + "' was: '" + sX2 + "'" - else - warnLog "Width is different expected: '" + sx1 + "' is: '" + sX2 + "'" - endif - endif - sY2 = Hoehe.GetText - if (LiberalMeasurement(sY, sY2)) <> TRUE then - if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then - Printlog "Height was ok. Expected: " + sY + "' was: '" + sY2 + "'" - else - warnLog "Height is different expected: '" + sY + "' is: '" + sY2 + "'" - endif - endif - BMPOptionen.Cancel - sleep 5 - endif - endif - call hCloseDocument endcase 'tBMP @@ -884,19 +840,11 @@ testcase tEMF hFileOpen sDocument if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Original.Check - if Breite.IsEnabled then - warnlog " :-(" - endif - if Hoehe.IsEnabled then - warnlog " :-(" - endif - Groesse.Check - Breite.More - Hoehe.Less - SVMOptionen.Cancel + Kontext "EMFOptions" + if EMFOptions.Exists (2) then + Exportwidth.More + Exportheight.Less + EMFOptions.Cancel sleep 5 if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed Printlog "ok :-)" @@ -915,12 +863,11 @@ testcase tEMF end if end if if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Groesse.Check - Breite.Less - Hoehe.More - SVMOptionen.OK + Kontext "EMFOptions" + if EMFOptions.Exists (2) then + Exportwidth.More + Exportheight.Less + EMFOptions.OK sleep 5 endif if ( dir(OutputGrafikTBO+sExt) <> "") then @@ -935,53 +882,26 @@ testcase tEMF Call hGrafikEinfuegen ( OutputGrafikTBO+sExt ) endif hCloseDocument () - hFileOpen (sDocument) - kontext "Filterauswahl" - if Filterauswahl.Exists(10) then - Warnlog "Error when loading the file. The Filter-dialogue came up. Test aborted." - Filterauswahl.Cancel - goto endsub - endif - printlog "making doc editable if it is readonly" - call fMakeDocumentWritable - hTypeKeys ("<escape><tab>") - fGetSizeXY sx1, sY, TRUE - if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Original.Check - SVMOptionen.OK - sleep 5 - endif - if ( dir(OutputGrafikTBO & "1" & sExt) <> "") then - Printlog "Ok :-) saved as: '" & OutputGrafikTBO & "1" & sExt & "'" - else - warnlog "File didn't get saved :-(" - endif - hCloseDocument () - sleep 5 - hNewDocument() - sleep 5 - Call hGrafikEinfuegen ( OutputGrafikTBO & "1" & sExt ) - bTemp = FALSE - fGetSizeXY sx1, sY, bTemp - if (bTemp = FALSE) then - warnlog "Selected original size NOT OK :-(" - endif - endif - hCloseDocument () + hNewDocument() hRechteckErstellen ( 10, 10, 30, 40 ) if hCallExport (OutputGrafikTBO & "2" , sFilter, TRUE ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Groesse.Check - Breite.SetText "9" - Hoehe.SetText "9" - Groesse.Check 'Press "Size" one more time to make the change go through" - sx1 = Breite.GetText - sY = Hoehe.GetText - SVMOptionen.OK + Kontext "EMFOptions" + if EMFOptions.Exists (2) then + Exportwidth.SetText "9" + if Exportmeasurement.GetSelText = "inches" then + sx1 = (Exportwidth.GetText)+ """" + printlog "sx1= " & sx1 + else + sx1 = (Exportwidth.GetText)+ "cm" + endif + if Exportmeasurement.GetSelText = "inches" then + sY = (Exportheight.GetText)+ """" + printlog "sY= " & sY + else + sY = (Exportwidth.GetText)+ "cm" + endif + EMFOptions.OK sleep 5 endif if ( dir(OutputGrafikTBO & "2" & sExt) <> "") then @@ -1002,10 +922,9 @@ testcase tEMF endif if hCallExport (OutputGrafikTBO & "3" , sFilter, TRUE ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Groesse.Check - sX2 = Breite.GetText + Kontext "EMFOptions" + if EMFOptions.Exists (2) then + sX2 = Exportwidth.GetText if (LiberalMeasurement(sx1, sX2)) <> TRUE then if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then Printlog "Width was ok. Expected: " & sx1 & "' was: '" & sX2 & "'" @@ -1013,7 +932,7 @@ testcase tEMF warnLog "Width is different expected: '" & sx1 & "' is: '" & sX2 & "'" endif endif - sY2 = Hoehe.GetText + sY2 = Exportheight.GetText if (LiberalMeasurement(sY, sY2)) <> TRUE then if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then Printlog "Height was ok. Expected: " & sY & "' was: '" & sY2 & "'" @@ -1021,7 +940,7 @@ testcase tEMF warnLog "Height is different expected: '" & sY & "' is: '" & sY2 & "'" endif endif - SVMOptionen.Cancel + EMFOptions.Cancel sleep 5 endif endif @@ -1050,32 +969,26 @@ testcase tMET sExt = ".met" sDocument = gTesttoolPath & "graphics\required\input\graphicexport." & ExtensionString + printlog "loading Test File" hFileOpen sDocument + printlog "----------1st: Trying to export and then canceling it" if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then - Kontext "METOptionen" - if METOptionen.Exists (2) then - Original.Check - if Breite.IsEnabled then - warnlog " :-(" - endif - if Hoehe.IsEnabled then - warnlog " :-(" - endif - Groesse.Check - sTemp = Breite.getText - Breite.More - if (sTemp = Breite.getText) then + Kontext "METOptions" + if METOptions.Exists (2) then + sTemp = Exportwidth.getText + Exportwidth.More + if (sTemp = Exportwidth.getText) then qaErrorLog "Width didn't change on pressing button 'More' #112225#" - Breite.setText "10" - Hoehe.setText "10" + Exportwidth.setText "10" endif - sTemp = Hoehe.getText - Hoehe.Less - if (sTemp = Hoehe.getText) then + sTemp = Exportheight.getText + Exportheight.Less + if (sTemp = Exportheight.getText) then warnlog "Height didn't change on pressing button 'Less'" endif - METOptionen.Cancel + printlog "Canceling export..." + METOptions.Cancel sleep 5 if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed Printlog "ok :-)" @@ -1093,25 +1006,24 @@ testcase tMET Active.OK end if end if + printlog "----------2nd: doing real export.." if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then - Kontext "METOptionen" - if METOptionen.Exists (2) then - Groesse.Check - sTemp = Breite.getText - Breite.Less - if (sTemp = Breite.getText) then + Kontext "METOptions" + if METOptions.Exists (2) then + sTemp = Exportwidth.getText + Exportwidth.Less + if (sTemp = Exportwidth.getText) then warnlog "Width didn't change on pressing button 'Less'" endif - sTemp = Hoehe.getText - Hoehe.More - if (sTemp = Hoehe.getText) then + sTemp = Exportheight.getText + Exportheight.More + if (sTemp = Exportheight.getText) then qaErrorLog "Height didn't change on pressing button 'More' #112225#" - Breite.setText "10" - Hoehe.setText "10" + Exportwidth.setText "10" endif - METOptionen.OK + METOptions.OK iWaitIndex = 0 - do while METOptionen.Exists AND iWaitIndex < 30 + do while METOptions.Exists AND iWaitIndex < 30 sleep (1) iWaitIndex = iWaitIndex + 1 loop @@ -1121,28 +1033,33 @@ testcase tMET else warnlog "File didn't get saved :-(" endif + printlog "Closing test doc." hCloseDocument () sleep 5 + printlog "----------3rd: Inserting export into new doc." + printlog "Opening new doc." hNewDocument() sleep 5 + printlog "Inserting the exported file..." Call hGrafikEinfuegen ( OutputGrafikTBO+sExt ) endif + printlog "Closing file with inserted graphic." hCloseDocument () + printlog "----------4th: Exporting part of test doc." + printlog "Opening test file.." hFileOpen (sDocument) sleep (10) - printlog "making doc editable if it is readonly" call fMakeDocumentWritable - + printlog "Selecting part of doc for export.." hTypeKeys ("<escape><tab>") fGetSizeXY sx1, sY, TRUE if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then - Kontext "METOptionen" - if METOptionen.Exists (2) then - Original.Check - METOptionen.OK + Kontext "METOptions" + if METOptions.Exists (2) then + METOptions.OK iWaitIndex = 0 - do while METOptionen.Exists AND iWaitIndex < 30 + do while METOptions.Exists AND iWaitIndex < 30 sleep (1) iWaitIndex = iWaitIndex + 1 loop @@ -1152,32 +1069,51 @@ testcase tMET else warnlog "File didn't get saved :-(" endif + printlog "Closing testfile" hCloseDocument () sleep 5 + printlog "----------5th: Inserting exported part into new doc." + printlog "Opening new file.." hNewDocument() sleep 5 + printlog "inserting exported part." Call hGrafikEinfuegen ( OutputGrafikTBO & "1" & sExt ) bTemp = FALSE + printlog "Checking size." fGetSizeXY sx1, sY, bTemp if (bTemp = FALSE) then warnlog "Selected original size NOT OK :-(" endif endif + printlog "Closing doc." hCloseDocument () + printlog "----------6th: exporting fresh rectangle." + printlog "opening new file." hNewDocument() + printlog "inserting rectangle." hRechteckErstellen ( 10, 10, 30, 40 ) + printlog "Exporting rectangle.." if hCallExport (OutputGrafikTBO & "2" , sFilter, TRUE ) = TRUE then - Kontext "METOptionen" - if METOptionen.Exists (2) then - Groesse.Check - Breite.SetText "9" - Hoehe.SetText "9" - Groesse.Check ' Click "Size" one more time to make the changes go through. - sx1 = Breite.GetText - sY = Hoehe.GetText - METOptionen.OK + Kontext "METOptions" + if METOptions.Exists (2) then + Exportwidth.SetText "9" + if Exportmeasurement.GetSelText = "inches" then + sx1 = (Exportwidth.GetText)+ """" + printlog "sx1= " & sx1 + else + sx1 = (Exportwidth.GetText)+ "cm" + endif + + if Exportmeasurement.GetSelText = "inches" then + sY = (Exportheight.GetText)+ """" + printlog "sY= " & sY + else + sY = (Exportwidth.GetText)+ "cm" + endif + + METOptions.OK iWaitIndex = 0 - do while METOptionen.Exists AND iWaitIndex < 30 + do while METOptions.Exists AND iWaitIndex < 30 sleep (1) iWaitIndex = iWaitIndex + 1 loop @@ -1187,11 +1123,14 @@ testcase tMET else warnlog "File didn't get saved :-(" endif + printlog "closing doc." hCloseDocument () sleep 5 + printlog "----------7th:Opening exported file with rectangle" hFileOpen (OutputGrafikTBO & "2" & sExt) kontext "DocumentDraw" DocumentDraw.TypeKeys ("<escape><tab>") + printlog "Checking file size." ContextOriginalSize bTemp = FALSE fGetSizeXY sx1, sY, bTemp @@ -1199,30 +1138,6 @@ testcase tMET warnlog "Selected original size NOT OK :-(" endif endif - if hCallExport (OutputGrafikTBO & "3" , sFilter, TRUE ) = TRUE then - Kontext "METOptionen" - if METOptionen.Exists (2) then - Groesse.Check - sX2 = Breite.GetText - if (LiberalMeasurement(sx1, sX2)) <> TRUE then - if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then - Printlog "Width was ok. Expected: " & sx1 & "' was: '" & sX2 & "'" - else - warnLog "Width is different expected: '" & sx1 & "' is: '" & sX2 & "'" - endif - endif - sY2 = Hoehe.GetText - if (LiberalMeasurement(sY, sY2)) <> TRUE then - if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then - Printlog "Height was ok. Expected: " & sY & "' was: '" & sY2 & "'" - else - warnLog "Height is different expected: '" & sY & "' is: '" & sY2 & "'" - endif - endif - METOptionen.Cancel - sleep 5 - endif - endif call hCloseDocument endcase 'tMET @@ -1270,27 +1185,20 @@ testcase tWMF sFilter = "WMF - Windows Metafile (.wmf)" sExt = ".wmf" - sDocument = gTesttoolPath & "graphics\required\input\graphicexport." & ExtensionString + printlog "Loading testdoc." hFileOpen sDocument + printlog "Starting export as WMF and canceling.." if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Original.Check - if Breite.IsEnabled then - warnlog " :-(" - endif - if Hoehe.IsEnabled then - warnlog " :-(" - endif - Groesse.Check - Breite.More - Hoehe.Less - SVMOptionen.Cancel + Kontext "WMFOptions" + if WMFOptions.Exists (2) then + Exportwidth.Less + Exportheight.More + WMFOptions.Cancel sleep 5 if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed - Printlog "ok :-)" + Printlog "ok :-), nothing exported due to canceling." else warnlog "Dialog was canceled, but file got saved, too :-( - i35177" endif @@ -1305,15 +1213,15 @@ testcase tWMF Active.OK end if end if + printlog "Doing real export." if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Groesse.Check - Breite.Less - Hoehe.More - SVMOptionen.OK + Kontext "WMFOptions" + if WMFOptions.Exists (2) then + Exportwidth.Less + Exportheight.More + WMFOptions.OK iWaitIndex = 0 - do while SVMOptionen.Exists AND iWaitIndex < 30 + do while WMFOptions.Exists AND iWaitIndex < 30 sleep (1) iWaitIndex = iWaitIndex + 1 loop @@ -1323,13 +1231,18 @@ testcase tWMF else warnlog "File didn't get saved :-(" endif + Printlog "Closing test doc." hCloseDocument () sleep 5 + printlog "Opening new odc." hNewDocument() sleep 5 + printlog "Inserting exported graphic." Call hGrafikEinfuegen ( OutputGrafikTBO+sExt ) endif + printlog "Closing." hCloseDocument () + Printlog "Opening exported file." hFileOpen (sDocument) sleep (10) @@ -1339,12 +1252,11 @@ testcase tWMF hTypeKeys ("<escape><tab>") fGetSizeXY sx1, sY, TRUE if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Original.Check - SVMOptionen.OK + Kontext "WMFOptions" + if WMFOptions.Exists (2) then + WMFOptions.OK iWaitIndex = 0 - do while SVMOptionen.Exists AND iWaitIndex < 30 + do while WMFOptions.Exists AND iWaitIndex < 30 sleep (1) iWaitIndex = iWaitIndex + 1 loop @@ -1369,17 +1281,25 @@ testcase tWMF hNewDocument() hRechteckErstellen ( 10, 10, 30, 40 ) if hCallExport (OutputGrafikTBO & "2" , sFilter, TRUE ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Groesse.Check - Breite.SetText "9" - Hoehe.SetText "9" - Groesse.Check 'Check "Size" to make changes really go through. - sx1 = Breite.GetText - sY = Hoehe.GetText - SVMOptionen.OK + Kontext "WMFOptions" + if WMFOptions.Exists (2) then + Exportwidth.SetText "9" + if Exportmeasurement.GetSelText = "inches" then + sx1 = (Exportwidth.GetText)+ """" + printlog "sx1= " & sx1 + else + sx1 = (Exportwidth.GetText)+ "cm" + endif + + if Exportmeasurement.GetSelText = "inches" then + sY = (Exportheight.GetText)+ """" + printlog "sY= " & sY + else + sY = (Exportwidth.GetText)+ "cm" + endif + WMFOptions.OK iWaitIndex = 0 - do while SVMOptionen.Exists AND iWaitIndex < 30 + do while WMFOptions.Exists AND iWaitIndex < 30 sleep (1) iWaitIndex = iWaitIndex + 1 loop @@ -1401,30 +1321,6 @@ testcase tWMF warnlog "Selected original size NOT OK :-(" endif endif - if hCallExport (OutputGrafikTBO & "3" , sFilter, TRUE ) = TRUE then - Kontext "SVMOptionen" - if SVMOptionen.Exists (2) then - Groesse.Check - sX2 = Breite.GetText - if (LiberalMeasurement(sx1, sX2)) <> TRUE then - if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then - Printlog "Width was ok. Expected: " & sx1 & "' was: '" & sX2 & "'" - else - warnLog "Width is different expected: '" & sx1 & "' is: '" & sX2 & "'" - endif - endif - sY2 = Hoehe.GetText - if (LiberalMeasurement(sY, sY2)) <> TRUE then - if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then - Printlog "Height was ok. Expected: " & sY & "' was: '" & sY2 & "'" - else - warnLog "Height is different expected: '" & sY & "' is: '" & sY2 & "'" - endif - endif - SVMOptionen.Cancel - sleep 5 - endif - endif call hCloseDocument endcase 'tWMF diff --git a/testautomation/graphics/optional/includes/global/g_accessability.inc b/testautomation/graphics/optional/includes/global/g_accessability.inc index 8d59b0c6b387..6fa992308c44 100644 --- a/testautomation/graphics/optional/includes/global/g_accessability.inc +++ b/testautomation/graphics/optional/includes/global/g_accessability.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Accessability '* diff --git a/testautomation/graphics/optional/includes/global/g_area.inc b/testautomation/graphics/optional/includes/global/g_area.inc index caab5801a075..758044290d45 100644 --- a/testautomation/graphics/optional/includes/global/g_area.inc +++ b/testautomation/graphics/optional/includes/global/g_area.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_arrangealign.inc b/testautomation/graphics/optional/includes/global/g_arrangealign.inc index 16f0ca213d26..48c6599efa72 100644 --- a/testautomation/graphics/optional/includes/global/g_arrangealign.inc +++ b/testautomation/graphics/optional/includes/global/g_arrangealign.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc index 447808b4bc8e..731c9e0ed21f 100644 --- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc +++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_character.inc b/testautomation/graphics/optional/includes/global/g_character.inc index 31b4f364c50c..a9d578665c5a 100644 --- a/testautomation/graphics/optional/includes/global/g_character.inc +++ b/testautomation/graphics/optional/includes/global/g_character.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc index 9bc85a4bbad1..4c1900876565 100644 --- a/testautomation/graphics/optional/includes/global/g_clipboard.inc +++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_clipexport.inc b/testautomation/graphics/optional/includes/global/g_clipexport.inc index 91357e867937..c9569cbf8741 100644 --- a/testautomation/graphics/optional/includes/global/g_clipexport.inc +++ b/testautomation/graphics/optional/includes/global/g_clipexport.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Tests the clipboard-function with a rectangle '* @@ -165,87 +165,138 @@ global Text5 as string global Text6 as string global Text7 as string +'--------------------------- Tests for Writer ---------------------------------- +sub writertest + + try + call Make_And_Check_Formatted_Text_Line_From_Application + catch + warnlog "Something went wrong with testing writertest" + endcatch + + try + call Make_Rectangle_From_Application + call Full_test_Draw + call Full_test_Impress + call Full_test_Writer + call Full_test_Calc + catch + warnlog "something wrong with testing writertest" + endcatch +end sub ' big one + +'---------------------------- Tests for Calc ----------------------------------- +sub calctest + + try + call Make_Rectangle_From_Application + call Full_test_Draw + call Full_test_Impress + call Full_test_Writer + call Full_test_Calc + catch + warnlog "something wrong with calctest" + endcatch + printlog "currently no specific tests from Calc" +end sub + +'------------------------------------------------------------------------------- +sub tClipboardFromDrawTest + + EnableQAErrors = false + FromApp2 = gApplication + printlog "gApplication = " + gApplication + + select case( gApplication ) + case "WRITER" : call writertest() + case "CALC" : call calctest() + case else : warnlog( "Unsupported gApplication provided: " & gApplication ) + end select + +end sub + '------------------------------- "object"-dependant tests ---------------------- -try - call Make_Rectangle_From_Application - call Full_test_Draw - call Full_test_Impress - call Full_test_Writer - call Full_test_Calc -catch - warnlog "something wrong with testing Rectangle" -endcatch - -try - call Make_Make3dObject_From_Application - call Full_test_Draw - call Small_test_Impress - call Small_test_Calc - call Small_test_Writer -catch - warnlog "something wrong with testing 3dObject" -endcatch - -'qaerrorlog "Make_CurveObject_From_Application needs an overview - FHA" -try - call Make_CurveObject_From_Application - call Small_test_Draw - call Small_test_Impress - call Small_test_Calc - call Small_test_Writer -catch - warnlog "something wrong with testing CurveObj" -endcatch - -try - call Make_ConnectorObject_From_Application - call Small_test_Draw - call Small_test_Impress - call Small_test_Calc - call Small_test_Writer -catch - warnlog "something wrong with testing ConnectorObject" -endcatch - -try - call Make_LineObject_From_Application - call Small_test_Draw - call Small_test_Impress - ' call Small_test_Calc - ' call Small_test_Writer -catch - warnlog "something wrong with testing LineObject" -endcatch - -try -catch - warnlog "something wrong with testing ConnectorObject" -endcatch - -try - call Make_Circle_From_Application - call Small_test_Draw - call Small_test_Impress - call Small_test_Calc - call Small_test_Writer -catch - warnlog "something wrong with testing Circle" -endcatch - -try - call Make_TextSquare_From_Application - call Small_test_Draw - call Small_test_Impress - call Small_test_Calc - call Small_test_Writer - -catch - warnlog "something wrong with testing TextSquare" -endcatch - -call clear_all_and_close -Printlog "tClipboardFromDrawTest finished" +sub g_clipexport + try + call Make_Rectangle_From_Application + call Full_test_Draw + call Full_test_Impress + call Full_test_Writer + call Full_test_Calc + catch + warnlog "something wrong with testing Rectangle" + endcatch + + try + call Make_Make3dObject_From_Application + call Full_test_Draw + call Small_test_Impress + call Small_test_Calc + call Small_test_Writer + catch + warnlog "something wrong with testing 3dObject" + endcatch + + 'qaerrorlog "Make_CurveObject_From_Application needs an overview - FHA" + try + call Make_CurveObject_From_Application + call Small_test_Draw + call Small_test_Impress + call Small_test_Calc + call Small_test_Writer + catch + warnlog "something wrong with testing CurveObj" + endcatch + + try + call Make_ConnectorObject_From_Application + call Small_test_Draw + call Small_test_Impress + call Small_test_Calc + call Small_test_Writer + catch + warnlog "something wrong with testing ConnectorObject" + endcatch + + try + call Make_LineObject_From_Application + call Small_test_Draw + call Small_test_Impress + ' call Small_test_Calc + ' call Small_test_Writer + catch + warnlog "something wrong with testing LineObject" + endcatch + + try + catch + warnlog "something wrong with testing ConnectorObject" + endcatch + + try + call Make_Circle_From_Application + call Small_test_Draw + call Small_test_Impress + call Small_test_Calc + call Small_test_Writer + catch + warnlog "something wrong with testing Circle" + endcatch + + try + call Make_TextSquare_From_Application + call Small_test_Draw + call Small_test_Impress + call Small_test_Calc + call Small_test_Writer + + catch + warnlog "something wrong with testing TextSquare" + endcatch + + call clear_all_and_close + Printlog "tClipboardFromDrawTest finished" end sub diff --git a/testautomation/graphics/optional/includes/global/g_clipexport2.inc b/testautomation/graphics/optional/includes/global/g_clipexport2.inc index c8dfe7f52d91..44fb7bbd5070 100644 --- a/testautomation/graphics/optional/includes/global/g_clipexport2.inc +++ b/testautomation/graphics/optional/includes/global/g_clipexport2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* @@ -61,7 +61,7 @@ sub MakeRectangle end sub '------------------------------------------------------------------------------- -sub MakeCircle +testcase MakeCircle printlog "Create Circle" if gApplication = "WRITER" then @@ -81,10 +81,10 @@ sub MakeCircle gMouseUp (30,30) sleep 1 -end sub +endcase '------------------------------------------------------------------------------- -sub Make3dObject +testcase Make3dObject printlog "Create 3dObject" if (Ucase(gApplication) = "CALC") then @@ -158,10 +158,10 @@ sub Make3dObject endif end if -end sub +endcase '------------------------------------------------------------------------------- -sub MakeCurveObject +testcase MakeCurveObject if (Ucase(gApplication) = "WRITER") then warnlog "Cant make circle in this application" @@ -195,10 +195,10 @@ sub MakeCurveObject hMenuItemUnCheck (7) sleep 1 -end sub +endcase '------------------------------------------------------------------------------- -sub MakeLineObject +testcase MakeLineObject if gApplication = "WRITER" then warnlog "Currently no support for line-object in this application" @@ -224,10 +224,10 @@ sub MakeLineObject Kontext "Arrowshapes" Arrowshapes.Close -end sub +endcase '------------------------------------------------------------------------------- -sub MakeConnectorObject +testcase MakeConnectorObject if gApplication = "WRITER" then warnlog "Cant make connector in this application" @@ -268,7 +268,7 @@ sub MakeConnectorObject gMouseUp (30,37) end if -end sub +endcase '------------------------------------------------------------------------------- sub MakeFormattedTextLine diff --git a/testautomation/graphics/optional/includes/global/g_clipexport3.inc b/testautomation/graphics/optional/includes/global/g_clipexport3.inc index c51d92eb3fed..63eb77cd6134 100644 --- a/testautomation/graphics/optional/includes/global/g_clipexport3.inc +++ b/testautomation/graphics/optional/includes/global/g_clipexport3.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Procedures for the Clipboard-Export-Test '* @@ -412,7 +412,7 @@ sub Check_Text_Formatting SetKontextApplication printlog " Check_Text_Formatting Ends" - +end suB '---------------------------------------------------------------------------------------------------- sub Check_Colors_Borders_Attributes @@ -558,26 +558,10 @@ sub Check_Colors_Borders_Attributes ColorModel = Farbmodell.GetSelText printlog " " + ColorModel - select case iSprache ' Prepared for future language-problematics. - if ColorR <> R.GetText then Warnlog "Wrong R-Color. Should be: " + ColorR + " but was: " + R.GetText - if ColorG <> G.GetText then Warnlog "Wrong V-Color. Should be: " + ColorG + " but was: " + G.GetText - if ColorB <> B.GetText then Warnlog "Wrong B-Color. Should be: " + ColorB + " but was: " + B.GetText - Else if ColorC <> C.GetText then Warnlog "Wrong C-Color. Should be: " + ColorC + " but was: " + C.GetText if ColorM <> M.GetText then Warnlog "Wrong M-Color. Should be: " + ColorM + " but was: " + M.GetText if ColorY <> Y.GetText then Warnlog "Wrong J-Color. Should be: " + ColorY + " but was: " + Y.GetText if ColorK <> K.GetText then Warnlog "Wrong N-Color. Should be: " + ColorK + " but was: " + K.GetText - End if - if ColorR <> R.GetText then Warnlog "Wrong R-Color. Should be: " + ColorR + " but was: " + R.GetText - if ColorG <> G.GetText then Warnlog "Wrong G-Color. Should be: " + ColorG + " but was: " + G.GetText - if ColorB <> B.GetText then Warnlog "Wrong B-Color. Should be: " + ColorB + " but was: " + B.GetText - Else - if ColorC <> C.GetText then Warnlog "Wrong C-Color. Should be: " + ColorC + " but was: " + C.GetText - if ColorM <> M.GetText then Warnlog "Wrong M-Color. Should be: " + ColorM + " but was: " + M.GetText - if ColorY <> Y.GetText then Warnlog "Wrong Y-Color. Should be: " + ColorY + " but was: " + Y.GetText - if ColorK <> K.GetText then Warnlog "Wrong K-Color. Should be: " + ColorK + " but was: " + K.GetText - End if - end select Kontext Active.setpage TabFarbverlaeufe @@ -624,7 +608,8 @@ sub Check_Colors_Borders_Attributes Printlog "End of one application" - '---------------------------------- Set the Kontext to the current Application ----------------------------------' +end sub + '---------------------------------- Set the Kontext to the current Application ----------------------------------' sub SetKontextApplication sleep 1 @@ -698,7 +683,7 @@ sub New_Writer end sub '------------------------------------------------------------------------------- -sub Choose_Toapplication +testcase Choose_Toapplication For ToAppCounter = 1 to 4 @@ -724,6 +709,6 @@ sub Choose_Toapplication Call hNewDocument SetKontextApplication -end sub +endcase '-------------------------------------------------------------------------------------------------------- diff --git a/testautomation/graphics/optional/includes/global/g_convertto.inc b/testautomation/graphics/optional/includes/global/g_convertto.inc index 8acac43a45fc..33eb157bc465 100644 --- a/testautomation/graphics/optional/includes/global/g_convertto.inc +++ b/testautomation/graphics/optional/includes/global/g_convertto.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_crossfading.inc b/testautomation/graphics/optional/includes/global/g_crossfading.inc index 275f1ee49839..0d7142b9ae46 100644 --- a/testautomation/graphics/optional/includes/global/g_crossfading.inc +++ b/testautomation/graphics/optional/includes/global/g_crossfading.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_customshapes.inc b/testautomation/graphics/optional/includes/global/g_customshapes.inc index 850356821d2f..28c2e22ed301 100644 --- a/testautomation/graphics/optional/includes/global/g_customshapes.inc +++ b/testautomation/graphics/optional/includes/global/g_customshapes.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Customshapes-test '* diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc index 8da45a872259..d733c878aeb4 100644 --- a/testautomation/graphics/optional/includes/global/g_demoguide.inc +++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : testcase to check the demo guide '* @@ -247,7 +247,8 @@ testcase t_Interoperability MenuSelect(MenuGetItemID(3)) View.OpenMenu MenuSelect(MenuGetItemID(2)) - sleep 2 + printlog "needing a longer wait here for first start of the master page previews" + wait(20000) Kontext "AvailableForUsePreview" AvailableForUsePreview.TypeKeys "<HOME> <RIGHT> <RETURN>" sleep (5) diff --git a/testautomation/graphics/optional/includes/global/g_dimensions.inc b/testautomation/graphics/optional/includes/global/g_dimensions.inc index 3d48ad7327ab..5980903828e0 100644 --- a/testautomation/graphics/optional/includes/global/g_dimensions.inc +++ b/testautomation/graphics/optional/includes/global/g_dimensions.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_edit.inc b/testautomation/graphics/optional/includes/global/g_edit.inc index 6313865b8912..fdff948d0bfb 100644 --- a/testautomation/graphics/optional/includes/global/g_edit.inc +++ b/testautomation/graphics/optional/includes/global/g_edit.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* @@ -258,6 +258,7 @@ testcase tEditObjectEdit else Call hNewDocument + call sSelectEmptyLayout sleep 1 '/// new document ///' InsertObjectOLEObject '/// insert writer ole object ///' Kontext "OLEObjektEinfuegen" diff --git a/testautomation/graphics/optional/includes/global/g_export_html.inc b/testautomation/graphics/optional/includes/global/g_export_html.inc index 5f6e9fa6040a..6b91cdef26fd 100644 --- a/testautomation/graphics/optional/includes/global/g_export_html.inc +++ b/testautomation/graphics/optional/includes/global/g_export_html.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* @@ -49,7 +49,7 @@ testcase tHtmlExport hToolsOptions ("STAROFFICE","USERDATA") VorName.SetText "Garfield" ZuName.SetText "Peanuts" - EMail.SetText "recumbent@sun.com" + EMail.SetText "recumbent@oracle.com" Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -197,8 +197,8 @@ testcase tHtmlExport end if sTemp = EMail.GetText Adresse1=EMail.GetText - if (sTemp <> "recumbent@sun.com") then - warnlog "Value for 'Email' is other than expected, should be 'recumbent@sun.com', is: '"+sTemp+"'" + if (sTemp <> "recumbent@oracle.com") then + warnlog "Value for 'Email' is other than expected, should be 'recumbent@oracle.com', is: '"+sTemp+"'" end if printlog "set text in field 'your homepage' " Homepage.SetText "mahler" diff --git a/testautomation/graphics/optional/includes/global/g_find_replace.inc b/testautomation/graphics/optional/includes/global/g_find_replace.inc index f49de3b03d35..4f6a045578e0 100755..100644 --- a/testautomation/graphics/optional/includes/global/g_find_replace.inc +++ b/testautomation/graphics/optional/includes/global/g_find_replace.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Edit -> Find & Replace '* diff --git a/testautomation/graphics/optional/includes/global/g_format.inc b/testautomation/graphics/optional/includes/global/g_format.inc index 2e2f1b0368ff..8cf37d5432a3 100644 --- a/testautomation/graphics/optional/includes/global/g_format.inc +++ b/testautomation/graphics/optional/includes/global/g_format.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_group.inc b/testautomation/graphics/optional/includes/global/g_group.inc index 3023e673a526..a11b809355ce 100644 --- a/testautomation/graphics/optional/includes/global/g_group.inc +++ b/testautomation/graphics/optional/includes/global/g_group.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_imagemap.inc b/testautomation/graphics/optional/includes/global/g_imagemap.inc index c8bee2af8537..de53fdb6f647 100644 --- a/testautomation/graphics/optional/includes/global/g_imagemap.inc +++ b/testautomation/graphics/optional/includes/global/g_imagemap.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_insert.inc b/testautomation/graphics/optional/includes/global/g_insert.inc index fbc787eac29a..44d9030413ea 100644 --- a/testautomation/graphics/optional/includes/global/g_insert.inc +++ b/testautomation/graphics/optional/includes/global/g_insert.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* @@ -167,7 +167,7 @@ testcase tInsertFields hToolsOptions ("STAROFFICE","USERDATA") VorName.SetText "Garfield" ZuName.SetText "Peanuts" - EMail.SetText "recumbent@sun.com" + EMail.SetText "recumbent@oracle.com" Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK diff --git a/testautomation/graphics/optional/includes/global/g_line.inc b/testautomation/graphics/optional/includes/global/g_line.inc index 55869c258f43..adc573a16e48 100644 --- a/testautomation/graphics/optional/includes/global/g_line.inc +++ b/testautomation/graphics/optional/includes/global/g_line.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_load_save.inc b/testautomation/graphics/optional/includes/global/g_load_save.inc index 6622c9c7a452..8d64e158eb2a 100644 --- a/testautomation/graphics/optional/includes/global/g_load_save.inc +++ b/testautomation/graphics/optional/includes/global/g_load_save.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc index 01fe8137ef64..5961a2132467 100644 --- a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc +++ b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : g_mediaplayer.inc '* diff --git a/testautomation/graphics/optional/includes/global/g_navigator.inc b/testautomation/graphics/optional/includes/global/g_navigator.inc index 7f4c06d6d979..4b9ef8948ab8 100644 --- a/testautomation/graphics/optional/includes/global/g_navigator.inc +++ b/testautomation/graphics/optional/includes/global/g_navigator.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_ole.inc b/testautomation/graphics/optional/includes/global/g_ole.inc index 84ff10294e6d..56a23c5fb021 100644 --- a/testautomation/graphics/optional/includes/global/g_ole.inc +++ b/testautomation/graphics/optional/includes/global/g_ole.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description: includefile for Ole-testing '* diff --git a/testautomation/graphics/optional/includes/global/g_paneview.inc b/testautomation/graphics/optional/includes/global/g_paneview.inc index 28e679367f08..a2e7bdb87266 100644 --- a/testautomation/graphics/optional/includes/global/g_paneview.inc +++ b/testautomation/graphics/optional/includes/global/g_paneview.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description: includefile for Paneview-testing '* diff --git a/testautomation/graphics/optional/includes/global/g_paragraph.inc b/testautomation/graphics/optional/includes/global/g_paragraph.inc index 5ba028ca5244..69f145230d2a 100644 --- a/testautomation/graphics/optional/includes/global/g_paragraph.inc +++ b/testautomation/graphics/optional/includes/global/g_paragraph.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_savepictureas.inc b/testautomation/graphics/optional/includes/global/g_savepictureas.inc index 3888cf31d39e..bbf9776b7ece 100644 --- a/testautomation/graphics/optional/includes/global/g_savepictureas.inc +++ b/testautomation/graphics/optional/includes/global/g_savepictureas.inc @@ -25,7 +25,7 @@ ' '/******************************************************************** '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics ContextMenu -SavePictureAs -Test '* diff --git a/testautomation/graphics/optional/includes/global/g_shaddow.inc b/testautomation/graphics/optional/includes/global/g_shaddow.inc index 0a7708086371..1dfd01f305aa 100644 --- a/testautomation/graphics/optional/includes/global/g_shaddow.inc +++ b/testautomation/graphics/optional/includes/global/g_shaddow.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Tests the shaddow-function on a picture '* diff --git a/testautomation/graphics/optional/includes/global/g_slidelayer.inc b/testautomation/graphics/optional/includes/global/g_slidelayer.inc index 4064ca5e9f45..a28526305d75 100644 --- a/testautomation/graphics/optional/includes/global/g_slidelayer.inc +++ b/testautomation/graphics/optional/includes/global/g_slidelayer.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc index 9780cb9933dc..f46c75f3e497 100644 --- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc +++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc @@ -25,70 +25,64 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* -'******************************************************************* -'* -' #1 tiToolsSpellcheckCorrect -' #1 tiToolsSpellcheckError -' #1 tiToolsSpellcheckCheck -' #1 tToolsSpellcheckAutoSpellcheck -'* '\******************************************************************* -testcase tiToolsSpellcheckCorrect - if iSprache = 48 then - qaerrorlog "This test is not adapted for polish, 48." - got endsub +testcase tiToolsSpellcheckCheck_AlwaysIgnore + + Dim sExt as string + + Dim sWrongWord as String + Dim sRightWord as string + + dim aWords(2) as string + aWords() = getWordsForLanguage() + + sWrongWord = aWords(0) + sRightWord = aWords(1) + + if(sWrongWord = "" OR sRightWord = "") then ' if any word is empty then the test should stop + qaerrorlog "no spellcheck test for the langauges " + iSprache + " available." + goto endsub endif - Dim DieDatei as String - dim lFiles(100) as string - dim i as integer - dim iFiles as integer + delete_word_from_dictionary(sWrongWord,"IgnoreAllList") - lFiles(0)=0 - Printlog "- Checking Dictionary-Files" ' borrowed from w_106.inc - select case iSprache - case 01 : DieDatei = "01-44-hyph.dat" - case else : DieDatei = "" & iSprache & "-hyph.dat" - end select - DieDatei = Convertpath(gNetzOfficePath + "share\dict\" + DieDatei) - if gPlatGroup <> "unx" then - if (Dir(DieDatei) = "") then - if bAsianLan then - printlog "Dictionary not found : " + DieDatei + ", but is AsianLan, so OK :-)" - else - if gNetzInst then - printlog "Dictionary not found : " + DieDatei - else - warnlog "Dictionary not found : " + DieDatei - end if - end if - else - Printlog " Dictionary has been installed : " + DieDatei - end if - end if - iFiles = GetFileList (Convertpath (gNetzOfficePath + "share\dict\"), "*.dat" ,lFiles()) - for i = 1 to iFiles - printlog " " + i + ": " + DateiExtract(lFiles(i)) - next i + if Ucase(gApplication) = "DRAW" then + sExt = ".odg" + else + sExt = ".odp" + endif - Call hNewDocument - ' sleep 2 - ToolsSpellcheck - Kontext "Active" - if Active.Exists(5) then - try - printlog "Message: Finished: Want to continue at the beginning? '" + active.gettext + "'" - Active.No - catch - Warnlog "The Active-dialoge didn't have a No-button, tries with OK instead." - Active.Ok - endcatch + Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_"+iSprache+sExt) + call fMakeDocumentWritable() + + sleep(1) + + ' Perform the test now: + printlog "Call Tools->Spellcheck" + ToolsSpellcheck + sleep(2) + Kontext "Spellcheck" + printlog "Click button 'Always ignore' on dialog." + IgnoreAll.Click + Sleep 2 + + ToolsOptions + printlog "Select in category 'Languagesettings' entry 'Writing Aids.'" + hToolsOptions ("LANGUAGESETTINGS","WRITINGAIDS") + + fSelectWithString(Benutzerwoerterbuch,"IgnoreAllList") + + Bearbeiten.Click + + Kontext "BenutzerwoerterbuchBearbeiten" + if(Inhalt.getText <> sWrongWord) then + warnlog " added word is not in dictionary: '" + Buch.getSelText + "'" else - Warnlog "No 'Spellcheck finished, do you wish to continue?' message appeared" + printlog " added word is in dictionary: '" + Buch.getSelText + "'" end if sleep 2 @@ -101,6 +95,7 @@ testcase tiToolsSpellcheckCorrect case 39 : hTextrahmenErstellen ("La ringraziamo per l'interesse mostrato a collaborare con la firma.<Return>",10,10,70,20) case 46 : hTextrahmenErstellen ("Det varierar vad som behandlas och ur vilket perspektiv.<Return>",10,10,50,20) case 49 : hTextrahmenErstellen ("Dies ist ein Text ohne Fehler.<Return>",10,10,50,20) + case 50 : hTextrahmenErstellen ("To je besedilo brez napake.<Return>",10,10,50,20) case 55 : hTextrahmenErstellen ("Esta poderia ser a resposta para suas preces?<Return>",10,10,50,20) case else : if bAsianLan then @@ -160,6 +155,7 @@ testcase tiToolsSpellcheckError case 39 : FehlerText$ = "Ringrarziamo per l'interessa mostrato a collaborare con la firma." : Fehler$ = "Ringrarziamo" : Sprachenname$ = "Italienisch" case 46 : FehlerText$ = "Detd varierar vad som behandlas och ur vilket perspektiv." : Fehler$ = "Detd" : Sprachenname$ = "Schwedisch" case 49 : FehlerText$ = "Diees ist ein Fehler." : Fehler$ = "Diees" : Sprachenname$ = "Deutsch" + case 50 : FehlerText$ = "Toje napaka, ker manjka presledek." : Fehler$ = "Toje" : Sprachenname$ = "Slovenš?ina" case 55 : FehlerText$ = "Eesta poderia ser a resposta para suas preces?": Fehler$ = "Eesta" : Sprachenname$ = "Portugiesisch" case else : if bAsianLan then @@ -248,140 +244,145 @@ testcase tiToolsSpellcheckError end if end if - printlog "delete textbox" - EditSelectAll - hTypeKeys "<DELETE>" - sleep 1 + printlog "Close dialog 'Edit Custom Dictionary'." + BenutzerwoerterbuchBearbeiten.Close + Kontext "ExtrasOptionenDlg" + printlog "Close the Option dialog." + ExtrasOptionenDlg.OK - printlog "Create same textbox again (test IGNORE function)." - Printlog "Check function Ignore" - hTextrahmenErstellen (FehlerText$,30,30,80,40) - printlog "All 'Tools->Spellcheck->Check'." - - 'printlog "Setting Text to english" - 'sleep 1 - 'EditSelectAll - 'FormatCharacter - 'sleep 1 - 'Kontext - 'Messagebox.SetPage TabFont - 'Kontext "TabFont" - 'Language.Select 41 - 'TabFont.OK + printlog "Close document" + Call hCloseDocument - ToolsSpellcheck - Kontext "Spellcheck" - printlog "press button 'Ignore'" - IgnoreOnce.Click - printlog "spellcheck dialog has to disappear and " - printlog " There has to come up only one active: 'Spellcheck of entire document has been completed [OK]'." - Kontext "Active" - if Active.Exists(5) Then - Printlog " Spellcheck ended because of only 1 defined error. And Ignore worked.'" + active.gettext + "'" - Active.OK + ' remove the word again from the dictionary + delete_word_from_dictionary(sWrongWord,"IgnoreAllList") + +endcase 'tiToolsSpellcheckCheck +'------------------------------------------------------------------------------- +testcase tiToolsSpellcheckCheck_Change + + Dim sExt as string + Dim sWrongWord as String + Dim sRightWord as string + + dim aWords(2) as string + aWords() = getWordsForLanguage() + + sWrongWord = aWords(0) + sRightWord = aWords(1) + + if(sWrongWord = "" OR sRightWord = "") then ' if any word is empty then the test should stop + qaerrorlog "no spellcheck test for the langauges " + iSprache + " available." + goto endsub + endif + + if Ucase(gApplication) = "DRAW" then + sExt = ".odg" else - Printlog " 'Ignore Once' seems to work correctly." - Kontext "Spellcheck" - Spellcheck.Close - Kontext "Active" - if active.exists(5) then - Printlog " Spellcheck dialog closed'" + active.gettext + "'" - Active.OK - else - Printlog " Spellcheck dialog closed'" - end if - end if + sExt = ".odp" + endif + + Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_"+iSprache+sExt) - printlog "Call 'Tools->Spellcheck->Check." + call fMakeDocumentWritable + + ' Perform the test now: + printlog "Call Tools->Spellcheck" ToolsSpellcheck + sleep(2) Kontext "Spellcheck" - if Spellcheck.Exists Then - Printlog " Ignore worked" - Spellcheck.Close - Kontext "Active" - if active.exists(5) then - Printlog " " + active.gettext + "'" - Active.OK - else - Printlog " Spellcheck dialog closed'" - end if + printlog "Click button 'Change' on dialog." + Change.Click + sleep(10) + SpellcheckClose.click + + if Ucase(gApplication) = "DRAW" then + Kontext "DocumentDraw" + DocumentDraw.TypeKeys("<TAB>",true) + DocumentDraw.TypeKeys("<SPACE>",true) else - Warnlog " Spellcheck ended even we only ignored the error" - end if + Kontext "DocumentImpress" + DocumentImpress.TypeKeys("<TAB>",true) + DocumentImpress.TypeKeys("<SPACE>",true) + endif - printlog "delete textbox." EditSelectAll - hTypeKeys "<DELETE>" - sleep 1 + EditCopy + + dim s as string + s = getClipBoard() - printlog "create same textbox again (test ALWAYS IGNORE function)." - hTextrahmenErstellen (FehlerText$,30,30,60,40) - - 'printlog "Setting Text to english" - 'sleep 1 - 'EditSelectAll - 'FormatCharacter - 'sleep 1 - 'Kontext - 'Messagebox.SetPage TabFont - 'Kontext "TabFont" - 'Language.Select 41 - 'TabFont.OK - - printlog "Call 'Tools->Spellcheck->Check'." - ToolsSpellcheck - Kontext "Spellcheck" - printlog "click button 'Always Ignore." - IgnoreAll.Click - printlog "spellcheck dialog has to disappear and" - printlog "There has to come up only one active: 'Spellcheck of entire document has been completed [OK]'." - Kontext "Active" - if active.exists(5) then - Printlog " Spellcheck ended because of only 1 defined error. And Ignore worked.'" + active.gettext + "'" - Active.OK + printlog s + + if(Instr(s,sWrongWord) <> 0) then + warnlog "word not changed. '" + s + "' contains still wrong word '" + sWrongWord + "'" else - Printlog " 'Ignore All' seems to work." - Kontext "Spellcheck" - Spellcheck.Close - Kontext "Active" - if active.exists(5) then - Printlog " Spellcheck dialog closed'" + active.gettext + "'" - Active.OK - else - Printlog " Spellcheck dialog closed'" - end if - end if + printlog "word changed." + endif - Printlog "- Delete ignore list" - sleep 1 - printlog "Delete ignore word list." - if (not wIgnorierenlisteLoeschen) then - qaErrorLog "Can't get into Dictionary lists" - goto endsub - end if + if(Instr(s,sRightWord) <> 0) then + printlog "word changed." + else + warnlog "word not changed." + endif + + printlog "Close document" Call hCloseDocument -endcase 'tiToolsSpellcheckError -'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -testcase tiToolsSpellcheckCheck - if iSprache = 48 then - qaerrorlog "This test is not adapted for polish, 48." - got endsub - endif - Dim Datei$ - Dim sWord(2) as string - Dim i as integer - Dim j as integer - Dim s as integer - Dim AlleBuecher as integer +endcase +'------------------------------------------------------------------------------- +testcase tiToolsSpellcheckCheck_ChangeAll + Dim sExt as string - Dim sWordOne as string - Dim sWordTwo as string + Dim sRightWord as String + Dim sWrongWord as string + + dim aWords(2) as string + aWords() = getWordsForLanguage() + + sWrongWord = aWords(0) + sRightWord = aWords(1) + + if(sWrongWord = "" OR sRightWord = "") then ' if any word is empty then the test should stop + qaerrorlog "no spellcheck test for the langauges " + iSprache + " available." + goto endsub + endif + + 'delete_word_from_dictionary(sWord,"IgnoreListAll") + + if Ucase(gApplication) = "DRAW" then + sExt = ".odg" + else + sExt = ".odp" + endif + + Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_"+iSprache+sExt) + + call fMakeDocumentWritable() + + ' Perform the test now: + printlog "Call Tools->Spellcheck" + ToolsSpellcheck + sleep(2) + Kontext "Spellcheck" + printlog "Click button 'Change' on dialog." + ChangeAll.Click + 'TODO: check result beware of issue 110688 + Sleep 2 + + SpellCheckClose.click + + printlog "Close document" + Call hCloseDocument + +endcase +'------------------------------------------------------------------------------- +function delete_all_added_words(aWords) + + '/// this function delete the words in sWords in all user dictionaries + + Dim iBookCounter as integer + Dim iWordCounter as integer Dim iBooks as integer - Dim bWordFound(2) as boolean - Dim iSuggestions as integer - Dim iWord(2) as integer - Dim bFound as boolean Select Case Ucase(gApplication) case "DRAW" : sExt = ".odg" @@ -410,6 +411,7 @@ testcase tiToolsSpellcheckCheck case 39 : sWord(1) = "Millano" : sWord(2) = "tarrget" case 46 : sWord(1) = "desa" : sWord(2) = "occh" case 49 : sWord(1) = "Texxt" : sWord(2) = "reichtt" + case 50 : sWord(1) = "Bsedilo" : sWord(2) = "zados?a" case 55 : sWord(1) = "esktava" : sWord(2) = "noitee" case else : if bAsianLan then @@ -420,7 +422,6 @@ testcase tiToolsSpellcheckCheck end select sleep 2 - Printlog "Delete all added words from dictionaries." printlog "Call Tools->Options." ToolsOptions printlog "Select in category 'Languagesettings' entry 'Writing Aids.'" @@ -428,487 +429,138 @@ testcase tiToolsSpellcheckCheck sleep 1 Kontext "WRITINGAIDS" sleep 1 - printlog "Click on button 'edit' in section 'User-defined dictionaries.'" - if (fGetIntoDictionary) then - qaErrorLog "wTSC" - goto endsub - end if + printlog "select the first User-defined dictionaries and click EDIT" + Benutzerwoerterbuch.select 1 + Bearbeiten.Click + Kontext "BenutzerwoerterbuchBearbeiten" sleep 1 - printlog "Check every book, if it contains the words that will be added in this test." - iBooks = Buch.getItemCount - bWordFound(1) = false - bWordFound(2) = false - for i = 1 to iBooks - Buch.select(i) + printlog "Check every book, if it contains the words." + iBooks = Buch.getItemCount + for iBookCounter = 1 to iBooks + Buch.select(iBookCounter) printlog "Items in Booklist: " & WordList.getItemCount - for j = 1 to 2 - Wort.setText sWord(j) + for iWordCounter = 1 to uBound(aWords) + Wort.setText aWords(iWordCounter) sleep 1 if ((not neu.isEnabled) and Loeschen.isEnabled) then printlog "If it contains the word, press button 'delete'." Loeschen.click - bWordFound(j) = true - printlog "Added word WAS in dictionary: '" + Buch.getSelText + "' - '" + sWord(j) + "'" + printlog "Added word WAS in dictionary: '" + Buch.getSelText + "' - '" + aWords(iWordCounter) + "'" end if - next j - next i - if (bWordFound(1) OR bWordFound(2))then - qaErrorLog "Word was found in dictionary - check why it was there. '" + sWord(1) + "': " + bWordFound(1) + " '" + sWord(2) + "': " + bWordFound(2) - end if + next iWordCounter + next iBookCounter printlog "Close dialog 'Edit Custom Dictionary.'" BenutzerwoerterbuchBearbeiten.Close sleep 1 Kontext "ExtrasOptionenDlg" printlog "Press button 'OK' on dialog 'Writing Aids'." ExtrasOptionenDlg.OK - printlog "Call dialog again and delete all remaining words from dictionary 'IgnoreAllList'." - if (not wIgnorierenlisteLoeschen) then - qaErrorLog "Can't get into Dictionary lists" - goto endsub - end if - - printlog "Test if spellcheck dialog comes up and check/set direction of spellcheck." - printlog "Call 'Tools->Spellcheck->Check'." - ToolsSpellcheck - Kontext "Spellcheck" - WaitSlot (1000) - printlog "If no dictionary for the language is available, a messagebox comes up:" - printlog ". . . 'Error executing the spellcheck.: Language is not supported by spellchecker funtion." - kontext "active" - if active.exists(5) then - warnlog "$Language is not supported by spellchecker funtion: '" + active.gettext + "'" - Active.OK - printlog ". . . exiting testcase." - goto endsub - end if - Kontext "Spellcheck" - printlog "Close dialog 'Spellcheck'." - Spellcheck.Close - Kontext "Active" - if active.exists(5) then - Warnlog " Should not be any message here: " + active.gettext + "'" - Active.OK - else - printlog "Spellcheck ended, dialog closed" - end if - printlog "Select all." - hTypeKeys "<MOD1 A>" - printlog "Check presupposition: 12 Words have to be complained about." - printlog "All 'Tools->Spellcheck->Check'." - ToolsSpellcheck - WaitSlot (2000) - Kontext "Spellcheck" - printlog "Click button 'Ignore' 12 times." - - for i = 1 to 11 - Kontext "Spellcheck" - IgnoreOnce.Click - Kontext "Active" - if active.exists(5) then - warnlog "Presupposition not met: there are less than 12 errors in the document! " + i - Active.OK - printlog "If errors < 12 -> exiting testcase." - goto endsub - end if - next i - Kontext "Spellcheck" - IgnoreOnce.Click - printlog "Spellcheck dialog has to disapear and messagebox with OK has to come up." - Kontext "Active" - if active.exists(5) then - printlog "Active dialog said: " + active.gettext + "'" - Active.OK - end if - Kontext "Spellcheck" - if Spellcheck.Exists(5) then - warnlog "Presupposition not met: there are more than 12 errors in the document!" - Spellcheck.Close - kontext "Active" - if active.exists(5) then - Active.OK - else - printlog "bug fixed #111972# " - end if - printlog "If errors > 12 -> exiting testcase." - goto endsub - else - Kontext "Active" - if active.exists(5) then - warnlog "There was a Message where none was supposed to be: '" + active.gettext + "'" - Active.NO - end if - printlog "Presupposition met: there are 12 errors in the document!" - end if - - printlog "Perform the test now:" - printlog "Call 'Tools->Spellcheck->Check'" - ToolsSpellcheck - WaitSlot (2000) - Kontext "Spellcheck" - Printlog "----------------------------------------------------------------------------" - Printlog "1st Test: - Ignore now" - printlog "1st error: ignore : 1st pink word in 1st Paragraph." - printlog "Backwards: last green word in 3rd Paragraph." - sWordOne = Suggestions.GetSelText - printlog "********* Suggestion word found: '" + sWordOne + "'" - printlog "##### suggestions: "+Suggestions.GetItemCount+"; Language: "+DictionaryLanguage.getSelText '+" ; dictionary: "+woerterbuch.getSelText - if (Suggestions.GetItemCount > 0) then - printlog "----- "+i+": "+Suggestions.GetSelText (1) - end if - printlog "Click button 'Ignore'." - IgnoreOnce.Click - Sleep 2 - - Printlog "----------------------------------------------------------------------------" - Printlog "2nd Test: - Add" - printlog "2nd error: add : 1st red word in 1st Paragraph -> hasn't to show up anymore from now on." - printlog "Backwards: last turquoise word in 3rd Paragraph -> hasn't to show up anymore from now on." - printlog "Check if word in textfield 'Word' changed." - printlog "(Check if it is the expected next error - you have to look into the source code for the right word!)." - sWordTwo = Suggestions.GetSelText - if (sWordOne = sWordTwo) then - warnlog "Ignore didn't work? Spellcheck didn't go on" - end if - if (sWord(iWord(1)) <> sWordTwo) then - Printlog "The errornous word '" + sWord(iWord(1)) + "' would be replaced with: '" + sWordTwo + "'" - end if - printlog "********* word found: '" + sWordTwo + "'" - printlog "##### suggestions: "+Suggestions.GetItemCount+"; Language: "+DictionaryLanguage.getSelText ' +" ; dictionary: "+woerterbuch.getSelText - if (Suggestions.GetItemCount > 0) then - printlog "----- "+i+": "+Suggestions.GetSelText (1) - end if - Sleep 1 - printlog "Click button 'Add' on dialog '" - AddToDictionary.Click - Sleep 2 - printlog "The menu has: " + MenuGetItemCount + " entries." - hMenuSelectNr(1) 'Default - Kontext "Active" - if Active.Exists(5) Then - Warnlog " - Word could not be added to dictionary: '" + active.getText + "'" - Active.OK - Sleep 1 - end if - printlog "Check in options, if word exists in word list." - printlog "Click button 'Options' on dialog 'Spellcheck'." - Kontext "Spellcheck" - SpellcheckOptions.Click - Kontext "TabLinguistik" - printlog "Click button 'Edit ...' on dialog 'Writing Aids' in section 'User-defined dictionaries'." - if TabLinguistik.exists(5) then - sleep 3 - if (fGetIntoDictionary) then - qaErrorLog "wTSC" - goto endsub - end if - else - qaerrorlog "baeh" - end if - Kontext "BenutzerwoerterbuchBearbeiten" - printlog "Check every book, if it contains the added word." - if not BenutzerwoerterbuchBearbeiten.exists(5) then - sleep 5 - qaerrorlog "baeh" - end if - iBooks = Buch.getItemCount - bWordFound(1) = false - for i = 1 to iBooks - Buch.select(i) - printlog "Book number selected: " & i - Wort.setText sWord(iWord(1)) - sleep 1 - if ((not neu.isEnabled) and Loeschen.isEnabled) then - bWordFound(1) = true - printlog "Added word is in dictionary: '" + Buch.getSelText + "'" - end if - next i - if (not bWordFound(1)) then - warnlog "Word was not added to dictionary" - end if - printlog "Cancel dialog 'Edit Custom Dictionary'." - BenutzerwoerterbuchBearbeiten.Close - Kontext "TabLinguistik" - printlog "Cancel dialog 'Writing Aids'." - TabLinguistik.Close - Kontext "Spellcheck" - - Printlog "----------------------------------------------------------------------------" - Printlog " 3rd Test: - Always Ignore" - printlog "3rd error: always ignore : 1st turquoise word in 1st Paragraph -> hasn't to show up anymore from now on." - printlog "Check if word in textfield 'Word' changed." - printlog "(check if it is the expected next error - you have to look into the source code for the right word!)" - sWordOne = sWordTwo - sWordTwo = Suggestions.GetSelText 'wort.getText - if (sWordOne = sWordTwo) then - warnlog "Add didn't work? Spellcheck didn't go on." - end if - if (sWord(iWord(2)) <> sWordTwo) then - Printlog "The erroneous word '" + sWord(iWord(2)) + "' would be replaced with: '" + sWordTwo + "'" - else - warnlog "ERROR: SAME WORD in the dictionary as in the text??? Must be wrong." - end if - printlog "********* word found: '" + sWordTwo + "'" - printlog "##### suggestions: "+Suggestions.GetItemCount+"; Language: "+DictionaryLanguage.getSelText ' +" ; dictionary: "+DictionaryLanguage.getSelText 'Wort.GetItemCount 'Woerterbuch.GetSelText - if (Suggestions.GetItemCount > 0) then 'Wort.GetItemCount > 0) then - printlog "----- "+i+": "+Suggestions.GetItemText (1) 'Wort.GetItemText (1) - end if - Sleep 1 - printlog "Click button 'Always ignore' on dialog." - IgnoreAll.Click - Sleep 2 - printlog "Check in options, if word exists in word list." - printlog "Click button 'Options' on dialog 'Spellcheck'." - SpellcheckOptions.Click - Kontext "TabLinguistik" - printlog "Click button 'Edit ...' on dialog 'Writing Aids' in section 'User-defined dictionaries." - if TabLinguistik.exists(5) then - sleep 3 'culprint swedish windows; wait until butrton exists? - if (fGetIntoDictionary) then - qaErrorLog "wTSC" - goto endsub - end if - else - qaerrorlog "baeh" - end if - Kontext "BenutzerwoerterbuchBearbeiten" - if not BenutzerwoerterbuchBearbeiten.exists(5) then - sleep 3 - qaerrorlog "baeh" - end if - printlog "Check every book, if it contains the added word." - iBooks = Buch.getItemCount - bWordFound(2) = false - for i = 1 to iBooks - Kontext "BenutzerwoerterbuchBearbeiten" - Buch.select(i) - Inhalt.setText sWord(iWord(2)) 'Wort.setText sWord(iWord(2)) - sleep 1 - if ((not neu.isEnabled) and Loeschen.isEnabled) then - bWordFound(2) = true - printlog " added word is in dictionary: '" + Buch.getSelText + "'" - end if - next i - if (not bWordFound(2)) then - warnlog "Word was not added to dictionary, #ixxxxxx" - end if - printlog "Cancel dialog 'Edit Custom Dictionary'." - BenutzerwoerterbuchBearbeiten.Close - Kontext "TabLinguistik" - printlog "Cancel dialog 'Writing Aids'." - TabLinguistik.Close - kontext "Spellcheck" - - Printlog "----------------------------------------------------------------------------" - Printlog "4th test: - Replace" - printlog "4th error: replace : 1st green word in 1st Paragraph." - printlog "Check if word in textfield 'Word' changed." - printlog "(check if it is the expected next error - you have to look into the source code for the right word!)." - sWordOne = sWordTwo - sWordTwo = Suggestions.GetSelText - if (sWordOne = sWordTwo) then - warnlog "Always ignore didn't work? Spellcheck didn't go on." - end if - printlog "********* word found: '" + sWordTwo + "'" - iSuggestions = Suggestions.GetItemCount - printlog "##### suggestions: " + iSuggestions + "; Language: "+DictionaryLanguage.getSelText '+"; dictionary: "+woerterbuch.getSelText - if (Suggestions.GetItemCount > 0) then - printlog "----- "+i+": "+Suggestions.GetItemText (1) - end if - Sleep 1 - printlog "Click button 'Replace'." - if (iSuggestions > 0) then - Change.click - else - qaerrorlog "Please change the text in the file, so the spellchecker can make a suggestion for the word: '" + sWordTwo + "'" - IgnoreOnce.Click - end if + +end function +'------------------------------------------------------------------------------- +function delete_word_from_dictionary(sWord as String, sDictionary as String) - Printlog "----------------------------------------------------------------------------" - Printlog "5th Test: - Always Replace" - printlog "5th error: always replace : 1st pink word in 2nd Paragraph -> hasn't to show up anymore from now on." - printlog "backwards: 1st green word in 2nd Paragraph -> hasn't to show up anymore from now on." - printlog "check if word in textfield 'Word' changed." - printlog "(check if it is the expected next error - you have to look into the source code for the right word!)." - sWordOne = sWordTwo - sWordTwo = Suggestions.GetSelText - if (sWordOne = sWordTwo) then - warnlog "Replace didn't work? Spellcheck didn't go on" - end if - printlog "********* word found: '" + sWordTwo + "'" - iSuggestions = Suggestions.GetItemCount - printlog "##### suggestions: " + iSuggestions + "; Language: "+DictionaryLanguage.getSelText ' +" ; dictionary: "+woerterbuch.getSelText - if (Suggestions.GetItemCount > 0) then - printlog "----- "+i+": "+Suggestions.GetItemText (1) - end if - Sleep 1 - printlog "click button 'Always Replace'." - if (iSuggestions > 0) then - ChangeAll.click - else - qaErrorLog "Please change the text in the file, so the spellchecker can make a suggestion for the word: '" + sWordTwo + "'" - IgnoreOnce.Click - end if + '/// this function delete the words in sWords in all user dictionaries - printlog "2 errors are left: 4th word (green) in 2nd and 3rd paragraph." - printlog "backwards: 1st word (pink) in 2nd and 1st paragraph." - Kontext "Spellcheck" - sWordOne = sWordTwo - sWordTwo = Suggestions.GetSelText - if (sWordOne <> sWordTwo) then - printlog sWordTwo - else - warnlog "there is anopther word left, that wasn't expected!. '" + sWordTwo +"'" - end if - printlog "Click button 'Ignore' 2 times." - IgnoreOnce.Click - - Kontext "Spellcheck" - sWordOne = sWordTwo - sWordTwo = Suggestions.GetSelText - if (sWordOne <> sWordTwo) then - warnlog "there is anopther word left, that wasn't expected!. '" + sWordTwo +"'" - else - printlog sWordTwo - end if - printlog "Click button 'Ignore' 2 times." - IgnoreOnce.Click - Kontext "Active" - if active.exists(5) then - printlog "Spellcheck works :-) '" + active.gettext + "'" - Active.No - else - warnlog "Spellcheck didn't work :-(! there are still errors in the document." - Kontext "Spellcheck" - Spellcheck.Close - Kontext "Active" - if active.exists(5) then - qaErrorLog " Spellcheck dialog closed'" + active.gettext + "'" - Active.No - end if - end if - sleep 2 + Dim iBookCounter as integer + Dim iWordCounter as integer + Dim iBooks as integer - Printlog "Delete all added words from dictionaries." + Printlog "Delete the given word from dictionaries." printlog "Call Tools->Options." ToolsOptions - printlog "Select in category 'Languagesettings' entry 'Writing Aids'." + printlog "Select in category 'Languagesettings' entry 'Writing Aids.'" hToolsOptions ("LANGUAGESETTINGS","WRITINGAIDS") sleep 1 Kontext "WRITINGAIDS" - printlog "Click on button 'edit' in section 'User-defined dictionaries'." - if (fGetIntoDictionary) then - qaErrorLog "wTSC" - goto endsub - end if + sleep 1 + printlog "select the dictionary and click EDIT" + + fSelectWithString(Benutzerwoerterbuch,sDictionary) + + Bearbeiten.Click + Kontext "BenutzerwoerterbuchBearbeiten" - printlog "Check every book, if it contains the added word." - iBooks = Buch.getItemCount - bWordFound(1) = false - bWordFound(2) = false - for i = 1 to iBooks - Buch.select(i) - for j = 1 to 2 - Wort.setText sWord(j) - sleep 1 - if ((not neu.isEnabled) and Loeschen.isEnabled) then - printlog "If it contains the word, press button 'delete'." - Loeschen.click - bWordFound(j) = true - printlog " added word is in dictionary: '" + Buch.getSelText + "' - '" + sWord(j) + "'" - end if - next j - next i - if ((not bWordFound(1)) AND (not bWordFound(2)))then - warnlog "Word was not found in dictionary. '" + sWord(1) + "': " + bWordFound(1) + " '" + sWord(2) + "': " + bWordFound(2) + + Wort.setText sWord + sleep 1 + if ((not neu.isEnabled) and Loeschen.isEnabled) then + printlog "If it contains the word, press button 'delete'." + Loeschen.click + printlog "Added word WAS in dictionary: '" + Buch.getSelText + "' - '" + sWord + "'" end if - printlog "Close dialog 'Edit Custom Dictionary'." + + printlog "Close dialog 'Edit Custom Dictionary.'" BenutzerwoerterbuchBearbeiten.Close sleep 1 Kontext "ExtrasOptionenDlg" - printlog "press button 'OK' on dialog 'Writing Aids'." + printlog "Press button 'OK' on dialog 'Writing Aids'." ExtrasOptionenDlg.OK - printlog "Call dialog again and delete all remaining words from dictionary 'IgnoreAllList'." - if (not wIgnorierenlisteLoeschen) then - qaErrorLog "Can't get into Dictionary lists" - goto endsub - end if - printlog "Close document" - Call hCloseDocument -endcase 'tiToolsSpellcheckCheck +end function -'------------------------------------------------------------------------------- -testcase tToolsSpellcheckAutoSpellcheck - - QaErrorLog "#i81928# - outcommented tToolsSpellcheckAutoSpellcheck due to bug." - goto endsub - dim i as integer - dim x as integer - dim y as integer - dim q as integer - dim z as integer - dim iResult as long - dim iTemp as long - dim iTemp2 as long - dim sTemp as string - dim sCompare as string - dim iCompare as long - dim iError as long - dim sError as string - - call hNewDocument - - call hTextrahmenErstellen ("Ein Tipp: Schiffahrt schreibt man nun mit 3f Tunfisch Amboss a", 10, 10, 90, 50) +function fSelectWithString(oControl as Object,sText as String) - EditSelectAll - setCharacterLanguage(glLocale(4)) - sleep 10 - printlog "## check ENGLISH auto spellchecking" - iError = 0 - ' Get underlined words / wrong recognized words by spellchecker - iResult = sAnalyseContextMenu(11, iError) - sTemp = sLongToBinary(iResult, 11) - sError = sLongToBinary(iError, 11) - ' reference of words, which should be underlined - sCompare = "11011001011" - iCompare = sBinaryToLong(sCompare) - ' compare result with reference -> get the difference - iTemp = not (iResult EQV iCompare) - ' eliminate errors from open bugs -> get the real errors - iTemp2 = iTemp AND NOT iError - if (iTemp2 > 0) then - warnlog "wrong words are not underlined? Should be: " + sCompare - warnlog "Is: " + sTemp - warnlog "Differences: " + sLongToBinary(iTemp, 11) - warnlog "Wrong after merging errors from bugs " + sLongToBinary(iTemp2, 11) - end if + dim iCounter as Integer + dim iNumberOfItems as Integer + iNumberOfItems = oControl.getItemCount() - sleep 1 - ' call hTypeKeys "<F2>" - call hTypeKeys "<mod1 end> <Shift mod1 home>" - setCharacterLanguage(glLocale(6)) - sleep 10 - printlog "## check GERMAN auto spellchecking" - iError = 0 - iResult = sAnalyseContextMenu(11, iError) - sTemp = sLongToBinary(iResult, 11) - sError = sLongToBinary(iError, 11) - sCompare = "00010000000" - iCompare = sBinaryToLong(sCompare) - ' compare result with reference -> get the difference - iTemp = not (iResult EQV iCompare) - ' eliminate errors from open bugs -> get the real errors - iTemp2 = iTemp AND NOT iError - if (iTemp2 > 0) then - warnlog "wrong words are not underlined? Should be: " + sCompare - warnlog "Is: " + sTemp - warnlog "Differences: " + sLongToBinary(iTemp, 11) - warnlog "Wrong after merging errors from bugs " + sLongToBinary(iTemp2, 11) - end if - printlog "-----------------------------------" + for iCounter = 1 to iNumberOfItems + oControl.select iCounter + if( Instr(oControl.getSelText,sText) <> 0 ) then ' the correct entry is selected + iCounter = iNumberOfItems ' stop the loop + endif + next - hCloseDocument() -endcase 'tToolsSpellcheckAutoSpellcheck +end function -'------------------------------------------------------------------------------- + +function getWordsForLanguage() + + dim sWrongWord as String + dim sRightWord as String + dim aWords(2) as String + + select case iSprache + case 1 : + sWrongWord = "documente" + sRightWord = "document" + case 31 : + sWrongWord = "miejn" + sRightWord = "mijn" + case 33 : + sWrongWord = "projjet" + sRightWord = "projet" + case 34 : + sWrongWord = "lazsos" + sRightWord = "lazos" + case 36 : + sWrongWord = "Bozniai" + sRightWord = "Boszniai" + case 39 : + sWrongWord = "borrdo" + sRightWord = "borro" + case 46 : + sWrongWord = "desa" + sRightWord = "edas" + case 48 : + sWrongWord = "werrsji" + sRightWord = "wersji" + case 49 : + sWrongWord = "Feehlern" + sRightWord = "Fehlern" + case 55 : + sWrongWord = "Elle" + sRightWord = "Elze" + case else : + sWrongWord = "" + sRightWord = "" + end select + + aWords(0) = sWrongWord + aWords(1) = sRightWord + + getWordsForLanguage = aWords + +end function diff --git a/testautomation/graphics/optional/includes/global/g_stylist.inc b/testautomation/graphics/optional/includes/global/g_stylist.inc index fe9a1e28dabb..fab547eb5d3b 100644 --- a/testautomation/graphics/optional/includes/global/g_stylist.inc +++ b/testautomation/graphics/optional/includes/global/g_stylist.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_tables.inc b/testautomation/graphics/optional/includes/global/g_tables.inc index ca5fc625c4ab..410ed8ca0fc6 100644 --- a/testautomation/graphics/optional/includes/global/g_tables.inc +++ b/testautomation/graphics/optional/includes/global/g_tables.inc @@ -25,7 +25,7 @@ ' '/****************************************************************** '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : Testing of impress tables '* @@ -218,8 +218,12 @@ testcase tiTableObjectBar Kontext "InsertTableImpress" printlog "Inserting table." - InsertTableImpress.OK - + if InsertTableImpress.Exists(1) then + InsertTableImpress.OK + else + sleep (1) + InsertTableImpress.OK + endif printlog "Selecting table for geeting the TableObjectBar." printlog "Switching between Draw/Impress" if ( gApplication = "IMPRESS" )then diff --git a/testautomation/graphics/optional/includes/global/g_toolbars.inc b/testautomation/graphics/optional/includes/global/g_toolbars.inc index 10ea5cdba195..9f8d8a6b2fb4 100644 --- a/testautomation/graphics/optional/includes/global/g_toolbars.inc +++ b/testautomation/graphics/optional/includes/global/g_toolbars.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index 2d802af5b40c..04fc0b92d4b2 100644 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : will be moved to autocorrection.bas/inc '* @@ -280,16 +280,7 @@ testcase tiToolsThesaurusContextMenu PrintLog "Thesaurus with 1 word: " + sWord - if( Ucase(gApplication) = "DRAW" ) then - sExt = ".odg" - Kontext "DrawDocument" - elseif( Ucase(gApplication) = "IMPRESS" ) then - sExt = ".odp" - Kontext "ImpressDocument" - endif - - Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) - + Call hNewDocument Call hTextrahmenErstellen (sWord,20,20,50,30) sleep 1 @@ -349,7 +340,7 @@ testcase tiToolsHyphenation1 case 46 : hTextrahmenErstellen ("Detta är en text utan delade ord",10,10,40,40) case 48 : hTextrahmenErstellen (" Jeoli jednak zechcesz",10,10,40,40) case 49 : hTextrahmenErstellen ("Dies ist ein Text ohne eine Moeglichkeit Woerter zu trennen",10,10,40,40) - case 50 : hTextrahmenErstellen ("Zato ves čas iščemo nove člane: sodelujte",10,10,40,40) + case 50 : hTextrahmenErstellen ("Zato ves ?as iš?emo nove ?lane: sodelujte",10,10,40,40) case 55 : hTextrahmenErstellen ("a Sun tentou adquirir a Apple",10,10,40,40) case else : if bAsianLan then printlog "For the language " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-)" diff --git a/testautomation/graphics/optional/includes/global/g_zoom.inc b/testautomation/graphics/optional/includes/global/g_zoom.inc index 30a6798d9082..c82b6743966a 100644 --- a/testautomation/graphics/optional/includes/global/g_zoom.inc +++ b/testautomation/graphics/optional/includes/global/g_zoom.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/gallery.inc b/testautomation/graphics/optional/includes/global/gallery.inc index 8398395c3653..6eca0a5276e3 100755..100644 --- a/testautomation/graphics/optional/includes/global/gallery.inc +++ b/testautomation/graphics/optional/includes/global/gallery.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : Global Required/resource test: Checking the gallery '* diff --git a/testautomation/graphics/optional/includes/global/gallery2.inc b/testautomation/graphics/optional/includes/global/gallery2.inc index b86cedcf8154..d46d0ae4a99c 100644 --- a/testautomation/graphics/optional/includes/global/gallery2.inc +++ b/testautomation/graphics/optional/includes/global/gallery2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : Checking all gallery themes '* diff --git a/testautomation/graphics/optional/includes/global/id_001.inc b/testautomation/graphics/optional/includes/global/id_001.inc index 2bbca902b249..15a99c0d3f23 100644 --- a/testautomation/graphics/optional/includes/global/id_001.inc +++ b/testautomation/graphics/optional/includes/global/id_001.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/id_002.inc b/testautomation/graphics/optional/includes/global/id_002.inc index feca54dac85e..c199ab998524 100644 --- a/testautomation/graphics/optional/includes/global/id_002.inc +++ b/testautomation/graphics/optional/includes/global/id_002.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/id_003.inc b/testautomation/graphics/optional/includes/global/id_003.inc index 371b0699fc8f..4ada1beaaea4 100644 --- a/testautomation/graphics/optional/includes/global/id_003.inc +++ b/testautomation/graphics/optional/includes/global/id_003.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/id_004.inc b/testautomation/graphics/optional/includes/global/id_004.inc index ff1317ce5d01..2e1aa6db3cd1 100644 --- a/testautomation/graphics/optional/includes/global/id_004.inc +++ b/testautomation/graphics/optional/includes/global/id_004.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/id_005.inc b/testautomation/graphics/optional/includes/global/id_005.inc index 0741bc82c8a9..4aefb701a861 100755..100644 --- a/testautomation/graphics/optional/includes/global/id_005.inc +++ b/testautomation/graphics/optional/includes/global/id_005.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/id_006.inc b/testautomation/graphics/optional/includes/global/id_006.inc index d41b0c08e688..bcbfa3d7c24b 100644 --- a/testautomation/graphics/optional/includes/global/id_006.inc +++ b/testautomation/graphics/optional/includes/global/id_006.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/id_007.inc b/testautomation/graphics/optional/includes/global/id_007.inc index 214b468e04d5..bbc870953f3a 100644 --- a/testautomation/graphics/optional/includes/global/id_007.inc +++ b/testautomation/graphics/optional/includes/global/id_007.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/id_008.inc b/testautomation/graphics/optional/includes/global/id_008.inc index 0efbf5add49d..654cae0f00df 100644 --- a/testautomation/graphics/optional/includes/global/id_008.inc +++ b/testautomation/graphics/optional/includes/global/id_008.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/id_009.inc b/testautomation/graphics/optional/includes/global/id_009.inc index ff8f41a10917..7096a1a860a9 100644 --- a/testautomation/graphics/optional/includes/global/id_009.inc +++ b/testautomation/graphics/optional/includes/global/id_009.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Testcases to test the Help-Menu. '* diff --git a/testautomation/graphics/optional/includes/global/id_011.inc b/testautomation/graphics/optional/includes/global/id_011.inc index 6c2ecd7ff08c..b1880d0982e8 100644 --- a/testautomation/graphics/optional/includes/global/id_011.inc +++ b/testautomation/graphics/optional/includes/global/id_011.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/impress/i_animation.inc b/testautomation/graphics/optional/includes/impress/i_animation.inc index 471ef1fada85..8ee7777e5994 100644 --- a/testautomation/graphics/optional/includes/impress/i_animation.inc +++ b/testautomation/graphics/optional/includes/impress/i_animation.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/impress/i_headerfooter.inc b/testautomation/graphics/optional/includes/impress/i_headerfooter.inc index 4237e7a070ca..3e4c54551525 100644 --- a/testautomation/graphics/optional/includes/impress/i_headerfooter.inc +++ b/testautomation/graphics/optional/includes/impress/i_headerfooter.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Tests the header-footer-function in Impress '* diff --git a/testautomation/graphics/optional/includes/impress/i_pengine.inc b/testautomation/graphics/optional/includes/impress/i_pengine.inc index 2d90d038b5d7..4f19f254b055 100644 --- a/testautomation/graphics/optional/includes/impress/i_pengine.inc +++ b/testautomation/graphics/optional/includes/impress/i_pengine.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Tests the shaddow-function on a picture '* diff --git a/testautomation/graphics/optional/includes/impress/i_pengine1.inc b/testautomation/graphics/optional/includes/impress/i_pengine1.inc index 5307cd665abd..44f531c47fcd 100644 --- a/testautomation/graphics/optional/includes/impress/i_pengine1.inc +++ b/testautomation/graphics/optional/includes/impress/i_pengine1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Tests the Engine for Presentation '* diff --git a/testautomation/graphics/optional/includes/impress/i_pengine2.inc b/testautomation/graphics/optional/includes/impress/i_pengine2.inc index f10b77f30db3..f1fa908cf7b7 100644 --- a/testautomation/graphics/optional/includes/impress/i_pengine2.inc +++ b/testautomation/graphics/optional/includes/impress/i_pengine2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Tests the Presentation-Engines effects '* diff --git a/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc b/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc index e5dbf1f53cc2..06a7ac89cf9d 100644 --- a/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc +++ b/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description: Save & Load testing of Layout -templates. '* diff --git a/testautomation/graphics/optional/includes/impress/i_shape.inc b/testautomation/graphics/optional/includes/impress/i_shape.inc index cd29dbb62e31..c33c92f2ec0f 100644 --- a/testautomation/graphics/optional/includes/impress/i_shape.inc +++ b/testautomation/graphics/optional/includes/impress/i_shape.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : owner : wolfram.garten@sun.com +'* owner : owner : wolfram.garten@oracle.com '* '* short description : import presentations with shapes in .ppt format '* diff --git a/testautomation/graphics/optional/includes/impress/i_slidecopy.inc b/testautomation/graphics/optional/includes/impress/i_slidecopy.inc index 1a9590b9856f..92283b35a369 100644 --- a/testautomation/graphics/optional/includes/impress/i_slidecopy.inc +++ b/testautomation/graphics/optional/includes/impress/i_slidecopy.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description: includefile for Slidecopy-testing '* diff --git a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc index 597762e8cf7e..441e0a323099 100644 --- a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc +++ b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow.inc b/testautomation/graphics/optional/includes/impress/i_slideshow.inc index 3a2b56fa5511..d313f444994b 100755..100644 --- a/testautomation/graphics/optional/includes/impress/i_slideshow.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc index 1b88116f1b5a..b15beb28932d 100644 --- a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc index 0cf806cd74cd..63a04aa6f8d5 100644 --- a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/impress/i_stylist.inc b/testautomation/graphics/optional/includes/impress/i_stylist.inc index 97ddb39999df..7efe28089365 100644 --- a/testautomation/graphics/optional/includes/impress/i_stylist.inc +++ b/testautomation/graphics/optional/includes/impress/i_stylist.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/impress/i_us2_present.inc b/testautomation/graphics/optional/includes/impress/i_us2_present.inc index 6b2b64881987..eeeeb5effb6b 100644 --- a/testautomation/graphics/optional/includes/impress/i_us2_present.inc +++ b/testautomation/graphics/optional/includes/impress/i_us2_present.inc @@ -25,7 +25,7 @@ ' '/************************************************************************** '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress User-Scenario: Beginner makes presentation. '* @@ -145,6 +145,7 @@ testcase i_us2_pres1 DocumentImpress.UseMenu hMenuSelectNr (4) hMenuSelectNr (1) + call sSelectEmptyLayout sleep (1) kontext "Slides" diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc index da63e3cf0966..599f89abe4f1 100644 --- a/testautomation/graphics/optional/includes/impress/i_us_present.inc +++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc @@ -25,7 +25,7 @@ ' '/************************************************************************** '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Include-file for impress User-Scenario: Presentation. '* @@ -52,19 +52,12 @@ testcase i_us_presentation1 printlog "New master" MenuSelect(MenuGetItemID(1)) sleep (1) - ViewMasterPage - kontext "Slides" - SlidesControl.OpenContextMenu(true) - sleep (2) - MenuSelect(MenuGetItemID(1)) 'New Master - sleep (1) - printlog " Inserted second Master-Slide" - + printlog "Inserted second Master-Slide" printlog "set background to picture(Gallery)" Kontext "Gallery" if Gallery.Exists(2) then - warnlog " The Gallery was already visible. Check earlier ran tests for inconsistency." + warnlog "The Gallery was already visible. Check earlier ran tests for inconsistency." sleep (2) else ToolsGallery @@ -118,9 +111,8 @@ testcase i_us_presentation1 sleep (2) Kontext "ExportierenDlg" if ExportierenDlg.IsVisible(5) then - printlog " Gallery-object correctly copied into Slide." + printlog "Gallery-object correctly copied into Slide." ExportierenDlg.Close - ToolsGallery WaitSlot (2000) end if kontext "GraphicObjectbar" @@ -128,33 +120,7 @@ testcase i_us_presentation1 kontext "DocumentImpress" ViewToolbarsPicture end if - Kontext "Gallery" - View.TypeKeys "<HOME><RIGHT><RIGHT>" - printlog "'OpenContextMenu" - View.TypeKeys "<SHIFT F10>" - sleep (2) - MenuSelect(MenuGetItemID(1)) 'Insert - sleep (2) - MenuSelect(MenuGetItemID(1)) 'Copy - sleep (2) - printlog "Check that we really got a copy of the object " - kontext "DocumentImpress" - DocumentImpress.OpenContextMenu(true) - sleep (2) - MenuSelect 27353 - sleep (2) - Kontext "ExportierenDlg" - if ExportierenDlg.IsVisible(5) then - printlog " Gallery-object correctly copied into Slide." - ExportierenDlg.Close - else - warnlog " Doesn't seem like we copied anything from the Gallery... ?" - end if - kontext "GraphicObjectbar" - if GraphicObjectbar.Exists(5) = FALSE then - kontext "DocumentImpress" - ViewToolbarsPicture - end if + kontext "Gallery" Gallerys.Select (iPictures) printlog " 50% Transparency" @@ -167,22 +133,6 @@ testcase i_us_presentation1 sleep (1) kontext "GraphicFilterBar" Mosaic.Click - WaitSlot (2000) - kontext "Mosaic" - Width.SetText "16" - Height.SetText "16" - Mosaic.OK - kontext "GraphicFilterBar" - GraphicFilterBar.Close - ToolsGallery - WaitSlot (1000) - kontext "DocumentImpress" - hTypeKeys "<TAB>" - sleep (1) - - kontext "GraphicFilterBar" - Mosaic.Click - kontext "Mosaic" if ( Mosaic.exists( 2 ) ) then Width.SetText "16" @@ -191,25 +141,21 @@ testcase i_us_presentation1 else warnlog( "Dialog <Mosaic> did not open" ) endif - kontext "GraphicFilterBar" GraphicFilterBar.Close - ToolsGallery WaitSlot (1000) - kontext "DocumentImpress" gMouseClick 50,50 sleep (1) - FormatPositionAndSize kontext if ( Active.exists( 2 ) ) then active.setPage(TabPositionAndSize) kontext "TabPositionAndSize" - Width.SetText "800" - Height.SetText "600" + Width.SetText "15" + Height.SetText "11" SizePosition.TypeKeys "<RIGHT><DOWN>" TabPositionAndSize.OK else @@ -239,13 +185,13 @@ testcase i_us_presentation2 PresentationFile1 = ConvertPath( gOfficePath + "user\work\PowerPes1.odp" ) PresentationFile2 = ConvertPath( gOfficePath + "user\work\PowerPes2.odp" ) - if ( FileExists( PresentationFile1 ) ) then 'if file exists... + if ( FileExists( PresentationFile1 ) ) then 'if file exists... hFileOpen (PresentationFile1) else warnlog " This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester." goto endsub end if - + sleep (2) printlog "New Slide" kontext "slides" SlidesControl.TypeKeys( "<PAGEDOWN>", 3 ) @@ -254,7 +200,7 @@ testcase i_us_presentation2 MenuSelect(MenuGetItemID(1)) 'New Slide 'No 2 printlog " Inserted second normal Slide" - + call sSelectEmptyLayout printlog "2. Layouts: Text. Bild: Gallery: Animation - Gif" Kontext "Tasks" printlog "to get to the very first position" @@ -275,11 +221,14 @@ testcase i_us_presentation2 printlog " Did the 'mistake' to FadeIn/Out the Slidepane" - printlog "activating the input picture area" - kontext "DocumentImpress" - DocumentImpress.TypeKeys "<TAB>",2 - DocumentImpress.TypeKeys "<RETURN>" - sleep (1) +InsertGraphicsFromFile +Kontext "GrafikEinfuegenDlg" +if GrafikEinfuegenDlg.exists(5) then +printlog " The Insertgraphics-dialogue showed up correctly." +sleep (5) +else +warnlog " The Insertgraphics-dialogue didn't show up." +endif printlog "Graphics-Import-dialogue. Select i_us_large.jpg" Kontext "GrafikEinfuegenDlg" diff --git a/testautomation/graphics/optional/includes/impress/i_view.inc b/testautomation/graphics/optional/includes/impress/i_view.inc index 56c5654315bf..54ba5132d16e 100644 --- a/testautomation/graphics/optional/includes/impress/i_view.inc +++ b/testautomation/graphics/optional/includes/impress/i_view.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/impress/im_002_.inc b/testautomation/graphics/optional/includes/impress/im_002_.inc index 2a7dd1dffa2e..d1fa457ae8b2 100644 --- a/testautomation/graphics/optional/includes/impress/im_002_.inc +++ b/testautomation/graphics/optional/includes/impress/im_002_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Required Test Library (2) '* diff --git a/testautomation/graphics/optional/includes/impress/im_003_.inc b/testautomation/graphics/optional/includes/impress/im_003_.inc index 6197e75c0fb4..1db0627e4a4e 100644 --- a/testautomation/graphics/optional/includes/impress/im_003_.inc +++ b/testautomation/graphics/optional/includes/impress/im_003_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Resource Test: View Menu '* diff --git a/testautomation/graphics/optional/includes/impress/im_004_.inc b/testautomation/graphics/optional/includes/impress/im_004_.inc index 230da47a4e87..17d00addc847 100644 --- a/testautomation/graphics/optional/includes/impress/im_004_.inc +++ b/testautomation/graphics/optional/includes/impress/im_004_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Required Test Library (4) '* diff --git a/testautomation/graphics/optional/includes/impress/im_005_.inc b/testautomation/graphics/optional/includes/impress/im_005_.inc index b743f32fb695..1aa218f3ecba 100644 --- a/testautomation/graphics/optional/includes/impress/im_005_.inc +++ b/testautomation/graphics/optional/includes/impress/im_005_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Required Test Library (5) '* diff --git a/testautomation/graphics/optional/includes/impress/im_007_.inc b/testautomation/graphics/optional/includes/impress/im_007_.inc index 15c9e8609b5d..fc9ba2800e0c 100644 --- a/testautomation/graphics/optional/includes/impress/im_007_.inc +++ b/testautomation/graphics/optional/includes/impress/im_007_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Required Test Library (7) '* diff --git a/testautomation/graphics/optional/includes/impress/im_011_.inc b/testautomation/graphics/optional/includes/impress/im_011_.inc index d31586b9079c..30ab1bebb74e 100644 --- a/testautomation/graphics/optional/includes/impress/im_011_.inc +++ b/testautomation/graphics/optional/includes/impress/im_011_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Required Test Library (11) '* diff --git a/testautomation/graphics/optional/includes/impress/options.inc b/testautomation/graphics/optional/includes/impress/options.inc index 3443ecf91198..cfce04e68805 100644 --- a/testautomation/graphics/optional/includes/impress/options.inc +++ b/testautomation/graphics/optional/includes/impress/options.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Tests the Presentation-Engines effects '* diff --git a/testautomation/graphics/required/d_opt.bas b/testautomation/graphics/required/d_opt.bas index 686291869943..1447b1f4e276 100755 --- a/testautomation/graphics/required/d_opt.bas +++ b/testautomation/graphics/required/d_opt.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Draw Options Test '* diff --git a/testautomation/graphics/required/d_updt.bas b/testautomation/graphics/required/d_updt.bas index 6c5fdbe74472..40dd64e3b50c 100644..100755 --- a/testautomation/graphics/required/d_updt.bas +++ b/testautomation/graphics/required/d_updt.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Draw Required Test '* diff --git a/testautomation/graphics/required/i_opt.bas b/testautomation/graphics/required/i_opt.bas index 16debcc9ede0..eb159ac83a55 100755 --- a/testautomation/graphics/required/i_opt.bas +++ b/testautomation/graphics/required/i_opt.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Options Test '* diff --git a/testautomation/graphics/required/i_updt_1.bas b/testautomation/graphics/required/i_updt_1.bas index 141b261e3ee9..f829cc9b8713 100644..100755 --- a/testautomation/graphics/required/i_updt_1.bas +++ b/testautomation/graphics/required/i_updt_1.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Required Test (Part 1) '* diff --git a/testautomation/graphics/required/i_updt_2.bas b/testautomation/graphics/required/i_updt_2.bas index 2c60d0da96ea..3d61eea42a4b 100755 --- a/testautomation/graphics/required/i_updt_2.bas +++ b/testautomation/graphics/required/i_updt_2.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Required (Test Part 2) '* diff --git a/testautomation/graphics/required/includes/draw/d_002_.inc b/testautomation/graphics/required/includes/draw/d_002_.inc index cf37b87ffee4..1716ea47dfa7 100644 --- a/testautomation/graphics/required/includes/draw/d_002_.inc +++ b/testautomation/graphics/required/includes/draw/d_002_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/required/includes/draw/d_003_.inc b/testautomation/graphics/required/includes/draw/d_003_.inc index 246e0db05fc9..a94ee55cc352 100644 --- a/testautomation/graphics/required/includes/draw/d_003_.inc +++ b/testautomation/graphics/required/includes/draw/d_003_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/required/includes/draw/d_005_.inc b/testautomation/graphics/required/includes/draw/d_005_.inc index 998a42cdc093..0b0505bd92f7 100644 --- a/testautomation/graphics/required/includes/draw/d_005_.inc +++ b/testautomation/graphics/required/includes/draw/d_005_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/required/includes/draw/d_007.inc b/testautomation/graphics/required/includes/draw/d_007.inc index ce36abf03b59..b1a3941a07ff 100644 --- a/testautomation/graphics/required/includes/draw/d_007.inc +++ b/testautomation/graphics/required/includes/draw/d_007.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/required/includes/global/gallery.inc b/testautomation/graphics/required/includes/global/gallery.inc index c6f3e2daae7d..cfdac0029ec1 100644 --- a/testautomation/graphics/required/includes/global/gallery.inc +++ b/testautomation/graphics/required/includes/global/gallery.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : Global Required/resource test: Checking the gallery '* diff --git a/testautomation/graphics/required/includes/global/gallery2.inc b/testautomation/graphics/required/includes/global/gallery2.inc index 1028503a0830..97f28a99849a 100644 --- a/testautomation/graphics/required/includes/global/gallery2.inc +++ b/testautomation/graphics/required/includes/global/gallery2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : Checking all gallery themes '* @@ -102,6 +102,7 @@ testcase tLoad100GalleryGraphicFiles '/// + Deleting the graphic with <delete> of the keyboard '/// <i>Loop ends</i> x = LoadGraphic ( lsGraphics(t), corLoad ) + sleep(1) printlog catch ExceptLog diff --git a/testautomation/graphics/required/includes/global/id_001.inc b/testautomation/graphics/required/includes/global/id_001.inc index 96d2b276eeaf..5e2b4912f6e7 100644 --- a/testautomation/graphics/required/includes/global/id_001.inc +++ b/testautomation/graphics/required/includes/global/id_001.inc @@ -25,12 +25,39 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* '\****************************************************************************** - +sub id_001 + + printLog Chr(13) + "--------- id_001 ----------" + + qaerrorlog "#74988# tiFilePassword outcommented due to bug. -FHA" + call tiFilePassword + call tiFileSaveAs + call tiFileReload + call tiFileVersion + printlog " File->Send not possible to test, because extrnal prg get's called!" + call tiFileTemplates + ' Call tiFileNew instead i call: + call tmFileNewFromTemplate + call tmFileOpen + call tmFileClose + call tmFileSave + call tmFileSaveAs + call tmFileExit + + call tmFileSaveAll + call tmFileProperties + call tdFileExport + call tmFilePrinterSetting + ' special cases + ' Call AutoPilot 'inc\desktop\autopilo.inc + call tmFileExit ' don't test because unpredictable behaviour +end sub +'------------------------------------------------------------------------------ testcase tiFileSaveAs dim sFileName as string ' test document & new created doc diff --git a/testautomation/graphics/required/includes/global/id_002.inc b/testautomation/graphics/required/includes/global/id_002.inc index 5880fc968806..0b2a91818cda 100644 --- a/testautomation/graphics/required/includes/global/id_002.inc +++ b/testautomation/graphics/required/includes/global/id_002.inc @@ -25,11 +25,32 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* '\****************************************************************************** +sub id_002 + + printLog Chr(13) + "--------- id_002 ----------" + + call tiEditUndoRedo + call tiEditRepeat + call tiEditCutPasteCopySelectall + call tiEditPasteSpecial + call tiEditSearchAndReplace + call tiEditDuplicate + call tEditPoints + call tiEditFields + call tdEditDeleteSlide + call tiEditLinks + call tiEditImageMap + call tiEditObjectProperties + call tiEditObjectEdit + call tiEditPlugIn + call tiEditHyperlink +end sub +'------------------------------------------------------------------------- testcase tiEditUndoRedo printlog " open application" @@ -204,6 +225,7 @@ testcase tiEditFields printlog " open application " Call hNewDocument WaitSlot (2000) + call sSelectEmptyLayout() printlog " insert something to be able to use this function" printlog "+ Insert->Fields->Date (fixed)" printlog "+ deselect object, select, editmode " diff --git a/testautomation/graphics/required/includes/global/id_003.inc b/testautomation/graphics/required/includes/global/id_003.inc index 16aa9f27bcd6..e7c47b2c434c 100644 --- a/testautomation/graphics/required/includes/global/id_003.inc +++ b/testautomation/graphics/required/includes/global/id_003.inc @@ -25,11 +25,26 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* '\****************************************************************************** + +sub id_003 + + printLog Chr(13) + "--------- id_003 ----------" + + call tiViewNavigator + call tiViewZoom + call tiViewToolbar + Call tToolsCustomize 'global\required\include + call tiViewDisplayQuality + call tiViewLayer + call tViewSnapLines + call tViewGrid +end sub +'------------------------------------------------------------------------- testcase tiViewNavigator printlog " open application " diff --git a/testautomation/graphics/required/includes/global/id_004.inc b/testautomation/graphics/required/includes/global/id_004.inc index e6f154f169c8..42b0170fe6ef 100644 --- a/testautomation/graphics/required/includes/global/id_004.inc +++ b/testautomation/graphics/required/includes/global/id_004.inc @@ -25,11 +25,39 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* '\****************************************************************************** +sub id_004 + + printLog Chr(13) + "--------- id_004 ----------" + + call tiInsertSlide + call tiInsertDuplicateSlide + ' v expand slide + ' v summary slide + call tiInsertField + call tiInsertSpecialCharacter + call tiInsertHyperlink + call tiInsertScan + call tiInsertGraphic + call tiInsertObjectSound + call tiInsertObjectVideo + call tiInsertObjectSound + call tiInsertObjectVideo + call tiInsertChart + call tiInsertObjectOLEObjects + call tiInsertSpreadsheet + call tiInsertFormula + call tiInsertFloatingFrame + call tiInsertFile + call tiInsertPlugin + call tiInsertSnappointLine + call tdInsertLayer ' IMPRESS: Edit->Layer->Insert +end sub +'------------------------------------------------------------------------------ testcase tiInsertSlide printlog "Dateiname.settext Convertpath (gTesttoolPath + global\input\graf_inp\stabler.tif) " diff --git a/testautomation/graphics/required/includes/global/id_005.inc b/testautomation/graphics/required/includes/global/id_005.inc index 97fea2b33dae..6ec5a5988235 100644 --- a/testautomation/graphics/required/includes/global/id_005.inc +++ b/testautomation/graphics/required/includes/global/id_005.inc @@ -25,11 +25,38 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* '\****************************************************************************** +sub id_005 + + printLog Chr(13) + "--------- id_005 ----------" + + call tiFormatDefault + call tiFormatLine + call tdFormatArea + call tiFormatText + call tiFormatPositionAndSize + call tiFormatCharacter + call tiFormatControlForm + ' ^ Form + call tiFormatDimensions + call tiFormatConnector + call tiFormat3D_Effects + call tiFormatNumberingBullets + call tiFormatCaseCharacter + call tiFormatParagraph + call tiFormatPage + call tiFormatStylesAndFormatting + call tiFormatStylesSlideDesign + call tiFormatFontwork + call tiFormatGroup + printlog " format->group is also modify->group " + ' tiFormatLayer ' not in impress +end sub +'------------------------------------------------------------------------------ testcase tiFormatDefault printlog "open application" @@ -985,8 +1012,8 @@ testcase tiFormatStylesSlideDesign DeleteUnusedBackgrounds.check printlog "click button 'Load...'" Laden.Click - kontext "Neu" - printlog "click button 'more'" + sleep (10) + Kontext "Neu" Zusaetze.click sleep 1 kontext "Neu" diff --git a/testautomation/graphics/required/includes/global/id_006.inc b/testautomation/graphics/required/includes/global/id_006.inc index 57990c2a16b0..434959a7ac2d 100644 --- a/testautomation/graphics/required/includes/global/id_006.inc +++ b/testautomation/graphics/required/includes/global/id_006.inc @@ -25,12 +25,11 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* '\********************************************************************************** - sub id_Tools printLog "--------- id_006 ----------" call tiToolsSpellchecking diff --git a/testautomation/graphics/required/includes/global/id_007.inc b/testautomation/graphics/required/includes/global/id_007.inc index 7fd278bc702c..29791d4b716f 100644 --- a/testautomation/graphics/required/includes/global/id_007.inc +++ b/testautomation/graphics/required/includes/global/id_007.inc @@ -25,12 +25,37 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* -'\********************************************************************************** - +'\****************************************************************************** + +sub id_007 + + printLog Chr(13) + "--------- id_007 ----------" + ' in imp available via context menu, in draw via modify menu + + call tdModifyFlipVertikal + call tdModifyFlipHorizontal + call tdContextConvertIntoCurve + call tdContextConvertIntoPolygon + call tdContextConvertIntoContour + call tdContextConvertInto3D + call tdContextConvertIntoRotationObject + call tdContextConvertIntoBitmap + call tdContextConvertIntoMetaFile + call tdModifyArrange + call tdModifyArrangeObjects + call tdModifyAlignment + call tdContextDistribution + call tdContextDescriptionObject + call tdContextNameObject + call tdModifyConnectBreak + call tdModifyShapes + call tdModifyCombineSplit +end sub +'------------------------------------------------------------------------------- testcase tdModifyFlipVertikal '/// open application ///' diff --git a/testautomation/graphics/required/includes/global/id_008.inc b/testautomation/graphics/required/includes/global/id_008.inc index 0697e82260b7..8848c7337dac 100644 --- a/testautomation/graphics/required/includes/global/id_008.inc +++ b/testautomation/graphics/required/includes/global/id_008.inc @@ -25,12 +25,20 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* '\***************************************************************** +sub id_008 + printLog Chr(13) + "--------- id_008 ----------" + + Call tiWindowNewWindow + call tidWindow123 + +end sub +'------------------------------------------------------------------------------- testcase tiWindowNewWindow '/// open application ///' diff --git a/testautomation/graphics/required/includes/global/id_009.inc b/testautomation/graphics/required/includes/global/id_009.inc index bbd9481430ab..d03d99b6050c 100644 --- a/testautomation/graphics/required/includes/global/id_009.inc +++ b/testautomation/graphics/required/includes/global/id_009.inc @@ -25,12 +25,24 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Testcases to test the Help-Menu. '* '\****************************************************************************** -' +sub id_009 + + printLog Chr(13) + "--------- id_009 ----------" + + call tCheckIfTheHelpExists + Call tmHelpContents + Call tmHelpHelpAgent + Call tmHelpTips + Call tmHelpExtendedTips + Call tmHelpAboutStarOffice + +end sub +'------------------------------------------------------------------------------ testcase tmHelpHelpAgent Call hNewDocument diff --git a/testautomation/graphics/required/includes/global/id_011.inc b/testautomation/graphics/required/includes/global/id_011.inc index a0e3e680709d..186c5e1b51ef 100644 --- a/testautomation/graphics/required/includes/global/id_011.inc +++ b/testautomation/graphics/required/includes/global/id_011.inc @@ -25,12 +25,23 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* '\****************************************************************************** +sub id_011 + printLog Chr(13) + "--------- id_011 ----------" + + call tdBezierToolbar + call tiDrawObjectBar + call tiTextToolbar + call tiGraphicsObjectBar + call tiGluepointToolbar + +end sub +'------------------------------------------------------------------------------- testcase tiTextToolbar Dim iWaitIndex as integer diff --git a/testautomation/graphics/required/includes/global/id_opt_1.inc b/testautomation/graphics/required/includes/global/id_opt_1.inc index 6df5ccdfdddf..7ca61a8774b5 100644 --- a/testautomation/graphics/required/includes/global/id_opt_1.inc +++ b/testautomation/graphics/required/includes/global/id_opt_1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/required/includes/global/id_opt_2.inc b/testautomation/graphics/required/includes/global/id_opt_2.inc index 6fa722e09dd9..8d38b2b9dc92 100644 --- a/testautomation/graphics/required/includes/global/id_opt_2.inc +++ b/testautomation/graphics/required/includes/global/id_opt_2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* @@ -64,39 +64,6 @@ testcase tToolsOptionsMeasurementUnit (sApplication as string) Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - FileExport - Kontext "ExportierenDlg" - Dateiname.SetText "adagio" - Dateityp.Select "BMP - Windows Bitmap (.bmp)" - if AutomatischeDateinamenserweiterung.Exists then - AutomatischeDateinamenserweiterung.Check - else - warnlog( "Automatic Filename Extension checkbox is mising" ) - endif - Speichern.Click - kontext "AlienWarning" - if AlienWarning.exists(5) then - warnlog "#i41983# Alien Warning on export not allowed" - AlienWarning.OK - endif - Kontext "Messagebox" - if Messagebox.Exists(2) then - Messagebox.Yes - endif - Sleep 3 - Kontext "BMPOptionen" - Groesse.Check - sUnitDialog = getMeasUnit(Breite.getText) ' (2) - if (getMeasUnit(Hoehe.getText) <> sUnitDialog) then - warnlog " Measurement Unit is different for Width:'" + sUnitDialog + "' and Hight:'" + getMeasUnit(Hoehe.getText) + "'" - else - printlog "Measurement Unit is same for Width:'" + sUnitDialog + "' and Hight:'" + getMeasUnit(Hoehe.getText) + "'" - endif - if (sUnitOptions <> sUnitDialog) then - printlog "#109705# Measurement Unit is different for Options:'" + sUnitOptions + "' and BMP Dialog:'" + sUnitDialog + "' (1) <> (2)" - endif - BMPOptionen.Cancel - Format3D_Effects Kontext "Drei_D_Effekte" Geometrie.Click diff --git a/testautomation/graphics/required/includes/impress/i_opt_1_.inc b/testautomation/graphics/required/includes/impress/i_opt_1_.inc index 148bbe980424..f7f726d94d0e 100644 --- a/testautomation/graphics/required/includes/impress/i_opt_1_.inc +++ b/testautomation/graphics/required/includes/impress/i_opt_1_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/required/includes/impress/im_002_.inc b/testautomation/graphics/required/includes/impress/im_002_.inc index bd101e4413f4..935175ca010c 100644 --- a/testautomation/graphics/required/includes/impress/im_002_.inc +++ b/testautomation/graphics/required/includes/impress/im_002_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Required Test Library (2) '* diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc index a160699d74ca..b8b5a6330f17 100644 --- a/testautomation/graphics/required/includes/impress/im_003_.inc +++ b/testautomation/graphics/required/includes/impress/im_003_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Resource Test: View Menu '* @@ -210,12 +210,21 @@ testcase tiViewToolbar_1 Dim NumberOfGraphicModes as integer Dim iCurrentGraphicsMode as integer - dim TestFile as string + dim i as integer + TestFile = ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp") printlog "open application " Call hNewDocument + Call sSelectEmptyLayout + printlog "delete default content" + hUseAsyncSlot( "EditSelectAll" ) + Kontext "DocumentImpress" + DocumentImpress.typeKeys("<DELETE>",true) + + printlog "use the empty layout" + call sSelectEmptyLayout printlog "Insert->Graphic... : global\input\graf_inp\desp.bmp " hUseAsyncSlot( "InsertGraphicsFromFile" ) @@ -235,8 +244,17 @@ testcase tiViewToolbar_1 printlog "select graphic " hUseAsyncSlot( "EditSelectAll" ) - Kontext "GraphicObjectbar" printlog "The Graphics Toolbar has to be visible now; If not -> ERROR " + ' workaround for i113609; there should have been a style selected without elements on creating the document - what failed; the elements should have been deleted before inserting the grafik in this test - which failed; so the workaround is to use <tab> to travel to the graphic selection here: + for i=1 to 3 + Kontext "GraphicObjectbar" + if ( not GraphicObjectbar.Exists( DEFAULT_DELAY ) ) Then + hTypeKeys("<tab>") + qaerrorlog "delete default content failed" + end if + next i + + Kontext "GraphicObjectbar" if ( GraphicObjectbar.Exists( DEFAULT_DELAY ) ) Then Printlog "- graphic object toolbar exists" diff --git a/testautomation/graphics/required/includes/impress/im_004_.inc b/testautomation/graphics/required/includes/impress/im_004_.inc index 28f11a778864..2c55bc4c2f13 100644 --- a/testautomation/graphics/required/includes/impress/im_004_.inc +++ b/testautomation/graphics/required/includes/impress/im_004_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Required Test Library (4) '* @@ -49,6 +49,7 @@ testcase tiInsertSlideExpandSummary Kontext "DocumentImpressOutlineView" printlog "Type 2 rows " DocumentImpressOutlineView.TypeKeys "Herbert<Return>Rudi" + sleep(1) printlog "View->Master View->Drawing View " ViewWorkspaceDrawingView WaitSlot() diff --git a/testautomation/graphics/required/includes/impress/im_005_.inc b/testautomation/graphics/required/includes/impress/im_005_.inc index 5a8b9fb9a518..146d37c0f669 100644 --- a/testautomation/graphics/required/includes/impress/im_005_.inc +++ b/testautomation/graphics/required/includes/impress/im_005_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Required Test Library (5) '* diff --git a/testautomation/graphics/required/includes/impress/im_007_.inc b/testautomation/graphics/required/includes/impress/im_007_.inc index 0a598f59c520..68d271e30d7f 100644 --- a/testautomation/graphics/required/includes/impress/im_007_.inc +++ b/testautomation/graphics/required/includes/impress/im_007_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Required Test Library (7) '* diff --git a/testautomation/graphics/required/includes/impress/im_011_.inc b/testautomation/graphics/required/includes/impress/im_011_.inc index 084be5223b10..2c505f5facc2 100644 --- a/testautomation/graphics/required/includes/impress/im_011_.inc +++ b/testautomation/graphics/required/includes/impress/im_011_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Required Test Library (11) '* diff --git a/testautomation/graphics/required/input/recht_1.odg b/testautomation/graphics/required/input/recht_1.odg Binary files differindex 7463fbaf16ef..720c437fad93 100755 --- a/testautomation/graphics/required/input/recht_1.odg +++ b/testautomation/graphics/required/input/recht_1.odg diff --git a/testautomation/graphics/required/input/recht_1.odp b/testautomation/graphics/required/input/recht_1.odp Binary files differindex 24442ce94654..fbad5296d1b1 100755 --- a/testautomation/graphics/required/input/recht_1.odp +++ b/testautomation/graphics/required/input/recht_1.odp diff --git a/testautomation/graphics/required/input/recht_3.odg b/testautomation/graphics/required/input/recht_3.odg Binary files differindex c2f3461b9877..b2df97654ead 100755 --- a/testautomation/graphics/required/input/recht_3.odg +++ b/testautomation/graphics/required/input/recht_3.odg diff --git a/testautomation/graphics/required/input/recht_3.odp b/testautomation/graphics/required/input/recht_3.odp Binary files differindex 768fbad4b780..84ab26098ca7 100644..100755 --- a/testautomation/graphics/required/input/recht_3.odp +++ b/testautomation/graphics/required/input/recht_3.odp diff --git a/testautomation/graphics/required/input/recht_31.odg b/testautomation/graphics/required/input/recht_31.odg Binary files differindex abe6d48edee1..e7b1c456163e 100755 --- a/testautomation/graphics/required/input/recht_31.odg +++ b/testautomation/graphics/required/input/recht_31.odg diff --git a/testautomation/graphics/required/input/recht_31.odp b/testautomation/graphics/required/input/recht_31.odp Binary files differindex 23f5c77c141d..4f74eee30cb4 100644..100755 --- a/testautomation/graphics/required/input/recht_31.odp +++ b/testautomation/graphics/required/input/recht_31.odp diff --git a/testautomation/graphics/required/input/recht_33.odg b/testautomation/graphics/required/input/recht_33.odg Binary files differindex 1288c85f2e97..03b6119a0157 100755 --- a/testautomation/graphics/required/input/recht_33.odg +++ b/testautomation/graphics/required/input/recht_33.odg diff --git a/testautomation/graphics/required/input/recht_33.odp b/testautomation/graphics/required/input/recht_33.odp Binary files differindex c6acada2537e..c49571f517e2 100644..100755 --- a/testautomation/graphics/required/input/recht_33.odp +++ b/testautomation/graphics/required/input/recht_33.odp diff --git a/testautomation/graphics/required/input/recht_34.odg b/testautomation/graphics/required/input/recht_34.odg Binary files differindex b3fd1da6db78..5789dd14fb07 100755 --- a/testautomation/graphics/required/input/recht_34.odg +++ b/testautomation/graphics/required/input/recht_34.odg diff --git a/testautomation/graphics/required/input/recht_34.odp b/testautomation/graphics/required/input/recht_34.odp Binary files differindex 2dcbd561f9e5..fec4da84f204 100644..100755 --- a/testautomation/graphics/required/input/recht_34.odp +++ b/testautomation/graphics/required/input/recht_34.odp diff --git a/testautomation/graphics/required/input/recht_36.odg b/testautomation/graphics/required/input/recht_36.odg Binary files differindex 81951c928e8f..a328b9827ca6 100755 --- a/testautomation/graphics/required/input/recht_36.odg +++ b/testautomation/graphics/required/input/recht_36.odg diff --git a/testautomation/graphics/required/input/recht_36.odp b/testautomation/graphics/required/input/recht_36.odp Binary files differindex 45f7fd3a47cb..318c75fb17d9 100644..100755 --- a/testautomation/graphics/required/input/recht_36.odp +++ b/testautomation/graphics/required/input/recht_36.odp diff --git a/testautomation/graphics/required/input/recht_39.odg b/testautomation/graphics/required/input/recht_39.odg Binary files differindex 0ef147755258..6f0404a13e72 100755 --- a/testautomation/graphics/required/input/recht_39.odg +++ b/testautomation/graphics/required/input/recht_39.odg diff --git a/testautomation/graphics/required/input/recht_39.odp b/testautomation/graphics/required/input/recht_39.odp Binary files differindex bf649b488030..777844272121 100644..100755 --- a/testautomation/graphics/required/input/recht_39.odp +++ b/testautomation/graphics/required/input/recht_39.odp diff --git a/testautomation/graphics/required/input/recht_46.odg b/testautomation/graphics/required/input/recht_46.odg Binary files differindex 1ad25dad2739..35abb966363b 100755 --- a/testautomation/graphics/required/input/recht_46.odg +++ b/testautomation/graphics/required/input/recht_46.odg diff --git a/testautomation/graphics/required/input/recht_46.odp b/testautomation/graphics/required/input/recht_46.odp Binary files differindex e9de83b58c8b..2c73a2a83371 100644..100755 --- a/testautomation/graphics/required/input/recht_46.odp +++ b/testautomation/graphics/required/input/recht_46.odp diff --git a/testautomation/graphics/required/input/recht_48.odg b/testautomation/graphics/required/input/recht_48.odg Binary files differindex 1e3206ffcd7d..ec17c200c483 100755 --- a/testautomation/graphics/required/input/recht_48.odg +++ b/testautomation/graphics/required/input/recht_48.odg diff --git a/testautomation/graphics/required/input/recht_48.odp b/testautomation/graphics/required/input/recht_48.odp Binary files differindex f836b0521f8b..6350630495fb 100644..100755 --- a/testautomation/graphics/required/input/recht_48.odp +++ b/testautomation/graphics/required/input/recht_48.odp diff --git a/testautomation/graphics/required/input/recht_48.sxd b/testautomation/graphics/required/input/recht_48.sxd Binary files differdeleted file mode 100755 index ef01f9ff9b9f..000000000000 --- a/testautomation/graphics/required/input/recht_48.sxd +++ /dev/null diff --git a/testautomation/graphics/required/input/recht_48.sxi b/testautomation/graphics/required/input/recht_48.sxi Binary files differdeleted file mode 100755 index bdbd34003ebb..000000000000 --- a/testautomation/graphics/required/input/recht_48.sxi +++ /dev/null diff --git a/testautomation/graphics/required/input/recht_49.odg b/testautomation/graphics/required/input/recht_49.odg Binary files differindex 0898a8b99a5c..d3bd17ae64b2 100755 --- a/testautomation/graphics/required/input/recht_49.odg +++ b/testautomation/graphics/required/input/recht_49.odg diff --git a/testautomation/graphics/required/input/recht_49.odp b/testautomation/graphics/required/input/recht_49.odp Binary files differindex 88c93c2856b4..d8c6e495c4f5 100644..100755 --- a/testautomation/graphics/required/input/recht_49.odp +++ b/testautomation/graphics/required/input/recht_49.odp diff --git a/testautomation/graphics/required/input/recht_55.odg b/testautomation/graphics/required/input/recht_55.odg Binary files differindex fc21ecba132a..6f4f649b13c0 100755 --- a/testautomation/graphics/required/input/recht_55.odg +++ b/testautomation/graphics/required/input/recht_55.odg diff --git a/testautomation/graphics/required/input/recht_55.odp b/testautomation/graphics/required/input/recht_55.odp Binary files differindex 6e78d94e8c49..001e79a700f7 100644..100755 --- a/testautomation/graphics/required/input/recht_55.odp +++ b/testautomation/graphics/required/input/recht_55.odp diff --git a/testautomation/graphics/tools/id_tools.inc b/testautomation/graphics/tools/id_tools.inc index 2940c0f35e3e..57bac12e8ce8 100644 --- a/testautomation/graphics/tools/id_tools.inc +++ b/testautomation/graphics/tools/id_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : some tools (Functions) '* @@ -104,10 +104,10 @@ function LiberalMeasurement ( sShould$, sActual$) as Boolean 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 "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 "pt", "?イント" : iTolerance = 2.5 '01, 81 case "" : iTolerance = 1.5 ' cm is presubposition in old functions case else iTolerance = 2.5 @@ -264,51 +264,51 @@ function fMakeDocumentWritable() as boolean printlog "Document is already writable." fMakeDocumentWritable = true endif - + sleep(1) end function '------------------------------------------------------------------------------- - -function fGetSizeXY (sX as string, sY as string, bRetrieveOnly as boolean) as Boolean - - const RC_FAILURE = -1 - +function fGetSizeXY (sX as string, sY as string, bGet as boolean) as Boolean dim sTx as string dim sTy as string + dim bReturn as boolean - fGetSizeXY() = True - - if ( hUseAsyncSlot( "ContextPositionAndSize" ) <> RC_FAILURE ) then - - kontext - active.SetPage TabPositionAndSize - - kontext "TabPositionAndSize" - if ( TabPositionAndSize.exists( 2 ) ) then - sTx = Width.GetText() - sTy = Height.GetText() - hCloseDialog( TabPositionAndSize, "ok" ) - else - warnlog "Couldn't switch tab page :-( " + bReturn = True + try + printlog "Trying to open Position and size Dialog.." + ContextPositionAndSize + catch + warnlog "couldn't call 'ContextPositionAndSize' no object selected ?" + endcatch + kontext + active.SetPage TabPositionAndSize + kontext "TabPositionAndSize" + printlog "Getting some sizes from Position and Size dialog." + if TabPositionAndSize.exists (5) then + sTx = Width.GetText + printlog "Width, sTx=" & sTx + sTy = Height.GetText + printlog "Height, sTy=" & sTy + TabPositionAndSize.OK + else + warnlog "Couldn't switch tab page :-( " + endif + if bGet then ' Get the Values only + sY = sTy + printlog "sY=" & sY + sX = sTx + printlog "sX=" & sX + else ' Get the Values and COMPARE them + if (LiberalMeasurement (sX,sTx) <> TRUE) then + warnlog "width is different :-( XXXXXXXXXXXXX should: '"+sX+"' is: '"+sTx+"'" + "eventually a result of i35519" + bReturn = False endif - - if ( bRetrieveOnly ) then ' Get the Values only - sY = sTy - sX = sTx - else ' Get the Values and compare them - if ( not LiberalMeasurement (sX,sTx) ) then - warnlog "width is different :-( should: '"+sX+"' is: '"+sTx+"'" + "eventually a result of i35519" - fGetSizeXY() = False - endif - if (not LiberalMeasurement (sY,sTy) ) then - warnlog "hight is different :-( should: '"+sY+"' is: '"+sTy+"'" + "eventually a result of i35519" - fGetSizeXY() = False - endif + if (LiberalMeasurement (sY,sTy) <> TRUE) then + warnlog "hight is different :-( xxxxxxxxxxxx should: '"+sY+"' is: '"+sTy+"'" + "eventually a result of i35519" + bReturn = False endif - else - warnlog( "Failed to open <Position And Size> dialog" ) + bGet = bReturn endif - end function '------------------------------------------------------------------------- diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc index e2d1a1497e9a..60836bdb274a 100644 --- a/testautomation/graphics/tools/id_tools_2.inc +++ b/testautomation/graphics/tools/id_tools_2.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : some tools (Subs) '* @@ -181,56 +181,6 @@ sub sPrintCheckOrder (optional bcheck as boolean) Printlog "-----------------------------------" end sub -'--------------------------- Tests for Writer ---------------------------------- -sub writertest - - try - call Make_And_Check_Formatted_Text_Line_From_Application - catch - warnlog "Something went wrong with testing writertest" - endcatch - - try - call Make_Rectangle_From_Application - call Full_test_Draw - call Full_test_Impress - call Full_test_Writer - call Full_test_Calc - catch - warnlog "something wrong with testing writertest" - endcatch -end sub ' big one - -'---------------------------- Tests for Calc ----------------------------------- -sub calctest - - try - call Make_Rectangle_From_Application - call Full_test_Draw - call Full_test_Impress - call Full_test_Writer - call Full_test_Calc - catch - warnlog "something wrong with calctest" - endcatch - printlog "currently no specific tests from Calc" -end sub - -'------------------------------------------------------------------------------- -sub tClipboardFromDrawTest - - EnableQAErrors = false - FromApp2 = gApplication - printlog "gApplication = " + gApplication - - select case( gApplication ) - case "WRITER" : call writertest() - case "CALC" : call calctest() - case else : warnlog( "Unsupported gApplication provided: " & gApplication ) - end select - -end sub - '------------------------------------------------------------------------------- sub Select_Copy @@ -572,6 +522,7 @@ sub LoadGraphic ( sFile as String, bOK as Boolean ) as boolean Dim iHMax if app.FileLen(sFile) = "0" then warnlog " the file (" + (sFile) + ") seems to be zero bytes large." call hGrafikEinfuegen ( sFile ) + sleep (1) FormatGraphics Kontext Active.SetPage TabType @@ -620,212 +571,7 @@ sub GetOnlyGraphics ( OldList() as String, NewList() as String ) end if next i end sub - -'------------------------------------------------------------------------- -sub id_001 - - printLog Chr(13) + "--------- id_001 ----------" - - qaerrorlog "#74988# tiFilePassword outcommented due to bug. -FHA" - call tiFilePassword - call tiFileSaveAs - call tiFileReload - call tiFileVersion - printlog " File->Send not possible to test, because extrnal prg get's called!" - call tiFileTemplates - ' Call tiFileNew instead i call: - call tmFileNewFromTemplate - call tmFileOpen - call tmFileClose - call tmFileSave - call tmFileSaveAs - call tmFileExit - - call tmFileSaveAll - call tmFileProperties - call tdFileExport - call tmFilePrinterSetting - ' special cases - ' Call AutoPilot 'inc\desktop\autopilo.inc - call tmFileExit ' don't test because unpredictable behaviour -end sub - -'------------------------------------------------------------------------------ -sub id_002 - - printLog Chr(13) + "--------- id_002 ----------" - - call tiEditUndoRedo - call tiEditRepeat - call tiEditCutPasteCopySelectall - call tiEditPasteSpecial - call tiEditSearchAndReplace - call tiEditDuplicate - call tEditPoints - call tiEditFields - call tdEditDeleteSlide - call tiEditLinks - call tiEditImageMap - call tiEditObjectProperties - call tiEditObjectEdit - call tiEditPlugIn - call tiEditHyperlink -end sub - -'------------------------------------------------------------------------- -sub id_003 - - printLog Chr(13) + "--------- id_003 ----------" - - call tiViewNavigator - call tiViewZoom - call tiViewToolbar - Call tToolsCustomize 'global\required\include - call tiViewDisplayQuality - call tiViewLayer - call tViewSnapLines - call tViewGrid -end sub - -'------------------------------------------------------------------------- -sub id_004 - - printLog Chr(13) + "--------- id_004 ----------" - - call tiInsertSlide - call tiInsertDuplicateSlide - ' v expand slide - ' v summary slide - call tiInsertField - call tiInsertSpecialCharacter - call tiInsertHyperlink - call tiInsertScan - call tiInsertGraphic - call tiInsertObjectSound - call tiInsertObjectVideo - call tiInsertObjectSound - call tiInsertObjectVideo - call tiInsertChart - call tiInsertObjectOLEObjects - call tiInsertSpreadsheet - call tiInsertFormula - call tiInsertFloatingFrame - call tiInsertFile - call tiInsertPlugin - call tiInsertSnappointLine - call tdInsertLayer ' IMPRESS: Edit->Layer->Insert -end sub - -'------------------------------------------------------------------------------ -sub id_005 - - printLog Chr(13) + "--------- id_005 ----------" - - call tiFormatDefault - call tiFormatLine - call tdFormatArea - call tiFormatText - call tiFormatPositionAndSize - call tiFormatCharacter - call tiFormatControlForm - ' ^ Form - call tiFormatDimensions - call tiFormatConnector - call tiFormat3D_Effects - call tiFormatNumberingBullets - call tiFormatCaseCharacter - call tiFormatParagraph - call tiFormatPage - call tiFormatStylesAndFormatting - call tiFormatStylesSlideDesign - call tiFormatFontwork - call tiFormatGroup - printlog " format->group is also modify->group " - ' tiFormatLayer ' not in impress -end sub - -'------------------------------------------------------------------------------ -sub id_006 - - printLog Chr(13) + "--------- id_006 ----------" - - call tiToolsSpellchecking - call tiToolsSpellcheckingAutomatic - call tiToolsThesaurus - call tiToolsHyphenation - call tiToolsAutoCorrect - call tChineseTranslation - call tiToolsMacro - call tiToolsGallery - call tiToolsEyedropper - call tiToolsOptions ' get just called one time here... - Call tToolsOptionsTest ' global one -end sub - '------------------------------------------------------------------------------- -sub id_007 - - printLog Chr(13) + "--------- id_007 ----------" - ' in imp available via context menu, in draw via modify menu - - call tdModifyFlipVertikal - call tdModifyFlipHorizontal - call tdContextConvertIntoCurve - call tdContextConvertIntoPolygon - call tdContextConvertIntoContour - call tdContextConvertInto3D - call tdContextConvertIntoRotationObject - call tdContextConvertIntoBitmap - call tdContextConvertIntoMetaFile - call tdModifyArrange - call tdModifyArrangeObjects - call tdModifyAlignment - call tdContextDistribution - call tdContextDescriptionObject - call tdContextNameObject - call tdModifyConnectBreak - call tdModifyShapes - call tdModifyCombineSplit -end sub - -'------------------------------------------------------------------------------- -sub id_008 - - printLog Chr(13) + "--------- id_008 ----------" - - Call tiWindowNewWindow - call tidWindow123 -end sub - -'------------------------------------------------------------------------------ -sub id_009 - - printLog Chr(13) + "--------- id_009 ----------" - - call tCheckIfTheHelpExists - Call tmHelpContents - Call tmHelpHelpAgent - Call tmHelpTips - Call tmHelpExtendedTips - Call tmHelpAboutStarOffice - -end sub - -'------------------------------------------------------------------------------ -sub id_011 - - printLog Chr(13) + "--------- id_011 ----------" - - call tdBezierToolbar - call tiDrawObjectBar - call tiTextToolbar - call tiGraphicsObjectBar - call tiGluepointToolbar - -end sub - -'-------------------------------------------------------------------------------' - sub hWalkTheStyles (optional a as integer,optional b as integer) dim i as integer @@ -991,4 +737,4 @@ sub sSelectEmptyLayout else printlog "No change of Layout needed." endif -end sub
\ No newline at end of file +end sub diff --git a/testautomation/graphics/tools/makeLokaleTxt.bas b/testautomation/graphics/tools/makeLokaleTxt.bas index 6a2cc3c60f92..687822938dd7 100755 --- a/testautomation/graphics/tools/makeLokaleTxt.bas +++ b/testautomation/graphics/tools/makeLokaleTxt.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics: get language dependant strings '* |