CWS-TOOLING: integrate CWS automationdev300m100

5 files changed, 34 insertions, 4 deletions

diff --git a/testautomation/chart2/optional/includes/ch2_lvl1a.inc b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
index 6da6e29ac72d..e012dd0253c8 100755
--- a/testautomation/chart2/optional/includes/ch2_lvl1a.inc
+++ b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
@@ -84,6 +84,7 @@ testcase tPlotOptions
 
     printlog "Close and reopen data series dialog - checkbox should be still activated"
     TabDataSeriesOptions.Ok
+    sleep (1)
     Kontext "DocumentChart"
     FormatSelection
     printlog "Select tab page Options"
diff --git a/testautomation/global/tools/includes/optional/t_ole.inc b/testautomation/global/tools/includes/optional/t_ole.inc
index 23b3e02a7ae8..714d708fc4ee 100644
--- a/testautomation/global/tools/includes/optional/t_ole.inc
+++ b/testautomation/global/tools/includes/optional/t_ole.inc
@@ -126,6 +126,8 @@ end function
 '*******************************************************************************
 
 function GetOleDefaultNames()
+    dim sAllOle as string
+    dim j as integer
 
     const CFN = "global::tools::includes::optional::t_ole.inc::GetOleDefaultNames(): "
     if ( GVERBOSE ) then printlog( CFN & "Retrieving OLE names" )
@@ -138,6 +140,24 @@ function GetOleDefaultNames()
     gOLEDraw    = hGetOleObjectName( "Draw"    )
     gOLEMath    = hGetOleObjectName( "Math"    )    
 
+    ' There is no programatical way to retrieve the word for 'further objects'
+    ' Only way to get it language independent is to retrieve all other words and take the last other entry that lasts
+    ' Only available on windows platform
+    if  ( gPlatgroup = "w95" )  then
+        sAllOle = gOLEWriter & gOLECalc & gOLEChart & gOLEImpress & gOLEDraw & gOLEMath
+        Call hNewDocument
+        InsertObjectOLEObject
+        Kontext "OLEObjektEinfuegen"
+        NeuErstellen.Check
+        WaitSlot()
+        for j=1 to ObjektTyp.GetItemCount
+            ObjektTyp.Select j
+            if 0 = instr (sAllOle, ObjektTyp.GetSelText ) then
+            gOleOthers = ObjektTyp.GetSelText
+            endif
+        next j
+        OLEObjektEinfuegen.cancel
+        hCloseDocument
+    endif
 end function
 
-'*******************************************************************************
diff --git a/testautomation/graphics/optional/includes/global/g_stylist.inc b/testautomation/graphics/optional/includes/global/g_stylist.inc
index 71d05f7d704c..0c03e0738abe 100644
--- a/testautomation/graphics/optional/includes/global/g_stylist.inc
+++ b/testautomation/graphics/optional/includes/global/g_stylist.inc
@@ -486,6 +486,8 @@ testcase tFormatStylistTemplateNew
 endcase 'tFormatStylistTemplateNew
 '--------------------------------------------------------
 testcase tiFormatStylist
+warnlog "#i116803# - Crash when closing stylist with closer"
+goto endsub
 
     Dim Num1 as integer '  graphics : first line indent ; the one with 0,6cm in the summary
     Dim Num2 as integer '  presentations : background   ; just one tabpage pops up: Area
@@ -530,6 +532,8 @@ testcase tiFormatStylist
     end if
     sleep 1
 
+
+
     FormatStylist
     Kontext "Gestalter"
     printlog "opening graphics styles"
@@ -559,7 +563,7 @@ testcase tiFormatStylist
         sleep 1
         printlog "presentation styles"
         Praesentationsvorlagen.Click
-
+        printlog "Select number 2"
         Vorlagenliste.Select Num2
         sleep 1
         printlog "opening context menu"
@@ -681,6 +685,10 @@ testcase tiFormatStylist
         TabOptionenNumerierung.Cancel
         sleep 1
     endif
+
+
+
+
     kontext "DocumentImpress"
     printlog "Closing Stylist"
     if lcase(gPlatform) = "osx" then
diff --git a/testautomation/graphics/optional/includes/impress/i_us2_present.inc b/testautomation/graphics/optional/includes/impress/i_us2_present.inc
index 1db9740b577a..9ec6ceffeba4 100644
--- a/testautomation/graphics/optional/includes/impress/i_us2_present.inc
+++ b/testautomation/graphics/optional/includes/impress/i_us2_present.inc
@@ -172,8 +172,11 @@ testcase i_us2_pres1
     SlidesControl.TypeKeys "<DOWN>"
     kontext "DocumentImpress"
     printlog "Insert three lines with text, all with different formatting."
+    sleep (1)
     call hTextrahmenErstellen ("First line with text",20,50,70,50)
+    sleep (1)
     call hTextrahmenErstellen ("Second line with text",20,60,70,60)
+    sleep (1)
     call hTextrahmenErstellen ("Third line with text",20,70,70,70)
     printlog "Go down to the third slide."
     kontext "Slides"
diff --git a/testautomation/graphics/required/includes/global/id_004.inc b/testautomation/graphics/required/includes/global/id_004.inc
index c06f88c682b8..f04a3ba5ec8f 100644
--- a/testautomation/graphics/required/includes/global/id_004.inc
+++ b/testautomation/graphics/required/includes/global/id_004.inc
@@ -45,8 +45,6 @@ sub id_004
     call tiInsertGraphic
     call tiInsertObjectSound
     call tiInsertObjectVideo
-    call tiInsertObjectSound
-    call tiInsertObjectVideo
     call tiInsertChart
     call tiInsertObjectOLEObjects
     call tiInsertSpreadsheet