automationooo330m3: #ii113764# - Moved check for binfilters to external function, too much duplication otherwise

3 files changed, 40 insertions, 28 deletions

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/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)