Kaydet (Commit) f7ae7046 authored tarafından Caolán McNamara's avatar Caolán McNamara

get smoketest working after save as old bin format removed

üst 4e9cb724
......@@ -35,7 +35,7 @@ const cParagraphBreak = 0
global const cExtensionFileName = "TestExtension.oxt"
global const cDocNew = 0, cDocCut = 1, cDocPaste = 2, cDocSaveOpen8 = 3, cDocSaveOpenXML = 4, cDocSaveOpen50 = 5, cDocClose = 6, cDocWrite = 7
global const cDocNew = 0, cDocCut = 1, cDocPaste = 2, cDocSaveOpen8 = 3, cDocSaveOpenXML = 4, cDocOpen50 = 5, cDocClose = 6, cDocWrite = 7
global const cDBService = 0, cDBOpen = 1, cDBInsert = 2, cDBDelete = 3, cDBSeek = 4, cDBClose = 5
global const cEXTService = 0, cEXTInstall = 1, cEXTUninstall = 2
global const cLogfileFailed = 255
......@@ -83,7 +83,7 @@ Global const cUserFieldTestWriter = "Writer", cUserFieldTestCalc = &qu
Global const cUserFieldTestDraw = "Draw", cUserFieldTestMath = "Math", cUserFieldTestChart = "Chart"
Global const cUserFieldTestHTML = "HTML", cUserFieldTestJava = "Java", cUserFieldTestDatabase = "Database"
Global const cUserFieldTestExtension = "Extension"
Global const cUserFieldTestOpenSaveXML = "SaveOpenXML", cUserFieldTestOpenSave50 = "SaveOpen50", cUserFieldTestCut = "Cut"
Global const cUserFieldTestOpenSaveXML = "SaveOpenXML", cUserFieldTestOpen50 = "Open50", cUserFieldTestCut = "Cut"
Global const cUserFieldTestPaste = "Paste", cUserFieldTestTerminateAfterTest = "Terminate", cUserFieldTestOpenSave8 = "SaveOpen8"
Global const cOptionsDialogName = "OptionsDlg", cTest10Modul = "Standard"
......@@ -100,7 +100,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, bMakeSaveOpen50Test as boolean, bMakeCutTest as boolean
Global bMakeSaveOpenXMLTest as boolean, bMakeOpen50Test as boolean, bMakeCutTest as boolean
Global bMakePasteTest as boolean, bMakeTerminateAfterTest as boolean, bShowTable as boolean
Global bMakeSaveOpen8Test as boolean
......@@ -162,7 +162,7 @@ Sub CreateStatusTable
tableColums(cDocPaste) = "paste"
tableColums(cDocSaveOpen8) = "V8.0"
tableColums(cDocSaveOpenXML) = "XML"
tableColums(cDocSaveOpen50) = "V5.0"
tableColums(cDocOpen50) = "V5.0"
' tableColums(cDocClose) = "close"
aDoc = gOutPutDoc
......@@ -507,7 +507,7 @@ Sub SetOptions
SetUserFieldState (cUserFieldTestDatabase, -(gOptionsDialog.getControl("cbDatabaseTest").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestExtension, -(gOptionsDialog.getControl("cbExtensionTest").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestOpenSaveXML, -(gOptionsDialog.getControl("cbSaveOpenXMLTest").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestOpenSave50, -(gOptionsDialog.getControl("cbSaveOpen50Test").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestOpen50, -(gOptionsDialog.getControl("cbOpen50Test").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestOpenSave8, -(gOptionsDialog.getControl("cbSaveOpen8Test").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestCut, -(gOptionsDialog.getControl("cbCutTest").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestPaste, -(gOptionsDialog.getControl("cbPasteTest").getState), gOutPutDoc)
......@@ -527,7 +527,7 @@ 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("cbSaveOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave50, gOutPutDoc)))
gOptionsDialog.getControl("cbOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)))
gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutPutDoc)))
gOptionsDialog.getControl("cbCutTest").setState( -( GetUserFieldState (cUserFieldTestCut, gOutPutDoc)))
gOptionsDialog.getControl("cbPasteTest").setState( -( GetUserFieldState (cUserFieldTestPaste, gOutPutDoc)))
......@@ -547,7 +547,7 @@ Sub ReadOptions
bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutPutDoc)
bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutPutDoc)
bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutPutDoc)
bMakeSaveOpen50Test = GetUserFieldState (cUserFieldTestOpenSave50, gOutPutDoc)
bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)
bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutPutDoc)
bMakeCutTest = GetUserFieldState (cUserFieldTestCut, gOutPutDoc)
bMakePasteTest = GetUserFieldState (cUserFieldTestPaste, gOutPutDoc)
......@@ -574,9 +574,9 @@ Sub SetDefaultOptions
bMakeSaveOpenXMLTest = true
REM Disable StarOffice 5.0 tests in case binfilter has not been included
if Environ("WITH_BINFILTER") = "NO" then
bMakeSaveOpen50Test = false
bMakeOpen50Test = false
else
bMakeSaveOpen50Test = true
bMakeOpen50Test = true
End If
bMakeSaveOpen8Test = true
bMakeCutTest = true
......@@ -620,7 +620,7 @@ Function StartTestWithDefaultOptions
action(cDocPaste) = "paste"
action(cDocSaveOpen8) = "V8.0"
action(cDocSaveOpenXML) = "XML"
action(cDocSaveOpen50) = "V5.0"
action(cDocOpen50) = "V5.0"
dim baseAction(5) as string
baseAction(cDBService) = "services"
baseAction(cDBOpen) = "open"
......
......@@ -42,7 +42,7 @@
<dlg:checkbox dlg:id="cbMathTest" dlg:tab-index="7" dlg:left="126" dlg:top="91" dlg:width="80" dlg:height="8" dlg:value="Math" dlg:checked="false"/>
<dlg:checkbox dlg:id="cbChartTest" dlg:tab-index="8" dlg:left="126" dlg:top="105" dlg:width="80" dlg:height="8" dlg:value="Chart" dlg:checked="false"/>
<dlg:checkbox dlg:id="cbSaveOpenXMLTest" dlg:tab-index="9" dlg:left="19" dlg:top="49" dlg:width="80" dlg:height="8" dlg:value="Save / Open XML" dlg:checked="false"/>
<dlg:checkbox dlg:id="cbSaveOpen50Test" dlg:tab-index="10" dlg:left="19" dlg:top="63" dlg:width="80" dlg:height="8" dlg:value="Save / Open V5.0" dlg:checked="false"/>
<dlg:checkbox dlg:id="cbOpen50Test" dlg:tab-index="10" dlg:left="19" dlg:top="63" dlg:width="80" dlg:height="8" dlg:value="Open V5.0" dlg:checked="false"/>
<dlg:checkbox dlg:id="cbCutTest" dlg:tab-index="11" dlg:left="19" dlg:top="77" dlg:width="80" dlg:height="8" dlg:value="Cut" dlg:checked="false"/>
<dlg:checkbox dlg:id="cbPasteTest" dlg:tab-index="12" dlg:left="19" dlg:top="91" dlg:width="80" dlg:height="8" dlg:value="Paste" dlg:checked="false"/>
<dlg:checkbox dlg:id="cbTerminateAfterTest" dlg:tab-index="13" dlg:disabled="true" dlg:left="19" dlg:top="174" dlg:width="190" dlg:height="8" dlg:value="Terminate Office after test" dlg:checked="false"/>
......
......@@ -39,7 +39,7 @@ const cTempFileName = &quot;ttt&quot;
const cMessageSaveOpen8Doc = &quot;Save/Open open Documents (8.0)&quot;
const cMessageSaveOpenXMLDoc = &quot;Save/Open Document XML (6/7)&quot;
const cMessageSaveOpen50Doc = &quot;Save/Open Document 5.0&quot;
const cMessageOpen50Doc = &quot;Open Document 5.0&quot;
const cMessageNewDoc = &quot;New Document&quot;
const cMessageCloseDoc = &quot;Close Document&quot;
const cMessageCutObj = &quot;Cut Object&quot;
......@@ -306,16 +306,13 @@ Sub WriteTests (sText as string, bTestAll as boolean, nFileChannel as integer)
if bMakeSaveOpenXMLTest then
sWriteStr = sWriteStr + &quot;, save XML&quot;
end if
if bMakeSaveOpen50Test then
sWriteStr = sWriteStr + &quot;, save 5.0&quot;
end if
if bMakeSaveOpen8Test then
sWriteStr = sWriteStr + &quot;, open 8.0&quot;
end if
if bMakeSaveOpenXMLTest then
sWriteStr = sWriteStr + &quot;, open XML&quot;
end if
if bMakeSaveOpen50Test then
if bMakeOpen50Test then
sWriteStr = sWriteStr + &quot;, open 5.0&quot;
end if
end if
......@@ -377,11 +374,7 @@ Sub MakeDocTest (FilterType as Integer)
sFileNameXML = sWorkPathURL+cTempFileName+&quot;.&quot;+GetDocEndings(FilterType or cFltXML)
SaveDoc (sFileNameXML, oDoc, GetDocFilter(FilterType or cFltXML))
end if
nCurrentAction = cDocSaveOpen50
if bMakeSaveOpen50Test and IsFilterAvailable (FilterType or cFlt50) then
sFileName50 = sWorkPathURL+cTempFileName+&quot;.&quot;+GetDocEndings(FilterType or cFlt50)
SaveDoc (sFileName50, oDoc, GetDocFilter(FilterType or cFlt50))
end if
nCurrentAction = cDocOpen50
&apos; oDoc.dispose
nCurrentAction = cDocClose
oDoc.close (true)
......@@ -421,14 +414,16 @@ Sub MakeDocTest (FilterType as Integer)
end If
end if
nCurrentAction = cDocSaveOpen50
if bMakeSaveOpen50Test and IsFilterAvailable (FilterType or cFlt50) then
nCurrentAction = cDocOpen50
if bMakeOpen50Test and IsFilterAvailable (FilterType or cFlt50) then
SOLARSRC = ConvertToURL(Environ(&quot;SOLARSRC&quot;))
sFileName50 = SOLARSRC+&quot;/qadevOOo/testdocs/&quot;+cTempFileName+&quot;.&quot;+GetDocEndings(FilterType or cFlt50)
oDoc = LoadDoc (sFileName50)
&apos; oDoc = Documents.open(sFileName)
LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+&quot; &quot;+ cMessageSaveOpen50Doc, FileChannel)
LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+&quot; &quot;+ cMessageSaveOpen50Doc, MainFileChannel)
SetStatus (FilterType, cDocSaveOpen50, not IsNull (oDoc))
LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+&quot; &quot;+ cMessageSave50Doc, FileChannel)
LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+&quot; &quot;+ cMessageOpen50Doc, MainFileChannel)
SetStatus (FilterType, cDocOpen50, not IsNull (oDoc))
if not IsNull (oDoc) then
&apos; oDoc.dispose
......@@ -682,8 +677,8 @@ Function GetErrorMessageOnAction (nAction as Integer) as String
GetErrorMessageOnAction = cMessageSaveOpen8Doc
case cDocSaveOpenXML
GetErrorMessageOnAction = cMessageSaveOpenXMLDoc
case cDocSaveOpen50
GetErrorMessageOnAction = cMessageSaveOpen50Doc
case cDocOpen50
GetErrorMessageOnAction = cMessageOpen50Doc
case cDocClose
GetErrorMessageOnAction = cMessageCloseDoc
case else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment