diff options
Diffstat (limited to 'smoketestoo_native')
| -rwxr-xr-x | smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl | 14 | ||||
| -rwxr-xr-x | smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java | 26 | ||||
| -rw-r--r-- | smoketestoo_native/data/Events.xml | 4 | ||||
| -rw-r--r-- | smoketestoo_native/data/Global.xml | 186 | ||||
| -rw-r--r-- | smoketestoo_native/data/Test_10er.xml | 284 | ||||
| -rw-r--r-- | smoketestoo_native/data/Test_DB.xml | 38 | ||||
| -rw-r--r-- | smoketestoo_native/data/Test_Ext.xml | 20 |
7 files changed, 286 insertions, 286 deletions
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl index 83c370e11a18..11267990f01c 100755 --- a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl +++ b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,16 +25,16 @@ * ************************************************************************/ -#ifndef _com_sun_star_comp_smoketest_TestExtension_idl_ +#ifndef _com_sun_star_comp_smoketest_TestExtension_idl_ #define _com_sun_star_comp_smoketest_TestExtension_idl_ - -#include <com/sun/star/lang/XServiceInfo.idl> - + +#include <com/sun/star/lang/XServiceInfo.idl> + module com { module sun { module star { module comp { module smoketest { // example service, XServiceInfo is implemented here for demonstration - // issues. XServiceInfo must be implemented by all components. + // issues. XServiceInfo must be implemented by all components. service TestExtension: ::com::sun::star::lang::XServiceInfo; };};};};}; -#endif +#endif diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java index c08c719116ae..45168e800aa5 100755 --- a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java +++ b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ public class TestExtension { */ static private final String __serviceName = "com.sun.star.comp.smoketest.TestExtension"; - + /** The initial component contextr, that gives access to * the service manager, supported singletons, ... * It's often later used @@ -65,7 +65,7 @@ public class TestExtension { * It's often later used */ private XMultiComponentFactory m_xMCF; - + /** The constructor of the inner class has a XMultiServiceFactory parameter. * @param xmultiservicefactoryInitialization A special service factory * could be introduced while initializing. @@ -73,13 +73,13 @@ public class TestExtension { public _TestExtension(XComponentContext xCompContext) { try { m_cmpCtx = xCompContext; - m_xMCF = m_cmpCtx.getServiceManager(); + m_xMCF = m_cmpCtx.getServiceManager(); } catch( Exception e ) { e.printStackTrace(); } } - + /** This method returns an array of all supported service names. * @return Array of supported service names. */ @@ -95,7 +95,7 @@ public class TestExtension { String[] sSupportedServiceNames = { __serviceName }; return sSupportedServiceNames; } - + /** This method returns true, if the given service will be * supported by the component. * @param sServiceName Service name. @@ -104,16 +104,16 @@ public class TestExtension { public boolean supportsService( String sServiceName ) { return sServiceName.equals( __serviceName ); } - + /** Return the class name of the component. * @return Class name of the component. */ public String getImplementationName() { return _TestExtension.class.getName(); - } + } } - - + + /** * Gives a factory for creating the service. * This method is called by the <code>JavaLoader</code> @@ -127,11 +127,11 @@ public class TestExtension { public static XSingleComponentFactory __getComponentFactory(String sImplName) { XSingleComponentFactory xFactory = null; - + if ( sImplName.equals( _TestExtension.class.getName() ) ) xFactory = Factory.createComponentFactory(_TestExtension.class, _TestExtension.getServiceNames()); - + return xFactory; } @@ -162,5 +162,5 @@ public class TestExtension { * your component using these objects. */ } - + } diff --git a/smoketestoo_native/data/Events.xml b/smoketestoo_native/data/Events.xml index 6536c1c5eafc..956a1ee40e2e 100644 --- a/smoketestoo_native/data/Events.xml +++ b/smoketestoo_native/data/Events.xml @@ -36,7 +36,7 @@ Sub ClickSaveTest if not OptionsDlg.cbSaveTest.Value then OptionsDlg.cbOpenTest.Value = false OptionsDlg.cbOpenTest.Enabled = false - else + else OptionsDlg.cbOpenTest.Enabled = true end If End Sub @@ -45,7 +45,7 @@ Sub ClickCutTest if not OptionsDlg.cbCutTest.Value then OptionsDlg.cbPasteTest.Value = false OptionsDlg.cbPasteTest.Enabled = false - else + else OptionsDlg.cbPasteTest.Enabled = true end If End Sub diff --git a/smoketestoo_native/data/Global.xml b/smoketestoo_native/data/Global.xml index 364d2e2efcfb..43d0a14e6734 100644 --- a/smoketestoo_native/data/Global.xml +++ b/smoketestoo_native/data/Global.xml @@ -131,11 +131,11 @@ Sub Main if bShowTable then call ClearDoc (gOutPutDoc) end If - + call ClearStatus - + Call Test_10er.Main - + if bShowTable then call CreateStatusTable2 call CreateStatusTable @@ -155,7 +155,7 @@ Sub CreateStatusTable tableHeaders(cStMath) = "Math" tableHeaders(cStHTML) = "HTML" tableHeaders(cStJava) = "Java" - + dim tableColums(5) as string tableColums(cDocNew) = "new" tableColums(cDocCut) = "cut" @@ -163,60 +163,60 @@ Sub CreateStatusTable tableColums(cDocSaveOpen8) = "V8.0" tableColums(cDocSaveOpenXML) = "XML" tableColums(cDocSaveOpen50) = "V5.0" -' tableColums(cDocClose) = "close" - +' tableColums(cDocClose) = "close" + aDoc = gOutPutDoc - + xText = aDoc.Text xCursor = xText.createTextCursor() - -' xCursor.gotoStart(FALSE) -' xCursor.GoRight (2, False) -' SetParagraphBreak (xCursor) -' SetParagraphBreak (xCursor) + +' xCursor.gotoStart(FALSE) +' xCursor.GoRight (2, False) +' SetParagraphBreak (xCursor) +' SetParagraphBreak (xCursor) xCursor.gotoStart(FALSE) xCursor.GoRight (4, False) SetParagraphBreak (xCursor) xCursor.GoRight (1, False) SetParagraphBreak (xCursor) xCursor.GoRight (1, False) - + table = aDoc.createInstance("com.sun.star.text.TextTable") table.initialize(7,9) table.Name = "StTab1" xText.insertTextContent(xCursor, table, FALSE) - + tableCursor = table.createCursorByCellName(table.CellNames(0)) tableCursor.gotoStart(FALSE) tableCursor.goRight(1,FALSE) - + for i% = 0 to 7 cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.String=tableHeaders(i%) - + xCell.BackTransparent = False xCell.BackColor = cCoGrey - + tableCursor.goRight(1,FALSE) next i% - + xCursor.gotoStart(FALSE) -' SetParagraphBreak (xCursor) -' SetParagraphBreak (xCursor) - - tableCursor.gotoStart(FALSE) +' SetParagraphBreak (xCursor) +' SetParagraphBreak (xCursor) + + tableCursor.gotoStart(FALSE) cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.BackTransparent = False xCell.BackColor = cCoGrey - + for i% = 0 to 5 tableCursor.goDown(1,FALSE) cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.String=tableColums(i%) - + xCell.BackTransparent = False xCell.BackColor = cCoGrey next i% @@ -229,7 +229,7 @@ Sub CreateStatusTable2 tableHeaders(cStExtension-9) = "Extension" tableHeaders(3) = "" tableHeaders(4) = "" - + dim tableColums(5) as string tableColums(cDBService ) = "services" tableColums(cDBOpen ) = "open" @@ -237,47 +237,47 @@ Sub CreateStatusTable2 tableColums(cDBDelete ) = "delete" tableColums(cDBSeek ) = "seek" tableColums(cDBClose ) = "close" - + dim tableColums2(3) as string tableColums2(cEXTService ) = "services" tableColums2(cEXTInstall ) = "install" tableColums2(cEXTUninstall ) = "uninstall" - + aDoc = gOutPutDoc - + xText = aDoc.Text xCursor = xText.createTextCursor() - + xCursor.gotoStart(FALSE) xCursor.GoRight (4, False) SetParagraphBreak (xCursor) SetParagraphBreak (xCursor) xCursor.gotoEnd(FALSE) - + table = aDoc.createInstance("com.sun.star.text.TextTable") table.initialize(7,6) table.Name = "StTab2" 'table.RelativeWidth =500 - + xText.insertTextContent(xCursor, table, FALSE) - + tableCursor = table.createCursorByCellName(table.CellNames(0)) tableCursor.gotoStart(FALSE) tableCursor.goRight(1,FALSE) - + for i% = 0 to 5 cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.String=tableHeaders(i%) - + xCell.BackTransparent = False xCell.BackColor = cCoGrey - + tableCursor.goRight(1,FALSE) next i% - + tableCursor.gotoStart(FALSE) - + cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.BackTransparent = False @@ -288,20 +288,20 @@ Sub CreateStatusTable2 cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.String=tableColums(i%) - + xCell.BackTransparent = False xCell.BackColor = cCoGrey next i% - + tableCursor.gotoStart(FALSE) tableCursor.goRight(2,FALSE) - + for i% = 0 to 3 tableCursor.goDown(1,FALSE) cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) xCell.String=tableColums2(i%) - + xCell.BackTransparent = False xCell.BackColor = cCoGrey next i% @@ -312,27 +312,27 @@ Sub CreateDocState aDoc = gOutPutDoc table = aDoc.TextTables.GetByIndex (1) 'table = aDoc.TextTables.GetByName ("StTab1") - + for j% = 0 to 7 for i% = 0 to 5 sRangeName = GetRangeName(j%, i%+1) - + tableCursor = table.createCursorByCellName(sRangeName) - + cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) - + xCell.BackTransparent = False - + if gErrorState (j%, i%) = cLogTrue then xCell.BackColor = cCoGreen else if gErrorState (j%, i%) = cLogFalse then xCell.BackColor = cCoRed else - xCell.BackColor = cCoGrey + xCell.BackColor = cCoGrey + end If end If - end If - + next i% next j% end Sub @@ -341,27 +341,27 @@ Sub CreateSecondState aDoc = gOutPutDoc table = aDoc.TextTables.GetByIndex (0) 'table = aDoc.TextTables.GetByName ("StTab2") - + for j% = 0 to cMaxErrorStates-9 for i% = 0 to 5 sRangeName = GetRangeName(j%, i%+1) - + tableCursor = table.createCursorByCellName(sRangeName) - + cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) - + xCell.BackTransparent = False - + if gErrorState (j%+9, i%) = cLogTrue then xCell.BackColor = cCoGreen else if gErrorState (j%+9, i%) = cLogFalse then xCell.BackColor = cCoRed else - xCell.BackColor = cCoGrey - end If + xCell.BackColor = cCoGrey + end If end If - + next i% next j% end Sub @@ -375,45 +375,45 @@ Sub SetStatus (nDocType as Integer, nAction as Integer, bState as Boolean) Dim nState as integer nStatusType = GetStatusType (nDocType) If nStatusType = cStNone then Exit Sub - - if bState then + + if bState then nState = cLogTrue else nState = cLogFalse end If - + gErrorState (nStatusType, nAction) = nState end Sub Function GetStatusType (nDocType as Integer) as Integer Select Case ( nDocType ) - case frmWriter - GetStatusType = cStWriter ' Textdokument + case frmWriter + GetStatusType = cStWriter ' Textdokument case frmCalc - GetStatusType = cStCalc 'Tabellendokument + GetStatusType = cStCalc 'Tabellendokument case frmMessage - GetStatusType = cStMessage 'Nachricht + GetStatusType = cStMessage 'Nachricht case frmImpress - GetStatusType = cStPraesentation 'Präsentation + GetStatusType = cStPraesentation 'Präsentation case frmDraw GetStatusType = cStZeichnen 'Zeichnen case frmMath - GetStatusType = cStMath 'Formel + GetStatusType = cStMath 'Formel case frmImage - GetStatusType = cStBild 'Bild + GetStatusType = cStBild 'Bild case frmHyperText - GetStatusType = cStHTML 'Hypertext-Dokument + GetStatusType = cStHTML 'Hypertext-Dokument case frmChart - GetStatusType = cStChart 'Diagramm + GetStatusType = cStChart 'Diagramm case frmJava GetStatusType = cStJava 'Java case frmDataBase - GetStatusType = cStDataBase 'DataBase + GetStatusType = cStDataBase 'DataBase case frmExtension GetStatusType = cStExtension 'Extension case else GetStatusType = cStNone - end Select + end Select end Function Sub SetParagraphBreak (aCursor as Object) @@ -456,13 +456,13 @@ Sub SetGlobalOptionsDialog () Const sLibName = cTest10Modul Const sDialogName = cOptionsDialogName - + REM get library and input stream provider oLibContainer = DialogLibraries - + REM load the library oLibContainer.loadLibrary( sLibName ) - + oLib = oLibContainer.getByName( sLibName ) oInputStreamProvider = oLib.getByName( sDialogName ) @@ -479,9 +479,9 @@ Sub ShowOptionsDlg REM show the dialog gOptionsDialog.execute() - + ' jetzt läuft der Dialog, bis ein Button gedrückt wird - + Select Case (gDlgState) case cDlgOk call SetOptions () @@ -489,7 +489,7 @@ Sub ShowOptionsDlg call SetOptions () call StartTestByOptions () end Select - + gOptionsDialog.dispose() end Sub @@ -503,9 +503,9 @@ Sub SetOptions SetUserFieldState (cUserFieldTestHTML, -(gOptionsDialog.getControl("cbHTMLTest").getState), gOutPutDoc) SetUserFieldState (cUserFieldTestMath, -(gOptionsDialog.getControl("cbMathTest").getState), gOutPutDoc) SetUserFieldState (cUserFieldTestChart, -(gOptionsDialog.getControl("cbChartTest").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestJava, -(gOptionsDialog.getControl("cbJavaTest").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestDatabase, -(gOptionsDialog.getControl("cbDatabaseTest").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestExtension, -(gOptionsDialog.getControl("cbExtensionTest").getState), gOutPutDoc) + SetUserFieldState (cUserFieldTestJava, -(gOptionsDialog.getControl("cbJavaTest").getState), gOutPutDoc) + 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 (cUserFieldTestOpenSave8, -(gOptionsDialog.getControl("cbSaveOpen8Test").getState), gOutPutDoc) @@ -592,7 +592,7 @@ Sub StartTestByOptions ClearDocFull (gOutPutDoc) gOutPutDoc.dispose 'StarDesktop.Terminate - + 'EnableReschedule( false ) 'DispatchSlot( 5300 ) stop @@ -661,18 +661,18 @@ Sub DispatchSlot(SlotID as Integer) oUrl.Complete = "slot:" & CStr(SlotID) oTrans.parsestrict(oUrl) - oDisp = StarDesktop.queryDispatch(oUrl, "_self", 0) + oDisp = StarDesktop.queryDispatch(oUrl, "_self", 0) oDisp.dispatch(oUrl, oArg()) End Sub Sub LoadLibrary( LibName As String ) - + dim args(1) dim arg as new com.sun.star.beans.PropertyValue arg.Name = "LibraryName" arg.Value = LibName args(0) = arg - + dim url as new com.sun.star.util.URL dim trans as object trans = createUnoService("com.sun.star.util.URLTransformer" ) @@ -682,7 +682,7 @@ Sub LoadLibrary( LibName As String ) dim disp as object disp = StarDesktop.currentFrame.queryDispatch( url, "", 0 ) disp.dispatch( url, args() ) - + End Sub Sub ExecuteSlot( SlotNr As String, oDoc as Object ) @@ -690,14 +690,14 @@ Sub ExecuteSlot( SlotNr As String, oDoc as Object ) dim url as new com.sun.star.util.URL dim trans as object dim disp as object - + trans = createUnoService("com.sun.star.util.URLTransformer" ) url.Complete = "slot:" + SlotNr trans.parsestrict( url ) - + disp = oDoc.CurrentController.Frame.queryDispatch( url, "", 0 ) disp.dispatch( url, args() ) - + End Sub Sub CutText (oDoc as Object) @@ -713,7 +713,7 @@ Sub DelAllUserFields (aDoc as Object) Dim aElements as Variant Dim i% Dim aFieldMasters, aFieldMaster as Object - Dim sElement$ + Dim sElement$ aFieldMasters = aDoc.TextFieldMasters aElements = aFieldMasters.ElementNames for i = 0 to UBound(aElements) @@ -722,7 +722,7 @@ Sub DelAllUserFields (aDoc as Object) aFieldMaster = aFieldMasters.GetByName(sElement$) aFieldMaster.Dispose endif - next + next end Sub Function GetUserFieldState (sName as String, aDoc as Object) as boolean @@ -761,7 +761,7 @@ Function ReadUserField(sFieldName as String, aDoc as Object) as String ReadUserField = aMasters.GetByName (cUnoUserField+cUnoSeparator+sFieldName).Content else ReadUserField = "" - end If + end If End Function Sub WriteUserField(sValue as String, sFieldName as String, aDoc as Object, optional aCursor as Object) @@ -769,10 +769,10 @@ Sub WriteUserField(sValue as String, sFieldName as String, aDoc as Object, optio aMasters = aDoc.TextFieldMasters if aMasters.HasByName (cUnoUserField+cUnoSeparator+sFieldName) then aUserField = aMasters.GetByName (cUnoUserField+cUnoSeparator+sFieldName) - else + else aUserField = aDoc.CreateInstance (cUnoUserField) aUserField.Name = sFieldName - end if + end if aUserField.Content = sValue End Sub diff --git a/smoketestoo_native/data/Test_10er.xml b/smoketestoo_native/data/Test_10er.xml index 636dc2129120..5563ce1b4894 100644 --- a/smoketestoo_native/data/Test_10er.xml +++ b/smoketestoo_native/data/Test_10er.xml @@ -91,7 +91,7 @@ Sub DeleteAllSavedFiles() sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmDraw or cFltXML) If FileExists (sFileName) then Kill (sFileName) - End If + End If sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmWriter or cFlt50) If FileExists (sFileName) then Kill (sFileName) @@ -119,22 +119,22 @@ Sub DeleteAllLogFiles() End If If FileExists (sWorkPath+sSCLogFileName) then Kill (sWorkPath+sSCLogFileName) - End If + End If If FileExists (sWorkPath+sSDLogFileName) then Kill (sWorkPath+sSDLogFileName) - End If + End If If FileExists (sWorkPath+sSMathLogFileName) then Kill (sWorkPath+sSMathLogFileName) - End If + End If If FileExists (sWorkPath+sSImDLogFileName) then Kill (sWorkPath+sSImDLogFileName) - End If + End If If FileExists (sWorkPath+sSChartLogFileName) then Kill (sWorkPath+sSChartLogFileName) - End If + End If If FileExists (sWorkPath+sSHptLogFileName) then Kill (sWorkPath+sSHptLogFileName) - End If + End If If FileExists (sWorkPath+sSMessageLogFileName) then Kill (sWorkPath+sSMessageLogFileName) End If @@ -156,8 +156,8 @@ Function OpenLogDat (sFileName as String) as Integer Dim LocaleFileChannel% If FileExists (sWorkPath+sFileName) then Kill (sWorkPath+sFileName) - End If - LocaleFileChannel% = Freefile + End If + LocaleFileChannel% = Freefile Open sWorkPath+sFileName For Output As LocaleFileChannel% OpenLogDat = LocaleFileChannel% end Function @@ -201,11 +201,11 @@ DIM nStrPos as Long sWorkPath = GetWorkPath sWorkPathURL = GetWorkURL - + if GetSystem (sWorkPath) = "windows" then sWorkPath = ConvertPathToWin (sWorkPath) end if - + 'search ExtensionURL sDocURL = gOutPutDoc.URL CompatibilityMode(true) @@ -234,7 +234,7 @@ DIM nStrPos as Long end if if bMakeChartTest then call MakeChartTest (frmChart) - end if + end if if bMakeMathTest then call MakeNewDoc (frmMath) end if @@ -247,13 +247,13 @@ DIM nStrPos as Long if bMakeExtensionTest then call Test_Ext.TestExtensions (frmExtension) end if - + Close #MainFileChannel end Sub Sub WriteTestSequence (FileChannel as integer) Print #FileChannel, "Sequence of testing" - + if bMakeWriterTest then WriteTests ("writer : ", true, FileChannel) end if @@ -271,7 +271,7 @@ Sub WriteTestSequence (FileChannel as integer) end if if bMakeChartTest then WriteTests ("chart : ", false, FileChannel) - end if + end if if bMakeMathTest then WriteTests ("math : ", false, FileChannel) end if @@ -284,13 +284,13 @@ Sub WriteTestSequence (FileChannel as integer) if bMakeExtensionTest then WriteExtensionTests ("Extension : ", FileChannel) end if - + Print #FileChannel end Sub Sub WriteTests (sText as string, bTestAll as boolean, nFileChannel as integer) Dim sWriteStr as string - + sWriteStr = sText sWriteStr = sWriteStr + "new" if bTestAll then @@ -319,33 +319,33 @@ Sub WriteTests (sText as string, bTestAll as boolean, nFileChannel as integer) sWriteStr = sWriteStr + ", open 5.0" end if end if - + sWriteStr = sWriteStr + ", close" - + Print #nFileChannel, sWriteStr end Sub Sub WriteDBTests (sText as string, nFileChannel as integer) Dim sWriteStr as string - + sWriteStr = sText sWriteStr = sWriteStr + "open / services" sWriteStr = sWriteStr + ", insert" sWriteStr = sWriteStr + ", delete" sWriteStr = sWriteStr + ", seek" sWriteStr = sWriteStr + ", close" - + Print #nFileChannel, sWriteStr end Sub Sub WriteExtensionTests (sText as string, nFileChannel as integer) Dim sWriteStr as string - + sWriteStr = sText sWriteStr = sWriteStr + "services" sWriteStr = sWriteStr + ", install" sWriteStr = sWriteStr + ", uninstall" - + Print #nFileChannel, sWriteStr end Sub @@ -354,7 +354,7 @@ Sub MakeDocTest (FilterType as Integer) Dim sFileNameXML$, sFileName50$, sFileName8$ Dim bError as Boolean Dim nCurrentAction as Integer - + On Local Error GoTo DOCTESTERROR nCurrentAction = cLogfileFailed FileChannel% = OpenLogDat (GetLogFileName(FilterType)) @@ -366,7 +366,7 @@ Sub MakeDocTest (FilterType as Integer) if not IsNull (oDoc) then nCurrentAction = cDocCut call CutAndPaste(FilterType, oDoc) -' bError = oDoc.CurrentController.frame.close +' bError = oDoc.CurrentController.frame.close nCurrentAction = cDocSaveOpen8 if bMakeSaveOpen8Test and IsFilterAvailable (FilterType or cFlt8) then sFileName8 = sWorkPathURL+cTempFileName+"."+GetDocEndings(FilterType or cFlt8) @@ -381,68 +381,68 @@ Sub MakeDocTest (FilterType as Integer) if bMakeSaveOpen50Test and IsFilterAvailable (FilterType or cFlt50) then sFileName50 = sWorkPathURL+cTempFileName+"."+GetDocEndings(FilterType or cFlt50) SaveDoc (sFileName50, oDoc, GetDocFilter(FilterType or cFlt50)) - end if -' oDoc.dispose + end if +' oDoc.dispose nCurrentAction = cDocClose oDoc.close (true) -' bError = true ' nur zum ¦bergang, weil bError = oDoc.CurrentController.frame.close nicht geht -' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, FileChannel) -' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, MainFileChannel) -' SetStatus (FilterType, cDocClose, bError) +' bError = true ' nur zum ¦bergang, weil bError = oDoc.CurrentController.frame.close nicht geht +' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, FileChannel) +' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, MainFileChannel) +' SetStatus (FilterType, cDocClose, bError) nCurrentAction = cDocSaveOpen8 if bMakeSaveOpen8Test and IsFilterAvailable (FilterType or cFlt8) then oDoc = LoadDoc (sFileName8) - -' oDoc = Documents.open(sFileName) + +' oDoc = Documents.open(sFileName) LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpen8Doc, FileChannel) LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpen8Doc, MainFileChannel) SetStatus (FilterType, cDocSaveOpen8, not IsNull (oDoc)) - + if not IsNull (oDoc) then -' oDoc.dispose +' oDoc.dispose nCurrentAction = cDocClose oDoc.close (true) - end If + end If end if - + nCurrentAction = cDocSaveOpenXML if bMakeSaveOpenXMLTest and IsFilterAvailable (FilterType or cFltXML) then oDoc = LoadDoc (sFileNameXML) - -' oDoc = Documents.open(sFileName) + +' oDoc = Documents.open(sFileName) LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpenXMLDoc, FileChannel) LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpenXMLDoc, MainFileChannel) SetStatus (FilterType, cDocSaveOpenXML, not IsNull (oDoc)) - + if not IsNull (oDoc) then -' oDoc.dispose +' oDoc.dispose nCurrentAction = cDocClose oDoc.close (true) - end If + end If end if - + nCurrentAction = cDocSaveOpen50 if bMakeSaveOpen50Test and IsFilterAvailable (FilterType or cFlt50) then oDoc = LoadDoc (sFileName50) - -' oDoc = Documents.open(sFileName) + +' oDoc = Documents.open(sFileName) LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpen50Doc, FileChannel) LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpen50Doc, MainFileChannel) SetStatus (FilterType, cDocSaveOpen50, not IsNull (oDoc)) - + if not IsNull (oDoc) then -' oDoc.dispose +' oDoc.dispose nCurrentAction = cDocClose oDoc.close (true) - end If + end If end if - end If + end If Print #FileChannel, "---" Close #FileChannel% Exit Sub ' Without error - + DOCTESTERROR: - If (nCurrentAction = cLogfileFailed) then + If (nCurrentAction = cLogfileFailed) then SetStatus (FilterType, cDocNew, False) Exit Sub else @@ -450,7 +450,7 @@ Sub MakeDocTest (FilterType as Integer) LogState (False, GetDocFilter(FilterType or cFltNewDoc)+" "+ GetErrorMessage(nCurrentAction), MainFileChannel) SetStatus (FilterType, nCurrentAction, False) Close #FileChannel% - End If + End If Exit Sub ' With error End Sub @@ -462,26 +462,26 @@ Sub MakeNewDoc (FilterType as Integer) nCurrentAction = cLogfileFailed FileChannel% = OpenLogDat (GetLogFileName(FilterType)) nCurrentAction = cDocNew -' oDoc = Documents.Add(GetDocFilter(FilterType)) +' oDoc = Documents.Add(GetDocFilter(FilterType)) oDoc = LoadDoc ("private:factory/" + GetDocFilter(FilterType or cFltNewDoc)) LogState (not IsNull (oDoc), GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageNewDoc, FileChannel) LogState (not IsNull (oDoc), GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageNewDoc, MainFileChannel) SetStatus (FilterType, cDocNew, not IsNull (oDoc)) if not IsNull (oDoc) then nCurrentAction = cDocClose -' oDoc.dispose +' oDoc.dispose oDoc.close (true) -' bError = true ' nur zum ¦bergang, weil bError = oDoc.CurrentController.frame.close nicht geht -' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, FileChannel) -' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, MainFileChannel) -' SetStatus (FilterType, cDocClose, bError) - end If +' bError = true ' nur zum ¦bergang, weil bError = oDoc.CurrentController.frame.close nicht geht +' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, FileChannel) +' LogState (bError, GetDocFilter(FilterType)+" "+ cMessageCloseDoc, MainFileChannel) +' SetStatus (FilterType, cDocClose, bError) + end If Print #FileChannel, "---" Close #FileChannel% Exit Sub ' Without error - + DOCTESTERROR2: - If (nCurrentAction = cLogfileFailed) then + If (nCurrentAction = cLogfileFailed) then SetStatus (FilterType, cDocNew, False) Exit Sub else @@ -489,7 +489,7 @@ Sub MakeNewDoc (FilterType as Integer) LogState (False, GetDocFilter(FilterType or cFltNewDoc)+" "+ GetErrorMessage(nCurrentAction), MainFileChannel) SetStatus (FilterType, nCurrentAction, False) Close #FileChannel% - End If + End If Exit Sub ' With error End Sub @@ -513,7 +513,7 @@ Sub MakeChartTest (FilterType as Integer) LogState (bError, GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageNewDoc, FileChannel) LogState (bError, GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageNewDoc, MainFileChannel) SetStatus (FilterType, cDocNew, bError) -' oDoc.dispose +' oDoc.dispose nCurrentAction = cDocClose oDoc.close (true) else @@ -524,9 +524,9 @@ Sub MakeChartTest (FilterType as Integer) Print #FileChannel, "---" Close #FileChannel% Exit Sub ' Without error - + CHARTTESTERROR: - If (nCurrentAction = cLogfileFailed) then + If (nCurrentAction = cLogfileFailed) then SetStatus (FilterType, cDocNew, False) Exit Sub else @@ -534,7 +534,7 @@ Sub MakeChartTest (FilterType as Integer) LogState (False, GetDocFilter(FilterType or cFltNewDoc)+" "+ GetErrorMessage(nCurrentAction), MainFileChannel) SetStatus (FilterType, nCurrentAction, False) Close #FileChannel% - End If + End If Exit Sub ' With error End Sub @@ -543,17 +543,17 @@ Sub LogState (bState as Boolean, sText as String, nLocaleFileChannel as integer) Print #nLocaleFileChannel, sText+" -> ok" else Print #nLocaleFileChannel, sText+" -> error" - end If + end If end Sub Function GetDocEndings (DocType as Integer) as String Select Case ( DocType ) case frmWriter or cFlt8 - GetDocEndings = "odt" ' Textdokument + GetDocEndings = "odt" ' Textdokument case frmCalc or cFlt8 - GetDocEndings = "ods" 'Tabellendokument + GetDocEndings = "ods" 'Tabellendokument case frmImpress or cFlt8 - GetDocEndings = "odp" 'PrÕsentation + GetDocEndings = "odp" 'PrÕsentation case frmDraw or cFlt8 GetDocEndings = "odg" 'Zeichen case frmHyperText, frmHyperText or cFlt50, frmHyperText or cFltXML @@ -567,42 +567,42 @@ Function GetDocEndings (DocType as Integer) as String case frmDraw or cFlt50 GetDocEndings = "sda" 'Zeichen 5.0 case frmWriter or cFltXML - GetDocEndings = "sxw" ' Textdokument + GetDocEndings = "sxw" ' Textdokument case frmCalc or cFltXML - GetDocEndings = "sxc" 'Tabellendokument + GetDocEndings = "sxc" 'Tabellendokument case frmImpress or cFltXML - GetDocEndings = "sxi" 'PrÕsentation + GetDocEndings = "sxi" 'PrÕsentation case frmDraw or cFltXML GetDocEndings = "sxd" 'Zeichen case else GetDocEndings = "" - end Select + end Select end Function Function GetDocFilter (DocType as Integer) as String Select Case ( DocType ) - case frmWriter or cFlt8 - GetDocFilter = "writer8" ' Textdokument + case frmWriter or cFlt8 + GetDocFilter = "writer8" ' Textdokument case frmCalc or cFlt8 - GetDocFilter = "calc8" 'Tabellendokument + GetDocFilter = "calc8" 'Tabellendokument case frmImpress or cFlt8 - GetDocFilter = "impress8" 'Präsentation + GetDocFilter = "impress8" 'Präsentation case frmDraw or cFlt8 GetDocFilter = "draw8" 'Zeichen case frmMath or cFlt8 GetDocFilter = "math8" 'Formel - + case frmWriter or cFltXML - GetDocFilter = "StarOffice XML (Writer)" ' Textdokument + GetDocFilter = "StarOffice XML (Writer)" ' Textdokument case frmCalc or cFltXML - GetDocFilter = "StarOffice XML (Calc)" 'Tabellendokument + GetDocFilter = "StarOffice XML (Calc)" 'Tabellendokument case frmImpress or cFltXML - GetDocFilter = "StarOffice XML (Impress)" 'Präsentation + GetDocFilter = "StarOffice XML (Impress)" 'Präsentation case frmDraw or cFltXML GetDocFilter = "StarOffice XML (Draw)" 'Zeichen case frmMath or cFltXML - GetDocFilter = "StarOffice XML (Math)" 'Formel - + GetDocFilter = "StarOffice XML (Math)" 'Formel + case frmHyperText, frmHyperText or cFlt50, frmHyperText or cFltXML GetDocFilter = "HTML" 'Hypertext-Dokument case frmWriter or cFlt50 @@ -615,69 +615,69 @@ Function GetDocFilter (DocType as Integer) as String GetDocFilter = "StarDraw 5.0" 'Zeichen 5.0 case frmMath or cFlt50 GetDocFilter = "StarMath 5.0" 'Formel 5.0 - + case frmWriter or cFltNewDoc - GetDocFilter = "swriter" ' Textdokument + GetDocFilter = "swriter" ' Textdokument case frmCalc or cFltNewDoc - GetDocFilter = "scalc" 'Tabellendokument + GetDocFilter = "scalc" 'Tabellendokument case frmMessage or cFltNewDoc - GetDocFilter = "Message" 'Nachricht + GetDocFilter = "Message" 'Nachricht case frmImpress or cFltNewDoc - GetDocFilter = "simpress" 'Präsentation + GetDocFilter = "simpress" 'Präsentation case frmDraw or cFltNewDoc GetDocFilter = "sdraw" 'Zeichen case frmMath or cFltNewDoc - GetDocFilter = "smath" 'Formel + GetDocFilter = "smath" 'Formel case frmImage or cFltNewDoc - GetDocFilter = "simage" 'Bild + GetDocFilter = "simage" 'Bild case frmHyperText or cFltNewDoc GetDocFilter = "swriter/web" 'Hypertext-Dokument case frmChart or cFltNewDoc - GetDocFilter = "schart" 'Diagramm + GetDocFilter = "schart" 'Diagramm case else GetDocFilter = "" - end Select + end Select end Function Function GetLogFileName (DocType as Integer) as String Select Case ( DocType ) - case frmWriter - GetLogFileName = sSWLogFileName ' Textdokument + case frmWriter + GetLogFileName = sSWLogFileName ' Textdokument case frmCalc - GetLogFileName = sSCLogFileName 'Tabellendokument + GetLogFileName = sSCLogFileName 'Tabellendokument case frmMessage - GetLogFileName = sSMessageLogFileName 'Nachricht + GetLogFileName = sSMessageLogFileName 'Nachricht case frmImpress - GetLogFileName = sSDLogFileName 'PrÕsentation + GetLogFileName = sSDLogFileName 'PrÕsentation case frmDraw GetLogFileName = sSDrawLogFileName 'Zeichnen case frmMath - GetLogFileName = sSMathLogFileName 'Formel + GetLogFileName = sSMathLogFileName 'Formel case frmImage - GetLogFileName = sSImDLogFileName 'Bild + GetLogFileName = sSImDLogFileName 'Bild case frmHyperText - GetLogFileName = sSHptLogFileName 'Hypertext-Dokument + GetLogFileName = sSHptLogFileName 'Hypertext-Dokument case frmChart - GetLogFileName = sSChartLogFileName 'Diagramm + GetLogFileName = sSChartLogFileName 'Diagramm case frmJava GetLogFileName = sJavaLogFileName 'Java case frmDataBase - GetLogFileName = sSDBLogFileName 'Database + GetLogFileName = sSDBLogFileName 'Database case frmExtension - GetLogFileName = sExtLogFileName 'Extension + GetLogFileName = sExtLogFileName 'Extension case else GetLogFileName = "" - end Select + end Select end Function Function GetErrorMessageOnAction (nAction as Integer) as String Select Case ( nAction ) - case cDocNew - GetErrorMessageOnAction = cMessageNewDoc + case cDocNew + GetErrorMessageOnAction = cMessageNewDoc case cDocCut - GetErrorMessageOnAction = cMessageCutObj + GetErrorMessageOnAction = cMessageCutObj case cDocPaste - GetErrorMessageOnAction = cMessagePasteObj + GetErrorMessageOnAction = cMessagePasteObj case cDocSaveOpen8 GetErrorMessageOnAction = cMessageSaveOpen8Doc case cDocSaveOpenXML @@ -688,7 +688,7 @@ Function GetErrorMessageOnAction (nAction as Integer) as String GetErrorMessageOnAction = cMessageCloseDoc case else GetErrorMessageOnAction = "" - end Select + end Select end Function Function IsFilterAvailable (FilterType as Integer) as boolean @@ -705,10 +705,10 @@ Function TestJava (FilterType as Integer) as boolean LogState (not IsNull (oObj), "Java "+ cMessageNewDoc, FileChannel) LogState (not IsNull (oObj), "Java "+ cMessageNewDoc, MainFileChannel) SetStatus (FilterType, cDocNew, not IsNull (oObj)) - + Print #FileChannel, "---" Close #FileChannel% - + TestJava = not IsNull (oObj) End Function @@ -721,17 +721,17 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) Select Case ( DocType ) case frmWriter Dim oCursor as Object - + sText = "AutomaticText" oText = oDoc.GetText oCursor = oText.CreateTextCursor oText.InsertString(oCursor, sText, true) ' Cursor selektiert den Text oView = oDoc.getCurrentController oView.Select(oCursor) - + if bMakeCutTest then call CutText (oDoc) - + if oText.GetString = "" Then bCutState = True else @@ -741,10 +741,10 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, FileChannel) LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, MainFileChannel) end if - + if bMakePasteTest and bMakeCutTest then call PasteText (oDoc) - + if oText.GetString = sText Then bPasteState = True else @@ -757,16 +757,16 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) case frmCalc DIM oCell as Object - + sText = "AutomaticText" oCell = oDoc.Sheets(0).GetCellByPosition(0, 0) oCell.String = sText oView = oDoc.getCurrentController oView.Select(oCell) - + if bMakeCutTest then call CutText (oDoc) - + if oCell.String = "" Then bCutState = True else @@ -776,10 +776,10 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, FileChannel) LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, MainFileChannel) end if - + if bMakePasteTest and bMakeCutTest then call PasteText (oDoc) - + if oCell.String = sText Then bPasteState = True else @@ -796,7 +796,7 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) Dim xSize as Object Dim xPoint as Object Dim bObjState as Boolean - + xSize = CreateUnoStruct ("com.sun.star.awt.Size") xPoint = CreateUnoStruct ("com.sun.star.awt.Point") xSize.Width = 2000 @@ -804,29 +804,29 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) xPoint.x = 10000 xPoint.y = 10000 oPage = oDoc.DrawPages(0) - + if DocType = frmImpress Then oPage.Layout = 20 ' set page layot to none end If - + oRect = oDoc.CreateInstance("com.sun.star.drawing.RectangleShape") oRect.Size = xSize oRect.Position = xPoint oPage.add(oRect) - + oView = oDoc.getCurrentController oView.Select(oRect) - + ' Prüft ob überhaupt ein Object angelegt wurde if oPage.count = 1 Then bObjState = True else bObjState = False end If - - if bMakeCutTest then + + if bMakeCutTest then call CutText (oDoc) - + if (oPage.count = 0) and bObjState Then bCutState = True else @@ -835,13 +835,13 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) SetStatus (DocType, cDocCut, bCutState) LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, FileChannel) LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, MainFileChannel) - end if + end if wait (1000) 'wait after cut - + if bMakePasteTest and bMakeCutTest then call PasteText (oDoc) - + if (oPage.count = 1) and bObjState Then bPasteState = True else @@ -855,17 +855,17 @@ Sub CutAndPaste (DocType as Integer, oDoc as Object) case frmImage case frmHyperText case frmChart - end Select + end Select end Sub Sub LoadLibrary( LibName as String ) - + dim args(1) dim arg as new com.sun.star.beans.PropertyValue arg.Name = "LibraryName" arg.Value = LibName args(0) = arg - + dim url as new com.sun.star.util.URL dim trans as object trans = createUnoService("com.sun.star.util.URLTransformer" ) @@ -875,7 +875,7 @@ Sub LoadLibrary( LibName as String ) dim disp as object disp = StarDesktop.currentFrame.queryDispatch( url, "", 0 ) disp.dispatch( url, args() ) - + End Sub Sub LoadDoc (DocName as String) as Object @@ -886,7 +886,7 @@ Sub LoadDoc (DocName as String) as Object if Left(DocName, 5 ) <> "file:" then trans.parsestrict( url ) endif - + Dim aPropArray(0) as Object aPropArray(0) = CreateUnoStruct("com.sun.star.beans.PropertyValue") aPropArray(0).Name = "OpenFlags" @@ -894,7 +894,7 @@ Sub LoadDoc (DocName as String) as Object dim doc as object dim noargs() - doc = StarDesktop.loadComponentFromURL( url.Complete, "_blank", 0, aPropArray() ) ' XModel + doc = StarDesktop.loadComponentFromURL( url.Complete, "_blank", 0, aPropArray() ) ' XModel LoadDoc = doc End Sub @@ -906,16 +906,16 @@ Sub SaveDoc (DocName as String, oDoc as Object, sFilterName as string ) if Left(DocName, 5 ) <> "file:" then trans.parsestrict( url ) endif - + if not (sFilterName = "") then Dim aPropArray(0) as Object aPropArray(0) = CreateUnoStruct("com.sun.star.beans.PropertyValue") aPropArray(0).Name = "FilterName" aPropArray(0).Value = sFilterName - + oDoc.storeAsURL( url.Complete, aPropArray() ) else MessageBox "Filtername is unknown!" - end if + end if end Sub </script:module> diff --git a/smoketestoo_native/data/Test_DB.xml b/smoketestoo_native/data/Test_DB.xml index ebb53cf0181c..37fdc0948955 100644 --- a/smoketestoo_native/data/Test_DB.xml +++ b/smoketestoo_native/data/Test_DB.xml @@ -45,23 +45,23 @@ Const sTestString = "Automatical Test" On Local Error GoTo DBERROR - + nCurrentAction = cLogfileFailed FileChannel% = OpenLogDat (GetLogFileName(FilterType)) nCurrentAction = cDBService sCurrentMessage = cMessageDatabaseService + " " + cUnoDatabaseContext - + oDBContext = CreateUnoService(cUnoDatabaseContext) sDBName="Bibliography" 'Names of Databases - + nCurrentAction = cDBOpen sCurrentMessage = cMessageDatabaseOpen - + oDataSource = oDBContext.GetByName(sDBName) sTable=oDataSource.Tables.ElementNames(0) oDBConnection = oDBContext.GetByName(sDBName).GetConnection("","") - + LogState (not IsNull (oDBConnection), "Database "+ cMessageDatabaseOpen, FileChannel) LogState (not IsNull (oDBConnection), "Database "+ cMessageDatabaseOpen, MainFileChannel) SetStatus (FilterType, cDBOpen, not IsNull (oDBConnection)) @@ -69,9 +69,9 @@ Const sTestString = "Automatical Test" Close #FileChannel% Exit Sub End If - + ' Database is open now - + nCurrentAction = cDBService sCurrentMessage = cMessageDatabaseService + " " + cUnoRowSet oRowSet = createUnoService(cUnoRowSet) @@ -86,10 +86,10 @@ Const sTestString = "Automatical Test" LogState (not IsNull (oRowSet), "Database "+ cMessageDatabaseService, MainFileChannel) SetStatus (FilterType, cDBService, not IsNull (oRowSet)) End If - + nCurrentAction = cDBInsert sCurrentMessage = cMessageDatabaseInsert - + oRowSet.ActiveConnection = oDBConnection oRowSet.CommandType = com.sun.star.sdb.CommandType.COMMAND @@ -101,16 +101,16 @@ Const sTestString = "Automatical Test" oRowSet.insertRow() nRowCount=oRowSet.RowCount - + oRowSet.moveToCurrentRow() - + bResult = (oRowSet.getString(5) = sTestString) LogState (bResult, "Database "+ cMessageDatabaseInsert, FileChannel) LogState (bResult, "Database "+ cMessageDatabaseInsert, MainFileChannel) SetStatus (FilterType, cDBInsert, bResult) - + 'delete only if insert passed - + if (bResult) Then nCurrentAction = cDBDelete sCurrentMessage = cMessageDatabaseDelete @@ -123,10 +123,10 @@ Const sTestString = "Automatical Test" LogState (bResult, "Database "+ cMessageDatabaseDelete, FileChannel) LogState (bResult, "Database "+ cMessageDatabaseDelete, MainFileChannel) SetStatus (FilterType, cDBDelete, bResult) - End If + End If ' read other record - + nCurrentAction = cDBSeek sCurrentMessage = cMessageDatabaseSeek oRowSet.first() @@ -134,7 +134,7 @@ Const sTestString = "Automatical Test" LogState (bResult, "Database "+ cMessageDatabaseSeek, FileChannel) LogState (bResult, "Database "+ cMessageDatabaseSeek, MainFileChannel) SetStatus (FilterType, cDBSeek, bResult) - + nCurrentAction = cDBClose sCurrentMessage = cMessageDatabaseClose oDBConnection.Dispose() @@ -145,9 +145,9 @@ Const sTestString = "Automatical Test" Print #FileChannel, "---" Close #FileChannel% Exit Sub ' Without error - + DBERROR: - If (nCurrentAction = cLogfileFailed) then + If (nCurrentAction = cLogfileFailed) then SetStatus (FilterType, cDBOpen, False) Exit Sub else @@ -155,7 +155,7 @@ Const sTestString = "Automatical Test" LogState (False, "Database "+ sCurrentMessage, MainFileChannel) SetStatus (FilterType, nCurrentAction, False) Close #FileChannel% - End If + End If Exit Sub ' With error End Sub </script:module> diff --git a/smoketestoo_native/data/Test_Ext.xml b/smoketestoo_native/data/Test_Ext.xml index 31d27dc7a4a7..9235b9600af9 100644 --- a/smoketestoo_native/data/Test_Ext.xml +++ b/smoketestoo_native/data/Test_Ext.xml @@ -41,15 +41,15 @@ Dim sImplementationNameString as String sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension" On Local Error GoTo EXTERROR - + nCurrentAction = cLogfileFailed FileChannel% = OpenLogDat (GetLogFileName(FilterType)) - + sCurrentMessage = cMessageExtensionService nCurrentAction = cEXTService - 'Create an implementation of com.sun.star.ucb.XCommandEnvironment which is needed for - 'adding the extension. The implementation is in + 'Create an implementation of com.sun.star.ucb.XCommandEnvironment which is needed for + 'adding the extension. The implementation is in 'javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java and the code is in juh.jar cmdEnv = createUnoService(cUnoSmoketestCommandEnvironment) @@ -68,14 +68,14 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q sCurrentMessage = cMessageExtensionInstall nCurrentAction = cEXTInstall - + 'Add the extension. We must provide a file URL here. 'By passing "user" we determine that the actions we perform on 'XExtensionManager only affect the user installation. To modify the share installation one would pass "share". Dim props() as Object ext_mgr.addExtension(sExtensionURL + cExtensionFileName, props, "user", obj_null, cmdEnv) - + 'Check if the extension has been added by creating a service which is contained in the extension. oTestExtension = createUnoService(cUnoSmoketestTestExtension) bResult = (oTestExtension.getImplementationName = sImplementationNameString) @@ -89,7 +89,7 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q sCurrentMessage = cMessageExtensionUninstall nCurrentAction = cEXTUninstall - + 'Remove the package ext_mgr.removeExtension("org.openoffice.legacy." + cExtensionFileName, cExtensionFileName, "user",obj_null, cmdEnv) @@ -100,13 +100,13 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q LogState (IsNull (oTestExtension), "Extension "+ cMessageExtensionUninstall, FileChannel) LogState (IsNull (oTestExtension), "Extension "+ cMessageExtensionUninstall, MainFileChannel) SetStatus (FilterType, cEXTUninstall, IsNull (oTestExtension)) - + Print #FileChannel, "---" Close #FileChannel% Exit Sub ' Without error EXTERROR: - If (nCurrentAction = cLogfileFailed) then + If (nCurrentAction = cLogfileFailed) then SetStatus (FilterType, cEXTService, False) Exit Sub else @@ -114,7 +114,7 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q LogState (False, "Extension "+ sCurrentMessage, MainFileChannel) SetStatus (FilterType, nCurrentAction, False) Close #FileChannel% - End If + End If Exit Sub ' With error End Sub |