CWS-TOOLING: integrate CWS automationooo330m3

9 files changed, 65 insertions, 37 deletions

diff --git a/testautomation/framework/optional/includes/extras_modify_objects.inc b/testautomation/framework/optional/includes/extras_modify_objects.inc
index f2e4717d2e96..964d28a95b77 100755
--- a/testautomation/framework/optional/includes/extras_modify_objects.inc
+++ b/testautomation/framework/optional/includes/extras_modify_objects.inc
@@ -41,8 +41,8 @@ testcase tModifyObjects( iMode as integer, cCategory as string, sVer as string )
 
     const CFN = "tModifyObjects::"
     const RESTART = 15
-    const TEMPLATE_COUNT = 236 ' For en-US/StarOffice, numbers may differ for Languages/Brands
-    const SAMPLE_COUNT = 60    ' For en-US/StarOffice, numbers may differ for Languages/Brands
+    const TEMPLATE_COUNT = 236 ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands
+    const SAMPLE_COUNT = 56    ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands
 
 
     dim iObjectFolder as integer
diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc
index 8d96cd000e02..3df134d83d33 100755
--- a/testautomation/framework/optional/includes/security_macrosecurity.inc
+++ b/testautomation/framework/optional/includes/security_macrosecurity.inc
@@ -51,8 +51,6 @@ end sub
 testcase tMacroSecurityLevels( cFileFormat )
 
     printlog( "Check macro execution behavior for all macro security levels" )
-    warnlog( "#i110184# - Documentbound macros not executed when loaded via API" )
-    goto endsub
 
     dim cWorkFile as string
         cWorkFile = gTesttoolPath & "framework\optional\input\BasicDocs\"
@@ -60,7 +58,7 @@ testcase tMacroSecurityLevels( cFileFormat )
 
     dim iSecLevel as integer
 
-    const EXPECTED_MESSAGECOUNT = 1
+    const EXPECTED_MESSAGECOUNT = 0
     const ALLOW_ONE_EXTRA_MESSAGEBOX = 1
     const ALLOW_NO_EXTRA_MESSAGEBOXES = 0
     
@@ -92,7 +90,11 @@ testcase tMacroSecurityLevels( cFileFormat )
         case GC_MACRO_SECURITY_LEVEL_LOW :
 
             if ( not hIdentifyExecutedMacro() ) then
-                warnlog( "#i110184# - Macro was not executed" )
+                if ( gApplication = "MATH" ) then
+                    qaerrorlog( "#i110184# - Macro was not executed" )
+                else
+                    warnlog( "Macro was not excuted" )
+                endif
             endif
 
         case GC_MACRO_SECURITY_LEVEL_MEDIUM :
@@ -102,12 +104,19 @@ testcase tMacroSecurityLevels( cFileFormat )
             endif
 
             if ( not hIdentifyExecutedMacro() ) then
-                warnlog( "#i110184# - Macro was not executed" )
+                if ( gApplication = "MATH" ) then
+                    qaerrorlog( "#i110184# - Macro was not executed" )
+                else
+                    warnlog( "Macro was not excuted" )
+                endif
             endif
 
         case GC_MACRO_SECURITY_LEVEL_HIGH :
 
-            if ( not hHandleActivesOnLoad( EXPECTED_MESSAGECOUNT , ALLOW_ONE_EXTRA_MESSAGEBOX ) ) then
+            kontext "Active"
+            hCloseDialog( Active, "ok" )
+
+            if ( not hHandleActivesOnLoad( EXPECTED_MESSAGECOUNT , ALLOW_NO_EXTRA_MESSAGEBOXES ) ) then
                 warnlog( "#i53710# unexpected second messagebox" )
             endif
 
@@ -117,6 +126,9 @@ testcase tMacroSecurityLevels( cFileFormat )
 
         case GC_MACRO_SECURITY_LEVEL_VERYHIGH :
 
+            kontext "Active"
+            hCloseDialog( Active, "ok" )
+
             if ( not hHandleActivesOnLoad( EXPECTED_MESSAGECOUNT , ALLOW_NO_EXTRA_MESSAGEBOXES ) ) then
                 warnlog( "#i53710# unexpected second messagebox" )
             endif
diff --git a/testautomation/framework/required/includes/basic_dialog_i18n.inc b/testautomation/framework/required/includes/basic_dialog_i18n.inc
index 3c95be08a9d6..162f0cc040cd 100755
--- a/testautomation/framework/required/includes/basic_dialog_i18n.inc
+++ b/testautomation/framework/required/includes/basic_dialog_i18n.inc
@@ -49,6 +49,7 @@ testcase tUpdtBasicDialogI18n
     printlog( "Click Manage Languages on ToolsCollectionBar")
     kontext "ToolsCollectionBar" 
     if ( ToolsCollectionBar.exists( DIALOG_DEFAULT_TIMEOUT ) ) then
+        wait( 500 )
         hClickButton( ManageLanguage )
     else
         warnlog( "<ToolsCollectionBar> is not open, is the test environment dirty?" )
diff --git a/testautomation/framework/required/includes/smoketest.inc b/testautomation/framework/required/includes/smoketest.inc
index 24ef362a1bf1..d4e327a21ad7 100755
--- a/testautomation/framework/required/includes/smoketest.inc
+++ b/testautomation/framework/required/includes/smoketest.inc
@@ -33,6 +33,10 @@
 
 testcase tSmokeTest
 
+    if ( not hCheckForBinfilters() ) then
+        goto endsub
+    endif
+
     printlog( "Smoketest (10er-Test) from Release Engineering" )
     dim sLocation as string
     dim i,x,a as integer
diff --git a/testautomation/framework/required/includes/topten.inc b/testautomation/framework/required/includes/topten.inc
index 8f5cb30fb99e..fdfdb49fec97 100755
--- a/testautomation/framework/required/includes/topten.inc
+++ b/testautomation/framework/required/includes/topten.inc
@@ -35,35 +35,28 @@ sub topten
 
     ' we need the binary filters (.sxw etc.) for this test but beginning with
     ' OOo 3.3 these are optional
-    try
-        hGetSuffix( "569" )
-    catch
-        warnlog( "Optional legacy filters package is not installed" )
-        printlog( "Please restart the setup to install the missing filters" )
-        exit sub
-    endcatch
-
-    gApplication = "WRITER"
-    call Top_ten_test
-    
-    gApplication = "CALC"
-    call Top_ten_test
-    
-    gApplication = "IMPRESS"
-    call Top_ten_test
-    
-    gApplication = "DRAW"
-    call Top_ten_test
-    
-    gApplication = "MATH"
-    call Top_ten_test
-    
-    gApplication = "HTML"
-    call Top_ten_test
-    
-    gApplication = "MASTERDOCUMENT"
-    call Top_ten_test
+    if ( hCheckForBinfilters() ) then
+        gApplication = "WRITER"
+        call Top_ten_test
 
+        gApplication = "CALC"
+        call Top_ten_test
+
+        gApplication = "IMPRESS"
+        call Top_ten_test
+
+        gApplication = "DRAW"
+        call Top_ten_test
+
+        gApplication = "MATH"
+        call Top_ten_test
+
+        gApplication = "HTML"
+        call Top_ten_test
+
+        gApplication = "MASTERDOCUMENT"
+        call Top_ten_test
+    endif
 end sub
 
 '*******************************************************************************
diff --git a/testautomation/global/required/includes/g_findbar.inc b/testautomation/global/required/includes/g_findbar.inc
index 38af3edd28aa..dd8e9062b604 100644
--- a/testautomation/global/required/includes/g_findbar.inc
+++ b/testautomation/global/required/includes/g_findbar.inc
@@ -87,7 +87,7 @@ testcase tUpdtFindBar()
             warnlog( "Messagebox missing <No matches found>" )
         endif
 
-        warnlog( "#i111984 - exclude <SearchDialog> button from testing" )
+        qaerrorlog( "#i111984 - exclude <SearchDialog> button from testing" )
         goto skip_SearchDialog
 
             printlog( "Search dialog button may not be visible by default" )
diff --git a/testautomation/global/tools/includes/required/t_filters.inc b/testautomation/global/tools/includes/required/t_filters.inc
index afb1bf999c52..243483be9e7d 100755
--- a/testautomation/global/tools/includes/required/t_filters.inc
+++ b/testautomation/global/tools/includes/required/t_filters.inc
@@ -34,6 +34,21 @@
 private const LENGTH_OF_FILTERFILE = 100
 private const FILE_DATA_SIZE = 300
 
+function hCheckForBinfilters() as boolean
+
+    try
+        hGetSuffix( "569" )
+        hCheckForBinfilters() = true
+    catch
+        warnlog( "Optional legacy filters package is not installed" )
+        printlog( "Please restart the setup to install the missing filters" )
+        hCheckForBinfilters() = false
+    endcatch
+
+end function
+
+'*******************************************************************************
+
 function hGetSuffix( optional cBuildId as string ) as string
 
     ' This function retrieves the suffix depending on the build id (e.g. 680)
diff --git a/testautomation/writer/required/includes/w_020_.inc b/testautomation/writer/required/includes/w_020_.inc
index d5f4709d9c21..9235d1b83d7b 100755
--- a/testautomation/writer/required/includes/w_020_.inc
+++ b/testautomation/writer/required/includes/w_020_.inc
@@ -54,6 +54,8 @@ sub w_020_
     Call tHtmlDoc_TB_Rest
     gApplication = "WRITER"
 
+    Call tUpdtFindBar()
+
 end sub
 
 '-----------------------------------------------------------
diff --git a/testautomation/writer/required/w_updt.bas b/testautomation/writer/required/w_updt.bas
index e9fc5aab6458..b8779647281b 100755
--- a/testautomation/writer/required/w_updt.bas
+++ b/testautomation/writer/required/w_updt.bas
@@ -86,6 +86,7 @@ sub LoadIncludeFiles
     use "global\required\includes\g_001.inc"
     use "global\required\includes\g_option.inc"                	' global subroutines for Tools / Options
     use "global\required\includes\g_printing.inc"
+    use "global\required\includes\g_findbar.inc"
     use "global\tools\includes\optional\t_xml_filter1.inc"       ' global routines for XML-functionality
     use "global\tools\includes\optional\t_docfuncs.inc"
     use "global\tools\includes\optional\t_control_objects.inc"