i115106,[Automation]: [Automation] General Cat 1-3 test case fixing

4 files changed, 54 insertions, 31 deletions

diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow.inc b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
index c9fec2c44ea8..cfcc0fbd2e2f 100644
--- a/testautomation/graphics/optional/includes/impress/i_slideshow.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
@@ -35,9 +35,12 @@ testcase tSlideShowSlideShow
 
     dim bLoaded as boolean
     dim i as integer
+    dim testfile as string
+    dim localtestfile as string
 
     '/// open file 'graphics\\input\\diashow.odp' ///'
-    hFileOpenLocally( gTesttoolPath + "graphics\required\input\diashow.odp" )
+    testfile = ( gTesttoolPath + "graphics\required\input\diashow.odp" )
+    hFileOpenLocally( testfile )
     sleep 30
 
    bLoaded = false
@@ -126,8 +129,15 @@ testcase tSlideShowSlideShow
    '/// Set "Start with current page" back to default = on, in ToolsOptions ///'
    setStartCurrentPage(TRUE)
    '/// close the application ///'
-   Call hCloseDocument
-   
+    Call hCloseDocument
+    localtestfile = hFileGetLocalPath( gTesttoolPath + "diashow.odp" )
+    printlog localtestfile
+    if (FileExists (localtestfile)) then
+        app.kill (localtestfile)
+        printlog "Deleting used file."
+    else
+        warnlog "File is missing."
+    endif
 endcase 'tSlideShowSlideShow
 
 '-------------------------------------------------------------------------------
@@ -216,6 +226,8 @@ testcase tSlideShowSlideShowSettings
    dim sTemp as string
    dim saSlideNames(4) as string
    dim bCurrentPage as boolean
+   dim sTestfile as string
+   dim sLocaltestfile as string
 
    S1 = glLocale (2) + " 1"
    S2 = glLocale (2) + " 2"
@@ -279,9 +291,10 @@ testcase tSlideShowSlideShowSettings
    Call hCloseDocument
    sleep 5
 
-   bLoaded = false
-   '/// open file 'graphics\\input\\diashow.odp' (Slide Show with 4 Slides) ///'
-   hFileOpenLocally( gTesttoolPath + "graphics\required\input\diashow.odp" )
+    bLoaded = false
+    '/// open file 'graphics\\input\\diashow.odp' (Slide Show with 4 Slides) ///'
+    sTestfile = ( gTesttoolPath + "graphics\required\input\diashow.odp" )
+    hFileOpenLocally( sTestfile )
    sleep 10
 
    try
@@ -681,7 +694,15 @@ testcase tSlideShowSlideShowSettings
    setStartCurrentPage(TRUE)
    '/// Close the document ///'
    call hCloseDocument
-   
+    sLocaltestfile = hFileGetLocalPath(  gTesttoolPath + "diashow.odp" )
+    printlog sLocaltestfile
+    if (FileExists (sLocaltestfile)) then
+        app.kill (sLocaltestfile)
+        printlog "Deleting used file."
+    else
+        warnlog "File is missing."
+    endif
+
 endcase 'tSlideShowSlideShowSettings
 
 '-------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
index 63a04aa6f8d5..bc138fef445d 100644
--- a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
@@ -529,7 +529,8 @@ endcase
 
 testcase tExtrasIndividuellePraesentation
     Printlog "- Slideshow/Individual slideshow"
- Call hNewDocument							'/// new impress document ///'
+    Call hNewDocument
+    Call sSelectEmptyLayout						'/// new impress document ///'
      '/// Deactivate "Start with current page" in ToolsOptions ///'
      setStartCurrentPage(FALSE)
    '///  check state of navigator ! expected: closed ///'
@@ -546,24 +547,27 @@ testcase tExtrasIndividuellePraesentation
        Kontext "Bildschirmpraesentation"
        Fenster.Check
        Bildschirmpraesentation.OK
-  InsertSlide                                                           '/// insert slide ///'
-  sleep 2
-  hTypekeys "<Pagedown>"
-  sleep 2
-  InsertSlide
-  sleep 2
-  hTypekeys "<Pagedown>"
-  sleep 2
-  InsertSlide								'/// insert another slide ///'
-  sleep 2
-  hTypekeys "<Pagedown>"
-  sleep 2
-  Printlog "  - Slides added"
-  sleep 1
-  Kontext "DocumentImpress"
-  DocumentImpress.TypeKeys "<MOD1 SHIFT F5>"		'/// open navigator ///'
-  sleep 1
-  Kontext "NavigatorDraw"
+    InsertSlide                                                           '/// insert slide ///'
+    sleep 2
+    Call sSelectEmptyLayout
+    hTypekeys "<Pagedown>"
+    sleep 2
+    InsertSlide
+    sleep 2
+    Call sSelectEmptyLayout
+    hTypekeys "<Pagedown>"
+    sleep 2
+    InsertSlide								'/// insert another slide ///'
+    sleep 2
+    Call sSelectEmptyLayout
+    hTypekeys "<Pagedown>"
+    sleep 2
+    Printlog "  - Slides added"
+    sleep 1
+    Kontext "DocumentImpress"
+    DocumentImpress.TypeKeys "<MOD1 SHIFT F5>"		'/// open navigator ///'
+    sleep 1
+    Kontext "NavigatorDraw"
    if NavigatorDraw.Exists Then
       Printlog "  - Navigator exists"
       Erste.Click							'/// switch to 1st slide ///'
diff --git a/testautomation/graphics/optional/includes/impress/i_view.inc b/testautomation/graphics/optional/includes/impress/i_view.inc
index 54ba5132d16e..e82ec2ec38a3 100644
--- a/testautomation/graphics/optional/includes/impress/i_view.inc
+++ b/testautomation/graphics/optional/includes/impress/i_view.inc
@@ -61,11 +61,9 @@ testcase tViewWorkspaceHandoutView
     Call hNewDocument						'/// new document ///'
     sleep 2
     Kontext "DocumentImpress"
-    if NOT documentImpress.Exists then
-        hNewDocument
-        sleep 1
-    end if
-    sleep 2
+    DocumentImpress.UseMenu
+    hMenuSelectNr (5)
+    hMenuSelectNr (13)
     Printlog "  ViewWorkspaceHandoutView"
     ViewWorkspaceHandoutView						'/// view background handout ///'
     sleep 2
diff --git a/testautomation/graphics/required/input/recht_1.odp b/testautomation/graphics/required/input/recht_1.odp
index fbad5296d1b1..998668d43966 100755
--- a/testautomation/graphics/required/input/recht_1.odp
+++ b/testautomation/graphics/required/input/recht_1.odp