CWS-TOOLING: integrate CWS automationdev300m61

10 files changed, 21 insertions, 123 deletions

diff --git a/testautomation/extensions/optional/input/dependencies/version31.oxt b/testautomation/extensions/optional/input/dependencies/version31.oxt
index ccc067cf2f09..870b4cc97a9a 100644
--- a/testautomation/extensions/optional/input/dependencies/version31.oxt
+++ b/testautomation/extensions/optional/input/dependencies/version31.oxt
diff --git a/testautomation/extensions/optional/input/files.txt b/testautomation/extensions/optional/input/files.txt
index f4ba428cb2ce..5e37bbd64659 100755
--- a/testautomation/extensions/optional/input/files.txt
+++ b/testautomation/extensions/optional/input/files.txt
@@ -26,11 +26,11 @@ dependencies\version10000.oxt;1,0,0,0,0
 dependencies\version21ns.oxt;0,0,1,0,0
 dependencies\version21other.oxt;1,0,0,0,0
 dependencies\version25.oxt;0,0,1,0,0
-dependencies\version30b.oxt;0,0,1,0,0
+dependencies\version30.oxt;0,0,1,0,0
 dependencies\version300.oxt;0,0,1,0,0
 dependencies\version301.oxt;0,0,1,0,0
 dependencies\versionempty.oxt;0,0,1,0,0
-dependencies\version31b.oxt;1,0,0,0,0
+dependencies\version31.oxt;1,0,0,0,0
 dependencies\version937.oxt;1,0,0,0,0
 dependencies\versionnone.oxt;0,0,1,0,0
 versions/plain.oxt;0,0,1,0,0
diff --git a/testautomation/framework/optional/f_CJK_GridLayout.bas b/testautomation/framework/optional/f_CJK_GridLayout.bas
index fb33fa326802..d131afc451ba 100755
--- a/testautomation/framework/optional/f_CJK_GridLayout.bas
+++ b/testautomation/framework/optional/f_CJK_GridLayout.bas
@@ -60,17 +60,12 @@ sub main
 
        Call tGridDisplay_1            'Printgrid: The grid lines will be printed. (vice versa)
 
-       Call tUserDefineLayout_1       'Decrease characters per line will cause lines per page decrease accordingly
-
        Call tFontSizeChanges_1        'Change the font size to bigger enough will change the layout 
      
        Call tRubyText_1               'If Ruby Text is applied and longer than its Base Text it will stretch over more grid cells than the base text itself.
 
        Call tIndentsTest_1            'Indents should work and always indenting as close as possible to their measurements by snapping to the appropriate grid cell. Tabs therefore will be ignored.
 
-       'Excluded until errors resolved by HLI.
-       'Call tObjectsTest_1            'If objects are anchored to text they will "wander" with its surrounding text. If they are anchored as character they will snap to the appropriate grid cell (since they are a character).
-    
     Call hStatusOut
 
     if sAsianLanguageFlag = "Off" Then  
@@ -81,16 +76,11 @@ sub main
 end sub
 
 sub LoadIncludeFiles
-
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    
     use "global\tools\includes\required\t_doc1.inc"
     use "global\tools\includes\required\t_tools1.inc"
-   
     use "framework\tools\includes\CJK_tools.inc"    
-
     gApplication   = "WRITER"
     Call GetUseFiles
-    
-End sub
+end sub
diff --git a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
index 13dac6822d0b..8e6f85afac01 100755
--- a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
+++ b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
@@ -381,10 +381,6 @@ endcase
 '-------------------------------------------------------------------------
 
 testcase tWriterUIChangesTest9
-
-    qaerrorlog( "#i105756# - Test case outdated, needs adjustments" )
-    goto endsub
-    
   call  hNewDocument
 
   Call CheckAsianLanguageSupport("On")
@@ -463,10 +459,6 @@ endcase
 '-------------------------------------------------------------------------
 
 testcase tWriterUIChangesTest11
-
-    qaerrorlog( "#i105756# - Test case outdated, needs adjustments" )
-    goto endsub
-
  Dim iHopeNumber1 , iHopeNumber2 as Integer
  dim i as integer
  dim iCount as integer
diff --git a/testautomation/framework/optional/includes/w_grid_layout1.inc b/testautomation/framework/optional/includes/w_grid_layout1.inc
index 69301789294c..8909045f288b 100755
--- a/testautomation/framework/optional/includes/w_grid_layout1.inc
+++ b/testautomation/framework/optional/includes/w_grid_layout1.inc
@@ -299,44 +299,6 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase tUserDefineLayout_1
-   Dim sLinesPerPage       , sCharsPerLine          as String
-   Dim sExpectLinesPerPage , sExpectLinesPerPage1   as String
-
-   sLinesPerPage  = "20"
-   sCharsPerLine  = "2"
-   sExpectLinesPerPage   = "2"
-   sExpectLinesPerPage1  = "3"
-
-  Call hNewDocument
-
-   FormatPageWriter
-   Kontext
-   if active.exists(5) then
-       Active.SetPage TabGrid
-   endif
-   Kontext "TabGrid"
-   CharsGrid.Check
-
-    LinesPerPage.SetText sLinesPerPage
-    Sleep 2
-    CharsPerLine.SetText sCharsPerLine
-    Sleep 2
-
-   'This step is no use, just let the LinesPerPage change the number
-    CharsGrid.Check
-
-    if LinesPerPage.GetText <> sExpectLinesPerPage AND LinesPerPage.GetText <> sExpectLinesPerPage1 then
-         Warnlog "The lines per page should be"  + sExpectLinesPerPage + " OR " + sExpectLinesPerPage1 +" but get " +LinesPerPage.GetText
-    end if
-
-   TabGrid.Cancel
-
-  Call hCloseDocument
-endcase
-
-'-------------------------------------------------------------------------
-
 testcase tFontSizeChanges_1
     Dim testFile      , sCorrectResult as String
     Dim sLinesPerPage , sCharsPerLine  as String
@@ -488,51 +450,3 @@ testcase tIndentsTest_1
 endcase
 
 '-------------------------------------------------------------------------
-
-testcase tObjectsTest_1
-   Dim testFile , sCorrectPage1 , sCorrectPage2 as String
-
-   testFile       = "objectsTest.sxw"
-   sCorrectPage1  = "1"
-   sCorrectPage2  = "2"
-
-   Call hNewDocument
-
-   Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
-
-    fStartupNavigator( "OLEObject" , 1 )
-    Sleep 1
-    Auswahlliste.TypeKeys "<Return>"
-    Sleep 1
-    fCloseNavigator
-    Sleep 2
-
-    Kontext
-    FormatAnchorAsCharacter
-    Sleep 1
-
-    ViewNavigator
-     Kontext "NavigatorWriter"
-     Seitennummer.SetText   sCorrectPage2
-     Sleep 5
-     if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Something wrong when object is anchored as Character!"
-    fCloseNavigator
-
-    fStartupNavigator( "OLEObject" , 1 )
-    Auswahlliste.TypeKeys "<Return>"
-    fCloseNavigator
-
-    Kontext
-    FormatAnchorToCharacter
-
-    ViewNavigator
-     Kontext "NavigatorWriter"
-     Seitennummer.SetText   sCorrectPage2
-     Sleep 5
-     if Seitennummer.GetText <> sCorrectPage1 then Warnlog "Something wrong when object is anchored to Character!"
-    fCloseNavigator
-   Kontext
-
-   Call hCloseDocument
-endcase
-
diff --git a/testautomation/framework/required/f_first.bas b/testautomation/framework/required/f_first.bas
index a661ed5cfa7d..0b278ed80d60 100755
--- a/testautomation/framework/required/f_first.bas
+++ b/testautomation/framework/required/f_first.bas
@@ -39,7 +39,6 @@
 
 
 sub main
-
     ' Disable sleep() calls. If you encounter unexpected test interruptions
     ' you should try to outcomment this or set the value to FALSE.
     GLOBAL_USE_NEW_SLEEP = TRUE
@@ -58,22 +57,14 @@ sub main
     
     gApplication = "WRITER"
     call tToolsOptionsTestFirst
-    call tToolsOptionsImprovementProgram
     call tDatabaseCheck
     call tHelpRegistration
     call hStatusOut   
-    
 end sub
 
-'*******************************************************************************
-
 sub LoadIncludeFiles
-
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    
-    use "global\required\includes\g_option.inc"
-    
     use "global\tools\includes\optional\t_ui_filters.inc"
     use "global\tools\includes\optional\t_filetools.inc"
     use "global\tools\includes\optional\t_docfuncs.inc"
@@ -81,8 +72,5 @@ sub LoadIncludeFiles
 
     gApplication = "WRITER"
     call GetUseFiles()
-    
 end sub
 
-'-------------------------------------------------------------------------
-
diff --git a/testautomation/framework/required/includes/wizard_documentconverter.inc b/testautomation/framework/required/includes/wizard_documentconverter.inc
index 6749601393ad..90b74049344c 100755
--- a/testautomation/framework/required/includes/wizard_documentconverter.inc
+++ b/testautomation/framework/required/includes/wizard_documentconverter.inc
@@ -46,7 +46,6 @@ testcase tUpdtWizardDocumentConverter
     dim iDialog as integer
     dim iDocumentType as integer
     dim iWait as integer
-    dim sKeys as string
     dim sSourcePathWriter as string
         sSourcePathWriter = gTesttoolpath & "framework\required\input\document_converter\"
         sSourcePathWriter = convertpath( sSourcePathWriter )
@@ -132,12 +131,14 @@ testcase tUpdtWizardDocumentConverter
     Kontext "DocumentConverter"
     printlog( "Page 7" )
     
-    sKeys = hGetAccel( "DocumentConverter_ShowLog" )
     qaerrorlog( "#i54265# Show Logfile button has no HID, using accelerator instead" )
     
     iWait = 0
     do while ( DocumentConverter.exists() )
-        DocumentConverter.TypeKeys( sKeys )
+        try
+            ContinueButton.click()
+        catch
+        endcatch
         Wait( 1 )
         iWait = iWait + 1
         if ( iWait = 20000 ) then
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index 515f37a83215..d590016bc8ba 100755
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -699,6 +699,12 @@ testcase tToolsOptionsImprovementProgram
 
     printlog( "Update test for the tools/options dialog of the OOo Improvement Program" )
 
+    if (gOOO AND NOT gOOoImprovementIsEnabled) then
+        'In StarOffice this test should always work - but on OOo contributet builds the function is not available - only on OOo builds provided by Sun Microsystems
+        qaErrorlog ("This build does not participate in the OOo Improvement Program - test exit")
+        goto endsub
+    endif
+
     dim cLogFile as string
         cLogFile = gOfficePath & "user\temp\feedback\Current.csv"
         cLogFile = convertpath( cLogFile )
diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index b8895c7fa637..718a7cf066cc 100755
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -335,6 +335,13 @@ end sub
 sub FirstOfficeStart
 '/// First start-routine.
     Dim i as integer
+    ' To nail down a possible culprint on test runs, the availability of existing user settings is checked.
+    ' In some environments the deleting of the settings might fail before the test is started - this will log it:
+    if (fileExists(gOfficePath)) then
+        qaErrorLog ("QA_DEBUG: User settings directory was not deleted before test start!: '" + gOfficePath + "'")
+    else
+        printlog ("QA_DEBUG: User settings directory is unavailable before soffice is started - this is good. '" + gOfficePath + "'")
+    endif
     caselog ""                   '///+<ul><li>Stop the first default-output into the resultfile</li>
     Call hStartTheOffice         '///+<li>Start the office</li>
     ResetApplication             '///+<li>Make the first recovering without an error output.</li></ul>
diff --git a/testautomation/math/required/m_updt.bas b/testautomation/math/required/m_updt.bas
index 7472d02e2dfa..61b517b1ba65 100755
--- a/testautomation/math/required/m_updt.bas
+++ b/testautomation/math/required/m_updt.bas
@@ -47,6 +47,7 @@ sub main
    use "math\required\includes\m_007_.inc"   ' help
    use "math\required\includes\m_010_.inc"
    use "math\required\includes\m_020_.inc"   ' toolbars
+   use "global\required\includes\g_009.inc"
 
    Call hStatusIn ( "Math","m_updt.bas" )
 
@@ -75,7 +76,6 @@ sub LoadIncludeFiles
    use "global\required\includes\g_option.inc"
    use "global\required\includes\g_customize.inc"
    use "global\required\includes\g_001.inc"
-   use "global\required\includes\g_009.inc"
    use "global\tools\includes\optional\t_ui_filters.inc" ' for gMathFilter in m_001_.inc
    gApplication = "MATH"
    Call GetUseFiles