[ooo-build-commit] Branch 'ooo/master' - 2 commits - testautomation/global testautomation/spreadsheet testautomation/writer
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Jul 15 19:36:11 PDT 2009
testautomation/global/win/edia_p_s.win | 4
testautomation/spreadsheet/required/includes/c_upd_datamenu.inc | 17
testautomation/writer/optional/includes/clipboard/clipbrd_func.inc | 4
testautomation/writer/optional/includes/clipboard/w_221_.inc | 21
testautomation/writer/optional/includes/clipboard/w_222_.inc | 22
testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc | 305 +++++++---
testautomation/writer/optional/includes/fields/w_fields1.inc | 67 +-
testautomation/writer/optional/includes/fields/w_fields2.inc | 65 +-
testautomation/writer/optional/includes/fields/w_fields3.inc | 87 +-
testautomation/writer/optional/includes/fields/w_fields4.inc | 98 +--
testautomation/writer/optional/includes/fields/w_fields5.inc | 66 +-
testautomation/writer/optional/includes/fields/w_fields6.inc | 145 ++--
testautomation/writer/optional/includes/fields/w_fields7.inc | 4
testautomation/writer/optional/includes/filter/w_filter.inc | 34 -
testautomation/writer/optional/includes/formatpage/w_formatpage1.inc | 39 -
testautomation/writer/optional/includes/formatpage/w_formatpage2.inc | 62 --
testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc | 69 +-
testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc | 20
testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc | 33 -
testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc | 73 +-
testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc | 44 -
testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc | 8
testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc | 1
testautomation/writer/optional/includes/navigator/w_navigator.inc | 2
testautomation/writer/optional/includes/option/wh_o_1.inc | 20
testautomation/writer/optional/includes/option/wh_o_2.inc | 12
testautomation/writer/optional/includes/option/wh_o_3.inc | 12
testautomation/writer/optional/includes/option/wr_o_1.inc | 126 ++--
testautomation/writer/optional/includes/option/wr_o_2.inc | 126 ++--
testautomation/writer/optional/includes/option/wr_o_3.inc | 161 ++---
testautomation/writer/optional/includes/option/wr_o_4.inc | 88 +-
testautomation/writer/optional/includes/option/wr_o_5.inc | 114 +--
testautomation/writer/optional/includes/option/wr_o_a.inc | 76 --
testautomation/writer/optional/includes/textframes/w_textframes1.inc | 109 ++-
testautomation/writer/optional/includes/textframes/w_textframes2.inc | 147 ++--
testautomation/writer/optional/includes/textframes/w_textframes3.inc | 228 +++----
testautomation/writer/optional/includes/textframes/w_textframes4.inc | 283 ++++-----
testautomation/writer/optional/includes/textframes/w_textframes5.inc | 140 ++--
testautomation/writer/optional/input/fields/diploma.ott |binary
testautomation/writer/optional/w_dropdownLB.bas | 2
testautomation/writer/optional/w_fields.bas | 198 +++---
testautomation/writer/optional/w_filter.bas | 61 --
testautomation/writer/optional/w_formatpage.bas | 5
testautomation/writer/optional/w_formatparagraph.bas | 2
testautomation/writer/optional/w_insertgraphic.bas | 8
testautomation/writer/optional/w_opt.bas | 6
testautomation/writer/optional/w_table.bas | 2
testautomation/writer/optional/w_textframes.bas | 5
testautomation/writer/required/includes/w_005_.inc | 6
testautomation/writer/required/includes/w_005b_.inc | 14
testautomation/writer/required/includes/w_010_1.inc | 3
testautomation/writer/required/includes/w_011_.inc | 3
testautomation/writer/tools/includes/w_tools.inc | 24
53 files changed, 1810 insertions(+), 1461 deletions(-)
New commits:
commit 27c1d4d6bb0ab84020ce07a23c57b6736c1c4925
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Jul 15 14:57:49 2009 +0000
CWS-TOOLING: integrate CWS dr68
2009-06-19 17:43:48 +0200 oc r273175 : #i102946# some lines for new dialog added
2009-06-19 14:17:45 +0200 oc r273158 : #i102946# three lines added
2009-05-19 11:56:14 +0200 dr r272065 : #i99677# wrong attribute name
2009-05-18 18:37:05 +0200 dr r272045 : #i10000# suncc warning
2009-05-05 16:46:13 +0200 dr r271536 : #i10000# adoptions after rebase to master containing dr67
2009-05-05 16:01:19 +0200 dr r271530 : #i10000# adoptions after rebase to master containing dr67
2009-05-04 14:20:39 +0200 dr r271453 : CWS-TOOLING: rebase CWS dr68 to trunk at 271427 (milestone: DEV300:m47)
2009-04-28 17:01:14 +0200 dr r271332 : CWS-TOOLING: rebase CWS dr68 to trunk at 270723 (milestone: DEV300:m46)
2009-04-23 12:21:40 +0200 dr r271149 : #i100688# missing checkins
2009-04-23 12:18:16 +0200 dr r271147 : #i100978# relations path handling
2009-04-22 19:25:45 +0200 nn r271136 : #i49491# show navigator for double click on document position status bar control
2009-04-22 11:28:36 +0200 nn r271085 : #i60401# small text change
2009-04-21 16:53:23 +0200 dr r271044 : #i10000# missing dtor
2009-04-20 13:39:25 +0200 nn r270977 : #i60401# add dialog to extend sort range (patch from maoyg)
2009-04-08 12:11:08 +0200 dr r270630 : #i100943# prevent assertion when loading chart with empty category ranges
2009-04-07 19:03:00 +0200 dr r270609 : #i100688# missing bits for OLE
2009-04-07 17:14:06 +0200 dr r270605 : ported fix for #i100710#
2009-04-07 17:12:50 +0200 dr r270604 : #i10000# wae
2009-04-07 15:31:55 +0200 dr r270598 : import system colors moved to FilterBase class, more rework on fill and color contexts
2009-04-06 15:00:03 +0200 dr r270552 : #i99677# prevent recursive loading of the current document
2009-04-03 18:28:42 +0200 dr r270515 : added import of brightness/contrast and mono/grayscale color effects for image shapes
2009-04-03 17:36:03 +0200 dr r270509 : cache already imported embedded graphics
2009-04-03 16:46:34 +0200 dr r270500 : more rework on bitmap fill and graphic object handling
2009-03-31 12:28:10 +0200 dr r270271 : #i10000# unxlngi6 wae
2009-03-31 09:04:10 +0200 dr r270261 : CWS-TOOLING: rebase CWS dr68 to trunk at 270033 (milestone: DEV300:m45)
2009-03-30 17:42:05 +0200 dr r270249 : #i91122# add missing doc
2009-03-30 17:37:08 +0200 dr r270248 : #i91122# add missing doc
2009-03-30 16:59:15 +0200 dr r270241 : #i99677# add import of ActiveX scrollbar controls
2009-03-30 14:30:36 +0200 dr r270230 : #i91122# missing/wrong documentation
2009-03-30 13:03:38 +0200 dr r270220 : #i99677# add import of ActiveX combobox and spinbutton controls
2009-03-27 11:46:59 +0100 dr r270144 : #i99677# import ActiveX listbox controls (Forms.ListBox.1)
2009-03-26 19:58:00 +0100 dr r270104 : #i99677# move more OLE import code into ole submodule
2009-03-26 15:15:02 +0100 dr r270082 : #i100546# add import of chart bitmap fills, add import of X/Y offset in tiled bitmap fills of all shapes
2009-03-25 12:54:59 +0100 dr r270018 : #i99677# import ActiveX edit text control (Forms.TextBox.1)
2009-03-24 10:59:29 +0100 dr r269921 : #i99677# moved import of OLE StdHlink to 'ole' submodule, added string import helpers to BinaryStreamBase class, removed implementation of ST_XString import from docprop in favour of the implementation in class AttributeList
2009-03-24 10:40:18 +0100 dr r269919 : #i100502# implicit precedence of '&&' was intended
2009-03-24 10:18:29 +0100 dr r269917 : #i100502# missing parentheses
2009-03-23 15:17:48 +0100 dr r269876 : #i99677# more code reorg, added graphic helper and OLE helper object per filter, added OLE/control import to PPTX/XLSX filter, moved helpers from XmlFilterBase to FilterBase
2009-03-19 12:45:20 +0100 dr r269740 : #i99677# interface changes in oox
2009-03-18 15:51:50 +0100 dr r269683 : #i99677# improved relation handling (internal/external), added preprocessor for VML streams to eat MS specific instructions, added OCX ToggleButton/OptionButton import, added DIB import for BIFF (page background picture, lots of other minor improvements
2009-03-16 15:25:30 +0100 dr r269551 : #i99677# import excel form control client data (printable, cell link)
2009-03-13 18:37:17 +0100 dr r269494 : #i99677# import image controls and check boxes
2009-03-12 15:08:18 +0100 dr r269420 : #i10000# rebase problems
2009-03-12 14:43:09 +0100 dr r269418 : #i10000# rebase problems
2009-03-12 14:42:41 +0100 dr r269417 : #i10000# missing delivered header
2009-03-12 13:57:06 +0100 dr r269405 : #i10000# typos
2009-03-12 12:58:52 +0100 dr r269391 : CWS-TOOLING: rebase CWS dr68 to trunk at 269297 (milestone: DEV300:m43)
2009-03-12 11:11:46 +0100 dr r269374 : #i99677# first step to import BIFF8 page background
2009-03-12 10:21:53 +0100 dr r269364 : #i99677# rework of graphic import in entire filter, added import of AX Label controls
2009-03-09 16:44:50 +0100 dr r269202 : #i99677# import some formatting attributes of command buttons
2009-03-05 15:31:46 +0100 dr r268911 : #i99677# use VML shape client data to import excel VML shape positions
2009-03-05 11:39:48 +0100 dr r268888 : #i99677# create UNO control shapes from VML control shapes
2009-03-05 11:38:59 +0100 dr r268886 : #i99677# change attribute Shapes to DrawPage for import of embedded form controls
2009-03-05 11:30:40 +0100 dr r268885 : #i99677# change attribute Shapes to DrawPage for import of embedded form controls
2009-03-04 18:46:05 +0100 dr r268860 : adapt namespace ids according to oox
2009-03-04 18:43:49 +0100 dr r268859 : #i99677# more VML import rework
2009-03-03 13:38:36 +0100 dr r268721 : #i99677# more cleanup for VML filter
2009-03-03 13:13:15 +0100 dr r268719 : #i99807# do not iterate beyond end of std::list
2009-03-02 11:55:49 +0100 dr r268644 : add ST_XString support (encoded characters in attribute values)
2009-02-26 17:07:18 +0100 dr r268542 : #i99677# first steps of ax control import: dummy AX base classes, reimplement VML import (hopefully without breaking anything), register embedded AX controls at VML drawing
2009-02-23 17:43:50 +0100 dr r268365 : #i99426# remaining work on scenario import
2009-02-19 16:56:25 +0100 dr r268295 : #i99426# base implementations for scenarios import
diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win
index 99c4562..0825b22 100755
--- a/testautomation/global/win/edia_p_s.win
+++ b/testautomation/global/win/edia_p_s.win
@@ -401,6 +401,10 @@ Order2 dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE2
Fieldname3 dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD3
Order3 dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE3
+*SortRange sc:ModalDialog:RID_SCDLG_SORT_WARNING
+ExtendSelection sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_EXTSORT
+CurrentSelection sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_CURSORT
+
*Spellcheck HID_SPELLCHECK
NotInDictionary svx:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD
Suggestions svx:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION
diff --git a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc
index 56280cd..0b2ae7c 100755
--- a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc
@@ -194,6 +194,23 @@ testcase tDataSort
'/// Close 'Sort' dialog with 'Cancel
printlog " Close 'Sort' dialog with 'Cancel"
TabSortierenOptionen.Cancel
+ printlog " Select cell B3"
+ Kontext ( "DocumentCalc" )
+ fCalcSelectRange ( "B3" )
+ printlog " Fill cells B3:B8 with numbers 1-6"
+ DocumentCalc.TypeKeys "1<RETURN>2<RETURN>3<RETURN>4<RETURN>5<RETURN>6"
+ printlog " Select cell C3"
+ fCalcSelectRange ( "C3" )
+ printlog " Fill cells C3:C8 with numbers 7-2"
+ DocumentCalc.TypeKeys "7<RETURN>6<RETURN>5<RETURN>4<RETURN>3<RETURN>2"
+ printlog " Select cells B5:B6"
+ fCalcSelectRange ( "B5:B6" )
+ printlog " Open Data Sort"
+ DataSort
+ Kontext ( "SortRange" )
+ printlog " SortRange dialog has opened"
+ printlog " Cancel Sort Range dialog"
+ SortRange.Cancel
'/// Close document
printlog " Close document"
Call hCloseDocument
commit f1ed767f925c9ac7f4fee9cf44d9a58a94f4185e
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Jul 15 12:25:42 2009 +0000
CWS-TOOLING: integrate CWS fhawfixes2
2009-07-08 14:58:06 +0200 oc r273832 : #i103413#
2009-07-01 22:02:46 +0200 fredrikh r273615 : i103249
2009-07-01 17:12:45 +0200 fredrikh r273605 : i103249
2009-07-01 16:55:27 +0200 fredrikh r273603 : i102752
2009-07-01 16:51:30 +0200 fredrikh r273602 : i102752
2009-07-01 15:49:58 +0200 fredrikh r273597 : i102752
2009-07-01 15:32:34 +0200 fredrikh r273596 : i103216
2009-07-01 15:10:05 +0200 fredrikh r273590 : i102752
2009-07-01 14:41:23 +0200 fredrikh r273587 : i102752
2009-07-01 14:40:11 +0200 fredrikh r273585 : i102752
2009-07-01 13:14:31 +0200 fredrikh r273572 : i102752
2009-07-01 13:02:47 +0200 fredrikh r273570 : i102752
2009-07-01 12:54:54 +0200 fredrikh r273569 : i102752
2009-07-01 12:24:23 +0200 fredrikh r273567 : i102752
2009-07-01 12:23:10 +0200 fredrikh r273566 : i102752
2009-07-01 12:22:06 +0200 fredrikh r273565 : i102752
2009-07-01 12:13:26 +0200 fredrikh r273563 : i102752
2009-06-30 18:00:13 +0200 fredrikh r273530 : i103220
2009-06-30 17:52:06 +0200 fredrikh r273528 : i102845
2009-06-30 17:36:50 +0200 fredrikh r273526 : CWS-TOOLING: rebase CWS fhawfixes2 to trunk at 273468 (milestone: DEV300:m51)
2009-06-30 11:36:55 +0200 fredrikh r273499 : CWS-TOOLING: rebase CWS fhawfixes2 to trunk at 272827 (milestone: DEV300:m50)
2009-06-29 14:12:15 +0200 fredrikh r273473 : i94734
2009-06-24 18:59:13 +0200 fredrikh r273362 : i102846
2009-06-24 16:01:32 +0200 fredrikh r273352 : i102999
2009-06-24 14:33:37 +0200 fredrikh r273347 : i103063 & i102999
2009-06-24 14:32:18 +0200 fredrikh r273346 : i103063
2009-06-24 14:17:42 +0200 fredrikh r273345 : i103063
2009-06-24 13:38:39 +0200 fredrikh r273341 : i103063
2009-06-24 13:38:15 +0200 fredrikh r273340 : i103063
2009-06-24 13:37:32 +0200 fredrikh r273339 : i103063
2009-06-24 13:36:43 +0200 fredrikh r273338 : i103063
2009-06-24 13:36:26 +0200 fredrikh r273337 : i103063
2009-06-24 13:36:08 +0200 fredrikh r273336 : i103063
2009-06-24 13:32:08 +0200 fredrikh r273335 : i103063
2009-06-24 02:01:29 +0200 fredrikh r273305 : i102999
2009-06-23 17:07:02 +0200 fredrikh r273298 : i103042
2009-06-23 17:06:17 +0200 fredrikh r273297 : i103042
2009-06-23 16:27:47 +0200 fredrikh r273295 : i102999
2009-06-23 16:26:46 +0200 fredrikh r273294 : i102999
2009-06-23 16:26:20 +0200 fredrikh r273293 : i102999
2009-06-23 16:25:37 +0200 fredrikh r273291 : i102999
2009-06-23 16:24:52 +0200 fredrikh r273290 : i102999
2009-06-23 16:24:05 +0200 fredrikh r273288 : i102999
2009-06-23 16:23:49 +0200 fredrikh r273287 : i102999
2009-06-23 14:46:08 +0200 fredrikh r273282 : i102999
2009-06-23 13:18:56 +0200 fredrikh r273279 : i102999
2009-06-22 18:17:33 +0200 fredrikh r273250 : i102999
2009-06-22 18:17:10 +0200 fredrikh r273249 : i102999
2009-06-22 18:16:48 +0200 fredrikh r273248 : i102999
2009-06-22 18:16:33 +0200 fredrikh r273247 : i102999
2009-06-22 18:16:07 +0200 fredrikh r273246 : i102999
2009-06-22 18:15:32 +0200 fredrikh r273245 : i102999
2009-06-22 16:14:00 +0200 fredrikh r273237 : i102792
2009-06-22 13:35:09 +0200 fredrikh r273228 : i102648
2009-06-22 12:19:41 +0200 fredrikh r273211 : i102800
2009-06-18 17:57:17 +0200 fredrikh r273127 : i102800
2009-06-17 19:01:42 +0200 fredrikh r273092 : i102800
2009-06-17 14:28:32 +0200 fredrikh r273073 : i102800
2009-06-17 13:16:26 +0200 fredrikh r273061 : i102800
2009-06-17 13:14:19 +0200 fredrikh r273060 : i102800
2009-06-17 12:20:47 +0200 fredrikh r273058 : i102800
2009-06-16 23:56:39 +0200 fredrikh r273043 : i102800
2009-06-16 19:01:53 +0200 fredrikh r273036 : i102800
2009-06-15 17:53:18 +0200 fredrikh r273005 : i102800
2009-06-15 17:19:25 +0200 fredrikh r273003 : i102800
2009-06-15 15:57:40 +0200 fredrikh r272993 : i102799
2009-06-15 15:11:05 +0200 fredrikh r272990 : i102648
2009-06-15 15:09:56 +0200 fredrikh r272989 : i102648
2009-06-15 14:48:42 +0200 fredrikh r272988 : i102648
2009-06-15 12:41:32 +0200 fredrikh r272977 : i102648
2009-06-15 12:27:09 +0200 fredrikh r272975 : i102648
2009-06-10 17:31:22 +0200 fredrikh r272831 : i102648
2009-06-10 15:47:16 +0200 fredrikh r272823 : i102647
2009-06-10 13:21:24 +0200 fredrikh r272805 : i102639 + i96954
diff --git a/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc b/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc
index 9b16ad4..9dda2c1 100755
--- a/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc
+++ b/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc
@@ -213,11 +213,11 @@ function wSetClipboardtestDefaults(ForWhat as string) as boolean
Case else
Warnlog "Unknown object!"
-
end select
+
try
EditCopy
- EditCopy
+ EditCopy 'and a second time to make sure..
wSetClipboardtestDefaults = True
catch
QAErrorlog "Error jump to beginning of document!"
diff --git a/testautomation/writer/optional/includes/clipboard/w_221_.inc b/testautomation/writer/optional/includes/clipboard/w_221_.inc
index 1d4813e..aef5a4b 100755
--- a/testautomation/writer/optional/includes/clipboard/w_221_.inc
+++ b/testautomation/writer/optional/includes/clipboard/w_221_.inc
@@ -50,9 +50,6 @@ end sub
testcase DrawToHTMLScrollingText
- QaErrorLog "#i95309# - DrawToHTMLScrollingText outcommented due to problem when opening certain sxd-files."
- goto endsub
-
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
@@ -108,10 +105,7 @@ endcase
' ---------------------------------------------------------------------------------
testcase DrawToHTMLGroupedObject
- QaErrorLog "#i95309# - DrawToHTMLGroupedObject outcommented due to problem when opening certain sxd-files."
- goto endsub
-
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
printlog " + Jump to beginning of document "
@@ -166,9 +160,6 @@ endcase
' ---------------------------------------------------------------------------------
testcase DrawToHTML3D
- QaErrorLog "#i95309# - DrawToHTML3D outcommented due to problem when opening certain sxd-files."
- goto endsub
-
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
@@ -224,9 +215,6 @@ endcase
' ---------------------------------------------------------------------------------
testcase DrawToHTMLFontwork
- QaErrorLog "#i95309# - DrawToHTMLFontwork outcommented due to problem when opening certain sxd-files."
- goto endsub
-
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
@@ -282,9 +270,6 @@ endcase
' ---------------------------------------------------------------------------------
testcase DrawToHTMLBullets
- QaErrorLog "#i95309# - DrawToHTMLBullets outcommented due to problem when opening certain sxd-files."
- goto endsub
-
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
@@ -340,9 +325,6 @@ endcase
' ---------------------------------------------------------------------------------
testcase DrawToHTMLDimensionLines
- QaErrorLog "#i95309# - DrawToHTMLDimensionLines outcommented due to problem when opening certain sxd-files."
- goto endsub
-
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
@@ -399,9 +381,6 @@ endcase
' ---------------------------------------------------------------------------------
testcase DrawToHTMLConnectors
- QaErrorLog "#i95309# - DrawToHTMLConnectors outcommented due to problem when opening certain sxd-files."
- goto endsub
-
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
diff --git a/testautomation/writer/optional/includes/clipboard/w_222_.inc b/testautomation/writer/optional/includes/clipboard/w_222_.inc
index 66a2e5e..1fbcbde 100755
--- a/testautomation/writer/optional/includes/clipboard/w_222_.inc
+++ b/testautomation/writer/optional/includes/clipboard/w_222_.inc
@@ -48,10 +48,9 @@ sub w_222_
end sub
+'------------------------------------------------------------------------------
testcase DrawToWriterScrollingText
-' QaErrorLog "#i95309# - DrawToWriterScrollingText outcommented due to problem when opening certain sxd-files."
-' goto endsub
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
@@ -107,9 +106,6 @@ endcase
' ---------------------------------------------------------------------------------
testcase DrawToWriterGroupedObject
-' QaErrorLog "#i95309# - DrawToWriterGroupedObject outcommented due to problem when opening certain sxd-files."
-' goto endsub
-
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
@@ -165,9 +161,6 @@ endcase
' ---------------------------------------------------------------------------------
testcase DrawToWriter3D
-' QaErrorLog "#i95309# - DrawToWriter3D outcommented due to problem when opening certain sxd-files."
-' goto endsub
-
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
@@ -223,9 +216,6 @@ endcase
' ---------------------------------------------------------------------------------
testcase DrawToWriterFontwork
-' QaErrorLog "#i95309# - DrawToWriterFontwork outcommented due to problem when opening certain sxd-files."
-' goto endsub
-
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
@@ -281,9 +271,6 @@ endcase
' ---------------------------------------------------------------------------------
testcase DrawToWriterBullets
-' QaErrorLog "#i95309# - DrawToWriterBullets outcommented due to problem when opening certain sxd-files."
-' goto endsub
-
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
@@ -339,9 +326,6 @@ endcase
' ---------------------------------------------------------------------------------
testcase DrawToWriterDimensionLines
- QaErrorLog "#i95309# - DrawToWriterDimensionLines outcommented due to problem when opening certain sxd-files."
- goto endsub
-
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
@@ -398,9 +382,6 @@ endcase
' ---------------------------------------------------------------------------------
testcase DrawToWriterConnectors
-' QaErrorLog "#i95309# - DrawToWriterConnectors outcommented due to problem when opening certain sxd-files."
-' goto endsub
-
gApplication = "DRAW"
printlog " Open File '..\\writer\\optional\\input\\clipboard\\draw.sxd' "
@@ -454,3 +435,4 @@ testcase DrawToWriterConnectors
Loop
endcase
+'------------------------------------------------------------------------------
diff --git a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc
index 8afbd00..2b39d87 100755
--- a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc
+++ b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc
@@ -38,48 +38,45 @@
sub w_contextmenu1
- Call tPickSimpleText
- Call tPickSimpleTextMultiselection
- Call tPickGraphic
- Call tPickHyperlink
- Call tPickDrawingObjects
+ Call tPickSimpleText
+ Call tPickSimpleTextMultiselection
+ Call tPickGraphic
+ Call tPickHyperlink
+ Call tHyperlinkEdit
+ Call tHyperlinkRemove
+ Call tHyperlinkCopy
+ Call tPickDrawingObjects
end sub
' -----------------------------------------------------------------------------
testcase tPickSimpleText
- QaErrorLog "tPickSimpleText outcommented due to problam."
- goto endsub
- Dim SetThisFontSize as string
+ Dim SetThisFontSize as string
Dim GetThisFontSize as string
- printlog "Open context menu on unselected text"
+ printlog "Open context menu on unselected text"
printlog " Open a new text document"
- Call hNewDocument
+ Call hNewDocument
printlog " Set zoom to 100%"
- Call wSetZoom
+ Call wSetZoom
printlog " Write down 'This is a test'"
- Call wTypeKeys "This is a test"
-
+ Call wTypeKeys "This is a test"
printlog " In text document select word 'test'"
- Call wTypeKeys "<End>"
- Call wTypeKeys "<Mod1 Shift Left>"
+ Call wTypeKeys "<End>"
+ Call wTypeKeys "<Mod1 Shift Left>"
printlog " Open context menu in word 'This'"
- printlog " Shift + F8 changes selection mode in writer"
- Call wTypeKeys "<Shift F8>"
- Call wTypeKeys "<Mod1 Left>", 3
- Call wTypeKeys "<Right>"
- Call wTypeKeys "<Shift F8>"
- Call wTypeKeys "<Shift F10>"
+ Call wTypeKeys "<Mod1 Left>", 3
+ Call wTypeKeys "<Right>"
+ Call wTypeKeys "<Shift F10>"
printlog " Change font size for word 'This'"
try
- Call hMenuSelectNr(3)
- wait 500
- SetThisFontSize = hMenuItemGetText(MenuGetItemCount)
- Call hMenuSelectNr(MenuGetItemCount)
+ Call hMenuSelectNr(3)
+ wait 500
+ SetThisFontSize = hMenuItemGetText(MenuGetItemCount)
+ Call hMenuSelectNr(MenuGetItemCount)
catch
- Warnlog "Unable to open context menu"
+ Warnlog "Unable to open context menu"
endcatch
Call wTypeKeys "<Home>"
@@ -90,10 +87,10 @@ testcase tPickSimpleText
Active.Setpage TabFont
Kontext "TabFont"
if gAsianSup = True or gCTLSup = True then
- GetThisFontSize = SizeWest.GetSelText
+ GetThisFontSize = SizeWest.GetSelText
else
- GetThisFontSize = Size.GetSelText
- end if
+ GetThisFontSize = Size.GetSelText
+ end if
TabFont.Ok
if GetThisFontSize <> SetThisFontSize then Warnlog "Fontsize for word 'This' has not correctly been set"
@@ -105,22 +102,20 @@ testcase tPickSimpleText
Active.Setpage TabFont
Kontext "TabFont"
if gAsianSup = True or gCTLSup = True then
- GetThisFontSize = SizeWest.GetSelText
+ GetThisFontSize = SizeWest.GetSelText
else
- GetThisFontSize = Size.GetSelText
- end if
+ GetThisFontSize = Size.GetSelText
+ end if
TabFont.Ok
if GetThisFontSize = SetThisFontSize then Warnlog "Fontsize for word 'test' has been set"
-
Call hCloseDocument
-
endcase
' -----------------------------------------------------------------------------
testcase tPickSimpleTextMultiselection
- Dim SetThisFontSize as string
+ Dim SetThisFontSize as string
Dim GetThisFontSize as string
printlog " Open context menu on unselected text"
Call hNewDocument
@@ -142,12 +137,12 @@ testcase tPickSimpleTextMultiselection
Printlog " Change font size"
try
- Call hMenuSelectNr(3)
- wait 500
- SetThisFontSize = hMenuItemGetText(MenuGetItemCount)
- Call hMenuSelectNr(MenuGetItemCount)
+ Call hMenuSelectNr(3)
+ wait 500
+ SetThisFontSize = hMenuItemGetText(MenuGetItemCount)
+ Call hMenuSelectNr(MenuGetItemCount)
catch
- Warnlog "Unable to open context menu"
+ Warnlog "Unable to open context menu"
endcatch
Call wTypeKeys "<Home>"
@@ -173,17 +168,15 @@ testcase tPickSimpleTextMultiselection
Active.Setpage TabFont
Kontext "TabFont"
if gAsianSup = True or gCTLSup = True then
- GetThisFontSize = SizeWest.GetSelText
+ GetThisFontSize = SizeWest.GetSelText
else
- GetThisFontSize = Size.GetSelText
- end if
+ GetThisFontSize = Size.GetSelText
+ end if
TabFont.Ok
-
- if GetThisFontSize <> SetThisFontSize then Warnlog "Fontsize for word 'test' has not correctly been set"
-
- Call hCloseDocument
-
+ if GetThisFontSize <> SetThisFontSize then Warnlog "Fontsize for word 'test' has not correctly been set"
+ printlog " Close text document"
+ Call hCloseDocument
endcase
' -----------------------------------------------------------------------------
@@ -203,48 +196,47 @@ testcase tPickGraphic
Call DocumentWriter.MouseMove 50,30
Printlog " Open context menu upon graphic with mouse"
Call wOpenContextMenu(true)
-
+
printlog " Select 'ImageMap' in context menu"
try
- CALL hMenuFindSelect (".uno:ImageMapDialog", true, 9, true) 'Find "ImageMap" and call the slot.
- wait 500
+ CALL hMenuFindSelect (".uno:ImageMapDialog", true, 9, true) 'Find "ImageMap" and call the slot.
+ wait 500
catch
- Warnlog "Unable to open context menu"
- Call hCloseDocument
- goto endsub
+ Warnlog "Unable to open context menu"
+ Call hCloseDocument
+ goto endsub
endcatch
Printlog " The graphic has to be selected and the context menu has to show graphics related commands"
Kontext "ImageMapEditor"
if Not ImageMapEditor.Exists(3) then
- Warnlog "Unfortunately not the context menu from graphics has been used!"
- Kontext
- try
- Active.Setpage TabFont
- Kontext "TabFont"
- TabFont.Cancel
- catch
- endcatch
+ Warnlog "Unfortunately not the context menu from graphics has been used!"
+ Kontext
+ try
+ Active.Setpage TabFont
+ Kontext "TabFont"
+ TabFont.Cancel
+ catch
+ endcatch
else
- ImageMapEditor.Close
- Kontext "Active"
- if Active.Exists then
- if Active.GetRT = 304 then Active.No
- end if
+ ImageMapEditor.Close
+ Kontext "Active"
+ if Active.Exists then
+ if Active.GetRT = 304 then Active.No
+ end if
end if
Kontext "DocumentWriter"
try
- FormatGraphics
- Kontext
- Active.Setpage TabType
- Kontext "TabType"
- TabType.Close
+ FormatGraphics
+ Kontext
+ Active.Setpage TabType
+ Kontext "TabType"
+ TabType.Close
catch
- Warnlog "Graphic has not been selected!"
+ Warnlog "Graphic has not been selected!"
endcatch
printlog " Close text document"
- Call hCloseDocument
-
+ Call hCloseDocument
endcase
' -----------------------------------------------------------------------------
@@ -262,55 +254,186 @@ testcase tPickHyperlink
Call wTypeKeys "www.sun.com"
Call wTypeKeys " "
Call wTypeKeys "<HOME>"
-
printlog " Open context menu on hyperlink"
Call wTypeKeys "<SHIFT F10>"
printlog " Last entry in menu has to be 'Open hyperlink' ...."
- CALL hMenuFindSelect (10955, true, 17, true) 'Find "Hyperlink-dialog" and call the slot.
+ CALL hMenuFindSelect (10955, true, 17, true) 'Find "Hyperlink-dialog" and call the slot.
+ kontext "TabHyperlinkInternet"
+ if TabHyperlinkInternet.Exists(3) then
+ Warnlog "Hyperlink-Dialog opened!"
+ TabHyperlinkInternet.Close
+ end if
printlog " Close text document"
Call hCloseDocument
+endcase
+
+' -----------------------------------------------------------------------------
+
+testcase tHyperlinkEdit
+
+ printlog "Context menu on hyperlinks"
+ printlog " Open a new text document"
+ CALL hNewDocument
+ printlog " Set zoom to 100%"
+ Call wSetZoom
+ printlog " Empty clipboard"
+ SetClipBoard = ""
+ printlog " Insert a hyperlink in document"
+ Call wTypeKeys "www.openoffice.org"
+ Call wTypeKeys " "
+ Call wTypeKeys "<HOME>"
+ printlog " Open context menu on hyperlink"
+ Call wTypeKeys "<SHIFT F10>"
+ printlog " Open contextmenu, find the entry 'Edit Hyperlink', and call the slot..."
+ CALL hMenuFindSelect (21835, true, 18, true) 'Find "Edit Hyperlink" and call the slot.
+ printlog " Check if the Hyperlink-dialogue comes up correctly."
+ kontext "TabHyperlinkInternet"
+ if NOT TabHyperlinkInternet.Exists(3) then
+ Warnlog "No Hyperlink-Dialog visible!"
+ else
+ TabHyperlinkInternet.Close
+ end if
+ printlog " Close text document"
+ CALL hCloseDocument
+endcase
+
+' -----------------------------------------------------------------------------
+
+testcase tHyperlinkRemove
+
+ printlog "Context menu on hyperlinks"
+ printlog " Open a new text document"
+ CALL hNewDocument
+ kontext "TabHyperlinkInternet"
+ if TabHyperlinkInternet.Exists then
+ TabHyperlinkInternet.Close
+ end if
+ Kontext "DocumentWriter"
+ printlog " Set zoom to 100%"
+ Call wSetZoom
+ printlog " Empty clipboard"
+ SetClipBoard = ""
+ printlog " Insert a hyperlink in document"
+ Call wTypeKeys "www.openoffice.org"
+ Call wTypeKeys " "
+ Call wTypeKeys "<HOME>"
+ printlog " Open context menu on hyperlink"
+ Call wTypeKeys "<SHIFT F10>"
+ printlog " Find the entry 'Remove hyperlink' in the menu... Check the position of the entry, and call it."
+ CALL hMenuFindSelect (21839, true, 20, true) 'Find "Remove hyperlink" and call the slot.
+ Printlog " Check that the hyperlink formatting has been removed and 'Format - Character - Hyperlink - URL' is empty."
+ Call wTypeKeys "<HOME>"
+ printlog " Open context menu on the hyperlink."
+ Call wTypeKeys "<SHIFT F10>"
+ printlog " Check that the Menu has less than 18 entries, otherwise the pasted content is wrong."
+ if MenuGetItemCount > 18 then
+ Warnlog " Either error or the contextmenu has changed - contact testowner."
+ CALL hMenuFindSelect (21839, false, 20, false) 'Check if "Remove hyperlink" exists in the menu.
+ kontext "TabHyperlinkInternet"
+ if TabHyperlinkInternet.Exists(3) then
+ Warnlog " ERROR. The Hyperlink-Status of the text wasn't removed. BUG!"
+ TabHyperlinkInternet.Close
+ end if
+ end if
+ printlog " Close text document"
+ CALL hCloseDocument
+endcase
+
+' -----------------------------------------------------------------------------
+
+testcase tHyperlinkCopy
+
+ printlog "Context menu on hyperlinks"
+ printlog " Open a new text document"
+ Call hNewDocument
+ printlog " If the Hyperlink-Dialog is open - Close it."
+ kontext "TabHyperlinkInternet"
+ if TabHyperlinkInternet.Exists then
+ TabHyperlinkInternet.Close
+ end if
+ kontext "DocumentWriter"
+ printlog " Set zoom to 100%"
+ Call wSetZoom
+ printlog " Empty clipboard"
+ SetClipBoard = ""
+ printlog " Insert a hyperlink in document"
+ Call wTypeKeys "www.openoffice.org"
+ Call wTypeKeys " "
+ Call wTypeKeys "<HOME><RIGHT RIGHT RIGHT>"
+ printlog " Open context menu on hyperlink"
+ Call wTypeKeys "<SHIFT F10>"
+ printlog " Select 'Copy Hyperlink Location'..."
+ CALL hMenuFindSelect (21840, true, 19, true) 'Find "Copy Hyperlink Location" and call the slot.
+ printlog " Check that the Clipboard contains something/the string we wanted to copy."
+ if GetClipboard = "" then
+ warnlog " Clipboard empty, notify testowner and check if the Hyperlink Copy-function works."
+ end if
+ printlog " Set the cursor somwhere else in the document."
+ Call wTypeKeys "<END>"
+ Call wTypeKeys "<RETURN>", 10
+ printlog " Paste."
+ EditPaste
+ printlog " Check that the hyperlink URL is pasted as plain text."
+ printlog " Mark the text we just pasted."
+ Call wTypeKeys "<HOME><RIGHT RIGHT RIGHT>"
+ printlog " We do this by opening the context menu on the text-string."
+ Call wTypeKeys "<SHIFT F10>"
+ printlog " Check if the contextmenu contains anything about 'Hyperlink'."
+ CALL hMenuFindSelect (10955, true, 17, false) 'Try to find and call "Open Hyperlink".
+ kontext "TabHyperlinkInternet"
+ if TabHyperlinkInternet.Exists(3) then
+ Warnlog " Seemingly, the copy wasn't plaintext, but also a hyperlink. BUG!"
+ end if
+ printlog " Close text document"
+ Call hCloseDocument
endcase
' -----------------------------------------------------------------------------
testcase tPickDrawingObjects
- printlog "Context menu on drawing objects"
+ printlog "Context menu on drawing objects"
printlog " Open a new text document"
Call hNewDocument
+ printlog " If the Hyperlink-Dialog is open - Close it."
+ kontext "TabHyperlinkInternet"
+ if TabHyperlinkInternet.Exists then
+ TabHyperlinkInternet.Close
+ end if
+ kontext "DocumentWriter"
printlog " Set zoom to 100%"
Call wSetZoom
printlog " empty clipboard"
SetClipBoard = ""
printlog " Insert 2 drawing objects (rectangle)"
- Call wZeichenobjektEinfuegen ( "Rechteck", 35, 40, 52, 52 )
- Call wTypeKeys "<Escape>"
- Sleep 1
- Call wZeichenobjektEinfuegen ( "Rechteck", 35, 35, 50, 50 )
- Call wTypeKeys "<Escape>"
- Sleep 1
+ Call wZeichenobjektEinfuegen ( "Rechteck", 35, 40, 52, 52 )
+ Call wTypeKeys "<Escape>"
+ Sleep 1
+ Call wZeichenobjektEinfuegen ( "Rechteck", 35, 35, 50, 50 )
+ Call wTypeKeys "<Escape>"
+ Sleep 1
printlog " Select both objects"
Call wObjektSelektieren ( 32, 32, 60, 60 )
- Sleep 1
-
+ Sleep 1
+
printlog " Open context menu on 1. drawing object"
Call DocumentWriter.MouseMove 51, 51
Call wOpenContextMenu(true)
printlog " Normally 'copy' is last menu entry"
CALL hMenuFindSelect (5711, true, 15, true) 'Find "Copy" and call the slot.
- 'Call hMenuSelectNr(12)
printlog " Both drawing objects have to leave selected"
try
FormatGroupGroup
Sleep 1
- catch
- Warnlog "Drawing objects did not leave selected after context menu opened"
+ catch
+ Warnlog "Drawing objects did not leave selected after context menu opened"
endcatch
printlog " Close text document"
- Call hCloseDocument
-
+ CALL hCloseDocument
endcase
+
+' -----------------------------------------------------------------------------
diff --git a/testautomation/writer/optional/includes/fields/w_fields1.inc b/testautomation/writer/optional/includes/fields/w_fields1.inc
index 2da1bd8..dc68e7f 100755
--- a/testautomation/writer/optional/includes/fields/w_fields1.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields1.inc
@@ -49,55 +49,63 @@ sub w_fields1
end sub
+'-----------------------------------------------------------------
+
testcase tFields_1
-qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
-goto endsub
- Dim sDate , sDate1 , sDate2 as String
-
+ Dim sDate as String
sDate = Date
- sDate1 = Left (sDate , 6)
- sDate2 = Right(sDate , 2)
-
+
printlog "Insert / Fields / Date"
'/// <b> Default should be mm/dd/yy </b>
-
+
Call hNewDocument
-
+
'/// Insert / Fields / Date , the 1st date is fixed
InsertFieldsDate
-
+
'/// Return
Call wTypeKeys "<Return>"
-
+
'/// Insert / Fields / Date
InsertFieldsDate
-
+
Call wTypeKeys "<Home>"
-
+
'/// Set 2nd date only to be date , not fixed
'/// In 2nd date , Edit / Fields , select date in 'select'
+ '/// Select second format in 'Format'
EditFields
Kontext "FeldbefehlBearbeitenDokument"
Auswahl.Select 2
- Sleep 2
+ Zahlenformat.Select 2 'Should be the same as the value we get with 'Time'.
+ '/// Close the dialog
FeldbefehlBearbeitenDokument.OK
-
+
+ '/// Set first date to the right format, but leave as unfixed
+ '/// In 1nd date , Edit / Fields , select second format in 'Format'
+ Call wTypeKeys "<MOD1 Home>"
+
+ EditFields
+ Kontext "FeldbefehlBearbeitenDokument"
+ Zahlenformat.Select 2 'Should be the same as the value we get with 'Time'.
+ FeldbefehlBearbeitenDokument.OK
+
'/// Check if the date is correct
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Shift Right>"
EditCopy
- if GetClipboard <> sDate1 then
+ if GetClipboard <> sDate then
Warnlog "Fixed date is wrong ! Hope you don't run this case in the midnight"
end if
-
+
Call wTypeKeys "<Down><Home>"
Call wTypeKeys "<Shift Right>"
EditCopy
- if GetClipboard <> sDate2 then
+ if GetClipboard <> sDate then
Warnlog "Date is wrong ! Hope you don't run this case in the midnight"
end if
-
+
Call hCloseDocument
endcase
@@ -105,19 +113,17 @@ endcase
'-----------------------------------------------------------------
testcase tFields_2
-qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
-goto endsub
- Dim sTime() , sTime1 , sTime2 as String
- Dim sTemp as String
+ Dim sTime as String
+ Dim sTime1 as String
+ Dim sTime2 as String
+ Dim sTemp as String
printlog "Insert / Fields / Time"
- '/// <b> Default should be hh/mm/ss pm </b>
+ '/// <b> Default could be hh/mm/ss pm or simply hh/mm/ss , depending on the system the test is running on.</b>
Call hNewDocument
-
sTime = Time
- sTemp = Right(sTime , 2) 'It should get am or pm
'/// Insert / Fields / Time , the 1st time is fixed
InsertFieldsTime
@@ -135,7 +141,6 @@ goto endsub
EditFields
Kontext "FeldbefehlBearbeitenDokument"
Auswahl.Select 2
- Sleep 2
FeldbefehlBearbeitenDokument.OK
'/// Check if the time is correct
@@ -143,19 +148,17 @@ goto endsub
Call wTypeKeys "<Shift Right>"
EditCopy
sTime1 = GetClipboard
- if Len(sTime1) < 11 then Warnlog "Fixed time is wrong !"
- if Right(sTime1 , 2) <> sTemp then Warnlog "Fixed time is wrong ! , Hope you don't run this case in the midnight"
+ if NOT Len(sTime1) > 7 then Warnlog "Fixed time-format is wrong !"
Call wTypeKeys "<Down><Home>"
Call wTypeKeys "<Shift Right>"
EditCopy
sTime2 = GetClipboard
- if Len(sTime2) <> 11 then Warnlog "Time is wrong !"
- if Right(sTime2 , 2) <> sTemp then Warnlog "Time is wrong ! , Hope you don't run this case in the midnight"
+ if NOT Len(sTime2) > 7 then Warnlog "Time-format is wrong !"
printlog "Stop for a while ..."
'/// Stop for a while , check if the time is still correct
- Sleep 5
+ Sleep 2
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Shift Right>"
EditCopy
diff --git a/testautomation/writer/optional/includes/fields/w_fields2.inc b/testautomation/writer/optional/includes/fields/w_fields2.inc
index 6ab38e5..5340b6c 100755
--- a/testautomation/writer/optional/includes/fields/w_fields2.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields2.inc
@@ -54,6 +54,8 @@ sub w_fields2
end sub
+'-----------------------------------------------------------------
+
testcase tFieldsOther_0
Dim sTest as String
@@ -94,10 +96,14 @@ testcase tFieldsOther_1_1
exit sub
end if
- Dim sFirstName , sLastName as String
- Dim sFirstName1 , sLastName1 as String
- Dim sFirstName2 , sLastName2 as String
- Dim sInitial1 , sInitial2 as String
+ Dim sFirstName as String
+ Dim sLastName as String
+ Dim sFirstName1 as String
+ Dim sLastName1 as String
+ Dim sFirstName2 as String
+ Dim sLastName2 as String
+ Dim sInitial1 as String
+ Dim sInitial2 as String
sFirstName1 = "ABC" : sLastName1 = "DEF"
sFirstName2 = "XYZ" : sLastName2 = "OPQ"
@@ -196,10 +202,13 @@ testcase tFieldsOther_1_2
exit sub
end if
- Dim sFirstName , sLastName as String
- Dim sFirstName1 , sLastName1 as String
- Dim sFirstName2 , sLastName2 as String
- Dim sInitial1 as String
+ Dim sFirstName as String
+ Dim sLastName as String
+ Dim sFirstName1 as String
+ Dim sLastName1 as String
+ Dim sFirstName2 as String
+ Dim sLastName2 as String
+ Dim sInitial1 as String
sFirstName1 = "ABC" : sLastName1 = "DEF"
sFirstName2 = "XYZ" : sLastName2 = "OPQ"
@@ -297,9 +306,9 @@ endcase
testcase tFieldsOther_2
- Dim sTestFile as String
- Dim sChapter() as String
- Dim i as Integer
+ Dim sTestFile as String
+ Dim sChapter() as String
+ Dim i as Integer
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\chapterTest.sxw")
@@ -445,9 +454,9 @@ testcase tFieldsOther_5
qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
goto endsub
- Dim sTestFile as String
- Dim sPage() as String
- Dim i as Integer
+ Dim sTestFile as String
+ Dim sPage() as String
+ Dim i as Integer
sPage = Array( _
"2" , _
@@ -506,7 +515,9 @@ testcase tFieldsOther_6_1
exit sub
end if
- Dim aUserData(14) , aUserData1() , aUserData2() as String
+ Dim aUserData(14) as String
+ Dim aUserData1() as String
+ Dim aUserData2() as String
Dim i as Integer
@@ -682,8 +693,8 @@ testcase tFieldsOther_6_2
end if
Dim aUserData(16) as String
- Dim aUserData1() as String
- Dim aUserData2() as String
+ Dim aUserData1() as String
+ Dim aUserData2() as String
Dim i as Integer
@@ -859,9 +870,9 @@ testcase tFieldsOther_7
qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
goto endsub
- Dim sTestFile as String
- Dim sStatistics() as String
- Dim i as Integer
+ Dim sTestFile as String
+ Dim sStatistics() as String
+ Dim i as Integer
sStatistics = Array( _
"2" , _
@@ -924,19 +935,19 @@ goto endsub
Dim sTestFile as String
Dim sDirectory as String
+ Dim oDirectory as String
Dim sLanguage as String
Dim sFormat() as String
Dim sResult(6) as String
Dim i as Integer
sLanguage = fGetDirLanguage()
- sDirectory = "..\..\OpenOffice.org\Basis 3.0\share\template\" & sLanguage & "\educate"
- sTestFile = Convertpath ( gNetzOfficePath + sDirectory + "\diploma.ott")
+ sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\diploma.ott")
sResult(0) = fGetCateGory()
sResult(1) = "diploma.ott"
sResult(2) = "diploma"
- sResult(3) = Convertpath ( gNetzOfficePath + sDirectory )
+ sResult(3) = Convertpath (gTesttoolpath + "writer\optional\input\fields\")
sResult(4) = sTestFile
sResult(5) = fGetStyle()
@@ -981,16 +992,17 @@ goto endsub
Kontext "TabDokumentFeldbefehle"
TabDokumentFeldbefehle.Close
+ Do Until GetDocumentCount = 0
Call hCloseDocument
- Call hCloseDocument
-
+ Loop
endcase
'-----------------------------------------------------------------
testcase tFieldsOther_9
- Dim sTime1 , sTime2 as String
+ Dim sTime1 as String
+ Dim sTime2 as String
printlog "Insert/Fields/Other/Document / Time"
'/// <b> Insert/Fields/Other/Document / Time </b>
@@ -1050,4 +1062,3 @@ testcase tFieldsOther_9
endcase
'-----------------------------------------------------------------
-
diff --git a/testautomation/writer/optional/includes/fields/w_fields3.inc b/testautomation/writer/optional/includes/fields/w_fields3.inc
index d002e66..cc54ad7 100755
--- a/testautomation/writer/optional/includes/fields/w_fields3.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields3.inc
@@ -59,6 +59,8 @@ sub w_fields3
end sub
+'-----------------------------------------------------------------
+
testcase tFieldsReferences
printlog "Insert/Cross-reference"
@@ -86,8 +88,8 @@ endcase
testcase tSetReferences_1
- Dim sReference as String
- Dim sTestFile as String
+ Dim sReference as String
+ Dim sTestFile as String
sReference = "myTest"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\pageTest.sxw")
@@ -133,7 +135,7 @@ endcase
testcase tSetReferences_2
- Dim sReference as String
+ Dim sReference as String
sReference = "myTest"
@@ -174,8 +176,8 @@ endcase
testcase tInsertReference_1
- Dim sReference as String
- Dim sTestFile as String
+ Dim sReference as String
+ Dim sTestFile as String
sReference = "myTest"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\pageTest.sxw")
@@ -234,8 +236,8 @@ endcase
testcase tInsertReference_2
- Dim sReference as String
- Dim sTestFile as String
+ Dim sReference as String
+ Dim sTestFile as String
sReference = "myTest"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\chapterTest.sxw")
@@ -294,8 +296,8 @@ endcase
testcase tInsertReference_3
- Dim sReference as String
- Dim sReferenceName as String
+ Dim sReference as String
+ Dim sReferenceName as String
sReference = "est !"
sReferenceName = "myTest"
@@ -354,14 +356,20 @@ endcase
'-----------------------------------------------------------------
testcase tInsertReference_4
-qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
-goto endsub
- Dim sReference as String
- Dim sAbove , sBelow as String
+ Dim sReference as String
+ Dim sAbove as String
+ Dim sBelow as String
- sReference = "myTest"
- sAbove = "above" : sBelow = "below"
+ sReference = "myTest"
+ Select Case iSystemSprache
+ Case 01 : sAbove = "above" : sBelow = "below"
+ Case 35 : sAbove = "sur" : sBelow = "sous"
+ Case 39 : sAbove = "sopra" : sBelow = "sotto"
+ Case 49 : sAbove = "oben" : sBelow = "unten"
+ Case 46 : sAbove = "ovan" : sBelow = "under"
+ Case 55 : sAbove = "arriba" : sBelow = "abajo"
+ End Select
printlog "Insert Reference - Above/Below"
'/// <b> Insert Reference - Above/Below</b>
@@ -440,8 +448,8 @@ endcase
testcase tInsertReference_5
- Dim sReference as String
- Dim sTestSytle as String
+ Dim sReference as String
+ Dim sTestSytle as String
sReference = "myTest"
sTestSytle = "A"
@@ -503,7 +511,7 @@ endcase
testcase tInsertReference_6
- Dim sFootnote as String
+ Dim sFootnote as String
sFootnote = "Test"
@@ -537,7 +545,7 @@ endcase
testcase tInsertReference_7
- Dim sEndnote as String
+ Dim sEndnote as String
sEndnote = "Test"
@@ -571,7 +579,9 @@ endcase
testcase tInsertReference_8_1
- Dim sCategory , sCaption , sSeparator as String
+ Dim sCategory as String
+ Dim sCaption as String
+ Dim sSeparator as String
sCategory = "A" : sCaption = "B" : sSeparator = "*"
@@ -619,7 +629,9 @@ endcase
testcase tInsertReference_8_2
- Dim sCategory , sCaption , sSeparator as String
+ Dim sCategory as String
+ Dim sCaption as String
+ Dim sSeparator as String
sCategory = "A" : sCaption = "B" : sSeparator = "*"
@@ -667,8 +679,8 @@ endcase
testcase tInsertBookmark_1
- Dim sBookmark as String
- Dim sTestFile as String
+ Dim sBookmark as String
+ Dim sTestFile as String
sBookmark = "myTest"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\pageTest.sxw")
@@ -725,8 +737,8 @@ endcase
testcase tInsertBookmark_2
- Dim sBookmark as String
- Dim sTestFile as String
+ Dim sBookmark as String
+ Dim sTestFile as String
sBookmark = "myTest"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\chapterTest.sxw")
@@ -782,8 +794,8 @@ endcase
testcase tInsertBookmark_3
- Dim sReference as String
- Dim sBookmark as String
+ Dim sReference as String
+ Dim sBookmark as String
sReference = "est !"
sBookmark = "myTest"
@@ -839,14 +851,20 @@ endcase
'-----------------------------------------------------------------
testcase tInsertBookmark_4
-qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'"
-goto endsub
- Dim sBookmark as String
- Dim sAbove , sBelow as String
+ Dim sBookmark as String
+ Dim sAbove as String
+ Dim sBelow as String
sBookmark = "myTest"
- sAbove = "above" : sBelow = "below"
+ Select Case iSystemSprache
+ Case 01 : sAbove = "above" : sBelow = "below"
+ Case 35 : sAbove = "sur" : sBelow = "sous"
+ Case 39 : sAbove = "sopra" : sBelow = "sotto"
+ Case 49 : sAbove = "oben" : sBelow = "unten"
+ Case 46 : sAbove = "ovan" : sBelow = "under"
+ Case 55 : sAbove = "arriba" : sBelow = "abajo"
+ End Select
printlog "Insert Bookmark - Above/Below"
'/// <b> Insert Bookmark - Above/Below</b>
@@ -922,8 +940,8 @@ endcase
testcase tInsertBookmark_5
- Dim sBookmark as String
- Dim sTestSytle as String
+ Dim sBookmark as String
+ Dim sTestSytle as String
sBookmark = "myTest"
sTestSytle = "A"
@@ -979,4 +997,3 @@ testcase tInsertBookmark_5
endcase
'-----------------------------------------------------------------
-
diff --git a/testautomation/writer/optional/includes/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc
index cb801f3..7933e99 100755
--- a/testautomation/writer/optional/includes/fields/w_fields4.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields4.inc
@@ -53,10 +53,12 @@ sub w_fields4
end sub
+'-----------------------------------------------------------------
+
testcase tDocInformation_1
- Dim sTitle as String
- Dim sTestFile as String
+ Dim sTitle as String
+ Dim sTestFile as String
Dim sVarResult as String
Dim sFixResult as String
@@ -107,8 +109,8 @@ endcase
testcase tDocInformation_2
- Dim sSubject as String
- Dim sTestFile as String
+ Dim sSubject as String
+ Dim sTestFile as String
Dim sVarResult as String
Dim sFixResult as String
@@ -159,9 +161,10 @@ endcase
testcase tDocInformation_3
- Dim sKeywords as String
- Dim sTestFile as String
- Dim sVarResult , sFixResult as String
+ Dim sKeywords as String
+ Dim sTestFile as String
+ Dim sVarResult as String
+ Dim sFixResult as String
sKeywords = "Keywords Test"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
@@ -211,9 +214,9 @@ endcase
testcase tDocInformation_4
Dim sDescription as String
- Dim sTestFile as String
- Dim sVarResult as String
- Dim sFixResult as String
+ Dim sTestFile as String
+ Dim sVarResult as String
+ Dim sFixResult as String
sDescription = "Description Test"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
@@ -300,7 +303,7 @@ goto endsub
'/// File / Properties / Description , input some
'/// + text in Description
- Call fFileProperties("TabBenutzer")
+ Call fFileProperties("TabDokument")
Info0.Settext sVarResult(0)
Info1.Settext sVarResult(1)
Info2.Settext sVarResult(2)
@@ -339,11 +342,11 @@ endcase
testcase tDocInformation_6
- Dim sTestFile as String
- Dim sFirstName as String
- Dim sLastName as String
- Dim sFirstName1 as String
- Dim sLastName1 as String
+ Dim sTestFile as String
+ Dim sFirstName as String
+ Dim sLastName as String
+ Dim sFirstName1 as String
+ Dim sLastName1 as String
Dim sVarResult(3) as String
Dim sFixResult(3) as String
Dim i as Integer
@@ -443,15 +446,15 @@ endcase
testcase tDocInformation_7_1
- Dim sTestFile as String
- Dim sSaveasFile as String
- Dim sFirstName as String
- Dim sLastName as String
- Dim sFirstName1 as String
- Dim sLastName1 as String
+ Dim sTestFile as String
+ Dim sSaveasFile as String
+ Dim sFirstName as String
+ Dim sLastName as String
+ Dim sFirstName1 as String
+ Dim sLastName1 as String
Dim sVarResult(3) as String
Dim sFixResult(3) as String
- Dim i as Integer
+ Dim i as Integer
sFirstName1 = "Test1" : sLastName1 = "Test2"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
@@ -569,16 +572,18 @@ endcase
'-----------------------------------------------------------------
testcase tDocInformation_7_2
-
- Dim sTestFile as String
- Dim sSaveasFile as String
- Dim sFirstName as String
- Dim sLastName as String
- Dim sFirstName1 as String
- Dim sLastName1 as String
+ QaErrorLog "#i102792# - tDocInformation_7_2 outcommented due to issue."
+ goto endsub
+
+ Dim sTestFile as String
+ Dim sSaveasFile as String
+ Dim sFirstName as String
+ Dim sLastName as String
+ Dim sFirstName1 as String
+ Dim sLastName1 as String
Dim sVarResult(3) as String
Dim sFixResult(3) as String
- Dim i as Integer
+ Dim i as Integer
sFirstName1 = "Test1" : sLastName1 = "Test2"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
@@ -682,14 +687,14 @@ endcase
testcase tDocInformation_8
- Dim sTestFile as String
- Dim sFirstName as String
- Dim sLastName as String
- Dim sFirstName1 as String
- Dim sLastName1 as String
+ Dim sTestFile as String
+ Dim sFirstName as String
+ Dim sLastName as String
+ Dim sFirstName1 as String
+ Dim sLastName1 as String
Dim sVarResult(3) as String
Dim sFixResult(3) as String
- Dim i as Integer
+ Dim i as Integer
sFirstName1 = "Test1" : sLastName1 = "Test2"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
@@ -800,14 +805,14 @@ endcase
testcase tDocInformation_9
- Dim sTestFile as String
+ Dim sTestFile as String
Dim sSaveasFile as String
- Dim sFirstName as String
- Dim sLastName as String
+ Dim sFirstName as String
+ Dim sLastName as String
Dim sFirstName1 as String
- Dim sLastName1 as String
- Dim sVarResult as String
- Dim sFixResult as String
+ Dim sLastName1 as String
+ Dim sVarResult as String
+ Dim sFixResult as String
sFirstName1 = "Test1" : sLastName1 = "Test2"
sVarResult = "17" : sFixResult = "4"
@@ -896,10 +901,10 @@ endcase
testcase tDocInformation_10
- Dim sTestFile as String
+ Dim sTestFile as String
Dim sSaveasFile as String
- Dim sVarResult as String
- Dim sFixResult as String
+ Dim sVarResult as String
+ Dim sFixResult as String
sFixResult = "00:29:05"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw")
@@ -973,4 +978,3 @@ testcase tDocInformation_10
endcase
'-----------------------------------------------------------------
-
diff --git a/testautomation/writer/optional/includes/fields/w_fields5.inc b/testautomation/writer/optional/includes/fields/w_fields5.inc
index 8a739bb..abb75ea 100755
--- a/testautomation/writer/optional/includes/fields/w_fields5.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields5.inc
@@ -53,6 +53,8 @@ sub w_fields5
end sub
+'-----------------------------------------------------------------
+
testcase tVariables_1
if bAsianLan = true then
QaErrorLog "No testing with Asian language. Aborting."
@@ -62,8 +64,8 @@ testcase tVariables_1
Dim sName() as String
Dim sValue as String
Dim sResult() as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
sValue = "This is a test!"
@@ -134,8 +136,8 @@ testcase tVariables_2
Dim sName() as String
Dim sValue as String
Dim sResult() as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
sValue = "1234,567"
@@ -205,8 +207,9 @@ testcase tVariables_3
Dim sValue as String
Dim iFormat() as Integer
Dim sResult() as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
+ Dim mUnit as String
sName = "myTest"
sValue = "1234.567"
@@ -271,8 +274,8 @@ testcase tVariables_4
Dim sName() as String
Dim sResult() as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
sName = Array( _
"myTest1" , _
@@ -350,8 +353,8 @@ testcase tVariables_5
Dim sName as String
Dim sValue as String
Dim sResult() as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
sResult = Array( _
"100" , _
@@ -429,8 +432,8 @@ testcase tVariables_6
Dim sName() as String
Dim sValue() as String
Dim sResult as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
sName = Array( _
"myTest1" , _
@@ -482,8 +485,8 @@ endcase
testcase tVariables_7
Dim sResult() as String
- Dim i as Integer
- Dim x as Integer
+ Dim i as Integer
+ Dim x as Integer
printlog "Number range"
'/// <b> Number range </b>
@@ -540,9 +543,9 @@ endcase
testcase tVariables_8
- Dim sName as String
- Dim sValue as String
- Dim sReference as String
+ Dim sName as String
+ Dim sValue as String
+ Dim sReference as String
Dim sFieldContent as String
sName = "myTest" : sValue = "100"
@@ -613,12 +616,12 @@ endcase
testcase tVariables_9
- Dim sName() as String
- Dim sValue() as String
+ Dim sName() as String
+ Dim sValue() as String
Dim sResult1() as String
Dim sResult2() as String
- Dim i as Integer
- Dim j as Integer
+ Dim i as Integer
+ Dim j as Integer
sName = Array("U1" , "UserField" , "U2")
sValue = Array("UserField - 10" , "100" , "UserField + 10")
@@ -673,11 +676,11 @@ testcase tVariables_10
qaerrorlog "#i93906# - tVariables_10 outcommented due to a problem with copying field-contents outside the office."
goto endsub
- Dim sDDEFile as String
- Dim sContent as String
- Dim sName as String
- Dim sDDEStatement as String
- Dim sSectionName as String
+ Dim sDDEFile as String
+ Dim sContent as String
+ Dim sName as String
+ Dim sDDEStatement as String
+ Dim sSectionName as String
sDDEFile = Convertpath ( gNetzOfficePath + "dde_test.oxt")
sContent = "DDE"
@@ -763,14 +766,14 @@ endcase
'-----------------------------------------------------------------
testcase tVariables_11
- qaerrorlog "#i93906# - tVariables_10 outcommented due to a problem with copying field-contents outside the office."
+ qaerrorlog "#i102792# - tVariables_11 outcommented. Fields not updated."
goto endsub
- Dim sDDEFile as String
- Dim sContent as String
- Dim sName as String
+ Dim sDDEFile as String
+ Dim sContent as String
+ Dim sName as String
Dim sDDEStatement as String
- Dim sSectionName as String
+ Dim sSectionName as String
sDDEFile = Convertpath ( gNetzOfficePath + "dde_test.oxt")
sContent = "DDE"
@@ -840,4 +843,3 @@ testcase tVariables_11
endcase
'-----------------------------------------------------------------
-
diff --git a/testautomation/writer/optional/includes/fields/w_fields6.inc b/testautomation/writer/optional/includes/fields/w_fields6.inc
index af44b1e..d19de7b 100755
--- a/testautomation/writer/optional/includes/fields/w_fields6.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields6.inc
@@ -55,17 +55,19 @@ sub w_fields6
end sub
+'-----------------------------------------------------------------
+
testcase tFunctions_1
- Dim sName as String
- Dim sValue() as String
+ Dim sName as String
+ Dim sValue() as String
Dim sCondition as String
- Dim sElse as String
- Dim sThen as String
- Dim sResult() as String
- Dim iType as Integer
- Dim i as Integer
- Dim j as Integer
+ Dim sElse as String
+ Dim sThen as String
+ Dim sResult() as String
+ Dim iType as Integer
+ Dim i as Integer
+ Dim j as Integer
sName = "X"
SCondition = "X==" + Chr(34) + "Sun" + Chr(34)
@@ -134,14 +136,14 @@ endcase
testcase tFunctions_2
- Dim sName as String
- Dim sValue() as String
- Dim sCondition as String
- Dim sHiddenText as String
- Dim sResult() as String
- Dim bHiddenText as Boolean
- Dim i as Integer
- Dim j as Integer
+ Dim sName as String
+ Dim sValue() as String
+ Dim sCondition as String
+ Dim sHiddenText as String
+ Dim sResult() as String
+ Dim bHiddenText as Boolean
+ Dim i as Integer
+ Dim j as Integer
sName = "X"
SCondition = "X==" + Chr(34) + "ABC" + Chr(34)
@@ -219,13 +221,14 @@ endcase
testcase tFunctions_3
- Dim sName as String
- Dim sValue() as String
- Dim sCondition as String
- Dim sHiddenText as String
- Dim sResult() as String
- Dim bHiddenText as Boolean
- Dim i , j as Integer
+ Dim sName as String
+ Dim sValue() as String
+ Dim sCondition as String
+ Dim sHiddenText as String
+ Dim sResult() as String
+ Dim bHiddenText as Boolean
+ Dim i as Integer
+ Dim j as Integer
sName = "X"
SCondition = "X==" + Chr(34) + "ABC" + Chr(34)
@@ -306,7 +309,8 @@ endcase
testcase tFunctions_4
- Dim sReference , sFieldContent as String
+ Dim sReference as String
+ Dim sFieldContent as String
sReference = "NewTest"
sFieldContent = "10000"
@@ -348,7 +352,7 @@ endcase
testcase tFunctions_5
- Dim sPlaceHolder as String
+ Dim sPlaceHolder as String
sPlaceHolder = "Text"
@@ -381,12 +385,12 @@ endcase
'-----------------------------------------------------------------
testcase tFunctions_6
-
+
printlog "Placeholder - Table"
'/// <b> Placeholder - Table </b>
-
+
Call hNewDocument
-
+
Call fFormatPageWriter("TabSeite")
Breite.SetText "15"
Hoehe.SetText "15"
@@ -406,7 +410,7 @@ testcase tFunctions_6
else
Warnlog "Something wrong !"
end if
-
+
'/// Insert/Fields/Other/Functions / Select "Placeholder" ,
'/// + select Table
Call fInsertFieldsOther("TabFunktionen")
@@ -416,29 +420,29 @@ testcase tFunctions_6
Platzhalter.SetText "TableTableTableTableTable"
Einfuegen.Click
TabFunktionen.Close
-
+
'/// Check if the insertion is correct
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Shift Right>"
if fGetFieldContent() <> ("<TableTableTableTableTable>" )then
Warnlog "Should get <TableTableTableTableTable> but get " & fGetFieldContent()
end if
-
+
Call fSetToBigSize()
Call wTypeKeys "<MOD1 Home>"
Sleep 1
-
+
Call gMouseMove(0,0,30,25)
Call gMouseClick(30,25)
Sleep 3
-
+
Kontext "TabelleEinfuegenWriter"
if TabelleEinfuegenWriter.Exists then
TabelleEinfuegenWriter.Cancel
else
Warnlog "Insert table dialog isn't up !"
end if
-
+
Call hCloseDocument
endcase
@@ -449,9 +453,9 @@ testcase tFunctions_7
printlog "Placeholder - Frame"
'/// <b> Placeholder - Frame </b>
-
+
Call hNewDocument
-
+
fFormatPageWriter("TabSeite")
Breite.SetText "15"
Hoehe.SetText "15"
@@ -470,7 +474,7 @@ testcase tFunctions_7
else
Warnlog "Something wrong !"
end if
-
+
'/// Insert/Fields/Other/Functions / Select "Placeholder" ,
'/// + select Frame
Call fInsertFieldsOther("TabFunktionen")
@@ -480,21 +484,21 @@ testcase tFunctions_7
Platzhalter.SetText "FrameFrameFrameFrameFrameFrame"
Einfuegen.Click
TabFunktionen.Close
-
+
'/// Check if the insertion is correct
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Shift Right>"
if fGetFieldContent() <> ("<FrameFrameFrameFrameFrameFrame>" )then
Warnlog "Should get <FrameFrameFrameFrameFrameFrame> but get " & fGetFieldContent()
end if
-
+
Call fSetToBigSize()
Call wTypeKeys "<MOD1 Home>"
Sleep 1
Call gMouseMove(0,0,30,25)
Call gMouseClick(30,25)
Sleep 3
-
+
try
Kontext
Active.SetPage TabType
@@ -504,7 +508,7 @@ testcase tFunctions_7
catch
Warnlog "Format/Frame dialog isn't up !"
endcatch
-
+
Call hCloseDocument
endcase
@@ -515,9 +519,9 @@ testcase tFunctions_8
printlog "Placeholder - Graphics"
'/// <b> Placeholder - Graphics </b>
-
+
Call hNewDocument
-
+
fFormatPageWriter("TabSeite")
Breite.SetText "15"
Hoehe.SetText "15"
@@ -525,7 +529,7 @@ testcase tFunctions_8
Rechts.SetText "0"
Oben.SetText "0"
Unten.SetText "0"
-
+
TabSeite.OK
Kontext "Active"
if Active.Exists then
@@ -537,7 +541,7 @@ testcase tFunctions_8
else
Warnlog "Something wrong !"
end if
-
+
'/// Insert/Fields/Other/Functions / Select "Placeholder" ,
'/// + select Graphics
Call fInsertFieldsOther("TabFunktionen")
@@ -547,21 +551,21 @@ testcase tFunctions_8
Platzhalter.SetText "GraphicsGraphicsGraphicsGraphicsGraphics"
Einfuegen.Click
TabFunktionen.Close
-
+
'/// Check if the insertion is correct
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Shift Right>"
if fGetFieldContent() <> ("<GraphicsGraphicsGraphicsGraphicsGraphics>" )then
Warnlog "Should get <GraphicsGraphicsGraphicsGraphicsGraphics> but get " & fGetFieldContent()
end if
-
+
Call fSetToBigSize()
Call wTypeKeys "<MOD1 Home>"
Sleep 1
Call gMouseMove(0,0,30,25)
Call gMouseClick(30,25)
Sleep 3
-
+
try
Kontext "GrafikEinfuegenDlg"
Oeffnen.Click
@@ -569,7 +573,7 @@ testcase tFunctions_8
catch
Warnlog "Insert picture dialog isn't up !"
endcatch
-
+
Call hCloseDocument
endcase
@@ -580,9 +584,9 @@ testcase tFunctions_9
printlog "Placeholder - Object"
'/// <b> Placeholder - Object </b>
-
+
Call hNewDocument
-
+
fFormatPageWriter("TabSeite")
Breite.SetText "15"
Hoehe.SetText "15"
@@ -601,7 +605,7 @@ testcase tFunctions_9
else
Warnlog "Something wrong !"
end if
-
+
'/// Insert/Fields/Other/Functions / Select "Placeholder" ,
'/// + select object
Call fInsertFieldsOther("TabFunktionen")
@@ -611,21 +615,21 @@ testcase tFunctions_9
Platzhalter.SetText "ObjectObjectObjectObjectObjectObject"
Einfuegen.Click
TabFunktionen.Close
-
+
'/// Check if the insertion is correct
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Shift Right>"
if fGetFieldContent() <> ("<ObjectObjectObjectObjectObjectObject>" )then
Warnlog "Should get <ObjectObjectObjectObjectObjectObject> but get " & fGetFieldContent()
end if
-
+
Call fSetToBigSize()
Call wTypeKeys "<MOD1 Home>"
Sleep 1
Call gMouseMove(0,0,30,25)
Call gMouseClick(30,25)
Sleep 3
-
+
try
Kontext "OLEObjektEinfuegen"
NeuErstellen.Check
@@ -633,7 +637,7 @@ testcase tFunctions_9
catch
Warnlog "Insert OLE Object dialog isn't up !"
endcatch
-
+
Call hCloseDocument
endcase
@@ -642,7 +646,8 @@ endcase
testcase tFunctions_10
- Dim sItem1 , sItem2 as String
+ Dim sItem1 as String
+ Dim sItem2 as String
sItem1 = "First" : sItem2 = "Second"
@@ -689,7 +694,8 @@ endcase
testcase tFunctions_11
- Dim sItem1 , sItem2 as String
+ Dim sItem1 as String
+ Dim sItem2 as String
sItem1 = "First" : sItem2 = "Second"
@@ -735,7 +741,8 @@ endcase
testcase tFunctions_12
- Dim sItem1 , sItem2 as String
+ Dim sItem1 as String
+ Dim sItem2 as String
sItem1 = "First" : sItem2 = "Second"
@@ -781,25 +788,26 @@ endcase
'-----------------------------------------------------------------
testcase tFunctions_13
+Warnlog "#i102752# - tFunctions_13 outcommented due to bug."
+goto endsub
Dim sCombineCharacter as String
- Dim sTestFile as String
-
+ Dim sTestFile as String
+
sCombineCharacter = "ABC"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\CombineTest.sxw")
-
+
printlog "Combine Character"
'/// <b> Combine Character </b>
-
+
Call hNewDocument
-
+
'/// Open test file pageTest.sxw
Call hFileOpen(sTestFile)
Call sMakeReadOnlyDocumentEditable
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Right>"
-
'/// Insert/Fields/Other/Functions / Select "Combine characters"
Call fInsertFieldsOther("TabFunktionen")
Feldtyp.Select 6 'Combine characters
@@ -807,13 +815,13 @@ testcase tFunctions_13
Namefeld.SetText sCombineCharacter
Einfuegen.Click
TabFunktionen.Close
-
+
'/// Check if the insertion is correct
Call wTypeKeys "<Shift Left>"
if fGetFieldContent() <> sCombineCharacter then
Warnlog "Should get " & sCombineCharacter & " but get " & fGetFieldContent()
end if
-
+
Call wTypeKeys ( "<Shift F4>" )
FormatAnchorToPage
Sleep 1
@@ -822,10 +830,9 @@ testcase tFunctions_13
Warnlog "Something wrong in combine character"
end if
TabPositionAndSizeWriter.Cancel
-
+
Call hCloseDocument
endcase
'-----------------------------------------------------------------
-
diff --git a/testautomation/writer/optional/includes/fields/w_fields7.inc b/testautomation/writer/optional/includes/fields/w_fields7.inc
index d7f7bda..e123629 100755
--- a/testautomation/writer/optional/includes/fields/w_fields7.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields7.inc
@@ -45,6 +45,8 @@ sub w_fields7
end sub
+'-----------------------------------------------------------------
+
testcase tL10N_1
if iSprache <> 1 then
@@ -163,7 +165,7 @@ testcase tL10N_1
if sAsiancbChecked = true then Aktivieren.IsChecked
end if
- if sCTLcb = true then
+ if sCTLcb = true then
if sCTLcbChecked = true then ComplexScriptEnabled.IsChecked
end if
diff --git a/testautomation/writer/optional/includes/filter/w_filter.inc b/testautomation/writer/optional/includes/filter/w_filter.inc
index a2c95b1..a2d82ba 100755
--- a/testautomation/writer/optional/includes/filter/w_filter.inc
+++ b/testautomation/writer/optional/includes/filter/w_filter.inc
@@ -248,11 +248,10 @@ testcase tCollectSaveAsFilter
Dim j as Integer
Dim x as Integer
- Dim lsListe(350) as String ' IST list gets generated with tested SO and written into
-
- Dim iFilterCount as Integer
- Dim fActualFilterFile as String
- Dim fSortedFilterFile as String
+ Dim lsListe(350) as String ' IST list gets generated with tested SO and written into
+ Dim iFilterCount as Integer
+ Dim fActualFilterFile as String
+ Dim fSortedFilterFile as String
ListAllDelete(lsListe())
x = 0
@@ -311,11 +310,10 @@ testcase tCollectExportFilters
Dim j as Integer
Dim x as Integer
- Dim lsListe(350) as String ' IST list gets generated with tested SO and written into
-
- Dim iFilterCount as Integer
- Dim fActualFilterFile as String
- Dim fSortedFilterFile as String
+ Dim lsListe(350) as String ' IST list gets generated with tested SO and written into
+ Dim iFilterCount as Integer
+ Dim fActualFilterFile as String
+ Dim fSortedFilterFile as String
ListAllDelete(lsListe())
x = 0
@@ -353,8 +351,8 @@ testcase tCollectExportFilters
hCloseDocument()
next j
- Printlog chr(13)+" This are "+ x + " - from 70 expected." + chr(13)
- if x <> 70 then warnlog "Somewhere Over the rainbow... there are filters missing / too much :-("
+ Printlog chr(13)+" This are "+ x + " - from 65 expected." + chr(13)
+ if x <> 65 then warnlog "Somewhere Over the rainbow... there are filters missing / too much :-("
if (app.dir(fActualFilterFile) = "") then
Call ListWrite(lsListe(),fActualFilterFile, "utf8")
@@ -542,8 +540,10 @@ end function
'------------------------------------------------------------------------------------------------------------------------------
testcase tGroupNameCheck
-QaErrorLog "#i94734# - testcase tGroupNameCheck outcommented due to unpredictable results."
-goto endsub
+ if gPlatGroup = "unx" then
+ Printlog "No testing under Unix/Linux. Exiting testcase."
+ goto endsub
+ end if
'///' inspired from #97305 : 86+88: missing import filters in fileopen dialog ///'
'///+' -> 97723 97758 ///'
@@ -577,11 +577,7 @@ function TBOXMLGetListOfFilterGroups ( iLang as integer, sList() as string ) as
dim iAttrCount as integer
sElementLine = "UI;FilterClassification;GlobalFilters;Classes"
- if gNetzInst then
- sXMLFile = ConvertPath ( gNetzOfficePath + "share\registry\res\" + gISOLang + "\org\openoffice\Office\UI.xcu" )
- else
- sXMLFile = ConvertPath ( gOfficePath + "share\registry\res\" + gISOLang + "\org\openoffice\Office\UI.xcu" )
- end if
+ sXMLFile = gNetzOfficePath & ConvertPath("Basis\share\registry\res\" + gISOLang + "\org\openoffice\Office\UI.xcu")
if (dir(sXMLFile) = "") then
qaErrorLog "File doesn't exist :-( '" + sXMLFile + "'"
diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc
index ff21e48..75e465d 100755
--- a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc
+++ b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc
@@ -92,9 +92,9 @@ endcase
testcase tFormatPage_2
- Dim sTestString as String
+ Dim sTestString as String
Dim iRepectLength as Integer
- Dim iFormat as Integer
+ Dim iFormat as Integer
sTestString = "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQ"
iRepectLength = 26
@@ -137,7 +137,7 @@ testcase tFormatPage_3
Call hNewDocument
- Call wOptionenUndo( "Grundschriften" )
+ Call wOptionsUndo( "Grundschriften" )
'/// Input a long test string
Call wTypeKeys "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQ"
@@ -170,7 +170,7 @@ endcase
testcase tFormatPage_4
Dim iFormat as Integer
- Dim sWidth as String
+ Dim sWidth as String
Dim sHeight as String
iFormat = 2 'A4 paper
@@ -225,9 +225,8 @@ endcase
testcase tFormatPage_5
Dim iFormat as Integer
- Dim sWidth as String
- Dim sHeight as String
- Dim sLeft as String , sRight as String , sUp as String , sBottom as String ' set page size
+ Dim sWidth as String , sHeight as String
+ Dim sLeft as String , sRight as String , sUp as String , sBottom as String ' set page size
Dim sLeft1 as String , sRight1 as String , sUp1 as String , sBottom1 as String ' get page size
iFormat = 2 'A4 paper
@@ -451,7 +450,7 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tFormatPage_8
- Dim RecheckCTLSupport as string
+ Dim RecheckCTLSupport as string
Dim RecheckAsianSupport as string
RecheckCTLSupport = gCTLSup
RecheckAsianSupport = gAsianSup
@@ -497,7 +496,7 @@ testcase tFormatPage_8
else
Call ActiveDeactivateAsianSupport(FALSE)
end if
-
+
Call hCloseDocument
endcase
@@ -515,6 +514,7 @@ testcase tFormatPage_9
'/// Check Listbox Text Direction when CTL is enabled
Call hNewDocument
+
'/// Set CTL enabled
Call ActiveDeactivateAsianSupport(FALSE)
Call ActiveDeactivateCTLSupport(TRUE)
@@ -553,7 +553,7 @@ endcase
testcase tFormatPage_10
- Dim RecheckCTLSupport as string
+ Dim RecheckCTLSupport as string
Dim RecheckAsianSupport as string
RecheckCTLSupport = gCTLSup
RecheckAsianSupport = gAsianSup
@@ -591,9 +591,12 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tFormatPage_11
- Dim sTestFile as String
+Warnlog "#i102752# - tFormatPage_11 outcommented due to bug."
+goto endsub
+
+ Dim sTestFile as String
Dim sMarginsLeft as String
- Dim iPageLayout as Integer
+ Dim iPageLayout as Integer
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatpage\pageLayout.sxw")
sMarginsLeft = "10" + gSeperator + "00" + gMeasurementUnit
@@ -649,10 +652,13 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tFormatPage_12
- Dim sTestFile as String
+Warnlog "#i102752# - tFormatPage_12 outcommented due to bug."
+goto endsub
+
+ Dim sTestFile as String
Dim sMarginsLeft as String
Dim sMarginsRight as String
- Dim iPageLayout as Integer
+ Dim iPageLayout as Integer
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatpage\pageLayout.sxw")
sMarginsLeft = "10" + gSeperator + "00" + gMeasurementUnit
@@ -710,6 +716,9 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tFormatPage_13
+Warnlog "#i102752# - tFormatPage_13 outcommented due to bug."
+goto endsub
+
Dim sTestFile as String
Dim sPage1 as String
Dim sPage2 as String
@@ -760,7 +769,7 @@ testcase tFormatPage_13
fCloseNavigator
Wait 500
- Call hCloseDocument
+ Call hCloseDocument
endcase
diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc
index a8edee0..7c8724b 100755
--- a/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc
+++ b/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc
@@ -146,7 +146,8 @@ endcase
testcase tFormatPage_17
Dim sTestFile as String
- Dim sDummy1 as String , sDummy2 as String
+ Dim sDummy1 as String
+ Dim sDummy2 as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatpage\testForAutoFit.sxw")
@@ -447,9 +448,10 @@ testcase tFormatPage_20
Sleep 2
MenuSelect(Menugetitemid(4))
Sleep 2
- MenuSelect(Menugetitemid(9))
+ MenuSelect(Menugetitemid(10))
Sleep 2
- MenuSelect(Menugetitemid(3))
+ Call hMenuFindSelect (".uno:InsertPageFooter?PageStyle:string=Default&On:bool=true", true, 3, true) 'Find "Insert:Footer:Default" and call the slot.
+' MenuSelect(Menugetitemid(3))
Sleep 2
'/// formatPage , tabpage footer
@@ -468,9 +470,9 @@ testcase tFormatPage_20
'/// Set the bigger fonts to selection in the footer
fFormatCharacter("TabFont")
try
- SizeWest.Select SizeWest.GetItemCount-2
+ SizeWest.Select SizeWest.GetItemCount-2
catch
- Size.Select Size.GetItemCount-2
+ Size.Select Size.GetItemCount-2
endcatch
TabFont.OK
@@ -500,20 +502,16 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tFormatPage_21
-Warnlog "#i102452# - tFormatPage_21 outcommented. Something wrong in AutoFit Height."
-goto endsub
-
Dim sTestFile as String
- Dim sDummy1 as String , sDummy2 as String
+ Dim sDummy1 as String
+ Dim sDummy2 as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatpage\testForAutoFit.sxw")
PrintLog "- AutoFit height - Check (Footer,multiline content)"
'/// AutoFit height - Check (Footer,multiline content)
- Call hNewDocument
-
'/// Open test file testForAutoFit.sxw
Call hFileOpen(sTestFile)
Call sMakeReadOnlyDocumentEditable
@@ -533,7 +531,7 @@ goto endsub
'/// Remember number in line
EditCopy
- sDummy1 = GetClipboardText
+ sDummy1 = GetClipboardText
'/// Again 1 step up
Call wTypeKeys "<Up>"
@@ -541,15 +539,15 @@ goto endsub
'/// Remember number in current line
EditCopy
- sDummy2 = GetClipboardText
-
- '/// Insert a footer
+ sDummy2 = GetClipboardText
+
+ printlog " Insert a footer"
DocumentWriter.UseMenu
MenuSelect(Menugetitemid(4))
Sleep 2
- MenuSelect(Menugetitemid(9))
+ MenuSelect(Menugetitemid(10))
Sleep 2
- MenuSelect(Menugetitemid(3))
+ Call hMenuFindSelect (".uno:InsertPageFooter?PageStyle:string=Default&On:bool=true", true, 3, true) 'Find "Insert:Footer:Default" and call the slot.
Sleep 2
'/// formatPage , tabpage footer
@@ -642,13 +640,14 @@ testcase tFormatPage_22
sDummy = GetClipboardText
'/// Insert a footer
- DocumentWriter.UseMenu
- MenuSelect(Menugetitemid(4))
- Sleep 2
- MenuSelect(Menugetitemid(10))
- Sleep 2
- MenuSelect(Menugetitemid(3))
- Sleep 2
+ DocumentWriter.UseMenu
+ MenuSelect(Menugetitemid(4))
+ Sleep 2
+ MenuSelect(Menugetitemid(10))
+ Sleep 2
+ Call hMenuFindSelect (".uno:InsertPageFooter?PageStyle:string=Default&On:bool=true", true, 3, true) 'Find "Insert:Footer:Default" and call the slot.
+' MenuSelect(Menugetitemid(3))
+ Sleep 2
'/// formatPage , tabpage footer ,UnCheck AutoFit Height
fFormatPageWriter("TabFusszeile")
@@ -662,9 +661,9 @@ testcase tFormatPage_22
'/// Set the bigger fonts to selection in the footer
fFormatCharacter("TabFont")
try
- SizeWest.Select SizeWest.GetItemCount-2
+ SizeWest.Select SizeWest.GetItemCount-2
catch
- Size.Select Size.GetItemCount-2
+ Size.Select Size.GetItemCount-2
endcatch
TabFont.OK
@@ -703,8 +702,6 @@ testcase tFormatPage_23
PrintLog "- AutoFit height - UnCheck (Footer,multiline content)"
'/// AutoFit height - UnCheck (Footer,multiline content)
- Call hNewDocument
-
'/// Open test file testForAutoFit.sxw
Call hFileOpen(sTestFile)
Call sMakeReadOnlyDocumentEditable
@@ -732,7 +729,8 @@ testcase tFormatPage_23
Sleep 2
MenuSelect(Menugetitemid(10))
Sleep 2
- MenuSelect(Menugetitemid(3))
+ Call hMenuFindSelect (".uno:InsertPageFooter?PageStyle:string=Default&On:bool=true", true, 3, true) 'Find "Insert:Footer:Default" and call the slot.
+' MenuSelect(Menugetitemid(3))
Sleep 2
'/// formatPage , tabpage footer ,Uncheck AutoFit Height
@@ -856,7 +854,7 @@ testcase tFormatPage_26
DocumentWriter.UseMenu
MenuSelect(Menugetitemid(4))
Sleep 2
- MenuSelect(Menugetitemid(9))
+ MenuSelect(Menugetitemid(10))
Sleep 2
MenuSelect(Menugetitemid(1))
Sleep 2
@@ -894,7 +892,7 @@ testcase tFormatPage_27
DocumentWriter.UseMenu
MenuSelect(Menugetitemid(4))
Sleep 2
- MenuSelect(Menugetitemid(9))
+ MenuSelect(Menugetitemid(10))
Sleep 2
MenuSelect(Menugetitemid(1))
Sleep 2
@@ -903,7 +901,7 @@ testcase tFormatPage_27
DocumentWriter.UseMenu
MenuSelect(Menugetitemid(4))
Sleep 2
- MenuSelect(Menugetitemid(9))
+ MenuSelect(Menugetitemid(10))
Sleep 2
MenuSelect(Menugetitemid(1))
Sleep 2
diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc
index d2f2882..d5f1d70 100755
--- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc
+++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc
@@ -95,9 +95,11 @@ endcase
testcase tParagraphIndent1
Dim sTest as String
- Dim iLenTest , iLenHalf as Integer
+ Dim iLenTest as Integer
+ Dim iLenHalf as Integer
Dim sPageWidth as String
- Dim sMarginLeft , sMarginRight as String
+ Dim sMarginLeft as String
+ Dim sMarginRight as String
Dim sIndentLeft as String
sTest = "lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll"
@@ -157,9 +159,11 @@ endcase
testcase tParagraphIndent2
Dim sTest as String
- Dim iLenTest , iLenHalf as Integer
+ Dim iLenTest as Integer
+ Dim iLenHalf as Integer
Dim sPageWidth as String
- Dim sMarginLeft , sMarginRight as String
+ Dim sMarginLeft as String
+ Dim sMarginRight as String
Dim sIndentRight as String
sTest = "lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll"
@@ -219,10 +223,13 @@ endcase
testcase tParagraphIndent3
Dim sTest as String
- Dim iLenTest , iLenNew as Integer
+ Dim iLenTest as Integer
+ Dim iLenNew as Integer
Dim sPageWidth as String
- Dim sMarginLeft , sMarginRight as String
- Dim sIndentRight , sIndentFirst as String
+ Dim sMarginLeft as String
+ Dim sMarginRight as String
+ Dim sIndentRight as String
+ Dim sIndentFirst as String
sTest = "lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll"
sPageWidth = "8" + gSeperator + "00" + gMeasurementUnit
@@ -281,10 +288,13 @@ endcase
testcase tParagraphIndent4
Dim sTest as String
- Dim iLenTest , iLenNew as Integer
+ Dim iLenTest as Integer
+ Dim iLenNew as Integer
Dim sPageWidth as String
- Dim sMarginLeft , sMarginRight as String
- Dim sIndentRight , sIndentFirst as String
+ Dim sMarginLeft as String
+ Dim sMarginRight as String
+ Dim sIndentRight as String
+ Dim sIndentFirst as String
sTest = "lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll"
sPageWidth = "8" + gSeperator + "00" + gMeasurementUnit
@@ -347,7 +357,8 @@ endcase
testcase tParagraphIndent5
Dim sTestFile as String
- Dim sTest1 , sTest2 as String 'the words in 2nd paragraph (sTest1 is head , sTest2 is end)
+ Dim sTest1 as String
+ Dim sTest2 as String 'the words in 2nd paragraph (sTest1 is head , sTest2 is end)
Dim sSpacing as String
sTest1 = "He2" : sTest2 = "endof2ndparagraph"
@@ -406,7 +417,8 @@ endcase
testcase tParagraphIndent6
Dim sTestFile as String
- Dim sTest1 , sTest2 as String '(sTest1 is head of paragraph 1 , sTest2 is end of paragraph2)
+ Dim sTest1 as String
+ Dim sTest2 as String '(sTest1 is head of paragraph 1 , sTest2 is end of paragraph2)
Dim sSpacing as String
sTest1 = "He1" : sTest2 = "endof2ndparagraph"
@@ -466,7 +478,8 @@ testcase tParagraphIndent7
Dim sTestFile as String
Dim sEndOfPara1 as String
- Dim sStartPara2 , sEndPara2 as String
+ Dim sStartPara2 as String
+ Dim sEndPara2 as String
Dim sParagraph2 as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\spacing.sxw")
@@ -623,7 +636,7 @@ endcase
testcase tParagraphIndent9
- Dim sTestFile as String
+ Dim sTestFile as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\eightline.sxw")
@@ -663,7 +676,7 @@ endcase
testcase tParagraphIndent10
- Dim sTestFile as String
+ Dim sTestFile as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\eightline.sxw")
@@ -733,7 +746,7 @@ endcase
testcase tParagraphIndent11
- Dim sTestFile as String
+ Dim sTestFile as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\eightline.sxw")
@@ -741,7 +754,7 @@ testcase tParagraphIndent11
'/// <b>Test Line spacing - Double lines</b>
Call hNewDocument
- Call wOptionenUndo ( "Grundschriften" )
+ Call wOptionsUndo ( "Grundschriften" )
'/// Open the test file
'/// This file includes 8 lines
'/// when the spacing is Double lines , the first 4 lines should be in 1st page
@@ -883,6 +896,9 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphIndent13
+Warnlog "#i102752# - tParagraphIndent13 outcommented due to bug."
+goto endsub
+
Dim sTestFile as String
Dim sAtLeast as String
@@ -952,6 +968,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphIndent14
+Warnlog "#i102752# - tParagraphIndent14 outcommented due to bug."
+goto endsub
Dim sTestFile as String
Dim sAtLeast as String
@@ -1086,9 +1104,13 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphIndent16
+Warnlog "#i102752# - tParagraphIndent16 outcommented due to bug."
+goto endsub
- Dim sTestFile as String
- Dim sPositionX , sPositionY as String
+
+ Dim sTestFile as String
+ Dim sPositionX as String
+ Dim sPositionY as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\registerTrue.sxw")
@@ -1148,7 +1170,8 @@ endcase
testcase tParagraphIndent17
- Dim sTestFile1 , sTestFile2 as String
+ Dim sTestFile1 as String
+ Dim sTestFile2 as String
sTestFile1 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldCheck.doc")
sTestFile2 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldNotCheck.doc")
@@ -1207,8 +1230,10 @@ endcase
testcase tParagraphIndent18
Dim sPageWidth as String
- Dim sMarginLeft , sMarginRight as String
- Dim sBeforeText , sAfterText as String
+ Dim sMarginLeft as String
+ Dim sMarginRight as String
+ Dim sBeforeText as String
+ Dim sAfterText as String
sPageWidth = "8" + gSeperator + "00" + gMeasurementUnit
sMarginLeft = "2" + gSeperator + "00" + gMeasurementUnit
diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc
index f3c6f56..ef67979 100755
--- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc
+++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc
@@ -63,6 +63,9 @@
'\***********************************************************************
testcase tParagraphAlignment1
+Warnlog "#i102752# - tParagraphAlignment1 outcommented due to bug."
+goto endsub
+
Dim sTestFile as String
Dim sPositionX as String
@@ -111,6 +114,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphAlignment2
+Warnlog "#i102752# - tParagraphAlignment2 outcommented due to bug."
+goto endsub
Dim sTestFile as String
Dim sPositionX as String
@@ -150,6 +155,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphAlignment3
+Warnlog "#i102752# - tParagraphAlignment3 outcommented due to bug."
+goto endsub
Dim sTestFile as String
@@ -187,6 +194,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphAlignment4
+Warnlog "#i102752# - tParagraphAlignment4 outcommented due to bug."
+goto endsub
Dim sTestFile as String
Dim sPositionX1 as String
@@ -258,6 +267,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphAlignment5
+Warnlog "#i102752# - tParagraphAlignment5 outcommented due to bug."
+goto endsub
Dim sTestFile as String
@@ -297,6 +308,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphAlignment6
+Warnlog "#i102752# - tParagraphAlignment6 outcommented due to bug."
+goto endsub
Dim sTestFile as String
Dim sPositionX1 as String
@@ -367,6 +380,9 @@ endcase
'--------------------------------------------------------------------------
testcase tParagraphAlignment7
+Warnlog "#i102752# - tParagraphAlignment7 outcommented due to bug."
+goto endsub
+
Dim sTestFile as String
Dim sPositionX as String
@@ -426,6 +442,8 @@ endcase
'--------------------------------------------------------------------------
testcase tParagraphAlignment8
+Warnlog "#i102752# - tParagraphAlignment8 outcommented due to bug."
+goto endsub
Dim bAsianLanguage as Boolean
Dim sTestFile as String
@@ -497,6 +515,8 @@ endcase
'--------------------------------------------------------------------------
testcase tParagraphAlignment9
+Warnlog "#i102752# - tParagraphAlignment9 outcommented due to bug."
+goto endsub
Dim bAsianLanguage as Boolean
Dim sTestFile as String
diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc
index d82935c..9dbf386 100755
--- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc
+++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc
@@ -63,10 +63,12 @@
'\***********************************************************************
testcase tParagraphTabs1
+Warnlog "#i102752# - tParagraphTabs1 outcommented due to bug."
+goto endsub
- Dim sTestFile as String
- Dim sTabs as String
- Dim sPosition as String
+ Dim sTestFile as String
+ Dim sTabs as String
+ Dim sPosition as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\TabsTest.sxw")
sTabs = "3" + gSeperator + "00" + gMeasurementUnit
@@ -109,10 +111,12 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphTabs2
+Warnlog "#i102752# - tParagraphTabs2 outcommented due to bug."
+goto endsub
- Dim sTestFile as String
- Dim sTabs as String
- Dim sPosition as String
+ Dim sTestFile as String
+ Dim sTabs as String
+ Dim sPosition as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\TabsTest.sxw")
sTabs = "3" + gSeperator + "00" + gMeasurementUnit
@@ -155,6 +159,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphTabs3
+Warnlog "#i102752# - tParagraphTabs3 outcommented due to bug."
+goto endsub
Dim sTestFile as String
Dim sTabs as String
@@ -201,6 +207,9 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphTabs4
+Warnlog "#i102752# - tParagraphTabs4 outcommented due to bug."
+goto endsub
+
Dim sTestFile as String
Dim sTabs as String
@@ -341,6 +350,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphDropCaps1
+Warnlog "#i102752# - tParagraphDropCaps1 outcommented due to bug."
+goto endsub
Dim sTestFile as String
Dim sPositionX as String
@@ -393,6 +404,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphDropCaps2
+Warnlog "#i102752# - tParagraphDropCaps2 outcommented due to bug."
+goto endsub
Dim sTestFile as String
Dim sPositionX as String
@@ -447,6 +460,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphDropCaps3
+Warnlog "#i102752# - tParagraphDropCaps3 outcommented due to bug."
+goto endsub
Dim sTestFile as String
Dim sPositionX as String
@@ -501,6 +516,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphDropCaps4
+Warnlog "#i102752# - tParagraphDropCaps4 outcommented due to bug."
+goto endsub
Dim sTestFile as String
Dim sPositionX as String
@@ -550,6 +567,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphDropCaps5
+Warnlog "#i102752# - tParagraphDropCaps5 outcommented due to bug."
+goto endsub
Dim sTestFile as String
Dim sSpace as String
@@ -638,6 +657,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tParagraphDropCaps7
+Warnlog "#i102752# - tParagraphDropCaps7 outcommented due to bug."
+goto endsub
Dim sTestFile as String
Dim sTestText as String
diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc
index 7c3828c..fef0135 100755
--- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc
+++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc
@@ -63,7 +63,7 @@ testcase tInsertGraphic_1
'/// Test default directory of inserting graphic -1
select case iSprache
case 01: iJump = 5
- case 31: iJump = 1
+ case 31: iJump = 1
case 33: iJump = 14
case 34: iJump = 12
case 36: iJump = 10
@@ -131,7 +131,7 @@ testcase tInsertGraphic_1
Sleep 1
if iJump-1 > 0 then Typ.TypeKeys "<DOWN>", iJump-1
Sleep 1
- Standard.Click
+ Standard.Click
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
@@ -287,7 +287,7 @@ testcase tInsertGraphic_X
Call hNewDocument
try
- Call wTypeKeys sShortcut
+ Call wTypeKeys sShortcut
Kontext "GrafikEinfuegenDlg"
if GrafikEinfuegenDlg.Exists then
@@ -455,10 +455,16 @@ endcase
testcase tInsertGraphic_8
- Dim iFileType , iFileNumber as Integer
+ Dim iFileType as Integer
+ Dim iFileNumber as Integer
- iFileType = 1 'filter (Format <All>)
- iFileNumber = 5 '4 graphic files and 1 directory
+ iFileType = 1 'filter (Format <All>)
+
+ if gPlatGroup = "unx" then
+ iFileNumber = 4 '4 graphic files. (directory hidden on Unix)
+ else
+ iFileNumber = 5 '4 graphic files and 1 directory.
+ end if
PrintLog "- Test preselect Filter (Format <All>)"
'/// Test preselect Filter (Format <All>)
@@ -489,10 +495,16 @@ endcase
testcase tInsertGraphic_9
- Dim iFileType , iFileNumber as Integer
+ Dim iFileType as Integer
+ Dim iFileNumber as Integer
- iFileType = 2 'another filter except for (Format <All>) -- bmp
- iFileNumber = 2 'the first is a directory - CVS
+ iFileType = 2 'another filter except for (Format <All>) -- bmp
+
+ if gPlatGroup = "unx" then
+ iFileNumber = 1
+ else
+ iFileNumber = 2 'the first is the .svn-directory
+ end if
PrintLog "- Test preselect Filter excepte for (Format <All>)"
'/// Test preselect Filter excepte for (Format <All>)
@@ -692,10 +704,14 @@ endcase
testcase tInsertGraphic_11
- Dim sGraphicName as String
- Dim sWidth , sHeight , sLeft , sUp as String
- Dim iFromLeft , iFromUp as Integer
- Dim sURL as String
+ Dim sGraphicName as String
+ Dim sWidth as String
+ Dim sHeight as String
+ Dim sLeft as String
+ Dim sUp as String
+ Dim iFromLeft as Integer
+ Dim iFromUp as Integer
+ Dim sURL as String
sGraphicName = "TEST1"
sWidth = "5"+ gSeperator + "00" + gMeasurementUnit
@@ -797,14 +813,21 @@ endcase
testcase tInsertGraphic_12
- Dim sGraphicName as String
- Dim sOriginalGraphicName as String
- Dim sWidth , sHeight , sLeft , sUp as String
- Dim sOriginalWidth , sOriginalHeight , sOriginalLeft , sOriginalUp as String
- Dim iFromLeft , iFromUp as Integer
- Dim iOriginalFromLeft , iOriginalFromUp as Integer
-
- Dim sURL as String
+ Dim sGraphicName as String
+ Dim sOriginalGraphicName as String
+ Dim sWidth as String
+ Dim sHeight as String
+ Dim sLeft as String
+ Dim sUp as String
+ Dim sOriginalWidth as String
+ Dim sOriginalHeight as String
+ Dim sOriginalLeft as String
+ Dim sOriginalUp as String
+ Dim iFromLeft as Integer
+ Dim iFromUp as Integer
+ Dim iOriginalFromLeft as Integer
+ Dim iOriginalFromUp as Integer
+ Dim sURL as String
Dim i as integer
sGraphicName = "TEST1"
@@ -876,12 +899,12 @@ testcase tInsertGraphic_12
'/// 1. Edit/Paste special the graphic from
'/// + Graphic [StarOffice Writer]
EditPasteSpecialWriter
- Sleep 1
- Kontext "InhaltEinfuegen"
+ Sleep 1
+ Kontext "InhaltEinfuegen"
if Auswahl.GetItemCount < 4 then
QAErrorlog "#i47320#Only " & Auswahl.GetItemCount & " graphic formats available"
InhaltEinfuegen.Cancel
- else
+ else
Auswahl.Select 1
PrintLog "- " & Auswahl.GetSelText
InhaltEinfuegen.OK
@@ -919,7 +942,7 @@ testcase tInsertGraphic_12
if URL.GetText <> sURL then Warnlog "The graphic's URL is not correct ! "
wait 500
TabHyperlinkRahmen.Ok
-
+
'delete the graphic
Call wTypeKeys "<Delete>"
Sleep 1
diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc
index 0b18102..f44471a 100755
--- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc
+++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc
@@ -51,9 +51,11 @@
'\***********************************************************************
testcase tInsertGraphic_21
+Warnlog "#i102752# - tInsertGraphic_21 outcommented due to bug."
+goto endsub
- Dim iLeft , iRight , iCenterHorizontal as Integer
- Dim iTop , iBottom , iCenterVertical as Integer
+ Dim iLeft as Integer , iRight as Integer , iCenterHorizontal as Integer
+ Dim iTop as Integer , iBottom as Integer , iCenterVertical as Integer
iLeft = 1 : iRight = 2 : iCenterHorizontal = 3
iTop = 1 : iBottom = 2 : iCenterVertical = 3
@@ -150,9 +152,11 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tInsertGraphic_22
+Warnlog "#i102752# - tInsertGraphic_22 outcommented due to bug."
+goto endsub
- Dim iLeft , iRight , iCenterHorizontal as Integer
- Dim iTop , iBottom , iCenterVertical as Integer
+ Dim iLeft as Integer , iRight as Integer , iCenterHorizontal as Integer
+ Dim iTop as Integer , iBottom as Integer , iCenterVertical as Integer
iLeft = 1 : iRight = 2 : iCenterHorizontal = 3
iTop = 1 : iBottom = 2 : iCenterVertical = 3
@@ -249,9 +253,11 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tInsertGraphic_23
+Warnlog "#i102752# - tInsertGraphic_23 outcommented due to bug."
+goto endsub
- Dim iLeft , iRight , iCenterHorizontal as Integer
- Dim iTop , iBottom , iCenterVertical as Integer
+ Dim iLeft as Integer , iRight as Integer , iCenterHorizontal as Integer
+ Dim iTop as Integer , iBottom as Integer , iCenterVertical as Integer
iLeft = 1 : iRight = 2 : iCenterHorizontal = 3
iTop = 1 : iBottom = 2 : iCenterVertical = 3
@@ -348,8 +354,10 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tInsertGraphic_24
+Warnlog "#i102752# - tInsertGraphic_24 outcommented due to bug."
+goto endsub
- Dim iTop , iBottom , iCenterVertical as Integer
+ Dim iTop as Integer , iBottom as Integer , iCenterVertical as Integer
iTop = 1 : iBottom = 2 : iCenterVertical = 3
@@ -408,9 +416,11 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tInsertGraphic_25
+Warnlog "#i102752# - tInsertGraphic_25 outcommented due to bug."
+goto endsub
- Dim iLeft , iRight , iCenterHorizontal as Integer
- Dim iTop , iBottom , iCenterVertical as Integer
+ Dim iLeft as Integer , iRight as Integer , iCenterHorizontal as Integer
+ Dim iTop as Integer , iBottom as Integer , iCenterVertical as Integer
iLeft = 1 : iRight = 2 : iCenterHorizontal = 3
iTop = 1 : iBottom = 2 : iCenterVertical = 3
@@ -528,9 +538,11 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tInsertGraphic_26
+Warnlog "#i102752# - tInsertGraphic_26 outcommented due to bug."
+goto endsub
- Dim iLeft , iRight , iCenterHorizontal as Integer
- Dim iTop , iBottom , iCenterVertical as Integer
+ Dim iLeft as Integer , iRight as Integer , iCenterHorizontal as Integer
+ Dim iTop as Integer , iBottom as Integer , iCenterVertical as Integer
iLeft = 1 : iRight = 2 : iCenterHorizontal = 3
iTop = 1 : iBottom = 2 : iCenterVertical = 3
@@ -648,9 +660,11 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tInsertGraphic_27
+Warnlog "#i102752# - tInsertGraphic_27 outcommented due to bug."
+goto endsub
- Dim iLeft , iRight , iCenterHorizontal as Integer
- Dim iTop , iBottom , iCenterVertical as Integer
+ Dim iLeft as Integer , iRight as Integer , iCenterHorizontal as Integer
+ Dim iTop as Integer , iBottom as Integer , iCenterVertical as Integer
iLeft = 1 : iRight = 2 : iCenterHorizontal = 3
iTop = 1 : iBottom = 2 : iCenterVertical = 3
@@ -768,8 +782,10 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tInsertGraphic_28
+Warnlog "#i102752# - tInsertGraphic_28 outcommented due to bug."
+goto endsub
- Dim iTop , iBottom , iCenterVertical as Integer
+ Dim iTop as Integer , iBottom as Integer , iCenterVertical as Integer
iTop = 1 : iBottom = 2 : iCenterVertical = 3
diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc
index 3ed33ad..bfe05ce 100755
--- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc
+++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc
@@ -53,6 +53,8 @@
'\***********************************************************************
testcase tInsertGraphic_31
+Warnlog "#i102752# - tInsertGraphic_31 outcommented due to bug."
+goto endsub
Dim iLeft as Integer
Dim iRight as Integer
@@ -179,6 +181,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tInsertGraphic_32
+Warnlog "#i102752# - tInsertGraphic_32 outcommented due to bug."
+goto endsub
Dim iLeft as Integer
Dim iRight as Integer
@@ -295,6 +299,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tInsertGraphic_33
+Warnlog "#i102752# - tInsertGraphic_33 outcommented due to bug."
+goto endsub
Dim iLeft as Integer
Dim iRight as Integer
@@ -421,6 +427,8 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tInsertGraphic_34
+Warnlog "#i102752# - tInsertGraphic_34 outcommented due to bug."
+goto endsub
Dim iTop as Integer
Dim iBottom as Integer
diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc
index b92cabb..f8a9a7f 100755
--- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc
+++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc
@@ -53,7 +53,6 @@ testcase tInsertGraphic_41
QaErrorLog "#i102477# - tInsertGraphic_41 crashes testtool. Therefore outcommented."
goto endsub
-
Dim sLeft as String
Dim sRight as String
Dim sUp as String
diff --git a/testautomation/writer/optional/includes/navigator/w_navigator.inc b/testautomation/writer/optional/includes/navigator/w_navigator.inc
index 35703cf..f14a58d 100755
--- a/testautomation/writer/optional/includes/navigator/w_navigator.inc
+++ b/testautomation/writer/optional/includes/navigator/w_navigator.inc
@@ -217,7 +217,7 @@ endcase
' **********************************************************************
testcase tViewNavigator3
- QaErrorLog "#i94614# - tViewNavigator3 outcommented"
+ QaErrorLog "#i94614 + i102752# - tViewNavigator3 outcommented"
goto endsub
Dim NavigationTearOff as boolean
diff --git a/testautomation/writer/optional/includes/option/wh_o_1.inc b/testautomation/writer/optional/includes/option/wh_o_1.inc
index f95607e..09179f5 100755
--- a/testautomation/writer/optional/includes/option/wh_o_1.inc
+++ b/testautomation/writer/optional/includes/option/wh_o_1.inc
@@ -58,21 +58,21 @@ testcase tToolsOptionsHTMLContent
Call hNewDocument
printlog "'///- Tools/Options/HTML: Content ///"
-
+
printlog ("'/// - save states ///")
ToolsOptions
Call hToolsOptions ("HTML","View")
-
+
irgendwas(1) = GrafikenUndObjekte.IsChecked
irgendwas(2) = Tabellen.IsChecked
irgendwas(3) = Zeichnungen.IsChecked
irgendwas(4) = Feldnamen.IsChecked
irgendwas(5) = Notizen.IsChecked
-
+
'irgendwas(9) = Felder.IsChecked
-
+
printlog ("'/// - all states inverting ///")
-
+
if irgendwas(1) Then GrafikenUndObjekte.UnCheck Else GrafikenUndObjekte.Check
if irgendwas(2) Then Tabellen.UnCheck Else Tabellen.Check
if irgendwas(3) Then Zeichnungen.UnCheck Else Zeichnungen.Check
@@ -97,7 +97,7 @@ testcase tToolsOptionsHTMLContent
if ( irgendwas(3) = Zeichnungen.IsChecked ) Then WarnLog "Zeichnungen state changed"
if ( irgendwas(4) = Feldnamen.IsChecked ) Then WarnLog "Feldnamen state changed"
if ( irgendwas(5) = Notizen.IsChecked ) Then WarnLog "Notizen state changed"
-
+
printlog ("'/// - all UnCheck -> o ///")
GrafikenUndObjekte.UnCheck
@@ -120,8 +120,8 @@ testcase tToolsOptionsHTMLContent
if Zeichnungen.IsChecked Then WarnLog "Zeichnungen x"
if Feldnamen.IsChecked Then WarnLog "Feldnamen x"
if Notizen.IsChecked Then WarnLog "Notizen x"
-
- Printlog ("'/// - all Check -> x ///")
+
+ Printlog ("'/// - all Check -> x ///")
GrafikenUndObjekte.Check
Tabellen.Check
Zeichnungen.Check
@@ -414,7 +414,7 @@ testcase tToolsOptionsHTMLGrid
Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options1.sxw" )
Call sMakeReadOnlyDocumentEditable
- printlog "'///- Tools/Options/HTML: Grid ///"
+ printlog "'///- Tools/Options/HTML: Grid ///"
printlog ("'/// - save states ///")
ToolsOptions
@@ -510,7 +510,7 @@ testcase tToolsOptionsHTMLGrid
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- printlog ("'/// - check if all UnChecked ///")
+ printlog ("'/// - check if all UnChecked ///")
ToolsOptions
Call hToolsOptions ( "HTML","Grid" )
diff --git a/testautomation/writer/optional/includes/option/wh_o_2.inc b/testautomation/writer/optional/includes/option/wh_o_2.inc
index 1ee7f65..dba3a06 100755
--- a/testautomation/writer/optional/includes/option/wh_o_2.inc
+++ b/testautomation/writer/optional/includes/option/wh_o_2.inc
@@ -299,9 +299,9 @@ testcase tToolsOptionsHTMLPrint
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'------------------------------------------------------------------------------
@@ -496,9 +496,9 @@ testcase tToolsOptionsHTMLTable
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'------------------------------------------------------------------------------
diff --git a/testautomation/writer/optional/includes/option/wh_o_3.inc b/testautomation/writer/optional/includes/option/wh_o_3.inc
index 099ff82..b64db4b 100755
--- a/testautomation/writer/optional/includes/option/wh_o_3.inc
+++ b/testautomation/writer/optional/includes/option/wh_o_3.inc
@@ -272,9 +272,9 @@ testcase tToolsOptionsHTMLInsert
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'------------------------------------------------------------------------------------------------------------------------
@@ -388,8 +388,8 @@ testcase tToolsOptionsHTMLCursor
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
diff --git a/testautomation/writer/optional/includes/option/wr_o_1.inc b/testautomation/writer/optional/includes/option/wr_o_1.inc
index d9b7c73..ef19d3b 100755
--- a/testautomation/writer/optional/includes/option/wr_o_1.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_1.inc
@@ -76,7 +76,7 @@ testcase tToolsOptionsWriterView1
option_value(6) = HorizontalesLineal.IsChecked
option_value(7) = VertikalesLineal.IsChecked
option_value(8) = WeichesScrollen.IsChecked
-
+
measurement_unit(2) = HorizontalesLinealMasseinheit.GetSelIndex
measurement_unit(3) = VertikalesLinealMasseinheit.GetSelIndex
@@ -153,7 +153,8 @@ testcase tToolsOptionsWriterView1
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
'/// restore default values
- Call wOptionenUndo( "View" )
+ Call wOptionsUndo( "All" )
+
'/// close document
Do Until GetDocumentCount = 0
Call hCloseDocument
@@ -190,8 +191,8 @@ testcase tToolsOptionsWriterView2
'/// - uncheck all checkboxes
Hilfslinien.UnCheck
FarbigeHandles.UnCheck
- GrosseHandles.UnCheck
-
+ GrosseHandles.UnCheck
+
HorizontaleBildlaufleiste.UnCheck
VertikaleBildlaufleiste.UnCheck
Lineal.Check
@@ -245,9 +246,10 @@ testcase tToolsOptionsWriterView2
if ( VertikalesLinealMasseinheit.GetSelIndex <> 1 ) then WarnLog "VertikalesLinealMasseinheit is not item 1"
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
- '/// restore default values
- Call wOptionenUndo( "View" )
+ ExtrasOptionenDlg.OK
+ '/// restore default values
+ Call wOptionsUndo( "All" )
+
'/// close writer document
Do Until GetDocumentCount = 0
Call hCloseDocument
@@ -260,6 +262,7 @@ testcase tToolsOptionsWriterView3
dim option_value(11) as boolean
dim measurement_unit(3) as integer
dim iTemp(3) as integer
+
'/// new writer document
Call hNewDocument
@@ -299,8 +302,8 @@ testcase tToolsOptionsWriterView3
'/// close options dialog
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
-
+ ExtrasOptionenDlg.OK
+
ViewTextBoundaries
ViewRuler
@@ -308,7 +311,7 @@ testcase tToolsOptionsWriterView3
Call wOfficeRestart
'///- Tools/Options/Writer: View
ToolsOptions
- Call hToolsOptions ( "WRITER" , "VIEW" )
+ Call hToolsOptions ( "WRITER" , "VIEW" )
'/// - check if all checked
if Hilfslinien.IsChecked = false then WarnLog "Hilfslinien o"
@@ -325,9 +328,10 @@ testcase tToolsOptionsWriterView3
if ( VertikalesLinealMasseinheit.GetSelIndex <> iTemp(3) ) then WarnLog "VertikalesLinealMasseinheit is not item " + iTemp(3) + " it's: " + VertikalesLinealMasseinheit.GetSelIndex
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
- '/// restore default values
- Call wOptionenUndo( "View" )
+ ExtrasOptionenDlg.OK
+ '/// restore default values
+ Call wOptionsUndo( "All" )
+
'/// close document
Do Until GetDocumentCount = 0
Call hCloseDocument
@@ -348,8 +352,8 @@ testcase tToolsOptionsWriterView4
ToolsOptions
Call hToolsOptions ( "WRITER" , "VIEW" )
- '/// remember all values
- printlog "- remember all values"
+ '/// remember all values
+ printlog "- remember all values"
option_value(1) = Hilfslinien.IsChecked
option_value(2) = FarbigeHandles.IsChecked
option_value(3) = GrosseHandles.IsChecked
@@ -366,7 +370,7 @@ testcase tToolsOptionsWriterView4
'/// close options dialog
printlog "- close options dialog"
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
+ ExtrasOptionenDlg.OK
'/// Insert a table
printlog "- insert a table"
@@ -410,10 +414,11 @@ testcase tToolsOptionsWriterView4
GrosseHandles.UnCheck
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
- '/// restore default values
+ ExtrasOptionenDlg.OK
+ '/// restore default values
printlog "- set defaultsvalues in options"
- Call wOptionenUndo( "View" )
+ Call wOptionsUndo( "All" )
+
'/// close document
Do Until GetDocumentCount = 0
Call hCloseDocument
@@ -454,7 +459,7 @@ testcase tToolsOptionsWriterView5
printlog ("'/// - SO quit - start ///")
- wOfficeRestart
+ CALL wOfficeRestart
printlog ("'/// - checking states ///")
ToolsOptions
@@ -467,10 +472,11 @@ testcase tToolsOptionsWriterView5
if ( option_value(5) = Notizen.IsChecked ) then WarnLog "Notizen state changed"
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
- '/// restore default values
+ ExtrasOptionenDlg.OK
+ '/// restore default values
printlog "- set defaultsvalues in options"
- Call wOptionenUndo( "View" )
+ Call wOptionsUndo( "All" )
+
'/// close document
Do Until GetDocumentCount = 0
Call hCloseDocument
@@ -511,7 +517,7 @@ testcase tToolsOptionsWriterView6
printlog ("'/// - SO quit - start ///")
- wOfficeRestart
+ CALL wOfficeRestart
printlog ("'/// - checking states ///")
ToolsOptions
@@ -521,13 +527,21 @@ testcase tToolsOptionsWriterView6
if Tabellen.IsChecked then WarnLog "Tabellen x"
if Zeichnungen.IsChecked then WarnLog "Zeichnungen x"
if Feldname.IsChecked then WarnLog "Feldname x"
- if Notizen.IsChecked then WarnLog "Notizen x"
+ if Notizen.IsChecked then WarnLog "Notizen x"
+
+ printlog ("'/// - restore states ///")
+ if ( option_value(1) = TRUE ) Then GrafikenUndObjekte.Check Else GrafikenUndObjekte.UnCheck
+ if ( option_value(2) = TRUE ) Then Tabellen.Check Else Tabellen.UnCheck
+ if ( option_value(3) = TRUE ) Then Zeichnungen.Check Else Zeichnungen.UnCheck
+ if ( option_value(4) = TRUE ) Then Feldname.Check Else Feldname.UnCheck
+ if ( option_value(5) = TRUE ) Then Notizen.Check Else Notizen.UnCheck
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
- '/// restore default values
+ ExtrasOptionenDlg.OK
+ '/// restore default values
printlog "- set defaultsvalues in options"
- Call wOptionenUndo( "View" )
+ Call wOptionsUndo( "All" )
+
'/// close document
Do Until GetDocumentCount = 0
Call hCloseDocument
@@ -556,35 +570,37 @@ testcase tToolsOptionsWriterView7
option_value(5) = Notizen.IsChecked
printlog ("'/// - all Check -> x ///")
-
+
GrafikenUndObjekte.Check
Tabellen.Check
Zeichnungen.Check
Feldname.Check
Notizen.Check
-
+
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
printlog ("'/// - SO quit - start ///")
- wOfficeRestart
+ CALL wOfficeRestart
printlog ("'/// - check if all Checked ///")
ToolsOptions
hToolsOptions ( "WRITER" , "VIEW" )
-
+
if true <> GrafikenUndObjekte.IsChecked then WarnLog "GrafikenUndObjekte o"
if true <> Tabellen.IsChecked then WarnLog "Tabellen."
if true <> Zeichnungen.IsChecked then WarnLog "Zeichnungen o"
if true <> Feldname.IsChecked then WarnLog "Feldname o"
if true <> Notizen.IsChecked then WarnLog "Notizen o"
-
+
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
- '/// restore default values
- printlog "- set defaultsvalues in options"
- Call wOptionenUndo( "View" )
+ ExtrasOptionenDlg.OK
+
+ '/// restore default values
+' printlog "- set defaultsvalues in options"
+' Call wOptionsUndo( "All" )
+
'/// close document
Do Until GetDocumentCount = 0
Call hCloseDocument
@@ -668,7 +684,8 @@ testcase tToolsOptionsWriterGrid1
ExtrasOptionenDlg.OK
'/// restore default values
printlog "- set defaultsvalues in options"
- Call wOptionenUndo( "Grid" )
+ Call wOptionsUndo( "Grid" )
+
'/// close document
Do Until GetDocumentCount = 0
Call hCloseDocument
@@ -682,9 +699,9 @@ testcase tToolsOptionsWriterGrid2
dim sMetricField(4) as string ' MetricField
dim sTempMetricField(4) as string
- '/// new writer document
+ '/// new writer document
Call hNewDocument
- '/// Tools/Options/Writer: Grid
+ '/// Tools/Options/Writer: Grid
ToolsOptions
Call hToolsOptions ( "WRITER" , "GRID" )
@@ -698,7 +715,6 @@ testcase tToolsOptionsWriterGrid2
sMetricField(3) = RasterUnterteilungXAchse.GetText
sMetricField(4) = RasterUnterteilungYAchse.GetText
-
printlog "- uncheck all checkboxes and set metric fields to min"
'/// - uncheck all checkboxes and set metric fields to min
FangrasterBenutzen.UnCheck
@@ -712,7 +728,7 @@ testcase tToolsOptionsWriterGrid2
sTempMetricField(1) = RasterAufloesungXAchse.GetText
sTempMetricField(2) = RasterAufloesungYAchse.GetText
sTempMetricField(3) = RasterUnterteilungXAchse.GetText
- sTempMetricField(4) = RasterUnterteilungYAchse.GetText
+ sTempMetricField(4) = RasterUnterteilungYAchse.GetText
RasterAufloesungXAchse.More
RasterAufloesungYAchse.More
@@ -725,7 +741,7 @@ testcase tToolsOptionsWriterGrid2
sTempMetricField(1) = RasterAufloesungXAchse.GetText
sTempMetricField(2) = RasterAufloesungYAchse.GetText
sTempMetricField(3) = RasterUnterteilungXAchse.GetText
- sTempMetricField(4) = RasterUnterteilungYAchse.GetText
+ sTempMetricField(4) = RasterUnterteilungYAchse.GetText
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
@@ -748,10 +764,11 @@ testcase tToolsOptionsWriterGrid2
if ( RasterUnterteilungYAchse.GetText <> sTempMetricField(4) ) then WarnLog "RasterUnterteilungYAchse is not min."
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
- '/// restore default values
+ ExtrasOptionenDlg.OK
+ '/// restore default values
printlog "- set defaultsvalues in options"
- Call wOptionenUndo( "Grid" )
+ Call wOptionsUndo( "Grid" )
+
'/// close document
Do Until GetDocumentCount = 0
Call hCloseDocument
@@ -770,7 +787,7 @@ testcase tToolsOptionsWriterGrid3
printlog "'///- Tools/Options/Writer: Grid ///"
'/// Tools/Options/Writer: Grid
printlog ("'/// - save states ///")
- '/// remember values
+ '/// remember values
ToolsOptions
Call hToolsOptions ( "WRITER" , "GRID" )
@@ -797,7 +814,7 @@ testcase tToolsOptionsWriterGrid3
RasterUnterteilungXAchse.ToMax
wait 500
sTempMetricField(3) = RasterUnterteilungXAchse.GetText
- if RasterUnterteilungYAchse.GetText <> sTempMetricField(3) then Warnlog "Y-axis sub. differs from X-axis"
+ if RasterUnterteilungYAchse.GetText <> sTempMetricField(3) then Warnlog "Y-axis sub. differs from X-axis"
sTempMetricField(2) = RasterAufloesungYAchse.GetText
sTempMetricField(4) = RasterUnterteilungYAchse.GetText
@@ -820,10 +837,11 @@ testcase tToolsOptionsWriterGrid3
if ( RasterUnterteilungYAchse.GetText <> sTempMetricField(4) ) then WarnLog "RasterUnterteilungYAchse is not max."
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
- '/// restore default values
+ ExtrasOptionenDlg.OK
+ '/// restore default values
printlog "- set defaultsvalues in options"
- Call wOptionenUndo( "Grid" )
+ Call wOptionsUndo( "Grid" )
+
'/// close document
Do Until GetDocumentCount = 0
Call hCloseDocument
@@ -920,14 +938,16 @@ testcase tToolsOptionsWriterGrid4
TabType.Cancel
Call hCloseDocument
- Sleep 2
Call hNewDocument
'/// restore default values
printlog "- set defaultsvalues in options"
- Call wOptionenUndo( "Grid" )
+ Call wOptionsUndo( "Grid" )
+
'/// close document
Do Until GetDocumentCount = 0
Call hCloseDocument
Loop
endcase
+
+'------------------------------------------------------------------------------
diff --git a/testautomation/writer/optional/includes/option/wr_o_2.inc b/testautomation/writer/optional/includes/option/wr_o_2.inc
index 7284c7f..b62a61a 100755
--- a/testautomation/writer/optional/includes/option/wr_o_2.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_2.inc
@@ -1,4 +1,4 @@
-'encoding UTF-8 Do not remove or change this line!
+ 'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
'*
@@ -39,6 +39,7 @@
sub wr_o_2
Dim temp as boolean
+
Call tToolsOptionsWriterDefaultfont("BASICFONTS")
Call tToolsOptionsWriterPrint
' is located in wr_o_a.inc
@@ -55,8 +56,6 @@ end sub
'------------------------------------------------------------------------------
testcase tToolsOptionsWriterDefaultfont (WestOrEast as string)
-QaErrorLog "#i94557# - Testcase outcommented due to bug"
-goto endsub
Dim bCheckboxes(1) as boolean ' Checkbox states
Dim iListBox(5) as integer ' ListBox
@@ -66,10 +65,11 @@ goto endsub
Dim iTempListBox(5) as integer
Dim sTempListBox(5) as String
Dim iTempListBoxSize(5) as integer
- Dim sTempListBoxSize(5) as String
+ Dim sTempListBoxSize(5) as String
Dim sInitFont(5) as String
Dim sInitFontSize(5) as String
- Dim i,x as integer
+ Dim i as integer
+ Dim x as integer
Dim sFileName as string
Dim sTempS as String
@@ -91,11 +91,11 @@ goto endsub
sInitFontSize(2) = UeberschriftGroesse.GetSelText
sInitFontSize(3) = ListeGroesse.GetSelText
sInitFontSize(4) = BeschriftungGroesse.GetSelText
- sInitFontSize(5) = VerzeichnisGroesse.GetSelText
+ sInitFontSize(5) = VerzeichnisGroesse.GetSelText
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- sleep 2
-
+ WaitSlot (2)
+
if (Ucase(WestOrEast) = "BASICFONTSASIAN") then
printlog "------------ ASIAN FONTS -------------"
warnlog "TBO: don't know how it get's handeld, so don't pay ANY attention to warnlogs :-)"
@@ -138,7 +138,7 @@ goto endsub
sListBoxSize(3) = ListeGroesse.GetSelText
sListBoxSize(4) = BeschriftungGroesse.GetSelText
sListBoxSize(5) = VerzeichnisGroesse.GetSelText
-
+
printlog ("'/// - all states inverting ///")
AktuellesDokument.UnCheck
@@ -176,11 +176,11 @@ goto endsub
sTempListBoxSize(2) = UeberschriftGroesse.GetSelText
sTempListBoxSize(3) = ListeGroesse.GetSelText
sTempListBoxSize(4) = BeschriftungGroesse.GetSelText
- sTempListBoxSize(5) = VerzeichnisGroesse.GetSelText
-
+ sTempListBoxSize(5) = VerzeichnisGroesse.GetSelText
+
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Sleep 5
+ WaitSlot (2)
Printlog "'/// - check whether fonts get changed in doc. ///"
Kontext "DocumentWriter"
@@ -216,10 +216,11 @@ goto endsub
Call wTypeKeys "<Down>"
sTempS = wGetCharacterFontSize()
if sTempS <> sTempListBoxSize(5) then Warnlog "Index fontsize: state changed is: "+sTempS+" ;should: "+sTempListBoxSize(5)+" : "+iTempListBoxSize(5)
-
+
printlog (" - SO quit - start" )
Call wOfficeRestart
+ WaitSlot (2)
printlog ("'/// - checking states ///")
ToolsOptions
@@ -237,11 +238,11 @@ goto endsub
if ( ListeGroesse.GetSelIndex <> iTempListBoxSize(3) ) then WarnLog "List fontsize state changed"
if ( BeschriftungGroesse.GetSelIndex <> iTempListBoxSize(4) ) then WarnLog "Caption fontsize state changed"
if ( VerzeichnisGroesse.GetSelIndex <> iTempListBoxSize(5) ) then WarnLog "Index fontsize state changed"
-
+
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- sleep 2
-
+ WaitSlot (2)
+
Printlog "'/// - verify global settings don't affect saved Document ///"
'///+ use input\\writer\\optional\\options\\options2.sxw ///
Call hFileOpen ( sFileName )
@@ -265,7 +266,7 @@ goto endsub
sTempS = wGetCharacterFont()
if sTempS <> sListBox(5) then Warnlog "Index font: Writer changed Font !?! is: "+sTempS+" ;should: "+sListBox(5)+" : "+iListBox(5)
- Call wTypeKeys "<Mod1 Home><Right>"
+ Call wTypeKeys "<Mod1 Home><Right>"
sTempS = wGetCharacterFontSize()
if sTempS <> sListBoxSize(1) then Warnlog "Default font: Writer changed Font !?! is: "+sTempS+" ;should: "+sListBoxSize(1)+" : "+iListBoxSize(1)
Call wTypeKeys "<Down>"
@@ -280,8 +281,9 @@ goto endsub
Call wTypeKeys "<Down>"
sTempS = wGetCharacterFontSize()
if sTempS <> sListBoxSize(5) then Warnlog "Index font: Writer changed Font !?! is: "+sTempS+" ;should: "+sListBoxSize(5)+" : "+iListBoxSize(5)
-
+
Call hCloseDocument
+ Call hNewDocument
printlog ("'/// - all UnCheck -> o ///")
ToolsOptions
@@ -293,12 +295,12 @@ goto endsub
' Workraound: Sometimes checkbox is disabled...don't know why
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.Cancel
- sleep 2
+ WaitSlot (1)
ToolsOptions
Call hToolsOptions ( "WRITER" , WestOrEast )
AktuellesDokument.Check
end if
-
+
StandardSchrift.Select(1)
Ueberschrift.Select(1)
Liste.Select(1)
@@ -313,8 +315,8 @@ goto endsub
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- sleep 2
-
+ WaitSlot (2)
+
printlog ("'/// - check if all UnChecked ///")
ToolsOptions
Call hToolsOptions ( "WRITER" , WestOrEast )
@@ -332,10 +334,9 @@ goto endsub
if ( BeschriftungGroesse.GetSelIndex <> 1 ) then WarnLog "Caption fontsize is not item 1"
if ( VerzeichnisGroesse.GetSelIndex <> 1 ) then WarnLog "Index fontsize is not item 1"
-
Printlog ("'/// - all Check -> x ///")
- Sleep 2
+ Sleep 1
AktuellesDokument.Check
StandardSchrift.Select(StandardSchrift.GetItemCount)
Ueberschrift.Select (Ueberschrift.GetItemCount )
@@ -347,12 +348,12 @@ goto endsub
UeberschriftGroesse.Select (UeberschriftGroesse.GetItemCount )
ListeGroesse.Select (ListeGroesse.GetItemCount )
BeschriftungGroesse.Select (BeschriftungGroesse.GetItemCount )
- VerzeichnisGroesse.Select (VerzeichnisGroesse.GetItemCount )
+ VerzeichnisGroesse.Select (VerzeichnisGroesse.GetItemCount )
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- sleep 2
-
+ WaitSlot (2)
+
printlog ("'/// - check if all Checked ///")
ToolsOptions
Call hToolsOptions ( "WRITER" , WestOrEast )
@@ -384,10 +385,11 @@ goto endsub
if ( ListeGroesse.GetSelText <> sInitFontSize(3) ) then WarnLog "List fontsize not init font!"
if ( BeschriftungGroesse.GetSelText <> sInitFontSize(4) ) then WarnLog "Caption fontsize not init font!"
if ( VerzeichnisGroesse.GetSelText <> sInitFontSize(5) ) then WarnLog "Index fontsize not init font!"
+ AktuellesDokument.Uncheck
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.Ok
-
+
'/// Open a new docuent and check fonts for default
Call hNewDocument
ToolsOptions
@@ -405,8 +407,9 @@ goto endsub
if ( BeschriftungGroesse.GetSelText <> sInitFontSize(4) ) then warnlog "Caption fontsize not init font!"
if ( VerzeichnisGroesse.GetSelText <> sInitFontSize(5) ) then warnlog "Index fontsize not init font!"
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.Cancel
+ ExtrasOptionenDlg.Cancel
Call hCloseDocument
+ Call hNewDocument
printlog ("'/// - restore states ///")
ToolsOptions
@@ -424,13 +427,13 @@ goto endsub
ListeGroesse.SetText (sListBoxSize(3))
BeschriftungGroesse.SetText (sListBoxSize(4))
VerzeichnisGroesse.SetText (sListBoxSize(5))
-
+
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'------------------------------------------------------------------------------
@@ -442,9 +445,9 @@ testcase tToolsOptionsWriterPrint1
Dim bRadioBut(4) as boolean ' RadioButtons
Dim bTempRadioBut(4) as boolean
Dim i as integer, sWriterFilter as string
- Dim WriterFilterExtension(10) as string
- WriterFilterExtension() = hGetFilternameExtension ( "writer8" )
-
+ Dim WriterFilterExtension(10) as string
+ WriterFilterExtension() = hGetFilternameExtension ( "writer8" )
+
' sMetricField(i) and sTempMetricField(i)
'(1) = Grafiken
'(2) = Tabellen
@@ -560,7 +563,7 @@ testcase tToolsOptionsWriterPrint1
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- sleep 2
+ WaitSlot (2)
Call hFileSaveAsWithFilterKill(gOfficepath + "user\work\printtest." & WriterFilterExtension(0) , "writer8")
printlog ("'/// - SO quit - start ///")
@@ -596,7 +599,7 @@ testcase tToolsOptionsWriterPrint1
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- sleep 2
+ WaitSlot (2)
' Notify is saved with document
Call hFileOpen(gOfficepath + "user\work\printtest." & WriterFilterExtension(0) )
ToolsOptions
@@ -635,8 +638,8 @@ testcase tToolsOptionsWriterPrint1
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- sleep 2
-
+ WaitSlot (2)
+
printlog ("'/// - check if all UnChecked ///")
ToolsOptions
Call hToolsOptions ( "WRITER" , "PRINT" )
@@ -691,8 +694,8 @@ testcase tToolsOptionsWriterPrint1
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- sleep 2
-
+ WaitSlot (2)
+
printlog ("'/// - check if all Checked ///")
ToolsOptions
Call hToolsOptions ( "WRITER" , "PRINT" )
@@ -756,11 +759,11 @@ testcase tToolsOptionsWriterPrint1
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- sleep 2
-
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ WaitSlot (2)
+
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'------------------------------------------------------------------------------
@@ -770,7 +773,7 @@ testcase tToolsOptionsWriterTable
Dim sTempMetricField(4) as string
Dim bRadioBut(3) as boolean ' RadioButton states
Dim bTempRadioBut(3) as boolean
-
+
' sMetricField(i) and sTempMetricField(i)
'(1) = VerschiebenZeile
'(2) = VerschiebenSpalte
@@ -842,8 +845,8 @@ testcase tToolsOptionsWriterTable
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- sleep 2
-
+ WaitSlot (2)
+
printlog ("'/// - all UnCheck -> o ///")
ToolsOptions
Call hToolsOptions ( "WRITER" , "Table" )
@@ -879,8 +882,8 @@ testcase tToolsOptionsWriterTable
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- sleep 2
-
+ WaitSlot (2)
+
printlog ("'/// - check if all UnChecked ///")
ToolsOptions
Call hToolsOptions ( "WRITER" , "Table" )
@@ -925,8 +928,8 @@ testcase tToolsOptionsWriterTable
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- sleep 2
-
+ WaitSlot (2)
+
printlog ("'/// - check if all Checked ///")
ToolsOptions
Call hToolsOptions ( "WRITER" , "Table" )
@@ -950,9 +953,9 @@ testcase tToolsOptionsWriterTable
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'------------------------------------------------------------------------------
@@ -971,7 +974,7 @@ testcase tToolsOptionsWriterTable1
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Sleep 5
+ WaitSlot (2)
'/// ///
ToolsOptions
@@ -982,7 +985,8 @@ testcase tToolsOptionsWriterTable1
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
+'------------------------------------------------------------------------------
diff --git a/testautomation/writer/optional/includes/option/wr_o_3.inc b/testautomation/writer/optional/includes/option/wr_o_3.inc
index 03a08e6..44031fc 100755
--- a/testautomation/writer/optional/includes/option/wr_o_3.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_3.inc
@@ -62,10 +62,10 @@ end sub
'------------------------------------------------------------------------------
testcase tToolsOptionsWriterCursor
- Dim irgendwas(17) as boolean ' Checkbox states
+ Dim irgendwas(17) as boolean ' Checkbox states
Dim bRadioBut(4) as boolean ' RadioButtons
Dim bTempRadioBut(4) as boolean
- Dim iListBox(1) as integer ' ListBox
+ Dim iListBox(1) as integer ' ListBox
Dim iTempListBox(1) as integer
Call hNewDocument
@@ -116,6 +116,7 @@ testcase tToolsOptionsWriterCursor
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
+ WaitSlot (2)
printlog ("'/// - SO quit - start ///")
@@ -257,14 +258,14 @@ testcase tToolsOptionsWriterCursor
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'------------------------------------------------------------------------------
testcase tToolsOptionsWriterChanges
- Dim iListBox(2) as integer ' ListBox
+ Dim iListBox(2) as integer ' ListBox
Dim iTempListBox(2) as integer
Dim iListBox2(3,2) as integer ' ListBox
Dim iTempListBox2(3,2) as integer
@@ -353,15 +354,16 @@ testcase tToolsOptionsWriterChanges
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
-
+
printlog ("'/// - SO quit - start ///")
-
+
Call wOfficeRestart
-
+ WaitSlot (2)
+
printlog ("'/// - checking states ///")
ToolsOptions
Call hToolsOptions ( "WRITER" , "CHANGES" )
-
+
if ( EinfuegenAttribute.GetSelIndex <> iTempListBox2(1,1) ) then WarnLog "EinfuegenAttribute state changed; is: "+EinfuegenAttribute.GetSelIndex +"; should: "+ iTempListBox2(1,1)
if ( EinfuegenFarbe.GetSelIndex <> iTempListBox2(1,2) ) then WarnLog "EinfuegenFarbe state changed"
if ( LoeschenAttribute.GetSelIndex <> iTempListBox2(2,1) ) then WarnLog "LoeschenAttribute state changed"
@@ -439,14 +441,13 @@ testcase tToolsOptionsWriterChanges
'new document starts with unchecked edit changes record!? (i hope always ;-))
printlog ("'/ Function test: color-real-print / screenshot also possible///'")
Call hNewDocument
- sleep (3)
-
+
Kontext "DocumentWriter"
DocumentWriter.TypeKeys "This is normal text"
DocumentWriter.TypeKeys "<return>"
DocumentWriter.TypeKeys "The quick brown fox jumps over the lazy dog"
DocumentWriter.TypeKeys "<return>"
-
+
ToolsOptions
Call hToolsOptions ( "WRITER" , "CHANGES" )
EinfuegenAttribute.Select (2) 'bold
@@ -455,12 +456,12 @@ testcase tToolsOptionsWriterChanges
LoeschenFarbe.Select (92) ' sun3
AendernAttribute.Select (8) 'smallcaps
AendernFarbe.Select (30)'red4
-
+
ZeilenMarkierung.Select (4) 'outer margins
ZeilenFarbe.Select (52)'turquise4
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.Ok
-
+
Kontext "DocumentWriter"
DocumentWriter.TypeKeys "This is inserted text"
DocumentWriter.TypeKeys "<return>"
@@ -493,11 +494,12 @@ testcase tToolsOptionsWriterChanges
DocumentWriter.TypeKeys "<return>"
EditChangesRecord
Call hCloseDocument
+
'--------------------------------------------------------------------------
printlog ("'/// - restore states ///")
ToolsOptions
Call hToolsOptions ( "WRITER" , "CHANGES" )
-
+
try
EinfuegenAttribute.Select (iListBox2(1,1))
catch
@@ -510,7 +512,7 @@ testcase tToolsOptionsWriterChanges
EinfuegenFarbe.Select (1)
WarnLog ("EinfuegenFarbe has wrong initialvalue: " + iListBox2(1,2))
endcatch
-
+
try
printlog iListBox2(2,1)
LoeschenAttribute.Select (iListBox2(2,1))
@@ -518,14 +520,14 @@ testcase tToolsOptionsWriterChanges
LoeschenAttribute.Select (1)
WarnLog ("LoeschenAttribute has wrong initialvalue: " + iListBox2(2,1) )
endcatch
-
+
try
LoeschenFarbe.Select (iListBox2(2,2))
catch
LoeschenFarbe.Select (1)
WarnLog ("LoeschenFarbe has wrong initialvalue: " + iListBox2(2,2))
endcatch
-
+
try
AendernAttribute.Select (iListBox2(3,1))
catch
@@ -539,7 +541,7 @@ testcase tToolsOptionsWriterChanges
AendernFarbe.Select (1)
WarnLog ("AendernFarbe has wrong initialvalue: " + iListBox2(3,2))
endcatch
-
+
try
ZeilenMarkierung.Select (iListBox(1))
catch
@@ -553,20 +555,17 @@ testcase tToolsOptionsWriterChanges
ZeilenFarbe.Select (1)
WarnLog ("ZeilenFarbe has wrong initialvalue: " + iListBox(4))
endcatch
-
+
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
-
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'------------------------------------------------------------------------------
testcase tToolsOptionsWriterInsert
-QaErrorLog "#i94753# - tToolsOptionsInsert shows machine-dependant results. Outcommented."
-goto endsub
-
Dim irgendwas(8) as boolean ' Checkbox states
@@ -655,6 +654,7 @@ goto endsub
if Kategorie.GetSelIndex <> 11 then Warnlog "Das Zahlenformat ist nicht Text geblieben!"
Zahlenformat.Cancel
Call hCloseDocument
+ Call hNewDocument
printlog ("'/// - check if all UnChecked ///")
ToolsOptions
@@ -672,11 +672,11 @@ goto endsub
Wiederholen.Check
NichtTrennen.Check
Umrandung.Check
-
+
AutomatischeZahlenerkennung.Check
Zahlenformaterkennung.Check
AutomatischeAusrichtung.Check
-
+
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
@@ -705,8 +705,9 @@ goto endsub
Kontext "Zahlenformat"
if Kategorie.GetSelIndex <> 3 then Warnlog "numberformat didn't get changed!"
Zahlenformat.Cancel
-
+
Call hCloseDocument
+ Call hNewDocument
printlog ("'/// - check if all Checked ///")
ToolsOptions
@@ -716,7 +717,7 @@ goto endsub
if ( Wiederholen.IsChecked = FALSE ) then WarnLog "Wiederholen o"
if ( NichtTrennen.IsChecked = FALSE ) then WarnLog "NichtTrennen o"
if ( Umrandung.IsChecked = FALSE ) then WarnLog "Umrandung o"
-
+
if ( AutomatischeZahlenerkennung.IsChecked = FALSE ) then WarnLog "AutomatischeZahlenerkennung o"
if ( Zahlenformaterkennung.IsChecked = FALSE ) then WarnLog "Zahlenformaterkennung o"
if ( AutomatischeAusrichtung.IsChecked = FALSE ) then WarnLog "AutomatischeAusrichtung o"
@@ -725,19 +726,17 @@ goto endsub
ExtrasOptionenDlg.OK
printlog ("'/// - restore states ///")
-
- Call wOptionenUndo("Table")
-
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+
+ Call wOptionsUndo("Table")
+
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
' ********************************************************************
testcase tToolsOptionsAutocaption
-QaErrorLog "#i94748# - tToolsOptionsAutocaption outcommented due to unreliable results."
-goto endsub
Dim Auswahl(20) as String
Dim i as Integer
@@ -746,6 +745,8 @@ goto endsub
printlog "- Tools/Options/StarOffice Writer/AutoCaption"
Call hNewDocument
+ Call wOptionsUndo( "All" )
+
ToolsOptions
Call hToolsOptions("WRITER","AutoCaption")
Kontext "TabAutocaption"
@@ -761,6 +762,9 @@ goto endsub
Category.SetText Auswahl(i)
next i
+ ObjectList.Select 1
+ Position.Select Position.GetItemCount 'Select "Caption: Below"
+
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
@@ -773,8 +777,9 @@ goto endsub
Kontext "TabelleEinfuegenWriter"
TabelleEinfuegenWriter.OK
Kontext "DocumentWriter"
- Call wTypeKeys ("<UP>", 2)
- Call wTypeKeys ("<Home>")
+ Call wTypeKeys ("<MOD1 Home>")
+ Call wTypeKeys ("<DOWN>", 2)
+ Call wTypeKeys ("<HOME>")
Select Case iSprache
Case 31:
Call wTypeKeys ("<Mod1 Shift Right>") ', 3
@@ -791,6 +796,7 @@ goto endsub
Kontext
Active.SetPage TabType
Kontext "TabType"
+' if gPlatGroup = "unx" then
Width.SetText "2"
TabType.OK
Call wTypeKeys ("<Return>")
@@ -804,7 +810,9 @@ goto endsub
end select
EditCopy
Wait 500
- if Trim$(GetClipboardText) <> Auswahl (2) then Warnlog "Caption of a frame is wrong. Not " & Auswahl(2) & " but: " & GetClipboardtext
+ if Trim$(GetClipboardText) <> Auswahl (2) then
+ Warnlog "Caption of a frame is wrong. Not " & Auswahl(2) & " but: " & GetClipboardtext
+ endif
Call wTypeKeys ("<Escape>")
sleep(1)
Call wTypeKeys ("<Home><SHIFT END><Delete>")
@@ -824,7 +832,9 @@ goto endsub
Call wTypeKeys ("<Mod1 Shift Right>")
end select
EditCopy
- if Trim$(GetClipboardText) <> Auswahl (3) then Warnlog "Caption of a graphic is wrong. Not " & Auswahl(3) & " but: " & GetClipboardtext
+ if Trim$(GetClipboardText) <> Auswahl (3) then
+ Warnlog "Caption of a graphic is wrong. Not " & Auswahl(3) & " but: " & GetClipboardtext
+ endif
Call hCloseDocument
printlog "'/// - Check caption of all other objects ///"
@@ -876,17 +886,17 @@ goto endsub
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
sleep (1)
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-------------------------------------------------------------------
testcase tToolsOptionsWriterCompatibility1
-
+
Dim i as integer
-
+
printlog "Check status change of all checkboxes in StarOffice Writer->Compatibility options"
printlog " Test of option 'Use StarOffice 6.0/7 tabstop formatting'"
Call hNewDocument
@@ -951,6 +961,7 @@ testcase tToolsOptionsWriterCompatibility1
'/// restart the office
Call wOfficeRestart
+ WaitSlot (2)
printlog "check state of all checkboxes and set defaults"
ToolsOptions
@@ -978,9 +989,9 @@ testcase tToolsOptionsWriterCompatibility1
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.Ok
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-------------------------------------------------------------------
@@ -1011,7 +1022,7 @@ testcase tToolsOptionsWriterCompatibility2
Warnlog "Seems document has been formatted wrong"
DefaultFailed = true
endcatch
-
+
Call wTypeKeys ("<Home>")
Call wTypeKeys ("<Down>" ,3)
Call wTypeKeys ("<Shift Right>")
@@ -1025,7 +1036,7 @@ testcase tToolsOptionsWriterCompatibility2
Warnlog "Seems document has been formatted wrong"
DefaultFailed = true
endcatch
-
+
if DefaultFailed = false then
printlog " in Tools->Options->StarOffice Writer->Compatitibility check option 'Use StarOffice 6.0/7 tabstop formatting'"
ToolsOptions
@@ -1048,7 +1059,7 @@ testcase tToolsOptionsWriterCompatibility2
catch
Warnlog "Seems document has been formatted wrong"
endcatch
-
+
Call wTypeKeys ("<Home>")
Call wTypeKeys ("<Down>" , 4)
Call wTypeKeys ("<Shift Right>")
@@ -1059,7 +1070,7 @@ testcase tToolsOptionsWriterCompatibility2
end if
catch
Warnlog "Seems document has been formatted wrong"
- endcatch
+ endcatch
printlog "in Tools->Options->StarOffice Writer->Compatitibility uncheck option 'Use StarOffice 6.0/7 tabstop formatting'"
ToolsOptions
@@ -1073,15 +1084,14 @@ testcase tToolsOptionsWriterCompatibility2
end if
printlog "Close document"
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'------------------------------------------------------------------------------------------------------------
testcase tToolsOptionsWriterCompatibility3
-'Variables:
DIM iWords_to_right AS integer 'variable for counting word-steps
DIM iOptionsCount AS integer 'variable for counting options on cmopatibility page
DIM sDocument AS string 'variable for saving the doc
@@ -1095,11 +1105,11 @@ DIM sFoundWord AS string 'variable for word found one line below
ToolsOptions
Kontext "ExtrasOptionenDLG"
printlog "Checking Options settings"
-
+
printlog "Tools-Options-OOo Writer-Compatibility"
Call hToolsOptions("WRITER","COMPATIBILITY")
Kontext "TabCompatibility"
-
+
printlog "Verify that the entry 'Expand word space on lines with manual line breaks in justified paragraphs' is checked by default"
iOptionsCount = Options.GetItemCount
Options.Select iOptionsCount
@@ -1109,12 +1119,12 @@ DIM sFoundWord AS string 'variable for word found one line below
warnlog "Warning: Expand word space on lines...is not checked as default!"
Options.Check
end if
-
+
printlog " Close dialog with OK"
Kontext "ExtrasOptionenDLG"
ExtrasOptionenDLG.OK
sleep (1)
-
+
printlog " Insert a paragraph with several lines of text"
Kontext "DocumentWriter"
DocumentWriter.typekeys ("one two three four five six seven eight nine ten eleven twelve thirteen fourteen fifteen sixteen seventeen eighteen nineteen twenty twentyone twentytwo twentythree twentyfour twentyfive twentysix")
@@ -1130,16 +1140,16 @@ DIM sFoundWord AS string 'variable for word found one line below
Kontext "TextObjectbar"
Blocksatz.Click 'setting to justified
Kontext "DocumentWriter"
-
+
printlog "(Now the paragraph adjustment is 'justified')"
printlog "Setting text to justified."
sleep (1)
-
+
printlog " Click into the middle of a line"
DocumentWriter.TypeKeys "<MOD1 HOME>" 'jumping to beginning of text
DocumentWriter.TypeKeys "<MOD1 RIGHT>",9,true '9 times to the right
sleep (1)
-
+
printlog " Insert a line break by pressing <SHIFT>+<ENTER>"
DocumentWriter.TypeKeys "<SHIFT RETURN>"
sleep (1)
@@ -1356,19 +1366,19 @@ DIM sFoundWord AS string 'variable for word found one line below
sleep (1)
Kontext "ExtrasOptionenDLG"
ExtrasOptionenDLG.OK 'Closing the options
-
+
printlog " Close document"
Call hCloseDocument
-
+
printlog " New Writer document"
Call hNewDocument
-
+
printlog " Tools-Options-OOo Writer-Compatibility"
ToolsOptions 'calling options
Kontext "ExtrasOptionenDLG"
Call hToolsOptions("WRITER","COMPATIBILITY")
Kontext "TabCompatibility"
-
+
printlog " Verify that the entry 'Expand word space [...]' is checked"
iOptionsCount = Options.GetItemCount
Options.Select iOptionsCount
@@ -1379,9 +1389,10 @@ DIM sFoundWord AS string 'variable for word found one line below
end if
Kontext "ExtrasOptionenDLG"
ExtrasOptionenDLG.Cancel 'leaving the options
-
+
printlog " Close document"
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
+' -------------------------------------------------------
diff --git a/testautomation/writer/optional/includes/option/wr_o_4.inc b/testautomation/writer/optional/includes/option/wr_o_4.inc
index 6d66e5b..485798c 100755
--- a/testautomation/writer/optional/includes/option/wr_o_4.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_4.inc
@@ -96,7 +96,7 @@ testcase tToolsOptionsWriterOther
printlog ("'/// - all states inverting ///")
- if irgendwas(2) Then Feldbefehle.UnCheck Else Feldbefehle.Check
+ if irgendwas(2) Then Feldbefehle.UnCheck Else Feldbefehle.Check
if Feldbefehle.IsChecked Then if irgendwas(3) Then Diagramme.UnCheck Else Diagramme.Check
if (Immer.IsChecked = True) Then AufNachfrage.Check Else Immer.Check
@@ -299,9 +299,9 @@ testcase tToolsOptionsWriterOther
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'------------------------------------------------------------------------------
@@ -413,7 +413,7 @@ testcase tToolsOptionsWriterAutoCaption
' checking Listentry '(7) = StarOffice 6.0 Impress' completely
dim vObjectList(10) as integer
- dim vObjectListDescription(10) as string
+ dim vObjectListDescription(10) as string
Dim vCategory(10) as integer
Dim vCategoryTmp(10) as string
Dim vNumbering(10) as integer
@@ -438,7 +438,7 @@ testcase tToolsOptionsWriterAutoCaption
NumberOfObjects = ObjectList.GetItemCount
Select Case gPlatGroup
- Case "w95"
+ Case "w95"
if (NumberOfObjects <> 9) then
warnlog "Number of Object List is not correct"
end if
@@ -447,7 +447,7 @@ testcase tToolsOptionsWriterAutoCaption
warnlog "Number of Object List is not correct"
end if
end select
-
+
for i=1 to NumberOfObjects
ObjectList.Select (i)
vObjectList(i) = ObjectList.IsChecked
@@ -497,7 +497,7 @@ testcase tToolsOptionsWriterAutoCaption
ObjectList.Check
end if
next i
-
+
printlog ("'/// - change states ///")
'/// look if properties get saved for each list item
for i=1 to NumberOfObjects
@@ -557,7 +557,7 @@ testcase tToolsOptionsWriterAutoCaption
ExtrasOptionenDlg.OK
printlog ("'/// - SO quit - start ///")
-
+
Call wOfficeRestart
printlog ("'/// - checking states ///")
@@ -566,7 +566,7 @@ testcase tToolsOptionsWriterAutoCaption
Kontext "TabAutoCaption"
for i=1 to NumberOfObjects
printlog "- checking: " & ObjectList.Gettext
- ObjectList.Select (i)
+ ObjectList.Select (i)
wait 500
if ObjectList.IsChecked Then
if i <= 7 then
@@ -590,7 +590,7 @@ testcase tToolsOptionsWriterAutoCaption
Warnlog "- 'Level' changed after restart"
else
Printlog "- 'Level' => ok"
- end if
+ end if
if CharacterStyle.GetSelIndex <> i then
Warnlog "- 'Character Style' changed after restart"
else
@@ -602,7 +602,7 @@ testcase tToolsOptionsWriterAutoCaption
else
printlog "- 'Category' => ok"
end if
-
+
Select Case i
case 1:
if Position.GetSelIndex <> 1 then
@@ -637,28 +637,28 @@ testcase tToolsOptionsWriterAutoCaption
else
printlog "- 'Position' => ok"
end if
-
+
case 5:
if Position.GetSelIndex <> 1 then
Warnlog "- 'Position' changed after restart"
else
printlog "- 'Position' => ok"
end if
-
+
case 6:
if Position.GetSelIndex <> 2 then
Warnlog "- 'Position' changed after restart"
else
printlog "- 'Position' => ok"
end if
-
+
case 7:
if Position.GetSelIndex <> 1 then
Warnlog "- 'Position' changed after restart"
else
printlog "- 'Position' => ok"
end if
-
+
case 8:
if Numbering.GetItemCount > 7 then
if Numbering.GetSelIndex <> Numbering.GetItemCount then
@@ -679,7 +679,7 @@ testcase tToolsOptionsWriterAutoCaption
else
printlog "- 'Position' => ok"
end if
-
+
case 9:
if Numbering.GetItemCount > 7 then
if Numbering.GetSelIndex <> Numbering.GetItemCount then
@@ -700,13 +700,13 @@ testcase tToolsOptionsWriterAutoCaption
else
printlog "- 'Position' => ok"
end if
-
+
end select
else
Warnlog "- " & ObjectList.GetText & " is not checked"
end if
- next i
-
+ next i
+
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
@@ -717,7 +717,7 @@ testcase tToolsOptionsWriterAutoCaption
Kontext "TabAutoCaption"
for i=1 to NumberOfObjects
- ObjectList.Select (i)
+ ObjectList.Select (i)
if ObjectList.IsChecked then
if vCategory(i) > Category.GetItemCount then
Category.Select Category.GetItemCount
@@ -738,7 +738,7 @@ testcase tToolsOptionsWriterAutoCaption
ApplyBorderAndShadow.Uncheck
end select
end if
- end if
+ end if
Select case vObjectList(i)
Case true
ObjectList.Check
@@ -751,9 +751,9 @@ testcase tToolsOptionsWriterAutoCaption
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'------------------------------------------------------------------------------
@@ -762,6 +762,7 @@ testcase tToolsOptionsWriterGeneral
Dim i as integer
Dim ist_aktualisiert as boolean
Dim CompareThis as string
+
' State is saved with document. Thats why I use 3 docs
Call hNewDocument
printlog "'///- Extras / Optionen / Sonstiges / Verkn?pfungen aktualisieren ///"
@@ -861,9 +862,10 @@ testcase tToolsOptionsWriterGeneral
AufNachfrage.Check
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'------------------------------------------------------------------------------
@@ -880,17 +882,17 @@ testcase tToolsOptionsWriterMailMerge
'/// Fill out all fields
printlog " - fill out Mail Settings"
Kontext "TabMailMergeEmail"
- YourName.Settext "Helge Delfs"
+ YourName.Settext "Fredrik Haegg"
EmailAddress.Settext "fredrik.haegg at sun.com"
SendReplies.Check
- ReplyAddress.Settext "hde at openoffice.org"
+ ReplyAddress.Settext "fredrikh at openoffice.org"
ServerName.Settext "MySMTP-Server"
UseSecure.Check
'/// Change details for Server Authentication
printlog " - fill out Authentication Settings"
ServerAuthentication.Click
- wait 500
+ wait 500
Kontext "ServerAuthentication"
SMTPauthentication.Check
@@ -899,8 +901,8 @@ testcase tToolsOptionsWriterMailMerge
Port.Settext "111"
IMAP.Check
User.Settext "MyAuthenticationUserName"
- Password.Settext "MyAuthenticationPassword"
- ServerAuthentication.Ok
+ Password.Settext "MyAuthenticationPassword"
+ ServerAuthentication.Ok
'/// Close 'Server Authentication dialog, reopen and check values set
printlog " - check settings"
@@ -908,7 +910,7 @@ testcase tToolsOptionsWriterMailMerge
ServerAuthentication.Click
wait 500
Kontext "ServerAuthentication"
- if Not SMTPauthentication.IsChecked then Warnlog "SMTP Authentication is not checked anymore"
+ if Not SMTPauthentication.IsChecked then Warnlog "SMTP Authentication is not checked anymore"
if Not IncomingMailServer.IsChecked then Warnlog "Incoming Mail Server has been changed"
if Server.Gettext <> "MySMTP-Server" then Warnlog "Servername has been changed"
if Port.Gettext <> "111" then Warnlog "Server Port has been changed"
@@ -925,7 +927,7 @@ testcase tToolsOptionsWriterMailMerge
'/// Close options dialog and restart the office
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.Ok
- printlog " - restart office"
+ printlog " - restart office"
Call wOfficeRestart
'/// Reopen Tools/Options and check settings
@@ -934,10 +936,10 @@ testcase tToolsOptionsWriterMailMerge
Call hToolsOptions ("WRITER","MailMergeEMail")
Kontext "TabMailMergeEmail"
- if YourName.Gettext <> "Helge Delfs" then Warnlog "'Your Name' has been changed after a restart"
+ if YourName.Gettext <> "Fredrik Haegg" then Warnlog "'Your Name' has been changed after a restart"
if EmailAddress.Gettext <> "fredrik.haegg at sun.com" then Warnlog "'Email Address' has been changed after a restart"
if Not SendReplies.IsChecked then Warnlog "'Send replies' has been changed after a restart"
- if ReplyAddress.Gettext <> "hde at openoffice.org" then Warnlog "'Reply adresses' has been changed after a restart"
+ if ReplyAddress.Gettext <> "fredrikh at openoffice.org" then Warnlog "'Reply adresses' has been changed after a restart"
if ServerName.Gettext <> "MySMTP-Server" then Warnlog "'Server name' has been changed after a restart"
if UseSecure.IsChecked = false then Warnlog "'Secure' has been changed after a restart"
@@ -955,7 +957,7 @@ testcase tToolsOptionsWriterMailMerge
TestSettings.Click
Kontext "TestAccountSettings"
- Do
+ Do
if TaskStatusListBox.GetItemCount > 0 then
TestAccountSettings.Cancel
exit do
@@ -980,8 +982,7 @@ testcase tToolsOptionsWriterMailMerge
OutgoingPassword.Settext ""
SMTPauthentication.UnCheck
-
- ServerAuthentication.Ok
+ ServerAuthentication.Ok
Kontext "TabMailMergeEmail"
YourName.Settext ""
@@ -995,7 +996,8 @@ testcase tToolsOptionsWriterMailMerge
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.Ok
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
+'------------------------------------------------------------------------------
diff --git a/testautomation/writer/optional/includes/option/wr_o_5.inc b/testautomation/writer/optional/includes/option/wr_o_5.inc
index 41b4188..9afe63b 100755
--- a/testautomation/writer/optional/includes/option/wr_o_5.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_5.inc
@@ -55,9 +55,7 @@ testcase tLanguageSettingsComplexTextLayout
Dim sCurrentDocumentLanguage as string
Dim sCurrentCTLLanguage as string
Dim bSequenceChecking as boolean
-' if Val(mid$(gMinor, 2, Len(gMinor))) < 141 then
-' goto endsub
-' end if
+
'/// Open new writerdocument
Call hNewDocument
'/// Activate Asian support
@@ -66,9 +64,9 @@ testcase tLanguageSettingsComplexTextLayout
bCTLLanguage = ActiveDeactivateCTLSupport(True)
ToolsOptions
- '/// Goto 'Tools->Options->Language settings->Languages
+ '/// Goto 'Tools->Options->Language settings->Languages
Call hToolsOptions ("LanguageSettings","Languages")
- sCurrentCTLLanguage = LanguageComplexScript.GetSelText
+ sCurrentCTLLanguage = LanguageComplexScript.GetSelText
Kontext "TabSprachen"
For i = 1 to LanguageComplexScript.GetItemCount
'/// Select CTL-Language
@@ -81,88 +79,88 @@ testcase tLanguageSettingsComplexTextLayout
'/// Reopen options and go to Tabpage 'Complex Text Layout'
ToolsOptions
Call hToolsOptions ("LanguageSettings","ComplexTextLayout")
-
+
Kontext "TabComplexTextLayout"
- bSequenceChecking = FALSE
- Select Case iSprache
- '/// Checkboxes under 'Sequence checking' should all be checked for CTL languages
- '/// + like "Thai", "Lao", "Khmer", "Vietnamese"
- Case 01
- sCTLLan = Array("Thai", "Lao", "Khmer", "Vietnamese")
- Case 49
- sCTLLan = Array("Thai", "Lao", "Khmer", "Vietnamesisch")
- Case else
- QAErrorlog "Please adapt testcase for this language"
- Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.Ok
- goto IfNoSupport
+ bSequenceChecking = FALSE
+ Select Case iSprache
+ '/// Checkboxes under 'Sequence checking' should all be checked for CTL languages
+ '/// + like "Thai", "Lao", "Khmer", "Vietnamese"
+ Case 01
+ sCTLLan = Array("Thai", "Lao", "Khmer", "Burmese", "Vietnamese")
+ Case 49
+ sCTLLan = Array("Thai", "Lao", "Khmer", "Birmanisch", "Vietnamesisch")
+ Case else
+ QAErrorlog "Please adapt testcase for this language"
+ Kontext "ExtrasOptionenDlg"
+ ExtrasOptionenDlg.Ok
+ goto IfNoSupport
end select
- for j = 0 to 2
+ for j = 0 to 4
if sCTLLan(j) = sCurrentDocumentLanguage then
bSequenceChecking = TRUE
exit for
end if
next j
- Select Case bSequenceChecking
- Case TRUE
- if UseSequenceChecking.IsChecked = False then
- Warnlog "'Sequence Checking' should be checked for language: " & sCurrentDocumentLanguage
- end if
- if Restricted.IsEnabled = False or Restricted.IsChecked = False then
- Warnlog "'Restricted' should be enabled and checked for language: " & sCurrentDocumentLanguage
- end if
- if TypeAndReplace.IsEnabled = False or TypeAndReplace.IsChecked = False then
- Warnlog "'Type And Replace' should be enabled and checked for language: " & sCurrentDocumentLanguage
- end if
-
- Case FALSE
- if UseSequenceChecking.IsChecked = True then
- QAErrorlog "'Sequence Checking' should not be checked for language: " & sCurrentDocumentLanguage
- end if
- if Restricted.IsEnabled = True AND Restricted.IsChecked = True then
- QAErrorlog "'Restricted' should not be checked for language: " & sCurrentDocumentLanguage
- end if
- if TypeAndReplace.IsEnabled = True AND TypeAndReplace.IsChecked = True then
- QAErrorlog "'Type And Replace' should not checked for language: " & sCurrentDocumentLanguage
- end if
- end select
-
+ Select Case bSequenceChecking
+ Case TRUE
+ if UseSequenceChecking.IsChecked = False then
+ Warnlog "'Sequence Checking' should be checked for language: " & sCurrentDocumentLanguage
+ end if
+ if Restricted.IsEnabled = False or Restricted.IsChecked = False then
+ Warnlog "'Restricted' should be enabled and checked for language: " & sCurrentDocumentLanguage
+ end if
+ if TypeAndReplace.IsEnabled = False or TypeAndReplace.IsChecked = False then
+ Warnlog "'Type And Replace' should be enabled and checked for language: " & sCurrentDocumentLanguage
+ end if
+
+ Case FALSE
+ if UseSequenceChecking.IsChecked = True then
+ QAErrorlog "'Sequence Checking' should not be checked for language: " & sCurrentDocumentLanguage
+ end if
+ if Restricted.IsEnabled = True AND Restricted.IsChecked = True then
+ QAErrorlog "'Restricted' should not be checked for language: " & sCurrentDocumentLanguage
+ end if
+ if TypeAndReplace.IsEnabled = True AND TypeAndReplace.IsChecked = True then
+ QAErrorlog "'Type And Replace' should not checked for language: " & sCurrentDocumentLanguage
+ end if
+ end select
+
'Get the number of Numerals-entries.
iNumeralsCount = Numerals.GetItemCount
-
+
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.Ok
+ ExtrasOptionenDlg.Ok
ToolsOptions
Call hToolsOptions ("LanguageSettings","Languages")
Kontext "TabSprachen"
next i
-
+
Kontext "ExtrasOptionenDlg"
- if ExtrasOptionenDlg.Exists then ExtrasOptionenDlg.Ok
-
+ if ExtrasOptionenDlg.Exists then ExtrasOptionenDlg.Ok
+
printlog "Check the Numerals-menu."
ToolsOptions
Call hToolsOptions ("LanguageSettings","ComplexTextLayout")
-
+
Printlog " Select every entry in the list, then press OK to close the dialogue, then open it again and check if the value got saved."
for iNumeralsCounter = 1 to iNumeralsCount
Numerals.Select iNumeralsCounter
Printlog " Numerals nr: " + iNumeralsCounter + " = " + Numerals.GetSelText
-
+
'Press ok, and open the dialogue again.
Kontext "ExtrasOptionenDlg"
if ExtrasOptionenDlg.Exists then ExtrasOptionenDlg.Ok
ToolsOptions
Call hToolsOptions ("LanguageSettings","ComplexTextLayout")
-
+
if Numerals.GetSelIndex <> iNumeralsCounter then Warnlog "The Numeral-Entry number: " + iNumeralsCounter + " didn't get saved when pressing OK in the FormatCharacter-dialogue."
next iNumeralsCounter
-
+
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.Ok
-
+
'/// Choose Thai as CTL language
ToolsOptions
Call hToolsOptions ("LanguageSettings","Languages")
@@ -173,7 +171,7 @@ testcase tLanguageSettingsComplexTextLayout
'/// Restart office
Call wOfficeRestart
-
+
'/// Reopen options and go to Tabpage 'Complex Text Layout'
ToolsOptions
Call hToolsOptions ("LanguageSettings","ComplexTextLayout")
@@ -202,7 +200,7 @@ IfNoSupport:
Call ActiveDeactivateAsianSupport(bAsianLanguage)
Call ActiveDeactivateCTLSupport(bCTLLanguage)
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
diff --git a/testautomation/writer/optional/includes/option/wr_o_a.inc b/testautomation/writer/optional/includes/option/wr_o_a.inc
index b1aaed2..04d3f9a 100755
--- a/testautomation/writer/optional/includes/option/wr_o_a.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_a.inc
@@ -49,7 +49,7 @@ testcase tToolsOptionsWriterPrint
' called after my save/restart testing
' The real print with paper to touch - and to get from the printer :-(
- Dim i
+ Dim i as integer
printlog "- Tools/Options/Writer: PrintWriter (real print)"
Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options3.sxw" )
Call sMakeReadOnlyDocumentEditable
@@ -128,11 +128,10 @@ testcase tToolsOptionsWriterPrint
Sleep 3
end if
- 'If this testcase runs alone next line has to be integrated
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
- Call wOptionenUndo ( "Drucken" )
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
+ Call wOptionsUndo ( "Drucken" )
endcase
'------------------------------------------------------------------------------
@@ -271,7 +270,6 @@ testcase tToolsOptionsWriterTableMove
Printlog "- with <Shift Alt Left> upsize 2. column to the right"
Call wTypeKeys "<Shift Mod2 Left>"
-
Call SpaltenBreiteTesten ( Spalte2 )
Call SeitenAbstaendeTesten ( 0, 0 )
@@ -280,16 +278,6 @@ testcase tToolsOptionsWriterTableMove
Call ZeilenHoeheTesten ( Zeile1+VerschubSpalte )
Call SeitenAbstaendeTesten ( 0, 0 )
- Printlog "- with <Shift Alt Up> upsize 1. column down"
- Call wTypeKeys "<Mod2 Down>"
- Call ZeilenHoeheTesten ( Zeile1+VerschubSpalte*2 )
- Call SeitenAbstaendeTesten ( 0, 0 )
-
- Printlog "- with <Shift Alt Down> downsize 1. column up"
- Call wTypeKeys "<Shift Mod2 Down>"
- Call ZeilenHoeheTesten ( Zeile1+VerschubSpalte )
- Call SeitenAbstaendeTesten ( 0, 0 )
-
Printlog "- with <Alt Up> downsize 1. column up"
Call wTypeKeys "<Mod2 Up>"
Call ZeilenHoeheTesten ( ( Zeile1 ) )
@@ -309,25 +297,15 @@ testcase tToolsOptionsWriterTableMove
Call ZeilenHoeheTesten ( Zeile2+VerschubSpalte*2/2 )
Call SeitenAbstaendeTesten ( 0, 0 )
- Printlog "- with <Shift Alt Up> upsize 2. column down"
- Call wTypeKeys "<Shift Mod2 Down>"
- Call ZeilenHoeheTesten ( Zeile2+VerschubSpalte*2 )
- Call SeitenAbstaendeTesten ( 0, 0 )
-
- Printlog "- with <Shift Alt Down> downsize 2. column up"
- Call wTypeKeys "<Shift Mod2 Down>"
- Call ZeilenHoeheTesten ( Zeile2+VerschubSpalte*2/2 )
- Call SeitenAbstaendeTesten ( 0, 0 )
-
Printlog "- with <Alt Up> downsize 2. column up"
Call wTypeKeys "<Mod2 Up>"
Call ZeilenHoeheTesten ( Zeile2 )
Call SeitenAbstaendeTesten ( 0, 0 )
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
- Call wOptionenUndo "Tabelle"
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
+ Call wOptionsUndo "Tabelle"
endcase
'------------------------------------------------------------------------------
@@ -427,10 +405,10 @@ testcase tToolsOptionsWriterTableInsert
Call SpaltenTesten ( 2 )
Call SeitenAbstaendeTesten ( VerschubSpalte, Spalte2 -VerschubSpalte )
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
- Call wOptionenUndo "Tabelle"
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
+ Call wOptionsUndo "Tabelle"
endcase
' ************************************************************************
@@ -587,11 +565,11 @@ testcase tToolsOptionsWriterTableEffects
Call ZeilenHoeheTesten ( 0.7 )
Call SeitenAbstaendeTesten ( 0.00, 0.00 )
end if
- Call wOptionenUndo "Tabelle"
+ Call wOptionsUndo "Tabelle"
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'------------------------------------------------------------------------------
@@ -600,9 +578,9 @@ testcase tToolsOptionsWriterTableEffects2
Dim Spalte1 as Double
Dim vSeparator as string
Dim VerschubZeile as Double
-
+
vSeparator = GetDecimalSeperator
-
+
printlog "- Tools / Options / Table"
printlog "- Effect options should work immediately"
@@ -642,10 +620,10 @@ testcase tToolsOptionsWriterTableEffects2
end if
TabTabelle.Cancel
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
- Call wOptionenUndo "Tabelle"
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
+ Call wOptionsUndo "Tabelle"
endcase
'------------------------------------------------------------------------------
@@ -688,10 +666,10 @@ testcase tToolsOptionsWriterDirectCursor2
Vergroesserung100.Check
Massstab.OK
- Do Until GetDocumentCount = 0
- Call hCloseDocument
- Loop
- Call wOptionenUndo "Cursor"
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
+ Call wOptionsUndo "Cursor"
endcase
'------------------------------------------------------------------------------
diff --git a/testautomation/writer/optional/includes/textframes/w_textframes1.inc b/testautomation/writer/optional/includes/textframes/w_textframes1.inc
index fbbbbee..6baf18b 100755
--- a/testautomation/writer/optional/includes/textframes/w_textframes1.inc
+++ b/testautomation/writer/optional/includes/textframes/w_textframes1.inc
@@ -180,9 +180,9 @@ endcase
testcase tTextframes_2
- Dim sText as String
- Dim sHeight as String
- Dim sSpacing as String
+ Dim sText as String
+ Dim sHeight as String
+ Dim sSpacing as String
sText = "ABCDEFG"
sSpacing = "0"
@@ -226,9 +226,10 @@ endcase
testcase tTextframes_3
- Dim sText, sExpect as String
- Dim sHeight as String
- Dim sSpacing as String
+ Dim sText as String
+ Dim sExpect as String
+ Dim sHeight as String
+ Dim sSpacing as String
sText = "ABCDEFG"
sExpect = "ABCDEFG"
@@ -272,9 +273,12 @@ endcase
testcase tTextframes_4
- Dim sWidth , sHeight as String
- Dim sWidthNew1 , sHeightNew1 as String
- Dim sWidthNew2 , sHeightNew2 as String
+ Dim sWidth as String
+ Dim sHeight as String
+ Dim sWidthNew1 as String
+ Dim sHeightNew1 as String
+ Dim sWidthNew2 as String
+ Dim sHeightNew2 as String
sWidth = "2"+ gSeperator + "00" + gMeasurementUnit
sHeight = "1"+ gSeperator + "00" + gMeasurementUnit
@@ -306,8 +310,8 @@ testcase tTextframes_4
Height.SetText sHeight
Sleep 1
- if Width.GetText <> sWidth then Warnlog "Keep ration(Uncheck) doesn't work - width!"
- if Height.GetText <> sHeight then Warnlog "Keep ration(Uncheck) doesn't work - heigth!"
+ if Width.GetText <> sWidth then Warnlog "Keep ration(Uncheck) doesn't work - width!"
+ if Height.GetText <> sHeight then Warnlog "Keep ration(Uncheck) doesn't work - heigth!"
'/// Check if height is changed after width is changed.
Width.SetText sWidthNew1
@@ -333,9 +337,12 @@ endcase
testcase tTextframes_5
- Dim sWidth , sHeight as String
- Dim sWidthNew1 , sHeightNew1 as String
- Dim sWidthNew2 , sHeightNew2 as String
+ Dim sWidth as String
+ Dim sHeight as String
+ Dim sWidthNew1 as String
+ Dim sHeightNew1 as String
+ Dim sWidthNew2 as String
+ Dim sHeightNew2 as String
sWidth = "2"+ gSeperator + "00" + gMeasurementUnit
sHeight = "1"+ gSeperator + "00" + gMeasurementUnit
@@ -361,9 +368,9 @@ testcase tTextframes_5
KeepRatio.UnCheck
'/// + Set width and height
- Width.SetText sWidth
+ Width.SetText sWidth
Sleep 1
- Height.SetText sHeight
+ Height.SetText sHeight
Sleep 1
'/// + Check Keep ratio
@@ -371,7 +378,7 @@ testcase tTextframes_5
Sleep 1
'/// Check if height is changed after width is changed.
- Width.SetText sWidthNew1
+ Width.SetText sWidthNew1
Sleep 1
if Width.GetText <> sWidthNew1 then Warnlog "Keep ration(check) doesn't work - widthNew1 !"
@@ -394,7 +401,8 @@ endcase
testcase tTextframes_6
- Dim sTestFile , sTestText as String
+ Dim sTestFile as String
+ Dim sTestText as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\AnchorToPage.sxw")
sTestText = "Bottom"
@@ -479,7 +487,10 @@ testcase tTextframes_6
fCloseNavigator
Wait 500
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -487,8 +498,8 @@ endcase
testcase tTextframes_7
- Dim sTestFile as String
- Dim sDummy as String
+ Dim sTestFile as String
+ Dim sDummy as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\AnchorToParagraph.sxw")
sDummy = "She heard"
@@ -556,7 +567,10 @@ testcase tTextframes_7
fCloseNavigator
Wait 500
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -686,7 +700,10 @@ testcase tTextframes_8
fCloseNavigator
Wait 500
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -814,7 +831,10 @@ testcase tTextframes_9
fCloseNavigator
Wait 500
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -822,8 +842,10 @@ endcase
testcase tTextframes_10
- Dim sColumn1 , sColumn2 as String
- Dim sTestFile1 , sTestFile2 as String
+ Dim sColumn1 as String
+ Dim sColumn2 as String
+ Dim sTestFile1 as String
+ Dim sTestFile2 as String
sColumn1 = "1"
sColumn2 = "2"
@@ -914,7 +936,10 @@ testcase tTextframes_10
fCloseNavigator
Wait 500
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -923,7 +948,8 @@ endcase
testcase tTextframes_11
Dim sTestFile as String
- Dim sDummy1 , sDummy2 as String
+ Dim sDummy1 as String
+ Dim sDummy2 as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\pageParagraph.sxw")
sDummy1 = "He heard"
@@ -1041,7 +1067,10 @@ Check2:
fCloseNavigator
Wait 500
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -1093,8 +1122,11 @@ endcase
testcase tTextframes_13
- Dim sHorizontalBy as String
- Dim iHorizontalLeft , iHorizontalRight , iHorizontalCenter , iHorizontalFromLeft as Integer
+ Dim sHorizontalBy as String
+ Dim iHorizontalLeft as Integer
+ Dim iHorizontalRight as Integer
+ Dim iHorizontalCenter as Integer
+ Dim iHorizontalFromLeft as Integer
sHorizontalBy = "1"+ gSeperator + "00" + gMeasurementUnit
@@ -1203,8 +1235,11 @@ endcase
testcase tTextframes_14
- Dim sVerticalBy as String
- Dim iVerticalTop , iVerticalBottom , iVerticalCenter , iVerticalFromTop as Integer
+ Dim sVerticalBy as String
+ Dim iVerticalTop as Integer
+ Dim iVerticalBottom as Integer
+ Dim iVerticalCenter as Integer
+ Dim iVerticalFromTop as Integer
sVerticalBy = "1"+ gSeperator + "00" + gMeasurementUnit
@@ -1313,7 +1348,8 @@ endcase
testcase tTextframes_15
- Dim sOriginalName , sNewName as String
+ Dim sOriginalName as String
+ Dim sNewName as String
sOriginalName = "TEST1"
sNewName = "TEST2"
@@ -1369,7 +1405,8 @@ endcase
testcase tTextframes_16
- Dim sOriginalName , sNewName as String
+ Dim sOriginalName as String
+ Dim sNewName as String
sOriginalName = "TEST1"
sNewName = "TEST2"
@@ -1423,3 +1460,5 @@ testcase tTextframes_16
Call hCloseDocument
endcase
+
+'---------------------------------------------------
diff --git a/testautomation/writer/optional/includes/textframes/w_textframes2.inc b/testautomation/writer/optional/includes/textframes/w_textframes2.inc
index bfe9c11..149d39b 100755
--- a/testautomation/writer/optional/includes/textframes/w_textframes2.inc
+++ b/testautomation/writer/optional/includes/textframes/w_textframes2.inc
@@ -61,8 +61,6 @@ end sub
'---------------------------------------------------
testcase tTextframes_17
-QaErrorLog "#i94758# - Testcase outcommented"
-goto endsub
Dim sTestText
@@ -73,7 +71,7 @@ goto endsub
Call hNewDocument
'/// insert a frame
- Call fInsertFrame(30,50 , 40,60)
+ Call fInsertFrame(30,30 , 60,60)
'/// Format / Frame / Options , check contents
Call fFormatFrame("TabZusaetze")
@@ -83,7 +81,7 @@ goto endsub
Call wTypeKeys "<ESCAPE>"
Wait 500
- Call gMouseClick(25,15)
+ Call gMouseClick(15,15)
Wait 500
'/// check if contents can be inserted into frame
@@ -103,10 +101,8 @@ endcase
'---------------------------------------------------
testcase tTextframes_18
-QaErrorLog "#i94758# - Testcase outcommented"
-goto endsub
- Dim sTestText
+ Dim sTestText as String
sTestText = "T"
@@ -115,7 +111,7 @@ goto endsub
Call hNewDocument
'/// insert a frame
- Call fInsertFrame(50,40 , 60,60)
+ Call fInsertFrame(30,30 , 70,70)
'/// Format / Frame / Options , check contents
Call fFormatFrame("TabZusaetze")
@@ -129,7 +125,7 @@ goto endsub
Call wTypeKeys "<ESCAPE>"
Wait 500
- Call gMouseClick(30,15)
+ Call gMouseClick(15,15)
Sleep 2
'/// check if the frame is moved
@@ -167,7 +163,7 @@ testcase tTextframes_19
Call hNewDocument
'/// insert a frame
- Call fInsertFrame(50,50 , 60,60)
+ Call fInsertFrame(30,30 , 70,70)
'/// Format / Frame / Options , check contents
Call fFormatFrame("TabZusaetze")
@@ -180,7 +176,7 @@ testcase tTextframes_19
Call wTypeKeys "<ESCAPE>"
Wait 500
- Call gMouseClick(52,55)
+ Call gMouseClick(15,15)
Wait 500
'/// check if the frame is moved
@@ -209,7 +205,8 @@ endcase
testcase tTextframes_20
- Dim sTestFile , sTestText as String
+ Dim sTestFile as String
+ Dim sTestText as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\wrap.sxw")
sTestText = "Test"
@@ -266,7 +263,10 @@ testcase tTextframes_20
Call fCloseNavigator
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -274,7 +274,8 @@ endcase
testcase tTextframes_21
- Dim sTestFile , sTestText as String
+ Dim sTestFile as String
+ Dim sTestText as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\through.sxw")
sTestText = "Test"
@@ -332,7 +333,10 @@ testcase tTextframes_21
Call fCloseNavigator
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -340,7 +344,8 @@ endcase
testcase tTextframes_22
- Dim sTestFile , sTestText as String
+ Dim sTestFile as String
+ Dim sTestText as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\before.sxw")
sTestText = "Test"
@@ -447,15 +452,19 @@ testcase tTextframes_22
Call fCloseNavigator
- Call hCloseDocument
-
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
+
endcase
'-----------------------------------------------------------------
testcase tTextframes_23
- Dim sTestFile , sTestText as String
+ Dim sTestFile as String
+ Dim sTestText as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\after.sxw")
sTestText = "Test"
@@ -562,7 +571,10 @@ testcase tTextframes_23
Call fCloseNavigator
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -600,22 +612,22 @@ endcase
testcase tTextframes_25
- Dim sWidth as String
+ Dim sWidth as String
Dim sSpacingToContent as String
- Dim sColumn as String
- Dim sWidthColumn1 as String
- Dim sWidthColumn2 as String
- Dim sWidthColumn3 as String
+ Dim sColumn as String
+ Dim sWidthColumn1 as String
+ Dim sWidthColumn2 as String
+ Dim sWidthColumn3 as String
- sWidth = "6"+ gSeperator + "00" + gMeasurementUnit
+ sWidth = "6"+ gSeperator + "00" + gMeasurementUnit
sSpacingToContent = "0"+ gSeperator + "00"
sColumn = "3"
- sWidthColumn1 = "1"+ gSeperator + "00" + gMeasurementUnit
- sWidthColumn2 = "2"+ gSeperator + "00" + gMeasurementUnit
- sWidthColumn3 = "3"+ gSeperator + "00" + gMeasurementUnit
-
+ sWidthColumn1 = "1"+ gSeperator + "00" + gMeasurementUnit
+ sWidthColumn2 = "2"+ gSeperator + "00" + gMeasurementUnit
+ sWidthColumn3 = "3"+ gSeperator + "00" + gMeasurementUnit
+
printlog "- Test columns' width"
Call hNewDocument
@@ -625,7 +637,7 @@ testcase tTextframes_25
'Set frame's width
Call fFormatFrame("TabType")
- Width.SetText sWidth
+ Width.SetText sWidth
wait 500
TabType.OK
@@ -679,18 +691,18 @@ endcase
testcase tTextframes_26
- Dim sWidth as String
+ Dim sWidth as String
Dim sSpacingToContent as String
- Dim sColumn as String
- Dim sWidthColumn1 as String
- Dim sWidthColumn2 as String
- Dim sWidthColumn3 as String
- Dim sSpacing1 as String
- Dim sSpacing2 as String
- Dim sNewWidthColumn1 as String
- Dim sNewWidthColumn2 as String
- Dim sNewWidthColumn3 as String
- Dim sNewWidthColumn4 as String
+ Dim sColumn as String
+ Dim sWidthColumn1 as String
+ Dim sWidthColumn2 as String
+ Dim sWidthColumn3 as String
+ Dim sSpacing1 as String
+ Dim sSpacing2 as String
+ Dim sNewWidthColumn1 as String
+ Dim sNewWidthColumn2 as String
+ Dim sNewWidthColumn3 as String
+ Dim sNewWidthColumn4 as String
sWidth = "6"+ gSeperator + "00" + gMeasurementUnit
sSpacingToContent = "0"+ gSeperator + "00"
@@ -707,7 +719,7 @@ testcase tTextframes_26
sNewWidthColumn1 = "1"+ gSeperator + "00" + gMeasurementUnit
sNewWidthColumn2 = "1"+ gSeperator + "90" + gMeasurementUnit
sNewWidthColumn3 = "2"+ gSeperator + "80" + gMeasurementUnit
- sNewWidthColumn4 = "2"+ gSeperator + "81" + gMeasurementUnit
+ sNewWidthColumn4 = "2"+ gSeperator + "81" + gMeasurementUnit
printlog "- Test columns' spacing"
@@ -773,12 +785,12 @@ testcase tTextframes_26
if Spaltenbreite1.GetText <> sNewWidthColumn1 then Warnlog "the column1's width isn't set correctly !"
if Spaltenbreite2.GetText <> sNewWidthColumn2 then Warnlog "the column2's width isn't set correctly !"
if (Spaltenbreite3.GetText <> sNewWidthColumn3) then
- if (Spaltenbreite3.GetText <> sNewWidthColumn4) then
- Warnlog "the column3's width isn't set correctly ! (not" & Spaltenbreite3.GetText & " but " & sNewWidthColumn3 & ")"
- end if
- end if
- if Abstand12.GetText <> sSpacing1 then Warnlog "the 1st spacing isn't set correctly !"
- if Abstand23.GetText <> sSpacing2 then Warnlog "the 2nd spacing isn't set correctly !"
+ if (Spaltenbreite3.GetText <> sNewWidthColumn4) then
+ Warnlog "the column3's width isn't set correctly ! (not" & Spaltenbreite3.GetText & " but " & sNewWidthColumn3 & ")"
+ end if
+ end if
+ if Abstand12.GetText <> sSpacing1 then Warnlog "the 1st spacing isn't set correctly !"
+ if Abstand23.GetText <> sSpacing2 then Warnlog "the 2nd spacing isn't set correctly !"
TabSpalten.Cancel
Call hCloseDocument
@@ -789,9 +801,9 @@ endcase
testcase tTextframes_27
- Dim iLine as Integer
+ Dim iLine as Integer
Dim iPosition as Integer
- Dim sHeight as String
+ Dim sHeight as String
iLine = 3
iPosition = 2
@@ -849,11 +861,6 @@ endcase
'-----------------------------------------------------------------
testcase tTextframes_28
-QaErrorLog "#i94758# - Testcase outcommented"
-goto endsub
-
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
Dim sFrameName1 as String
Dim sFrameName2 as String
@@ -866,7 +873,7 @@ goto endsub
Call hNewDocument
'/// Insert a frame
- Call fInsertFrame(30, 50, 60, 75)
+ Call fInsertFrame(30, 30, 60, 60)
'/// + Naming the frame
Call fFormatFrame("TabZusaetze")
@@ -883,7 +890,7 @@ goto endsub
Sleep 2
'/// Insert another frame
- Call fInsertFrame(50, 35, 30, 55)
+ Call fInsertFrame(50, 50, 80, 80)
printlog "Move second frame away from the first frame."
Call wTypeKeys "<RIGHT>", 10
@@ -941,9 +948,9 @@ endcase
testcase tTextframes_29
- Dim sLeft1 as String
- Dim sRight1 as String
- Dim sTop1 as String
+ Dim sLeft1 as String
+ Dim sRight1 as String
+ Dim sTop1 as String
Dim sBottom1 as String
sLeft1 = "0"+ gSeperator + "1"
@@ -994,10 +1001,10 @@ endcase
'-----------------------------------------------------------------
testcase tTextframes_30
-
- Dim sLeft1 as String
- Dim sRight1 as String
- Dim sTop1 as String
+
+ Dim sLeft1 as String
+ Dim sRight1 as String
+ Dim sTop1 as String
Dim sBottom1 as String
sLeft1 = "0"+ gSeperator + "1"
@@ -1098,11 +1105,9 @@ endcase
'-----------------------------------------------------------------
testcase tTextframes_32
-QaErrorLog "#i94758# - Testcase outcommented"
-goto endsub
Dim sTestFile as String
- Dim sText as String
+ Dim sText as String
sText = "Test"
sTestFile = ConvertPath (gOfficePath + "user\work\testFileReadOnly.odt" )
@@ -1118,7 +1123,7 @@ goto endsub
Call hNewDocument
'/// insert a frame
- Call fInsertFrame(30,30 , 50,60)
+ Call fInsertFrame(30,30 , 70,70)
'/// Format / Frame / Options , check "Editable in read-only document"
Call fFormatFrame("TabZusaetze")
@@ -1138,7 +1143,7 @@ goto endsub
'/// Check if the text can be inputed into frame
Call hFileOpen(sTestFile,false)
- Call gMouseClick(25,20)
+ Call wTypeKeys "<SHIFT F4><RETURN>"
Wait 500
try
@@ -1159,3 +1164,5 @@ goto endsub
Call hCloseDocument
endcase
+
+' ------------------------------------------------------------------------------
diff --git a/testautomation/writer/optional/includes/textframes/w_textframes3.inc b/testautomation/writer/optional/includes/textframes/w_textframes3.inc
index 49e4283..3d220ea 100755
--- a/testautomation/writer/optional/includes/textframes/w_textframes3.inc
+++ b/testautomation/writer/optional/includes/textframes/w_textframes3.inc
@@ -61,11 +61,6 @@ end sub
'---------------------------------------------------
testcase tTextframes_33
-QaErrorLog "#i94758# - Testcase outcommented"
-goto endsub
-
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
printlog "- Test attribute 'AutoSize' in linked frames"
'/// Test attribute 'AutoSize' in linked frames
@@ -73,17 +68,16 @@ goto endsub
Call hNewDocument
'/// insert a frame
- Call fInsertFrame(30,30 , 40,40)
+ Call fInsertFrame(30,30 , 50,50)
Call wTypeKeys "<ESCAPE>"
- Wait 500
+ WaitSlot (5)
'/// insert another frame
- Call fInsertFrame(50,50 , 65,65)
+ Call fInsertFrame(50,50 , 80,80)
printlog "Move the second frame away from the first one."
Call wTypeKeys "<RIGHT>",10
- Call wTypeKeys "<DOWN>",7
'/// Set focus to first frame
Call wTypeKeys "<TAB>"
@@ -98,7 +92,7 @@ goto endsub
Wait 500
'/// Target the second frame
- Call gMouseClick(60,60)
+ Call gMouseClick(60,20)
Wait 500
'/// Format/Frame / Type ,
@@ -132,12 +126,9 @@ endcase
testcase tTextframes_34
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sText as String
- Dim sOriginalName
- Dim sTargetName as String
+ Dim sText as String
+ Dim sOriginalName as String
+ Dim sTargetName as String
sOriginalName = "TEST1"
sTargetName = "TEST2"
@@ -148,7 +139,7 @@ testcase tTextframes_34
Call hNewDocument
'/// insert a frame , set frame name
- Call fInsertFrame(30,30 , 40,40)
+ Call fInsertFrame(30,30 , 50,50)
Call fFormatFrame("TabZusaetze")
ObjektName.SetText sOriginalName
@@ -158,12 +149,11 @@ testcase tTextframes_34
Wait 500
'/// insert another frame , set frame name
- Call fInsertFrame(50,50 , 65,65)
+ Call fInsertFrame(50,50 , 70,70)
printlog "Move second frame away from the first frame."
- Call wTypeKeys "<RIGHT>", 10
- Call wTypeKeys "<DOWN>", 10
-
+ Call wTypeKeys "<RIGHT>", 12
+
printlog "Name second object."
Call fFormatFrame("TabZusaetze")
ObjektName.SetText sTargetName
@@ -182,7 +172,7 @@ testcase tTextframes_34
Wait 500
'/// Target the second frame
- Call gMouseClick(60,80)
+ Call gMouseClick(60,20)
Wait 500
Call wTypeKeys "<RETURN>"
@@ -207,13 +197,9 @@ endcase
'-----------------------------------------------------------------
testcase tTextframes_35
-QaErrorLog "#i94758# - Testcase outcommented"
-goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim iNoLink , iLink as Integer
+ Dim iNoLink as Integer
+ Dim iLink as Integer
iNoLink = 1
iLink = 2
@@ -224,17 +210,16 @@ goto endsub
Call hNewDocument
'/// insert a frame
- Call fInsertFrame(30,30 , 40,40)
+ Call fInsertFrame(30,30 , 50,50)
Call wTypeKeys "<ESCAPE>"
Wait 500
'/// insert another frame
- Call fInsertFrame(50,50 , 65,65)
+ Call fInsertFrame(50,50 , 80,80)
printlog "Move the second frame away from the first one."
Call wTypeKeys "<RIGHT>",10
- Call wTypeKeys "<DOWN>",7
'/// Set focus to first frame
Call wTypeKeys "<TAB>"
@@ -249,7 +234,7 @@ goto endsub
Wait 500
'/// Target the second frame
- Call gMouseClick(60,60)
+ Call gMouseClick(60,20)
Wait 500
'/// Check if the link is showed correctly (Format.Frame.Options)
@@ -275,16 +260,11 @@ endcase
'-----------------------------------------------------------------
testcase tTextframes_36
-QaErrorLog "#i94758# - Testcase outcommented"
-goto endsub
-
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
Dim sTestFile as String
Dim sTestText as String
- Dim iNoLink as Integer
- Dim iLink as Integer
+ Dim iNoLink as Integer
+ Dim iLink as Integer
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\twopages.sxw")
iNoLink = 1
@@ -360,21 +340,21 @@ goto endsub
if NextLink.GetSelIndex <> iNoLink then Warnlog "2nd frame: next link should be none"
TabZusaetze.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_37
-QaErrorLog "#i94758# - Testcase outcommented"
-goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile , sTestText as String
- Dim iNoLink , iLink as Integer
+ Dim sTestFile as String
+ Dim sTestText as String
+ Dim iNoLink as String
+ Dim iLink as Integer
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\Header.sxw")
iNoLink = 1
@@ -424,21 +404,21 @@ goto endsub
if NextLink.GetSelIndex <> iNoLink then Warnlog "2nd frame: next link should be none"
TabZusaetze.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_38
-QaErrorLog "#i94758# - Testcase outcommented"
-goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile , sTestText as String
- Dim iNoLink , iLink as Integer
+ Dim sTestFile as String
+ Dim sTestText as String
+ Dim iNoLink as String
+ Dim iLink as Integer
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\Footer.sxw")
iNoLink = 1
@@ -486,33 +466,34 @@ goto endsub
if NextLink.GetSelIndex <> iNoLink then Warnlog "2nd frame: next link should be none"
TabZusaetze.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_39
-QaErrorLog "#i94758# - Testcase outcommented"
-goto endsub
- Dim sHorizontalBy1 as String
- Dim sHorizontalBy2 as String
- Dim sVerticalBy1 as String
- Dim sVerticalBy2 as String
+ Dim sHorizontalBy1 as String
+ Dim sHorizontalBy2 as String
+ Dim sVerticalBy1 as String
+ Dim sVerticalBy2 as String
Dim sHorizontalByNew1 as String
Dim sHorizontalByNew2 as String
- Dim sVerticalByNew1 as String
- Dim sVerticalByNew2 as String
-
- sHorizontalBy1 = "2"+ gSeperator + "00" + gMeasurementUnit
- sVerticalBy1 = "1"+ gSeperator + "00" + gMeasurementUnit
- sHorizontalBy2 = "7"+ gSeperator + "00" + gMeasurementUnit
- sVerticalBy2 = "4"+ gSeperator + "00" + gMeasurementUnit
- sHorizontalByNew1 = "3"+ gSeperator + "00" + gMeasurementUnit
- sVerticalByNew1 = "2"+ gSeperator + "00" + gMeasurementUnit
- sHorizontalByNew2 = "8"+ gSeperator + "00" + gMeasurementUnit
- sVerticalByNew2 = "5"+ gSeperator + "00" + gMeasurementUnit
+ Dim sVerticalByNew1 as String
+ Dim sVerticalByNew2 as String
+
+ sHorizontalBy1 = "2"+ gSeperator + "00" + gMeasurementUnit
+ sVerticalBy1 = "1"+ gSeperator + "00" + gMeasurementUnit
+ sHorizontalBy2 = "7"+ gSeperator + "00" + gMeasurementUnit
+ sVerticalBy2 = "4"+ gSeperator + "00" + gMeasurementUnit
+ sHorizontalByNew1 = "3"+ gSeperator + "00" + gMeasurementUnit
+ sVerticalByNew1 = "2"+ gSeperator + "00" + gMeasurementUnit
+ sHorizontalByNew2 = "7"+ gSeperator + "00" + gMeasurementUnit
+ sVerticalByNew2 = "4"+ gSeperator + "00" + gMeasurementUnit
printlog "- Test drag&drop with a linked frame - keyboard"
'/// Test drag&drop with a linked frame - keyboard
@@ -520,12 +501,12 @@ goto endsub
Call hNewDocument
'/// insert a frame and set Horizontal and Vertical
- Call fInsertFrame(40,40 , 50,50)
+ Call fInsertFrame(30,30 , 49,49)
Call fFormatFrame("TabType")
HorizontalBy.SetText sHorizontalBy1
wait 500
- VerticalBy.SetText sVerticalBy1
+ VerticalBy.SetText sVerticalBy1
wait 500
TabType.OK
@@ -533,12 +514,12 @@ goto endsub
Wait 500
'/// insert another frame and set Horizontal and Vertical
- Call fInsertFrame(50,50 , 60,60)
+ Call fInsertFrame(51,51 , 80,80)
Call fFormatFrame("TabType")
HorizontalBy.SetText sHorizontalBy2
wait 500
- VerticalBy.SetText sVerticalBy2
+ VerticalBy.SetText sVerticalBy2
wait 500
TabType.OK
@@ -582,11 +563,6 @@ endcase
'-----------------------------------------------------------------
testcase tTextframes_40
-QaErrorLog "#i94758# - Testcase outcommented"
-goto endsub
-
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
Dim sHorizontalBy as String
@@ -598,7 +574,7 @@ goto endsub
Call hNewDocument
'/// insert a frame
- Call fInsertFrame(30,30 , 50,50)
+ Call fInsertFrame(30,30 , 49,49)
Call fFormatFrame("TabType")
HorizontalBy.SetText sHorizontalBy
@@ -609,11 +585,11 @@ goto endsub
Wait 500
'/// insert another frame
- Call fInsertFrame(50,50 , 65,65)
+ Call fInsertFrame(51,51 , 80,80)
printlog "Move the second frame away from the first one."
Call wTypeKeys "<RIGHT>",10
- Call wTypeKeys "<DOWN>",7
+' Call wTypeKeys "<DOWN>",7
Call wTypeKeys "<Tab>"
@@ -626,7 +602,7 @@ goto endsub
Wait 500
'/// Target the second frame
- Call gMouseClick(60,60)
+ Call gMouseClick(75,30)
Wait 500
'/// Move 1st frame with keyboard (Left)
@@ -649,13 +625,9 @@ endcase
'-----------------------------------------------------------------
testcase tTextframes_41
-QaErrorLog "#i94758# - Testcase outcommented"
-goto endsub
-
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
- Dim iLink , iNolink as Integer
+ Dim iLink as String
+ Dim iNolink as Integer
iLink = 2
iNolink = 1
@@ -666,17 +638,16 @@ goto endsub
Call hNewDocument
'/// insert a frame
- Call fInsertFrame(30,30 , 50,50)
+ Call fInsertFrame(30,30 , 49,49)
Call wTypeKeys "<ESCAPE>"
- Wait 500
+ WaitSlot (5)
'/// insert another frame
- Call fInsertFrame(50,50 , 65,65)
+ Call fInsertFrame(51,51 , 80,80)
printlog "Move the second frame away from the first one."
Call wTypeKeys "<RIGHT>",10
- Call wTypeKeys "<DOWN>",7
'/// Set focus to 1st frame
Call wTypeKeys "<Tab>"
@@ -690,7 +661,7 @@ goto endsub
Wait 500
'/// Target the second frame
- Call gMouseClick(60,60)
+ Call gMouseClick(60,20)
Wait 500
'/// Remove link
@@ -719,7 +690,7 @@ endcase
testcase tTextframes_42
- Dim iNoLink as Integer
+ Dim iNoLink as Integer
iNoLink = 1
@@ -767,9 +738,9 @@ endcase
testcase tTextframes_43
- Dim iLink as Integer
+ Dim iLink as Integer
- iLink = 2
+ iLink = 2
printlog "- Link frame in footer with frame in bodytext should be forbidded"
'/// Link frame in footer with frame in bodytext should be forbidded
@@ -814,8 +785,8 @@ endcase
testcase tTextframes_44
- Dim sText as String
- Dim iNoLink as Integer
+ Dim sText as String
+ Dim iNoLink as Integer
sText = "Test"
iNoLink = 1
@@ -861,10 +832,7 @@ endcase
testcase tTextframes_45
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim iNoLink as Integer
+ Dim iNoLink as Integer
iNoLink = 1
@@ -874,17 +842,17 @@ testcase tTextframes_45
Call hNewDocument
'/// insert a frame
- Call fInsertFrame(30,30 , 35,40)
+ Call fInsertFrame(30,30 , 45,45)
Call wTypeKeys "<ESCAPE>"
Wait 500
'/// insert another frame
- Call fInsertFrame(50,50 , 65,65)
+ Call fInsertFrame(50,50 , 70,70)
printlog "Move the second frame away from the first one."
Call wTypeKeys "<RIGHT>",10
- Call wTypeKeys "<DOWN>",7
+' Call wTypeKeys "<DOWN>",7
'/// set focus to 1st frame
Call wTypeKeys "<TAB>"
@@ -895,7 +863,7 @@ testcase tTextframes_45
Sleep 2
Verketten.Click
Wait 500
- Call gMouseClick(60,60)
+ Call gMouseClick(75,30)
Wait 500
'/// link two frames (1st frame is target frame)
@@ -904,7 +872,7 @@ testcase tTextframes_45
Wait 500
Verketten.Click
Wait 500
- Call gMouseClick(20,35)
+ Call gMouseClick(35,35)
Wait 500
Call fFormatFrame("TabZusaetze")
@@ -919,12 +887,9 @@ endcase
testcase tTextframes_46
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim iNoLink as Integer
+ Dim iNoLink as Integer
- iNoLink = 1
+ iNoLink = 1
printlog "- Frames couldn't be linked with the current one is part of another 'chain'"
'/// Frames couldn't be linked with the current one is part of another 'chain'
@@ -932,13 +897,13 @@ testcase tTextframes_46
Call hNewDocument
'/// insert a frame
- Call fInsertFrame(50,30 , 70,40)
+ Call fInsertFrame(30,30 , 49,49)
Call wTypeKeys "<ESCAPE>"
Wait 500
'/// insert another frame
- Call fInsertFrame(60,50 , 80,60)
+ Call fInsertFrame(51,51 , 65,65)
printlog "Move the frame away from the position of the first one."
Call wTypeKeys "<RIGHT>",4
@@ -948,12 +913,12 @@ testcase tTextframes_46
Wait 500
'/// insert 3rd frame
- Call fInsertFrame(70,60 , 90,70)
+ Call fInsertFrame(70,70 , 80,80)
Wait 500
printlog "Move the frame away from the position of the first one."
- Call wTypeKeys "<RIGHT>",8
- Call wTypeKeys "<DOWN>",8
+ Call wTypeKeys "<LEFT>",8
+ Call wTypeKeys "<UP>",8
'/// set focus to 1st frame
Call wTypeKeys "<SHIFT F4>" 'make sure object is selected.
@@ -966,7 +931,7 @@ testcase tTextframes_46
Sleep 1
Verketten.Click
Sleep 1
- Call gMouseClick(45,45)
+ Call gMouseClick(70,70)
Wait 500
'/// set focus to 3rd frame
@@ -977,7 +942,7 @@ testcase tTextframes_46
Sleep 2
Verketten.Click
Sleep 1
- Call gMouseClick(45,45)
+ Call gMouseClick(70,70)
Wait 500
Call fFormatFrame("TabZusaetze")
@@ -992,9 +957,9 @@ endcase
testcase tTextframes_47
- Dim iLink as Integer
+ Dim iLink as Integer
- iLink = 2
+ iLink = 2
printlog "- Frames couldn't be linked with the current one is in protected section"
'/// Frames couldn't be linked with the current one is in protected section
@@ -1011,10 +976,12 @@ testcase tTextframes_47
TabBereiche.OK
wait 500
- Call wTypeKeys "<up>" , 1
+ Call wTypeKeys "<UP>" , 1
+ Call wTypeKeys "<RETURN>", 6
'/// Insert a frame (A) in the section
Call wInsertFrame
+ Call wTypeKeys "<UP>" , 2
Call wTypeKeys "<ESCAPE>"
'/// Set the section to be protected
@@ -1025,7 +992,10 @@ testcase tTextframes_47
BereicheBearbeiten.OK
'/// Insert another frame (B) out of the section
- Call fInsertFrame(50,50 , 60,60)
+ Call fInsertFrame(30,70 , 60,90)
+
+ Call wTypeKeys "<RIGHT>" , 8
+ Call wTypeKeys "<DOWN>" , 8
'/// Link B->A (A is target)
Call fFormatFrame("TabZusaetze")
@@ -1045,9 +1015,9 @@ endcase
testcase tTextframes_48
- Dim iLink as Integer
+ Dim iLink as Integer
- iLink = 2
+ iLink = 2
printlog "- Frames could be linked with the current one is set to 'editable in protected documents' even it is in protected section "
'/// Frames could be linked with the current one is set to "editable in protected documents" even it is in protected section
diff --git a/testautomation/writer/optional/includes/textframes/w_textframes4.inc b/testautomation/writer/optional/includes/textframes/w_textframes4.inc
index ca25884..3f6b014 100755
--- a/testautomation/writer/optional/includes/textframes/w_textframes4.inc
+++ b/testautomation/writer/optional/includes/textframes/w_textframes4.inc
@@ -90,7 +90,7 @@ endcase
testcase tTextframes_50
- Dim sTestFile as String
+ Dim sTestFile as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\frame.sxw")
@@ -116,7 +116,10 @@ testcase tTextframes_50
end if
TabType.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -124,7 +127,7 @@ endcase
testcase tTextframes_51
- Dim sTestFile as String
+ Dim sTestFile as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\inFrontText.doc")
@@ -150,7 +153,10 @@ testcase tTextframes_51
end if
TabType.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -184,7 +190,10 @@ testcase tTextframes_52
end if
TabType.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -218,7 +227,10 @@ testcase tTextframes_53
end if
TabType.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -252,7 +264,10 @@ testcase tTextframes_54
end if
TabType.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -349,15 +364,12 @@ endcase
'-----------------------------------------------------------------
testcase tTextframes_57
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_57 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
- Dim iVertical as Integer
- Dim sVerticalBy as String
+ Dim sTestFile as String
+ Dim iVertical as Integer
+ Dim sVerticalBy as String
Dim sPositionY1 as String
Dim sPositionY2 as String
@@ -423,21 +435,21 @@ goto endsub
Warnlog "Something is wrong ! Perhaps the frame isn't in the header!"
end if
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_58
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_58 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
- Dim iVertical as Integer
+ Dim sTestFile as String
+ Dim iVertical as Integer
Dim sVerticalBy as String
Dim sPositionY1 as String
Dim sPositionY2 as String
@@ -503,24 +515,24 @@ goto endsub
Warnlog "Something is wrong ! Perhaps the frame is still in the header!"
end if
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_59
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_57 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
+ Dim sTestFile as String
Dim sPositionY1 as String
Dim sPositionY2 as String
- sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInTable.sxw")
+ sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInTable.sxw")
printlog "- Exceeding layout environment at the bottom - 'Follow text flow'(ON , table)"
'/// Exceeding layout environment at the bottom - 'Follow text flow'(ON , table)
@@ -591,20 +603,20 @@ goto endsub
Warnlog "The frame isn't in the table!"
endcatch
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_60
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_60 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
+ Dim sTestFile as String
Dim sPositionY1 as String
Dim sPositionY2 as String
@@ -620,15 +632,17 @@ goto endsub
Call hFileOpen(sTestFile,false)
Call sMakeReadOnlyDocumentEditable
- 'Set focus to the picture
+ 'Set focus to the frame
Call wTypeKeys ( "<Shift F4>" )
Sleep 1
- Call wTypeKeys ( "<Tab>" )
printlog "Move the frame into the document-area."
Call wTypeKeys "<RIGHT>",10
Call wTypeKeys "<DOWN>",7
+ 'Set focus to the picture
+ Call wTypeKeys ( "<Tab>" )
+
'Get the pic Y position
Sleep 1
Call fFormatGraphic("TabType")
@@ -683,22 +697,22 @@ goto endsub
catch
endcatch
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_61
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_61 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
- Dim iVertical as Integer
- Dim sVerticalBy as String
+ Dim sTestFile as String
+ Dim iVertical as Integer
+ Dim sVerticalBy as String
Dim sPositionY1 as String
Dim sPositionY2 as String
@@ -763,22 +777,22 @@ goto endsub
Warnlog "Something is wrong ! Perhaps the frame isn't in the footer!"
end if
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_62
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_62 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
- Dim iVertical as Integer
- Dim sVerticalBy as String
+ Dim sTestFile as String
+ Dim iVertical as Integer
+ Dim sVerticalBy as String
Dim sPositionY1 as String
Dim sPositionY2 as String
@@ -843,24 +857,24 @@ goto endsub
Warnlog "Something is wrong ! Perhaps the frame is still in the footer!"
end if
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_63
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_63 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
- Dim iHorizontal as Integer
- Dim sHorizontalBy as String
- Dim sPositionX1 as String
- Dim sPositionX2 as String
+ Dim sTestFile as String
+ Dim iHorizontal as Integer
+ Dim sHorizontalBy as String
+ Dim sPositionX1 as String
+ Dim sPositionX2 as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInTable.sxw")
iHorizontal = 4 'From Left
@@ -935,24 +949,24 @@ goto endsub
Warnlog "The frame isn't in the table!"
endcatch
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_64
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_64 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
- Dim iHorizontal as Integer
- Dim sHorizontalBy as String
- Dim sPositionX1 as String
- Dim sPositionX2 as String
+ Dim sTestFile as String
+ Dim iHorizontal as Integer
+ Dim sHorizontalBy as String
+ Dim sPositionX1 as String
+ Dim sPositionX2 as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInTable.sxw")
iHorizontal = 4 'From Left
@@ -1027,24 +1041,24 @@ goto endsub
catch
endcatch
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_65
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_65 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
- Dim iHorizontal as Integer
- Dim sHorizontalBy as String
- Dim sPositionX1 as String
- Dim sPositionX2 as String
+ Dim sTestFile as String
+ Dim iHorizontal as Integer
+ Dim sHorizontalBy as String
+ Dim sPositionX1 as String
+ Dim sPositionX2 as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInFrame.sxw")
iHorizontal = 4 'From Left
@@ -1108,24 +1122,24 @@ goto endsub
Warnlog "Something is wrong ! Perhaps the frame A isn't in frame B!"
end if
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_66
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_66 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
- Dim iHorizontal as Integer
- Dim sHorizontalBy as String
- Dim sPositionX1 as String
- Dim sPositionX2 as String
+ Dim sTestFile as String
+ Dim iHorizontal as Integer
+ Dim sHorizontalBy as String
+ Dim sPositionX1 as String
+ Dim sPositionX2 as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInFrame.sxw")
iHorizontal = 4 'From Left
@@ -1189,24 +1203,24 @@ goto endsub
Warnlog "Something is wrong ! Perhaps the frame A isn't in frame B!"
end if
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_67
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_67 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
- Dim iHorizontal as Integer
- Dim sHorizontalBy as String
- Dim sPositionX1 as String
- Dim sPositionX2 as String
+ Dim sTestFile as String
+ Dim iHorizontal as Integer
+ Dim sHorizontalBy as String
+ Dim sPositionX1 as String
+ Dim sPositionX2 as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInTable.sxw")
iHorizontal = 4 'From Left
@@ -1281,24 +1295,24 @@ goto endsub
Warnlog "The frame isn't in the table!"
endcatch
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_68
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_68 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
- Dim iHorizontal as Integer
- Dim sHorizontalBy as String
- Dim sPositionX1 as String
- Dim sPositionX2 as String
+ Dim sTestFile as String
+ Dim iHorizontal as Integer
+ Dim sHorizontalBy as String
+ Dim sPositionX1 as String
+ Dim sPositionX2 as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInTable.sxw")
iHorizontal = 4 'From Left
@@ -1373,24 +1387,24 @@ goto endsub
catch
endcatch
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_69
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_69 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
- Dim iHorizontal as Integer
- Dim sHorizontalBy as String
- Dim sPositionX1 as String
- Dim sPositionX2 as String
+ Dim sTestFile as String
+ Dim iHorizontal as Integer
+ Dim sHorizontalBy as String
+ Dim sPositionX1 as String
+ Dim sPositionX2 as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInFrame.sxw")
iHorizontal = 4 'From Left
@@ -1454,24 +1468,24 @@ goto endsub
Warnlog "Something is wrong ! Perhaps the frame A isn't in frame B!"
end if
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_70
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_70 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
- Dim iHorizontal as Integer
- Dim sHorizontalBy as String
- Dim sPositionX1 as String
- Dim sPositionX2 as String
+ Dim sTestFile as String
+ Dim iHorizontal as Integer
+ Dim sHorizontalBy as String
+ Dim sPositionX1 as String
+ Dim sPositionX2 as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInFrame.sxw")
iHorizontal = 4 'From Left
@@ -1535,7 +1549,10 @@ goto endsub
Warnlog "Something is wrong ! Perhaps the frame A isn't in frame B!"
end if
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
diff --git a/testautomation/writer/optional/includes/textframes/w_textframes5.inc b/testautomation/writer/optional/includes/textframes/w_textframes5.inc
index 7bf7212..2ca64f9 100755
--- a/testautomation/writer/optional/includes/textframes/w_textframes5.inc
+++ b/testautomation/writer/optional/includes/textframes/w_textframes5.inc
@@ -60,10 +60,10 @@ end sub
testcase tTextframes_71
- Dim iVertical as Integer
- Dim sVerticalBy as String
- Dim iHorizontal as Integer
- Dim sHorizontalBy as String
+ Dim iVertical as Integer
+ Dim sVerticalBy as String
+ Dim iHorizontal as Integer
+ Dim sHorizontalBy as String
iHorizontal = 4 'From Left
sHorizontalBy = "-1"+ gSeperator + "00" + gMeasurementUnit
@@ -113,6 +113,8 @@ endcase
'-----------------------------------------------------------------
testcase tTextframes_72
+Warnlog "#i102752# - tTextframes_72 outcommented due to bug."
+goto endsub
printlog "- 'Vertical to' when anchor is inside frame"
'/// 'Vertical to' when anchor is inside frame
@@ -141,13 +143,18 @@ testcase tTextframes_72
TabType.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_73
+Warnlog "#i102752# - tTextframes_73 outcommented due to bug."
+goto endsub
printlog "- 'Vertical to' when anchor is inside document body"
'/// 'Vertical to' when anchor is inside document body
@@ -174,7 +181,10 @@ testcase tTextframes_73
end if
TabType.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -206,7 +216,10 @@ testcase tTextframes_74
end if
TabType.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -239,7 +252,10 @@ testcase tTextframes_75
end if
TabType.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -272,7 +288,10 @@ testcase tTextframes_76
end if
TabType.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -305,7 +324,10 @@ testcase tTextframes_77
end if
TabType.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
@@ -338,20 +360,23 @@ testcase tTextframes_78
end if
TabType.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_80
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_80 outcommented due to bug."
goto endsub
- Dim sTestFile as String
- Dim iVertical as Integer
- Dim iVerticalTo as Integer
- Dim sPositionY as String
+ Dim sTestFile as String
+ Dim iVertical as Integer
+ Dim iVerticalTo as Integer
+ Dim sPositionY as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\lineOfText.sxw")
iVertical = 1 ' Top
@@ -393,23 +418,23 @@ goto endsub
end if
TabPositionAndSizeWriter.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_81
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_81 outcommented due to bug."
goto endsub
- QaErrorLog "#i94758# Testcase outcommented due to unreability."
- goto endsub
-
- Dim sTestFile as String
- Dim iVertical as Integer
- Dim iVerticalTo as Integer
- Dim sPositionY as String
+ Dim sTestFile as String
+ Dim iVertical as Integer
+ Dim iVerticalTo as Integer
+ Dim sPositionY as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\lineOfText.sxw")
iVertical = 2 ' Bottom
@@ -451,20 +476,23 @@ goto endsub
end if
TabPositionAndSizeWriter.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_82
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_82 outcommented due to bug."
goto endsub
- Dim sTestFile as String
- Dim iVertical as Integer
- Dim iVerticalTo as Integer
- Dim sPositionY as String
+ Dim sTestFile as String
+ Dim iVertical as Integer
+ Dim iVerticalTo as Integer
+ Dim sPositionY as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\lineOfText.sxw")
iVertical = 4 ' Center
@@ -506,21 +534,24 @@ goto endsub
end if
TabPositionAndSizeWriter.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_83
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_83 outcommented due to bug."
goto endsub
- Dim sTestFile as String
- Dim iVertical as Integer
- Dim iVerticalTo as Integer
- Dim sPositionY as String
- Dim sVerticalBy as String
+ Dim sTestFile as String
+ Dim iVertical as Integer
+ Dim iVerticalTo as Integer
+ Dim sPositionY as String
+ Dim sVerticalBy as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\lineOfText.sxw")
iVertical = 6 ' From Bottom
@@ -571,21 +602,24 @@ goto endsub
end if
TabPositionAndSizeWriter.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_84
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_84 outcommented due to bug."
goto endsub
- Dim sTestFile as String
- Dim iVertical as Integer
- Dim iVerticalTo as Integer
- Dim sPositionY as String
- Dim sVerticalBy as String
+ Dim sTestFile as String
+ Dim iVertical as Integer
+ Dim iVerticalTo as Integer
+ Dim sPositionY as String
+ Dim sVerticalBy as String
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\textframe\lineOfText.sxw")
iVertical = 6 ' From Bottom
@@ -636,14 +670,17 @@ goto endsub
end if
TabPositionAndSizeWriter.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
'-----------------------------------------------------------------
testcase tTextframes_85
-QaErrorLog "#i94758# - Testcase outcommented"
+Warnlog "#i102752# - tTextframes_85 outcommented due to bug."
goto endsub
Dim sTestFile as String
@@ -670,10 +707,10 @@ goto endsub
'/// + the 3rd one is bottom to the line text
Call hFileOpen(sTestFile,false)
Call sMakeReadOnlyDocumentEditable
+ Sleep (2)
'/// Set focus to 1st Frame
Call wTypeKeys ( "<Shift F4>" )
- Sleep 1
'/// Format/Frame / Type , check if 'To character' in anchor area
'/// + check if 'Line of text' in vertical to ,
@@ -728,6 +765,11 @@ goto endsub
end if
TabType.Cancel
- Call hCloseDocument
+ printlog " Close active document "
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
+
+' ------------------------------------------------------------------------------
diff --git a/testautomation/writer/optional/input/fields/diploma.ott b/testautomation/writer/optional/input/fields/diploma.ott
new file mode 100644
index 0000000..1f15f78
Binary files /dev/null and b/testautomation/writer/optional/input/fields/diploma.ott differ
diff --git a/testautomation/writer/optional/w_dropdownLB.bas b/testautomation/writer/optional/w_dropdownLB.bas
index 08d6930..a681d39 100644
--- a/testautomation/writer/optional/w_dropdownLB.bas
+++ b/testautomation/writer/optional/w_dropdownLB.bas
@@ -52,7 +52,7 @@ sub main
printlog Chr(13) + "******* Writer - Level 1 - Test *******"
Call hStatusIn ( "writer", "w_dropdownLB.bas","Dropdown listbox" )
- Call wOptionenUndo ( "Alle" ) ' Sets all writer-options to default
+ Call wOptionsUndo ( "All" ) ' Sets all writer-options to default
printlog Chr(13) + " - Test Drop Down List Box"
diff --git a/testautomation/writer/optional/w_fields.bas b/testautomation/writer/optional/w_fields.bas
index a18ed1c..e46561f 100644
--- a/testautomation/writer/optional/w_fields.bas
+++ b/testautomation/writer/optional/w_fields.bas
@@ -1,99 +1,99 @@
-'encoding UTF-8 Do not remove or change this line!
-'**************************************************************************
-'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'*
-'* Copyright 2008 by Sun Microsystems, Inc.
-'*
-'* OpenOffice.org - a multi-platform office productivity suite
-'*
-'* $RCSfile: w_fields.bas,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: fredrikh $ $Date: 2008-06-18 09:11:25 $
-'*
-'* 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 : fredrik.haegg at sun.com
-'*
-'* short description : Test of content and update reliability of the fields
-'*
-'\*******************************************************************
-
-global gSeperator as String
-global gMeasurementUnit as String
-
-sub main
-
- Dim StartZeit
- StartZeit = Now()
-
- use "writer\tools\includes\w_tools.inc"
- use "writer\tools\includes\w_tool3.inc"
- use "writer\tools\includes\w_tool7.inc"
- use "writer\optional\includes\tools\tools1.inc"
- use "writer\optional\includes\tools\tools2.inc"
- use "writer\optional\includes\fields\w_fields1.inc"
- use "writer\optional\includes\fields\w_fields2.inc"
- use "writer\optional\includes\fields\w_fields3.inc"
- use "writer\optional\includes\fields\w_fields4.inc"
- use "writer\optional\includes\fields\w_fields5.inc"
- use "writer\optional\includes\fields\w_fields6.inc"
- use "writer\optional\includes\fields\w_fields7.inc"
-
- printlog Chr(13) + "Loading of Include - Files takes: " + Wielange ( StartZeit )
- printlog Chr(13) + "******* Writer - Level 1 - Test *******"
-
- Call hStatusIn ( "writer", "w_fields.bas" , "Fields" )
-
- 'Software Configuration:
- 'Getting the decimal seperator from global function
- gSeperator = GetDecimalSeperator()
- 'Setting the measurement unit to centimeters.
- gMeasurementUnit = fSetMeasurementToCM()
-
- printlog Chr(13) + " --- Test Fields - General Test ---"
- Call w_fields1
- Call w_fields2
- printlog Chr(13) + " --- Test Fields - Reference ---"
- Call w_fields3
- printlog Chr(13) + " --- Test Fields - Doc information ---"
- Call w_fields4
- printlog Chr(13) + " --- Test Fields - Variables ---"
- Call w_fields5
- printlog Chr(13) + " --- Test Fields - Functions ---"
- Call w_fields6
- printlog Chr(13) + " --- Test Fields - L10N ---"
- Call w_fields7
-
- Call hStatusOut
-
- Printlog Chr(13) + "End of Level 1 Test - Fields"
- Printlog "Duration: "+ WieLange ( StartZeit )
- Printlog "Date: " + Date + " Time: " + Time
-
-end sub
-
-sub LoadIncludeFiles
- use "global\system\includes\master.inc"
- use "global\system\includes\gvariabl.inc"
- Call GetUseFiles
- gApplication = "WRITER"
-end Sub
+'encoding UTF-8 Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'*
+'* Copyright 2008 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: w_fields.bas,v $
+'*
+'* $Revision: 1.1 $
+'*
+'* last change: $Author: fredrikh $ $Date: 2008-06-18 09:11:25 $
+'*
+'* 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 : fredrik.haegg at sun.com
+'*
+'* short description : Test of content and update reliability of the fields
+'*
+'\*******************************************************************
+
+global gSeperator as String
+global gMeasurementUnit as String
+
+sub main
+
+ Dim StartZeit
+ StartZeit = Now()
+
+ use "writer\tools\includes\w_tools.inc"
+ use "writer\tools\includes\w_tool3.inc"
+ use "writer\tools\includes\w_tool7.inc"
+ use "writer\optional\includes\tools\tools1.inc"
+ use "writer\optional\includes\tools\tools2.inc"
+ use "writer\optional\includes\fields\w_fields1.inc"
+ use "writer\optional\includes\fields\w_fields2.inc"
+ use "writer\optional\includes\fields\w_fields3.inc"
+ use "writer\optional\includes\fields\w_fields4.inc"
+ use "writer\optional\includes\fields\w_fields5.inc"
+ use "writer\optional\includes\fields\w_fields6.inc"
+ use "writer\optional\includes\fields\w_fields7.inc"
+
+ printlog Chr(13) + "Loading of Include - Files takes: " + Wielange ( StartZeit )
+ printlog Chr(13) + "******* Writer - Level 1 - Test *******"
+
+ Call hStatusIn ( "writer", "w_fields.bas" , "Fields" )
+
+ 'Software Configuration:
+ 'Getting the decimal seperator from global function
+ gSeperator = GetDecimalSeperator()
+ 'Setting the measurement unit to centimeters.
+ gMeasurementUnit = fSetMeasurementToCM()
+
+ printlog Chr(13) + " --- Test Fields - General Test ---"
+ Call w_fields1
+ Call w_fields2
+ printlog Chr(13) + " --- Test Fields - Reference ---"
+ Call w_fields3
+ printlog Chr(13) + " --- Test Fields - Doc information ---"
+ Call w_fields4
+ printlog Chr(13) + " --- Test Fields - Variables ---"
+ Call w_fields5
+ printlog Chr(13) + " --- Test Fields - Functions ---"
+ Call w_fields6
+ printlog Chr(13) + " --- Test Fields - L10N ---"
+ Call w_fields7
+
+ Call hStatusOut
+
+ Printlog Chr(13) + "End of Level 1 Test - Fields"
+ Printlog "Duration: "+ WieLange ( StartZeit )
+ Printlog "Date: " + Date + " Time: " + Time
+
+end sub
+
+sub LoadIncludeFiles
+ use "global\system\includes\master.inc"
+ use "global\system\includes\gvariabl.inc"
+ Call GetUseFiles
+ gApplication = "WRITER"
+end Sub
diff --git a/testautomation/writer/optional/w_filter.bas b/testautomation/writer/optional/w_filter.bas
index 3aa2b90..7f82b33 100755
--- a/testautomation/writer/optional/w_filter.bas
+++ b/testautomation/writer/optional/w_filter.bas
@@ -32,7 +32,7 @@
'*
'* owner : fredrik.haegg at sun.com
'*
-'* short description : Test of content and update reliability of the fields
+'* short description : Writer Filter Availability Test (Import/Export/Group names)
'*
'\*******************************************************************
@@ -40,59 +40,26 @@ global gSeperator as String
global gMeasurementUnit as String
sub main
+ Dim ImportFilterDatei as String
- Dim StartZeit
- StartZeit = Now()
+ use "writer\tools\includes\w_tool6.inc"
+ use "writer\optional\includes\filter\w_filter.inc"
- use "writer\tools\includes\w_tools.inc"
- use "writer\tools\includes\w_tool3.inc"
- use "writer\tools\includes\w_tool7.inc"
- use "writer\optional\includes\tools\tools1.inc"
- use "writer\optional\includes\tools\tools2.inc"
- use "writer\optional\includes\fields\w_fields1.inc"
- use "writer\optional\includes\fields\w_fields2.inc"
- use "writer\optional\includes\fields\w_fields3.inc"
- use "writer\optional\includes\fields\w_fields4.inc"
- use "writer\optional\includes\fields\w_fields5.inc"
- use "writer\optional\includes\fields\w_fields6.inc"
- use "writer\optional\includes\fields\w_fields7.inc"
+ Call hStatusIn ( "writer", "w_filter.bas" )
- printlog Chr(13) + "Loading of Include - Files takes: " + Wielange ( StartZeit )
- printlog Chr(13) + "******* Writer - Level 1 - Test *******"
+ Call tSammleImportFilter
+ Call tCollectSaveAsFilter
+ Call tCollectExportFilters
+ Call tGroupNameCheck
- Call hStatusIn ( "writer", "w_fields.bas" , "Fields" )
-
- 'Software Configuration:
- 'Getting the decimal seperator from global function
- gSeperator = GetDecimalSeperator()
- 'Setting the measurement unit to centimeters.
- gMeasurementUnit = fSetMeasurementToCM()
-
- printlog Chr(13) + " --- Test Fields - General Test ---"
- Call w_fields1
- Call w_fields2
- printlog Chr(13) + " --- Test Fields - Reference ---"
- Call w_fields3
- printlog Chr(13) + " --- Test Fields - Doc information ---"
- Call w_fields4
- printlog Chr(13) + " --- Test Fields - Variables ---"
- Call w_fields5
- printlog Chr(13) + " --- Test Fields - Functions ---"
- Call w_fields6
- printlog Chr(13) + " --- Test Fields - L10N ---"
- Call w_fields7
-
- Call hStatusOut
-
- Printlog Chr(13) + "End of Level 1 Test - Fields"
- Printlog "Duration: "+ WieLange ( StartZeit )
- Printlog "Date: " + Date + " Time: " + Time
+ Call hStatusOut
end sub
sub LoadIncludeFiles
use "global\system\includes\master.inc"
use "global\system\includes\gvariabl.inc"
- Call GetUseFiles
- gApplication = "WRITER"
-end Sub
+ use "global\tools\includes\optional\t_xml1.inc"
+ gApplication = "WRITER"
+ Call GetUseFiles()
+end sub
diff --git a/testautomation/writer/optional/w_formatpage.bas b/testautomation/writer/optional/w_formatpage.bas
index 8798f71..1a4ae2b 100644
--- a/testautomation/writer/optional/w_formatpage.bas
+++ b/testautomation/writer/optional/w_formatpage.bas
@@ -37,7 +37,8 @@
'*
'\*******************************************************************
-global gSeperator , gMeasurementUnit as String
+global gSeperator as String
+global gMeasurementUnit as String
sub main
Dim StartZeit
@@ -60,7 +61,7 @@ sub main
Call hStatusIn ( "writer", "w_FormatPage.bas" , "Page" )
- Call wOptionenUndo ( "Alle" ) ' Sets all writer-options to default
+ Call wOptionsUndo ( "All" ) ' Sets all writer-options to default
'Software Configuration:
'Getting the decimal seperator from global function
gSeperator = GetDecimalSeperator()
diff --git a/testautomation/writer/optional/w_formatparagraph.bas b/testautomation/writer/optional/w_formatparagraph.bas
index 320f0fb..f0cb9dc 100644
--- a/testautomation/writer/optional/w_formatparagraph.bas
+++ b/testautomation/writer/optional/w_formatparagraph.bas
@@ -60,7 +60,7 @@ sub main
Call hStatusIn ( "writer", "w_formatparagraph.bas" , "Paragrahp" )
- Call wOptionenUndo ( "Alle" ) ' Sets all writer-options to default
+ Call wOptionsUndo ( "All" ) ' Sets all writer-options to default
'Software Configuration:
'Getting the decimal seperator from global function
gSeperator = GetDecimalSeperator()
diff --git a/testautomation/writer/optional/w_insertgraphic.bas b/testautomation/writer/optional/w_insertgraphic.bas
index 86b730b..d375470 100644
--- a/testautomation/writer/optional/w_insertgraphic.bas
+++ b/testautomation/writer/optional/w_insertgraphic.bas
@@ -61,7 +61,7 @@ sub main
printlog Chr(13) + " - Test of Graphic function -"
Call hStatusIn ( "writer", "w_insertgraphic.bas" , "Graphic" )
- Call wOptionenUndo("AutoCaption")
+ Call wOptionsUndo("AutoCaption")
'Software Configuration:
'Getting the decimal seperator from global function
@@ -69,10 +69,10 @@ sub main
'Setting the measurement unit to centimeters.
gMeasurementUnit = fSetMeasurementToCM()
- Call tInsertGraphic_X
+ Call tInsertGraphic_X
Call tInsertGraphic_1
- Call tInsertGraphic_2
- Call tInsertGraphic_3
+ Call tInsertGraphic_2
+ Call tInsertGraphic_3
Call tInsertGraphic_4
Call tInsertGraphic_5
Call tInsertGraphic_6
diff --git a/testautomation/writer/optional/w_opt.bas b/testautomation/writer/optional/w_opt.bas
index 0fbb4d4..a5d2638 100755
--- a/testautomation/writer/optional/w_opt.bas
+++ b/testautomation/writer/optional/w_opt.bas
@@ -47,13 +47,13 @@ sub main
use "writer\tools\includes\w_tools.inc"
use "writer\tools\includes\w_tool5.inc"
- use "writer\tools\includes\w_tool6.inc"
+ use "writer\tools\includes\w_tool6.inc"
use "writer\optional\includes\option\wr_o_1.inc"
use "writer\optional\includes\option\wr_o_2.inc"
use "writer\optional\includes\option\wr_o_3.inc"
use "writer\optional\includes\option\wr_o_4.inc"
- use "writer\optional\includes\option\wr_o_5.inc"
+ use "writer\optional\includes\option\wr_o_5.inc"
use "writer\optional\includes\option\wr_o_a.inc"
printlog Chr(13) + "Loading of Include - Files takes: " + Wielange ( StartTime )
@@ -74,7 +74,7 @@ sub main
Call wr_o_5 'Language Settings
Call tToolsOptionsWriterDirectCursor2
Call wSetMacroSecurityLevel(3) ' Set security to default -- medium
- Call wOptionenUndo("Alle")
+ Call wOptionsUndo("All")
Call hStatusOut
Printlog Chr(13) + "End of Options - Test :"
diff --git a/testautomation/writer/optional/w_table.bas b/testautomation/writer/optional/w_table.bas
index d765c8b..19eabcd 100755
--- a/testautomation/writer/optional/w_table.bas
+++ b/testautomation/writer/optional/w_table.bas
@@ -95,7 +95,7 @@ sub LoadIncludeFiles
end sub
sub TableConfiguration
- Call wOptionenUndo("Tabelle")
+ Call wOptionsUndo("Tabelle")
Call hNewDocument
if iSprache = iSystemSprache then
printlog "Systemlocale matches UI-language"
diff --git a/testautomation/writer/optional/w_textframes.bas b/testautomation/writer/optional/w_textframes.bas
index f9da784..7f1412c 100644
--- a/testautomation/writer/optional/w_textframes.bas
+++ b/testautomation/writer/optional/w_textframes.bas
@@ -37,7 +37,8 @@
'*
'\*******************************************************************
-global gSeperator , gMeasurementUnit as String
+global gSeperator as String
+global gMeasurementUnit as String
sub main
@@ -65,7 +66,7 @@ sub main
'Setting the measurementunit to 'cm'
gMeasurementUnit = fSetMeasurementToCM()
'Sets all writer-options to default
- Call wOptionenUndo ( "Alle" )
+ Call wOptionsUndo ( "All" )
printlog Chr(13) + " - Test of TextFrame function -"
Call w_textframes1
diff --git a/testautomation/writer/required/includes/w_005_.inc b/testautomation/writer/required/includes/w_005_.inc
index cec3234..02722f3 100755
--- a/testautomation/writer/required/includes/w_005_.inc
+++ b/testautomation/writer/required/includes/w_005_.inc
@@ -760,6 +760,9 @@ endcase
'-----------------------------------------------------------
testcase tFormatAnchor
+Warnlog "#i102752# - tFormatAnchor outcommented due to bug."
+goto endsub
+
PrintLog "- Format / Anchor"
printlog " Open new document"
@@ -894,6 +897,9 @@ endcase
'-----------------------------------------------------------
testcase tFormatAnchorArea
+Warnlog "#i102752# - tFormatAnchorArea outcommented due to bug."
+goto endsub
+
PrintLog "- Format / Anchor drawing objects"
if gApplication = "HTML" then
printlog "Not in WriterWeb!"
diff --git a/testautomation/writer/required/includes/w_005b_.inc b/testautomation/writer/required/includes/w_005b_.inc
index 5d259a9..4788244 100755
--- a/testautomation/writer/required/includes/w_005b_.inc
+++ b/testautomation/writer/required/includes/w_005b_.inc
@@ -218,6 +218,9 @@ endcase
'-----------------------------------------------------------
testcase tFormatAlignment
+Warnlog "#i102752# - tFormatAlignment outcommented due to bug."
+goto endsub
+
PrintLog "- Format / Alignment"
printlog " Open new document"
@@ -413,6 +416,9 @@ endcase
'-----------------------------------------------------------
testcase tFormatAnchorObject
+Warnlog "#i102752# - tFormatAnchorObject outcommented due to bug."
+goto endsub
+
PrintLog "- Format / Anchor Frame"
printlog " Open new document"
@@ -880,6 +886,9 @@ endcase
'-----------------------------------------------------------
testcase tFormatAlignmentArea
+Warnlog "#i102752# - tFormatAlignmentArea outcommented due to bug."
+goto endsub
+
PrintLog "- Format / Alignment drawing objects"
if gApplication = "HTML" then
printlog "Not in WriterWeb!"
@@ -1092,7 +1101,7 @@ testcase tFormatPositionAndSizeLegend
printlog " Insert a legend"
sleep (1)
- Call wObjektSelektieren(13, 13, 75, 75)
+ Call wObjektSelektieren(30, 30, 75, 75)
hUseAsyncSlot( "FormatPositionAndSize" )
kontext "active"
@@ -1408,6 +1417,9 @@ endcase
'-----------------------------------------------------------
testcase tHtmlDocFormatAlignment
+Warnlog "#i102752# - tHtmlDocFormatAlignment outcommented due to bug."
+goto endsub
+
gApplication = "HTML"
PrintLog "- Format / Alignment"
diff --git a/testautomation/writer/required/includes/w_010_1.inc b/testautomation/writer/required/includes/w_010_1.inc
index 1395cc9..e7a5f60 100644
--- a/testautomation/writer/required/includes/w_010_1.inc
+++ b/testautomation/writer/required/includes/w_010_1.inc
@@ -628,6 +628,9 @@ endcase
'-----------------------------------------------------------
testcase tGraphicAnchor
+Warnlog "#i102752# - tGraphicAnchor outcommented due to bug."
+goto endsub
+
printlog "- Graphic-(Frame)-Objectbar: Anchor"
printlog " Open new document"
Call hNewDocument
diff --git a/testautomation/writer/required/includes/w_011_.inc b/testautomation/writer/required/includes/w_011_.inc
index 6a28224..c9d0f12 100755
--- a/testautomation/writer/required/includes/w_011_.inc
+++ b/testautomation/writer/required/includes/w_011_.inc
@@ -446,6 +446,9 @@ endcase
'-----------------------------------------------------------
testcase tZORest
+Warnlog "#i102752# - tZORest outcommented due to bug."
+goto endsub
+
printlog "- Draw Functions-Objectbar: Rest"
if gApplication = "HTML" then
printlog "This test does not apply to HTML documents"
diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc
index cb46e53..3a8c2ce 100755
--- a/testautomation/writer/tools/includes/w_tools.inc
+++ b/testautomation/writer/tools/includes/w_tools.inc
@@ -858,8 +858,10 @@ end function
' -----------------------------------------------------------------------
-sub wOptionenUndo ( sOption$ )
- Dim i as integer, sTempSeparator as string, sTempUnit as integer
+sub wOptionsUndo ( sOption$ )
+ Dim i as integer
+ Dim sTempSeparator as string
+ Dim sTempUnit as integer
Printlog " - Initial state"
@@ -878,7 +880,7 @@ sub wOptionenUndo ( sOption$ )
end if
sTempUnit = Masseinheit.GetSelIndex
- if sOption$ = "Laden" OR sOption$ = "Alle" then
+ if sOption$ = "Laden" OR sOption$ = "All" then
' Update
AufNachfrage.Check
Feldbefehle.Check
@@ -899,7 +901,7 @@ sub wOptionenUndo ( sOption$ )
end if
Call hToolsOptions("WRITER","View")
- if sOption$ = "Inhalte" OR sOption$ = "Alle" then
+ if sOption$ = "Inhalte" OR sOption$ = "All" then
' Guides
Hilfslinien.Uncheck
FarbigeHandles.Check
@@ -919,7 +921,7 @@ sub wOptionenUndo ( sOption$ )
Notizen.Check
end if
- if sOption$ = "Cursor" OR sOption$ = "Alle" then
+ if sOption$ = "Cursor" OR sOption$ = "All" then
Call hToolsOptions("WRITER","FormattingAids")
' Display of
Absatzenden.UnCheck
@@ -937,7 +939,7 @@ sub wOptionenUndo ( sOption$ )
Zonen_Cursor.Check
end if
- if sOption$ = "Raster" OR sOption$ = "Alle" then
+ if sOption$ = "Raster" OR sOption$ = "All" then
Call hToolsOptions("WRITER","Grid")
' Grid
FangrasterBenutzen.Uncheck
@@ -967,13 +969,13 @@ sub wOptionenUndo ( sOption$ )
RasterUnterteilungYAchse.More 1
end if
- if sOption$ = "Grundschriften" OR sOption$ = "Alle" then
+ if sOption$ = "Grundschriften" OR sOption$ = "All" then
Call hToolsOptions("WRITER","BasicFonts")
Standard.Click
AktuellesDokument.Uncheck
end if
- if sOption$ = "Drucken" OR sOption$ = "Alle" then
+ if sOption$ = "Drucken" OR sOption$ = "All" then
Call hToolsOptions("WRITER","Print")
' Contents
Grafiken.Check
@@ -995,7 +997,7 @@ sub wOptionenUndo ( sOption$ )
Fax.SetNoSelection
end if
- if sOption$ = "Tabelle" OR sOption$ = "Alle" then
+ if sOption$ = "Tabelle" OR sOption$ = "All" then
Call hToolsOptions("WRITER","Table")
' Default
Ueberschrift.Check
@@ -1040,7 +1042,7 @@ sub wOptionenUndo ( sOption$ )
Variabel.Check
end if
- if sOption$ = "Aenderung" OR sOption$ = "Alle" then
+ if sOption$ = "Aenderung" OR sOption$ = "All" then
Call hToolsOptions("WRITER","Changes")
' Text display
EinfuegenAttribute.Select 4
@@ -1054,7 +1056,7 @@ sub wOptionenUndo ( sOption$ )
Zeilenfarbe.Select 1
end if
- if sOption$ = "AutoCaption" OR sOption$ = "Alle" then
+ if sOption$ = "AutoCaption" OR sOption$ = "All" then
Call hToolsOptions("WRITER","Autocaption")
for i = 1 to ObjectList.GetItemCount
ObjectList.Select i
More information about the ooo-build-commit
mailing list