Clean up removal of binfilter tests from smoketest

Change-Id: Ide1d0b6c5cab56d5c383853d349d70b21401a533

smoketest/data/Global.xml

@@ -26,7 +26,7 @@ const cParagraphBreak = 0
 
 global const cExtensionFileName = "TestExtension.oxt"
 
-global const cDocNew = 0, cDocSaveOpen8 = 1, cDocSaveOpenXML = 2, cDocOpen50 = 3, cDocClose = 4, cDocMacros = 5
+global const cDocNew = 0, cDocSaveOpen8 = 1, cDocSaveOpenXML = 2, cDocClose = 3, cDocMacros = 4
 global const cDBService = 0, cDBOpen = 1, cDBInsert = 2, cDBDelete = 3, cDBSeek = 4, cDBClose = 5
 global const cEXTService = 0, cEXTInstall = 1, cEXTUninstall = 2
 global const cTestClosureSetupDoc = 0, cTestClosureWriteStatus = 1
@@ -39,7 +39,7 @@ global const cStExtension = 11
 global const cStTestGlue = 12
 global const cStNone = -1
 
-global const cFlt8 = 0, cFlt50 = 32, cFltNewDoc = 64, cFltXML = 128
+global const cFlt8 = 0, cFltNewDoc = 64, cFltXML = 128
 
 global const frmWriter = 1, frmCalc = 2, frmImpress = 4
 global const frmMath = 5, frmChart = 7, frmHyperText = 8, frmDraw = 9
@@ -81,7 +81,6 @@ Global const cUserFieldTestDraw = "Draw", cUserFieldTestMath = "M
 Global const cUserFieldTestHTML = "HTML", cUserFieldTestJava = "Java", cUserFieldTestDatabase = "Database"
 Global const cUserFieldTestExtension = "Extension"
 Global const cUserFieldTestOpenSaveXML = "SaveOpenXML"
-Global const cUserFieldTestOpen50 = "Open50"
 Global const cUserFieldTestTerminateAfterTest = "Terminate", cUserFieldTestOpenSave8 = "SaveOpen8", cUserFieldTestMacros = "Macros"
 
 Global const cOptionsDialogName = "OptionsDlg", cTest10Modul = "Standard"
@@ -99,7 +98,7 @@ Global bMakeWriterTest as boolean, bMakeCalcTest as  boolean, bMakeImpressTest a
 Global bMakeDrawTest as Boolean, bMakeMathTest as boolean, bMakeChartTest as boolean
 Global bMakeHTMLTest as boolean, bMakeJavaTest as boolean, bMakeDBTest as boolean
 Global bMakeExtensionTest as boolean
-Global bMakeSaveOpenXMLTest as boolean, bMakeOpen50Test as boolean
+Global bMakeSaveOpenXMLTest as boolean
 Global bMakeTerminateAfterTest as boolean, bShowTable as boolean
 Global bMakeSaveOpen8Test as boolean, bMakeMacrosTest as boolean
 
@@ -223,11 +222,10 @@ Sub CreateStatusTable
     tableHeaders(cStHTML) = "HTML"
     tableHeaders(cStJava) = "Java"
 
-    dim tableRows(5) as string
+    dim tableRows(4) as string
     tableRows(cDocNew) = "new"
     tableRows(cDocSaveOpen8) = "V8.0"
     tableRows(cDocSaveOpenXML) = "XML"
-    tableRows(cDocOpen50) = "V5.0"
     tableRows(cDocClose) = "close"
     tableRows(cDocMacros) = "macros"
 
@@ -528,9 +526,6 @@ Sub SetGlobalOptionsDialog ()
     REM create dialog control
     gOptionsDialog = CreateUnoDialog( oInputStreamProvider )
 
-    oControl = gOptionsDialog.getControl("cbOpen50Test")
-    oControl.Model.setPropertyValue("Enabled", FALSE)
-
 end Sub
 
 Sub ShowOptionsDlg
@@ -569,7 +564,6 @@ Sub SetOptions
     SetUserFieldState (cUserFieldTestDatabase, -(gOptionsDialog.getControl("cbDatabaseTest").getState), gOutputDoc)
     SetUserFieldState (cUserFieldTestExtension, -(gOptionsDialog.getControl("cbExtensionTest").getState), gOutputDoc)
     SetUserFieldState (cUserFieldTestOpenSaveXML, -(gOptionsDialog.getControl("cbSaveOpenXMLTest").getState), gOutputDoc)
-    SetUserFieldState (cUserFieldTestOpen50, -(gOptionsDialog.getControl("cbOpen50Test").getState), gOutPutDoc)
     SetUserFieldState (cUserFieldTestOpenSave8, -(gOptionsDialog.getControl("cbSaveOpen8Test").getState), gOutputDoc)
     SetUserFieldState (cUserFieldTestMacros, -(gOptionsDialog.getControl("cbMacrosTest").getState), gOutputDoc)
     SetUserFieldState (cUserFieldTestTerminateAfterTest, -(gOptionsDialog.getControl("cbTerminateAfterTest").getState), gOutputDoc)
@@ -588,7 +582,6 @@ Sub GetOptions
     gOptionsDialog.getControl("cbDatabaseTest").setState( -( GetUserFieldState (cUserFieldTestDatabase, gOutputDoc)))
     gOptionsDialog.getControl("cbExtensionTest").setState( -( GetUserFieldState (cUserFieldTestExtension, gOutputDoc)))
     gOptionsDialog.getControl("cbSaveOpenXMLTest").setState( -( GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc)))
-    gOptionsDialog.getControl("cbOpen50Test").setState(0)
     gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)))
     gOptionsDialog.getControl("cbMacrosTest").setState( -( GetUserFieldState (cUserFieldTestMacros, gOutputDoc)))
     gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)))
@@ -607,7 +600,6 @@ Sub ReadOptions
     bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutputDoc)
     bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutputDoc)
     bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc)
-    bMakeOpen50Test = false
     bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)
     bMakeMacrosTest = GetUserFieldState (cUserFieldTestMacros, gOutputDoc)
     bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)
@@ -631,7 +623,6 @@ Sub SetDefaultOptions
         bMakeExtensionTest = true
     End If
     bMakeSaveOpenXMLTest = true
-    bMakeOpen50Test = false
     bMakeSaveOpen8Test = true
     bMakeMacrosTest = true
     bMakeTerminateAfterTest = false
@@ -667,11 +658,10 @@ Function StartTestWithDefaultOptions
     component(cStJava) = "Java"
     component(cStDataBase) = "Base"
     component(cStExtension) = "Extensions"
-    dim action(5) as string
+    dim action(4) as string
     action(cDocNew) = "new"
     action(cDocSaveOpen8) = "V8.0"
     action(cDocSaveOpenXML) = "XML"
-    action(cDocOpen50) = "V5.0"
     action(cDocClose) = "close"
     action(cDocMacros) = "macros"
     dim baseAction(5) as string

smoketest/data/OptionsDlg.xml

@@ -38,7 +38,6 @@
   </dlg:titledbox>
   <dlg:checkbox dlg:id="cbSaveOpen8Test" dlg:tab-index="12" dlg:left="126" dlg:top="21" dlg:width="80" dlg:height="8" dlg:value="Save / Open V8.0" dlg:checked="false"/>
   <dlg:checkbox dlg:id="cbSaveOpenXMLTest" dlg:tab-index="13" dlg:left="126" dlg:top="35" dlg:width="80" dlg:height="8" dlg:value="Save / Open XML" dlg:checked="false"/>
-  <dlg:checkbox dlg:id="cbOpen50Test" dlg:tab-index="14" dlg:left="126" dlg:top="49" dlg:width="80" dlg:height="8" dlg:value="Open V5.0" dlg:checked="false"/>
   <dlg:checkbox dlg:id="cbMacrosTest" dlg:tab-index="15" dlg:left="126" dlg:top="63" dlg:width="80" dlg:height="8" dlg:value="Macros" dlg:checked="false"/>
   <dlg:titledbox dlg:id="fmBroker" dlg:tab-index="16" dlg:left="7" dlg:top="169" dlg:width="208" dlg:height="17"/>
   <dlg:checkbox dlg:id="cbTerminateAfterTest" dlg:tab-index="17" dlg:disabled="true" dlg:left="19" dlg:top="174" dlg:width="190" dlg:height="8" dlg:value="Terminate Office after test" dlg:checked="false"/>

smoketest/data/Test_10er.xml

@@ -31,7 +31,6 @@ const cTempFileName = "smoketest_file"
 
 const cMessageSaveOpen8Doc = "Save/Open open Documents (8.0)"
 const cMessageSaveOpenXMLDoc = "Save/Open Document XML (6/7)"
-const cMessageOpen50Doc = "Open Document 5.0"
 const cMessageNewDoc = "New Document"
 const cMessageCloseDoc = "Close Document"
 const cMessageRunMacros = "Run Macros"
@@ -83,22 +82,6 @@ Sub DeleteAllSavedFiles()
     If FileExists (sFileName) then
         Kill (sFileName)
     End If
-    sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmWriter or cFlt50)
-    If FileExists (sFileName) then
-        Kill (sFileName)
-    End If
-    sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmCalc or cFlt50)
-    If FileExists (sFileName) then
-        Kill (sFileName)
-    End If
-    sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmImpress or cFlt50)
-    If FileExists (sFileName) then
-        Kill (sFileName)
-    End If
-    sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmDraw or cFlt50)
-    If FileExists (sFileName) then
-        Kill (sFileName)
-    End If
 End Sub
 
 Sub DeleteAllLogFiles()
@@ -296,9 +279,6 @@ Sub WriteTestSequence
     if bMakeSaveOpenXMLTest then
         sWriteStr = sWriteStr + ", open XML"
     end if
-    if bMakeOpen50Test then
-        sWriteStr = sWriteStr + ", open 5.0"
-    end if
     if bMakeMacrosTest then
         sWriteStr = sWriteStr + ", run macros"
     end if
@@ -335,7 +315,7 @@ end Sub
 
 Sub MakeDocTest
     Dim oDoc as Object
-    Dim sFileNameXML$, sFileName50$, sFileName8$
+    Dim sFileNameXML$, sFileName8$
     Dim bSuccess as Boolean
 
     On Local Error GoTo DOCTESTERROR
@@ -384,21 +364,6 @@ Sub MakeDocTest
             end If
         end if
 
-        gCurrentTestCase = cDocOpen50
-        if bMakeOpen50Test and IsFilterAvailable (gCurrentDocTest or cFlt50) then
-            SOLARSRC = ConvertToURL(Environ("SRC_ROOT"))
-            sFileName50 = SOLARSRC+"/qadevOOo/testdocs/ttt."+GetDocEndings(gCurrentDocTest or cFlt50)
-            oDoc = LoadDoc (sFileName50)
-
-'          oDoc = Documents.open(sFileName)
-            LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ cMessageOpen50Doc, not IsNull (oDoc) )
-
-            if not IsNull (oDoc) then
-                gCurrentTestCase = cDocClose
-                oDoc.close (true)
-            end If
-        end if
-
         gCurrentTestCase = cDocMacros
 	' Just one calc macro test for now
 	' To-Do split this into its own per-module/test .xml and add more
@@ -539,16 +504,8 @@ Function GetDocEndings (DocType as Integer) as String
             GetDocEndings = "odp" 'PrÕsentation
         case frmDraw or cFlt8
             GetDocEndings = "odg" 'Zeichen
-        case frmHyperText, frmHyperText or cFlt50, frmHyperText or cFltXML
+        case frmHyperText, frmHyperText or cFltXML
             GetDocEndings = "html" 'Hypertext-Dokument
-        case frmWriter or cFlt50
-            GetDocEndings = "sdw" ' Textdokument 5.0
-        case frmCalc or cFlt50
-            GetDocEndings = "sdc" 'Tabellendokument 5.0
-        case frmImpress or cFlt50
-            GetDocEndings = "sdd" 'PrÕsentation 5.0
-        case frmDraw or cFlt50
-            GetDocEndings = "sda" 'Zeichen 5.0
         case frmWriter or cFltXML
             GetDocEndings = "sxw" ' Textdokument
         case frmCalc or cFltXML
@@ -586,18 +543,8 @@ Function GetDocFilter (DocType as Integer) as String
         case frmMath or cFltXML
             GetDocFilter = "StarOffice XML (Math)" ' formula
 
-        case frmHyperText, frmHyperText or cFlt50, frmHyperText or cFltXML
+        case frmHyperText, frmHyperText or cFltXML
             GetDocFilter = "HTML" ' HTML document
-        case frmWriter or cFlt50
-            GetDocFilter = "StarWriter 5.0" ' Textdokument 5.0
-        case frmCalc or cFlt50
-            GetDocFilter = "StarCalc 5.0" 'Tabellendokument 5.0
-        case frmImpress or cFlt50
-            GetDocFilter = "StarImpress 5.0" 'Präsentation 5.0
-        case frmDraw or cFlt50
-            GetDocFilter = "StarDraw 5.0" 'Zeichen 5.0
-        case frmMath or cFlt50
-            GetDocFilter = "StarMath 5.0" 'Formel 5.0
 
         case frmWriter or cFltNewDoc
             GetDocFilter = "swriter" ' text document
@@ -655,8 +602,6 @@ Function GetErrorMessageOnAction (nAction as Integer) as String
             GetErrorMessageOnAction = cMessageSaveOpen8Doc
         case cDocSaveOpenXML
             GetErrorMessageOnAction = cMessageSaveOpenXMLDoc
-        case cDocOpen50
-            GetErrorMessageOnAction = cMessageOpen50Doc
         case cDocMacros
             GetErrorMessageOnAction = cMessageRunMacros
         case cDocClose
@@ -668,7 +613,7 @@ end Function
 
 Function IsFilterAvailable (FilterType as Integer) as boolean
     IsFilterAvailable = true
-    if ((FilterType = (frmHyperText or cFlt50)) or (FilterType = (frmHyperText or cFltXML))) then
+    if (FilterType = (frmHyperText or cFltXML)) then
         IsFilterAvailable = false
     end if
 End Function

smoketest/data/content.xml

@@ -89,7 +89,6 @@
       <text:user-field-decl text:value-type="string" text:string-value="y" text:name="Chart"/>
       <text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpenXML"/>
       <text:user-field-decl text:value-type="string" text:string-value="y" text:name="Macros"/>
-      <text:user-field-decl text:value-type="string" text:string-value="y" text:name="Open50"/>
       <text:user-field-decl text:value-type="string" text:string-value="n" text:name="Terminate"/>
       <text:user-field-decl text:value-type="string" text:string-value="y" text:name="Java"/>
       <text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpen8"/>