summaryrefslogtreecommitdiff
path: root/testautomation/framework/optional/includes/options_ooo_colors.inc
diff options
context:
space:
mode:
Diffstat (limited to 'testautomation/framework/optional/includes/options_ooo_colors.inc')
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_ooo_colors.inc21
1 files changed, 7 insertions, 14 deletions
diff --git a/testautomation/framework/optional/includes/options_ooo_colors.inc b/testautomation/framework/optional/includes/options_ooo_colors.inc
index 6d1db18179c2..92489ecb15fc 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_colors.inc
+++ b/testautomation/framework/optional/includes/options_ooo_colors.inc
@@ -40,8 +40,8 @@ testcase tOOoColors
dim currentColor(4) as String
dim chColor(4) as String
- const DEFAULT_COLOR_COUNT = 103
- const CHANGED_COLOR_COUNT = 104
+ const DEFAULT_COLOR_COUNT = 100
+ const CHANGED_COLOR_COUNT = DEFAULT_COLOR_COUNT +1
const USER_COLOR = "TT-Test-Color"
myColor(1) = USER_COLOR
@@ -66,10 +66,8 @@ testcase tOOoColors
printlog( "Check the number of currently registered colors - cancel test on error" )
Kontext "TabFarben"
if ( Farbe.GetItemCount() <> DEFAULT_COLOR_COUNT ) then
- warnlog( "The number of colors has changed, stopping test" )
- printlog( "Expected: " & DEFAULT_COLOR_COUNT )
- printlog( "Found...: " & Farbe.getItemCount() )
- printlog( "Close the Tools/Options dialog with OK" )
+ warnlog "The number of colors has changed, stopping test; Expected: " & DEFAULT_COLOR_COUNT & "; Found...: " & Farbe.getItemCount()
+ printlog "Close the Tools/Options dialog with OK"
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
WaitSlot( 2000 )
@@ -106,8 +104,7 @@ testcase tOOoColors
printlog( "Close the Tools/Options dialog with OK" )
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
- WaitSlot( 2000 )
+ hCloseDialog( ExtrasOptionenDlg, "ok" )
else
warnlog( "Tools/Options dialog not open" )
endif
@@ -163,9 +160,7 @@ testcase tOOoColors
printlog( "Close options dialog with OK" )
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
- WaitSlot( 2000 )
-
+ hCloseDialog( ExtrasOptionenDlg, "ok" )
else
warnlog( "Tools/Options dialog not open" )
endif
@@ -196,9 +191,7 @@ testcase tOOoColors
printlog( "Close options dialog with OK" )
Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
- WaitSlot( 2000 )
-
+ hCloseDialog( ExtrasOptionenDlg, "ok" )
else
warnlog( "Tools/Options dialog not open" )
endif