CWS-TOOLING: integrate CWS tbo04

2009-01-21 16:56:09 +0100 tbo  r266688 : #i96107# fixed - extension deadlock
2008-12-23 16:38:40 +0100 tbo  r265786 : #i97535# enforce version minor
2008-12-23 16:30:09 +0100 tbo  r265785 : #158701# disappeared for unknown reason

3 files changed, 43 insertions, 41 deletions

diff --git a/testautomation/framework/required/includes/graphics_import.inc b/testautomation/framework/required/includes/graphics_import.inc
index c21f731532d2..7582d43ab331 100755
--- a/testautomation/framework/required/includes/graphics_import.inc
+++ b/testautomation/framework/required/includes/graphics_import.inc
@@ -39,6 +39,9 @@
 
 
 testcase tQuickInsertGraphNotAsLink
+    dim iCurrentFile as integer
+    dim GraphicFile as String
+    dim Filtername as String
 
     printlog( "Insert a sample of commonly used file formats into a writer document (not linked)" )
     
@@ -46,24 +49,26 @@ testcase tQuickInsertGraphNotAsLink
         warnlog( "This test needs the OpenOffice.org filepicker to be set as default" )
         goto endsub
     endif
-
-    dim iCurrentFile as integer
-    dim GraphicFile as String
-    dim Filtername as String
     
     gApplication = "WRITER"    
     Call hNewDocument
     
     for iCurrentFile = 1 to 25
-    
-        printlog( "" )
-        
         ' MODIFY and ENABLE this SAMPLE snippet to exclude one fileformat from testing
         '         if ( iCurrentFile = 7 ) AND (gtPlatform="x86") then
         '             qaErrorLog("#<issue-id># crash on <platform> on loading <image-file>")
         '             goto skipformat
         '         endif
         ' Note: Can be locale dependent!
+        if (iCurrentFile = 5) then
+            warnlog("#158701# crash on loading airshw.met going to next format")
+            goto skipformat
+        endif
+        if (iCurrentFile = 4) AND (gPlatform="osx") then
+            warnlog("#158701# crash on MacOS X on loading ball.eps")
+            goto skipformat
+        endif
+
 
         Kontext "GrafikEinfuegenDlg"
         if ( not GrafikEinfuegenDlg.exists() ) then
@@ -72,38 +77,37 @@ testcase tQuickInsertGraphNotAsLink
         endif
         
         if ( GrafikEinfuegenDlg.Exists( 2 ) ) then
-        
             ' the list of files expected to be found in the samples directory
             select case iCurrentFile
-            case 1  :  GraphicFile = "desp.bmp"
-            case 2  :  GraphicFile = "columbia.dxf"
-            case 3  :  GraphicFile = "extrud.emf"
-            case 4  :  GraphicFile = "ball.eps"
-            case 5  :  GraphicFile = "airshw.met"
-            case 6  :  GraphicFile = "eface.gif"
-            case 7  :  GraphicFile = "purzel.gif"         ' Animated Gif
-            case 8  :  GraphicFile = "borabora.jpg"
-            case 9  :  GraphicFile = "grafix1.pbm"
-            case 10 :  GraphicFile = "circle.pcx"
-            case 11 :  GraphicFile = "papagei1.pcd"
-            case 12 :  GraphicFile = "newtonme.pct"
-            case 13 :  GraphicFile = "grafix2.pgm"
-            case 14 :  GraphicFile = "obst.png"
-            case 15 :  GraphicFile = "london.ppm"
-            case 16 :  GraphicFile = "tiger.psd"
-            case 17 :  GraphicFile = "grafix3.ras"
-            case 18 :  GraphicFile = "mickym.sgf"
-            case 19 :  GraphicFile = "faxpfeil.sgv"
-            case 20 :  GraphicFile = "picture.svm"
-            case 21 :  GraphicFile = "pilz.tga"
-            case 22 :  GraphicFile = "stabler.tif"
-            case 23 :  GraphicFile = "krokodil.wmf"
-            case 24 :  GraphicFile = "grafix4.xbm"
-            case 25 :  GraphicFile = "papagei2.xpm"
+                case 1  :  GraphicFile = "desp.bmp"
+                case 2  :  GraphicFile = "columbia.dxf"
+                case 3  :  GraphicFile = "extrud.emf"
+                case 4  :  GraphicFile = "ball.eps"
+                case 5  :  GraphicFile = "airshw.met"
+                case 6  :  GraphicFile = "eface.gif"
+                case 7  :  GraphicFile = "purzel.gif"         ' Animated Gif
+                case 8  :  GraphicFile = "borabora.jpg"
+                case 9  :  GraphicFile = "grafix1.pbm"
+                case 10 :  GraphicFile = "circle.pcx"
+                case 11 :  GraphicFile = "papagei1.pcd"
+                case 12 :  GraphicFile = "newtonme.pct"
+                case 13 :  GraphicFile = "grafix2.pgm"
+                case 14 :  GraphicFile = "obst.png"
+                case 15 :  GraphicFile = "london.ppm"
+                case 16 :  GraphicFile = "tiger.psd"
+                case 17 :  GraphicFile = "grafix3.ras"
+                case 18 :  GraphicFile = "mickym.sgf"
+                case 19 :  GraphicFile = "faxpfeil.sgv"
+                case 20 :  GraphicFile = "picture.svm"
+                case 21 :  GraphicFile = "pilz.tga"
+                case 22 :  GraphicFile = "stabler.tif"
+                case 23 :  GraphicFile = "krokodil.wmf"
+                case 24 :  GraphicFile = "grafix4.xbm"
+                case 25 :  GraphicFile = "papagei2.xpm"
             end select
             
             GraphicFile = ConvertPath (gTesttoolPath & "global\input\graf_inp\" & GraphicFile)
-            printlog( "Current file: " & GraphicFile )
+            printlog( "Current file " + iCurrentFile + ": " & GraphicFile )
             printlog( " * Set filter to <All formats>" )
             DateiName.SetText( GraphicFile )
             DateiTyp.Select( 1 )
diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index 460a48f3e06b..11e0462bee1d 100755
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -72,6 +72,7 @@ sub GetUseFiles
     Dim sPrivateEnvironmentLocation as string
     Dim sEnvironmentVersion as string
     Dim sEnvironmentDisplayVersion as string
+    Dim sEnvironmentVersionMinor as string
 
     gTestcaseStart = Now()   ' get start time of test preparation phase
 
@@ -145,15 +146,16 @@ sub GetUseFiles
     if fileExists(sPrivateEnvironmentLocation) then
 	sEnvironmentVersion = getIniValue(sPrivateEnvironmentLocation, "EnvironmentVersion", "Current")
 	sEnvironmentDisplayVersion = getIniValue(sPrivateEnvironmentLocation, "EnvironmentVersion", "DisplayName")
+	sEnvironmentVersionMinor =  getIniValue(sPrivateEnvironmentLocation, "EnvironmentVersion", "Minor")
     else
         sEnvironmentVersion = "HEAD"
         sEnvironmentDisplayVersion = "Developer"
     end if
     if sEnvironmentVersion <> "HEAD" then
         if (len(gMajor) > 5) then
-	    if lCase(left(gMajor,6)) <> lCase(left(sEnvironmentVersion,6)) then
-                warnlog "This environment '" + sEnvironmentVersion + "' is not suitable for this OOo version '" + left(gMajor,6) + "'! Please get the environment suitable for this OOo version! This Environment only works with OOo " + sEnvironmentDisplayVersion + "!"
-                if MsgBox ("This environment '" + sEnvironmentVersion + "' is not suitable for this OOo version '" + left(gMajor,6) + "'! Please get the environment suitable for this OOo version! This Environment only works with OOo " + sEnvironmentDisplayVersion + "!", 16, "Error at startup") = 1 then 
+	    if lCase(left(gMajor,6)) <> lCase(left(sEnvironmentVersion,6)) OR (lCase(gMinor) <> lCase(sEnvironmentVersionMinor)) then
+                warnlog "This environment '" + sEnvironmentVersion + sEnvironmentVersionMinor + "' is not suitable for this OOo version '" + left(gMajor,6) + gMinor + "'!"+chr(13)+"Please get the environment suitable for this OOo version!"+chr(13)+"This Environment only works with OOo " + sEnvironmentDisplayVersion + "!"
+                if MsgBox ("This environment '" + sEnvironmentVersion + sEnvironmentVersionMinor +"' is not suitable for this OOo version '" + left(gMajor,6) + gMinor + "'! Please get the environment suitable for this OOo version! This Environment only works with OOo " + sEnvironmentDisplayVersion + "!", 16, "Error at startup") = 1 then 
 		    end
 	        end if
 	    end if
diff --git a/testautomation/math/required/includes/m_005_.inc b/testautomation/math/required/includes/m_005_.inc
index 783017b646b1..f1c7ff08a1b2 100755
--- a/testautomation/math/required/includes/m_005_.inc
+++ b/testautomation/math/required/includes/m_005_.inc
@@ -174,10 +174,6 @@ testcase tToolsExtensionManager
     dim sTemp2 as string
     dim x as integer
 
-    if gPlatform = lcase("osx") then
-        warnlog "#i96107# MacOS X 10.4 deadlock on installing extension, again."
-	goto endsub
-    endif
     sPath = convertPath(gTestToolPath+"math/required/input/")
     '/// open application ///'
     Call hNewDocument