diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:41 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:41 +0100 |
| commit | 8d2d57012c83f3a42a905b582fcb0eeca6365c67 (patch) | |
| tree | 5d98f787c470177283c8d91b7d38ca10764ca828 | |
| parent | c5cf3aaab577bf1dfdd6f6e81148497307abac9a (diff) | |
| parent | 9ffef9aeb36763304689c1aa02bce8f913c94b1c (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
smoketestdoc/com/sun/star/comp/smoketest/makefile.mk
smoketestdoc/data/Global.xml
smoketestdoc/data/OptionsDlg.xml
smoketestdoc/data/Test_10er.xml
smoketestoo_native/data/content.xml
smoketestoo_native/makefile.mk
83 files changed, 1114 insertions, 816 deletions
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/MANIFEST.MF b/smoketestdoc/com/sun/star/comp/smoketest/MANIFEST.MF index 09e2f42ca..09e2f42ca 100755 --- a/smoketestoo_native/com/sun/star/comp/smoketest/MANIFEST.MF +++ b/smoketestdoc/com/sun/star/comp/smoketest/MANIFEST.MF diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl b/smoketestdoc/com/sun/star/comp/smoketest/TestExtension.idl index 11267990f..83c370e11 100755 --- a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl +++ b/smoketestdoc/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/smoketestdoc/com/sun/star/comp/smoketest/TestExtension.java index 45168e800..45168e800 100755 --- a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java +++ b/smoketestdoc/com/sun/star/comp/smoketest/TestExtension.java diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/delzip b/smoketestdoc/com/sun/star/comp/smoketest/delzip index 636fda90b..636fda90b 100755 --- a/smoketestoo_native/com/sun/star/comp/smoketest/delzip +++ b/smoketestdoc/com/sun/star/comp/smoketest/delzip diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk b/smoketestdoc/com/sun/star/comp/smoketest/makefile.mk index 355d44ecd..be7af0510 100755 --- a/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk +++ b/smoketestdoc/com/sun/star/comp/smoketest/makefile.mk @@ -25,9 +25,9 @@ # #************************************************************************* -PRJ = ..$/..$/..$/..$/.. -PRJNAME = smoke_test -PACKAGE = com$/sun$/star$/comp$/smoketest +PRJ = ../../../../.. +PRJNAME = smoketestdoc +PACKAGE = com/sun/star/comp/smoketest TARGET = com_sun_star_comp_smoketest no_common_build_zip:=TRUE @@ -40,7 +40,6 @@ no_common_build_zip:=TRUE JARFILES = ridl.jar jurt.jar unoil.jar juh.jar - JARTARGET = TestExtension.jar JARCOMPRESS = TRUE CUSTOMMANIFESTFILE = MANIFEST.MF @@ -48,7 +47,7 @@ CUSTOMMANIFESTFILE = MANIFEST.MF ZIP1TARGET=TestExtension ZIP1LIST=* ZIPFLAGS=-r -ZIP1DIR=$(MISC)$/$(TARGET) +ZIP1DIR=$(MISC)/$(TARGET) ZIP1EXT=.oxt # --- Files -------------------------------------------------------- @@ -57,31 +56,31 @@ JAVAFILES = TestExtension.java # --- Targets ------------------------------------------------------ -ZIP1DEPS=$(MISC)$/$(TARGET)$/$(JARTARGET)\ - $(MISC)$/$(TARGET)$/TestExtension.rdb\ - $(MISC)$/$(TARGET)$/META-INF$/manifest.xml +ZIP1DEPS=$(MISC)/$(TARGET)/$(JARTARGET)\ + $(MISC)/$(TARGET)/TestExtension.rdb\ + $(MISC)/$(TARGET)/META-INF/manifest.xml .INCLUDE : target.mk -$(MISC)$/$(TARGET)$/META-INF: +$(MISC)/$(TARGET)/META-INF: @-$(MKDIRHIER) $(@) -$(MISC)$/TestExtension.urd: TestExtension.idl - $(IDLC) -O$(MISC) -I$(SOLARIDLDIR) -cid -we $< +$(MISC)/TestExtension.urd: TestExtension.idl + $(COMMAND_ECHO)$(IDLC) -O$(MISC) -I$(SOLARIDLDIR) -cid -we $< -$(MISC)$/$(TARGET)$/META-INF$/manifest.xml $(MISC)$/$(TARGET)$/TestExtension.rdb : $(MISC)$/$(TARGET)$/META-INF +$(MISC)/$(TARGET)/META-INF/manifest.xml $(MISC)/$(TARGET)/TestExtension.rdb : $(MISC)/$(TARGET)/META-INF -$(MISC)$/$(TARGET)$/META-INF$/manifest.xml: manifest.xml - $(COPY) $< $@ +$(MISC)/$(TARGET)/META-INF/manifest.xml: manifest.xml + $(COMMAND_ECHO)$(COPY) $< $@ -$(MISC)$/$(TARGET)$/TestExtension.rdb: $(MISC)$/TestExtension.urd - $(REGMERGE) $@ /UCR $< +$(MISC)/$(TARGET)/TestExtension.rdb: $(MISC)/TestExtension.urd + $(COMMAND_ECHO)$(REGMERGE) $@ /UCR $< -$(JAVACLASSFILES) .UPDATEALL: $(MISC)$/$(TARGET)$/TestExtension.rdb - $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $< +$(JAVACLASSFILES) .UPDATEALL: $(MISC)/$(TARGET)/TestExtension.rdb + $(COMMAND_ECHO)$(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $< -$(MISC)$/$(TARGET)$/$(JARTARGET) : $(JARTARGETN) - $(COPY) $< $@ +$(MISC)/$(TARGET)/$(JARTARGET) : $(JARTARGETN) + $(COMMAND_ECHO)$(COPY) $< $@ .ELSE @all: diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/manifest.xml b/smoketestdoc/com/sun/star/comp/smoketest/manifest.xml index fcedabf96..fcedabf96 100755 --- a/smoketestoo_native/com/sun/star/comp/smoketest/manifest.xml +++ b/smoketestdoc/com/sun/star/comp/smoketest/manifest.xml diff --git a/smoketestoo_native/data/Events.xml b/smoketestdoc/data/Events.xml index 61272293f..414f2c48e 100644 --- a/smoketestoo_native/data/Events.xml +++ b/smoketestdoc/data/Events.xml @@ -28,6 +28,8 @@ <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd"> <script:module xmlns:script="http://openoffice.org/2000/script" script:name="Events" script:language="StarBasic">REM ***** BASIC ***** +Global s_CloseListenerCalled As Boolean + Sub PressCancel gDlgState = cDlgCancel end Sub @@ -40,4 +42,25 @@ Sub PressTest gOptionsDialog.EndExecute() gDlgState = cDlgStartTest end Sub + +Sub closeListener_queryClosing + ' not interested in + closeListener_queryClosing = TRUE +End Sub + +Sub closeListener_notifyClosing + s_CloseListenerCalled = TRUE +End Sub + +Sub closeListener_disposing + ' not interested in +End Sub + +Sub ResetCloseListenerFlag + s_CloseListenerCalled = FALSE +End Sub + +Function HasCloseListenerBeenCalled As Boolean + HasCloseListenerBeenCalled = s_CloseListenerCalled +End Function </script:module> diff --git a/smoketestoo_native/data/Global.xml b/smoketestdoc/data/Global.xml index c4dc7666b..a35a8300d 100644 --- a/smoketestoo_native/data/Global.xml +++ b/smoketestdoc/data/Global.xml @@ -28,30 +28,36 @@ <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd"> <script:module xmlns:script="http://openoffice.org/2000/script" script:name="Global" script:language="StarBasic">REM ***** BASIC ***** -const cMaxErrorStates = 13 +const cMaxErrorStates = 14 const cCoGreen = 4057917, cCoRed = 16711680, cCoGrey = 12632256 const cParagraphBreak = 0 global const cExtensionFileName = "TestExtension.oxt" -global const cDocNew = 0, cDocSaveOpen8 = 1, cDocSaveOpenXML = 2, cDocOpen50 = 3, cDocClose = 4, cDocWrite = 5 +global const cDocNew = 0, cDocSaveOpen8 = 1, cDocSaveOpenXML = 2, cDocClose = 3 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 global const cLogfileFailed = 255 global const cStWriter = 0, cStCalc = 1, cStPraesentation = 2, cStZeichnen = 3 -global const cStMessage = 12, cStHTML = 6, cStChart = 4, cStJava = 7 +global const cStHTML = 6, cStChart = 4, cStJava = 7 global const cStMath = 5, cStDataBase = 9 global const cStExtension = 11 +global const cStTestGlue = 12 global const cStNone = -1 global const cFlt8 = 0, cFlt50 = 32, cFltNewDoc = 64, cFltXML = 128 -global const frmWriter = 1, frmCalc = 2, frmMessage = 3, frmImpress = 4 -global const frmMath = 5, frmImage = 6, frmChart = 7, frmHyperText = 8, frmDraw = 9 +global const frmWriter = 1, frmCalc = 2, frmImpress = 4 +global const frmMath = 5, frmChart = 7, frmHyperText = 8, frmDraw = 9 global const frmDataBase = 10, frmJava = 13 global const frmExtension = 14 +global const frmTestClosure = 15 + +Global gCurrentDocTest As Integer +Global gCurrentTestCase As Integer global const cLogUnknown = 0, cLogFalse = 1, cLogTrue = 2 @@ -83,7 +89,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", cUserFieldTestOpen50 = "Open50" +Global const cUserFieldTestOpenSaveXML = "SaveOpenXML" Global const cUserFieldTestTerminateAfterTest = "Terminate", cUserFieldTestOpenSave8 = "SaveOpen8" Global const cOptionsDialogName = "OptionsDlg", cTest10Modul = "Standard" @@ -91,6 +97,7 @@ Global const cOptionsDialogName = "OptionsDlg", cTest10Modul = "S Global const cDlgCancel = 1, cDlgOk = 0, cDlgStartTest = 2 global gErrorState (cMaxErrorStates, 5) as integer +Global gTestCaseAnnotations( cMaxErrorStates, 5 ) As String global gOutputDoc as Object global gOutputDocNotUno as Object @@ -100,7 +107,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 @@ -109,42 +116,110 @@ global sExtensionURL as string Dim gDlgState as Integer Sub SetGlobalDoc - gOutPutDoc = ThisComponent + gOutputDoc = ThisComponent end Sub Sub ClearStatus for j% = 0 to cMaxErrorStates for i% = 0 to 5 - gErrorState (j%, i%) = cLogUnknown + gErrorState (j%, i%) = cLogUnknown + gTestCaseAnnotations( J%, i% ) = "" next i% next j% end Sub Sub ClearAllText call SetGlobalDoc - call ClearDoc (gOutPutDoc) + call ClearDoc (gOutputDoc) call ClearStatus end Sub +Sub AssertionHandler( sMessage as String ) + LogTestResult( "assertion caught: " + sMessage, FALSE ) +End Sub + Sub Main + On Local Error Goto MainError + + gCurrentDocTest = frmTestClosure + gCurrentTestCase = cLogfileFailed + + DeleteAllSavedFiles() + DeleteAllLogFiles() + SetupWorkPath() + + if GetSystem (sWorkPath) = "windows" then + sWorkPath = ConvertPathToWin (sWorkPath) + end if + + LocalTestLog% = OpenLogDat( GetLogFileName( gCurrentDocTest ) ) + + gCurrentTestCase = cTestClosureSetupDoc + CaptureAssertions( "AssertionHandler" ) + call SetGlobalDoc + + Dim bWasModified as Boolean + bWasModified = gOutputDoc.isModified() + if bShowTable then - call ClearDoc (gOutPutDoc) + call ClearDoc (gOutputDoc) end If - + call ClearStatus - + + LogTestResult( GetTestGlueDescription( gCurrentTestCase ), TRUE ) + + Dim nPreserveFileHandle% + nPreserveFileHandle% = LocalTestLog% Call Test_10er.Main + LocalTestLog% = nPreserveFileHandle% + gCurrentDocTest = frmTestClosure + gCurrentTestCase = cTestClosureWriteStatus if bShowTable then call CreateStatusTable2 call CreateStatusTable call CreateDocState + LogTestResult( GetTestGlueDescription( gCurrentTestCase ), TRUE ) + ' do this LogTestResult call before CreateSecondState, since the latter accesses (and displays) the result call CreateSecondState gOutputDoc.CurrentController.ViewCursor.JumpToFirstPage - end if + Else + LogTestResult( GetTestGlueDescription( gCurrentTestCase ), TRUE ) + End If + + ' print the 'test complete' marker + Print #LocalTestLog%, "---" + LocalTestLog% = 0 + + gOutputDoc.setModified( bWasModified ) + + CaptureAssertions( "" ) + Exit Sub + +MainError: + If ( gCurrentTestCase = cLogfileFailed ) then + LogTestResult( "", False ) + Exit Sub + else + LogTestResult( "testclosure " + GetTestGlueDescription( gCurrentTestCase ), FALSE ) + Close #LocalTestLog% + LocalTestLog = 0 + End If End Sub +Function GetTestGlueDescription( nTestCase as Integer ) + Select Case ( nTestCase ) + case cTestClosureSetupDoc + GetTestGlueDescription = "setup" + case cTestClosureWriteStatus + GetTestGlueDescription = "write_status" + case Else + GetTestGlueDescription = "" + End Select +End Function + Sub CreateStatusTable dim tableHeaders(7) as string tableHeaders(cStWriter) = "Writer" @@ -155,93 +230,68 @@ Sub CreateStatusTable tableHeaders(cStMath) = "Math" tableHeaders(cStHTML) = "HTML" tableHeaders(cStJava) = "Java" - - dim tableColums(3) as string - tableColums(cDocNew) = "new" - tableColums(cDocSaveOpen8) = "V8.0" - tableColums(cDocSaveOpenXML) = "XML" - tableColums(cDocOpen50) = "V5.0" -' tableColums(cDocClose) = "close" - - aDoc = gOutPutDoc - + + dim tableRows(3) as string + tableRows(cDocNew) = "new" + tableRows(cDocSaveOpen8) = "V8.0" + tableRows(cDocSaveOpenXML) = "XML" + tableRows(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 (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.initialize(5,9) table.Name = "StTab1" + table.BackColor = cCoGrey 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) + tableCell = table.getCellByPosition( i% + 1, 0 ) + tableCell.String = tableHeaders( i% ) next i% - - xCursor.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 3 - tableCursor.goDown(1,FALSE) - cName = tableCursor.getRangeName() - xCell = table.getCellByName(cName) - xCell.String=tableColums(i%) - - xCell.BackTransparent = False - xCell.BackColor = cCoGrey + + for i% = LBound( tableRows ) to UBound( tableRows ) + tableCell = table.getCellByPosition( 0, i% + 1 ) + tableCell.String=tableRows(i%) next i% end Sub Sub CreateStatusTable2 - dim tableHeaders(5) as string - tableHeaders(cStDataBase-9) = "Database" + dim tableHeaders(4) as string + tableHeaders(0) = "Database" tableHeaders(1) = "" - tableHeaders(cStExtension-9) = "Extension" + tableHeaders(2) = "Extension" tableHeaders(3) = "" - tableHeaders(4) = "" + tableHeaders(4) = "Other" + + dim tableRows(5) as string + tableRows(cDBService ) = "services" + tableRows(cDBOpen ) = "open" + tableRows(cDBInsert ) = "insert" + tableRows(cDBDelete ) = "delete" + tableRows(cDBSeek ) = "seek" + tableRows(cDBClose ) = "close" - dim tableColums(5) as string - tableColums(cDBService ) = "services" - tableColums(cDBOpen ) = "open" - tableColums(cDBInsert ) = "insert" - tableColums(cDBDelete ) = "delete" - tableColums(cDBSeek ) = "seek" - tableColums(cDBClose ) = "close" + dim tableRows2(2) as string + tableRows2(cEXTService ) = "services" + tableRows2(cEXTInstall ) = "install" + tableRows2(cEXTUninstall ) = "uninstall" - dim tableColums2(3) as string - tableColums2(cEXTService ) = "services" - tableColums2(cEXTInstall ) = "install" - tableColums2(cEXTUninstall ) = "uninstall" + dim tableRows3(1) as string + tableRows3(cTestClosureSetupDoc ) = "setup test" + tableRows3(cTestClosureWriteStatus ) = "write test result" - aDoc = gOutPutDoc + aDoc = gOutputDoc xText = aDoc.Text xCursor = xText.createTextCursor() @@ -255,111 +305,98 @@ Sub CreateStatusTable2 table = aDoc.createInstance("com.sun.star.text.TextTable") table.initialize(7,6) table.Name = "StTab2" - 'table.RelativeWidth =500 + table.BackColor = cCoGrey 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) + for i% = LBound( tableHeaders ) to UBound( tableHeaders ) + tableCell = table.getCellByPosition( i% + 1, 0 ) + tableCell.String = tableHeaders(i%) next i% - 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 + for i% = LBound( tableRows ) to UBound( tableRows ) + tableCell = table.getCellByPosition( 0, i% + 1 ) + tableCell.String=tableRows(i%) 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 + for i% = LBound( tableRows2 ) to UBound( tableRows2 ) + tableCell = table.getCellByPosition( 2, i% + 1 ) + tableCell.String=tableRows2(i%) + next i% + + for i% = LBound( tableRows3 ) to UBound( tableRows3 ) + tableCell = table.getCellByPosition( 4, i% + 1 ) + tableCell.String=tableRows3(i%) next i% end Sub Sub CreateDocState - aDoc = gOutPutDoc + aDoc = gOutputDoc table = aDoc.TextTables.GetByIndex (1) - 'table = aDoc.TextTables.GetByName ("StTab1") - + for j% = 0 to 7 - for i% = 0 to 5 + for i% = 0 to 3 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 - end If - end If - + + 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 + If ( gTestCaseAnnotations( j%, i% ) <> "" ) Then + Dim annotation as Object + annotation = aDoc.createInstance( "com.sun.star.text.TextField.Annotation" ) + annotation.Author = "smoketest" + annotation.Content = gTestCaseAnnotations( j%, i% ) + xCell.insertTextContent( xCell, annotation, false ) + End If + else + xCell.BackColor = cCoGrey + end If + end If next i% next j% end Sub Sub CreateSecondState - aDoc = gOutPutDoc + 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 + + Dim stateIndex(2) as Integer + stateIndex(0) = cStDataBase + stateIndex(1) = cStExtension + stateIndex(2) = cStTestGlue + + Dim j as Integer + For j = LBound( stateIndex ) To UBound( stateIndex ) + for i% = 1 to 6 + tableCell = table.getCellByPosition( 2 * j + 1, i% ) + tableCell.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 + if gErrorState( stateIndex(j), i% - 1 ) = cLogTrue then + tableCell.BackColor = cCoGreen + else + if gErrorState ( stateIndex(j), i% - 1 ) = cLogFalse then + tableCell.BackColor = cCoRed + If ( gTestCaseAnnotations( stateIndex(j), i% - 1 ) <> "" ) Then + Dim annotation as Object + annotation = aDoc.createInstance( "com.sun.star.text.TextField.Annotation" ) + annotation.Author = "smoketest" + annotation.Content = gTestCaseAnnotations( stateIndex(j), i% - 1 ) + tableCell.insertTextContent( tableCell, annotation, false ) + End If + else + tableCell.BackColor = cCoGrey + end If end If - next i% next j% end Sub @@ -368,43 +405,69 @@ Function GetRangeName (nColumn as integer, nRow as integer) as string GetRangeName = chr (nColumn+66) + Trim(Str(nRow+1)) end Function -Sub SetStatus (nDocType as Integer, nAction as Integer, bState as Boolean) +Sub LogTestResult( sTestCaseDescription as String, bSuccess as Boolean ) + If ( gCurrentTestCase = cLogfileFailed ) Then + Dim sAnnotation as String + sAnnotation = "creating logfile '" + GetLogFileName( gCurrentDocTest ) + "' failed" + LogState( FALSE, sAnnotation, GlobalTestLog ) + RecordTestCaseStatus( 0, FALSE, sAnnotation ) + Else + bSuccess = RecordTestCaseStatus( gCurrentTestCase, bSuccess, sTestCaseDescription ) + If ( LocalTestLog <> 0 ) Then + LogState( bSuccess, sTestCaseDescription, LocalTestLog ) + EndIf + if ( GlobalTestLog <> 0 ) Then + LogState( bSuccess, sTestCaseDescription, GlobalTestLog ) + EndIf + End If +End Sub + +Function RecordTestCaseStatus( nAction as Integer, bState as Boolean, sFailureAnnotation as String ) as Boolean Dim nStatusType as Integer Dim nState as integer - nStatusType = GetStatusType (nDocType) - If nStatusType = cStNone then Exit Sub + nStatusType = GetStatusType( gCurrentDocTest ) + If nStatusType = cStNone then Exit Function + + If ( gErrorState( nStatusType, nAction ) = cLogFalse ) Then + ' don't overwrite a previous "failed" state for this test + bState = FALSE + End If if bState then nState = cLogTrue else nState = cLogFalse end If - + gErrorState (nStatusType, nAction) = nState -end Sub + + If ( nState = cLogFalse ) And ( sFailureAnnotation <> "" ) Then + gTestCaseAnnotations( nStatusType, nAction ) = gTestCaseAnnotations( nStatusType, nAction ) + sFailureAnnotation + chr(13) + End If + + RecordTestCaseStatus = bState +End Function Function GetStatusType (nDocType as Integer) as Integer Select Case ( nDocType ) case frmWriter - GetStatusType = cStWriter ' Textdokument + GetStatusType = cStWriter ' text document case frmCalc - GetStatusType = cStCalc 'Tabellendokument - case frmMessage - GetStatusType = cStMessage 'Nachricht + GetStatusType = cStCalc ' spreadsheet document case frmImpress - GetStatusType = cStPraesentation 'Präsentation + GetStatusType = cStPraesentation ' presentation case frmDraw - GetStatusType = cStZeichnen 'Zeichnen + GetStatusType = cStZeichnen ' drawing case frmMath - GetStatusType = cStMath 'Formel - case frmImage - GetStatusType = cStBild 'Bild + GetStatusType = cStMath ' formula case frmHyperText - GetStatusType = cStHTML 'Hypertext-Dokument + GetStatusType = cStHTML ' HTML document case frmChart - GetStatusType = cStChart 'Diagramm + GetStatusType = cStChart ' chart case frmJava GetStatusType = cStJava 'Java + case frmTestClosure + GetStatusType = cStTestGlue ' test framework case frmDataBase GetStatusType = cStDataBase 'DataBase case frmExtension @@ -494,56 +557,53 @@ end Sub Sub SetOptions call SetGlobalDoc - SetUserFieldState (cUserFieldTestWriter, -(gOptionsDialog.getControl("cbWriterTest").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestCalc, -(gOptionsDialog.getControl("cbCalcTest").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestImpress, -(gOptionsDialog.getControl("cbImpressTest").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestDraw, -(gOptionsDialog.getControl("cbDrawTest").getState), gOutPutDoc) - 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 (cUserFieldTestOpenSaveXML, -(gOptionsDialog.getControl("cbSaveOpenXMLTest").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestOpen50, -(gOptionsDialog.getControl("cbOpen50Test").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestOpenSave8, -(gOptionsDialog.getControl("cbSaveOpen8Test").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestTerminateAfterTest, -(gOptionsDialog.getControl("cbTerminateAfterTest").getState), gOutPutDoc) + SetUserFieldState (cUserFieldTestWriter, -(gOptionsDialog.getControl("cbWriterTest").getState), gOutputDoc) + SetUserFieldState (cUserFieldTestCalc, -(gOptionsDialog.getControl("cbCalcTest").getState), gOutputDoc) + SetUserFieldState (cUserFieldTestImpress, -(gOptionsDialog.getControl("cbImpressTest").getState), gOutputDoc) + SetUserFieldState (cUserFieldTestDraw, -(gOptionsDialog.getControl("cbDrawTest").getState), gOutputDoc) + 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 (cUserFieldTestOpenSaveXML, -(gOptionsDialog.getControl("cbSaveOpenXMLTest").getState), gOutputDoc) + SetUserFieldState (cUserFieldTestOpenSave8, -(gOptionsDialog.getControl("cbSaveOpen8Test").getState), gOutputDoc) + SetUserFieldState (cUserFieldTestTerminateAfterTest, -(gOptionsDialog.getControl("cbTerminateAfterTest").getState), gOutputDoc) end Sub Sub GetOptions call SetGlobalDoc - gOptionsDialog.getControl("cbWriterTest").setState( -( GetUserFieldState (cUserFieldTestWriter, gOutPutDoc))) - gOptionsDialog.getControl("cbCalcTest").setState ( -( GetUserFieldState (cUserFieldTestCalc, gOutPutDoc))) - gOptionsDialog.getControl("cbImpressTest").setState( -( GetUserFieldState (cUserFieldTestImpress, gOutPutDoc))) - gOptionsDialog.getControl("cbDrawTest").setState( -( GetUserFieldState (cUserFieldTestDraw, gOutPutDoc))) - gOptionsDialog.getControl("cbHTMLTest").setState( -( GetUserFieldState (cUserFieldTestHTML, gOutPutDoc))) - gOptionsDialog.getControl("cbMathTest").setState( -( GetUserFieldState (cUserFieldTestMath, gOutPutDoc))) - gOptionsDialog.getControl("cbChartTest").setState( -( GetUserFieldState (cUserFieldTestChart, gOutPutDoc))) - gOptionsDialog.getControl("cbJavaTest").setState( -( GetUserFieldState (cUserFieldTestJava, gOutPutDoc))) - 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( -( GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc))) - gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutPutDoc))) - gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutPutDoc))) + gOptionsDialog.getControl("cbWriterTest").setState( -( GetUserFieldState (cUserFieldTestWriter, gOutputDoc))) + gOptionsDialog.getControl("cbCalcTest").setState ( -( GetUserFieldState (cUserFieldTestCalc, gOutputDoc))) + gOptionsDialog.getControl("cbImpressTest").setState( -( GetUserFieldState (cUserFieldTestImpress, gOutputDoc))) + gOptionsDialog.getControl("cbDrawTest").setState( -( GetUserFieldState (cUserFieldTestDraw, gOutputDoc))) + gOptionsDialog.getControl("cbHTMLTest").setState( -( GetUserFieldState (cUserFieldTestHTML, gOutputDoc))) + gOptionsDialog.getControl("cbMathTest").setState( -( GetUserFieldState (cUserFieldTestMath, gOutputDoc))) + gOptionsDialog.getControl("cbChartTest").setState( -( GetUserFieldState (cUserFieldTestChart, gOutputDoc))) + gOptionsDialog.getControl("cbJavaTest").setState( -( GetUserFieldState (cUserFieldTestJava, gOutputDoc))) + gOptionsDialog.getControl("cbDatabaseTest").setState( -( GetUserFieldState (cUserFieldTestDatabase, gOutputDoc))) + gOptionsDialog.getControl("cbExtensionTest").setState( -( GetUserFieldState (cUserFieldTestExtension, gOutputDoc))) + gOptionsDialog.getControl("cbSaveOpenXMLTest").setState( -( GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc))) + gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc))) + gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc))) End Sub Sub ReadOptions call SetGlobalDoc - bMakeWriterTest = GetUserFieldState (cUserFieldTestWriter, gOutPutDoc) - bMakeCalcTest = GetUserFieldState (cUserFieldTestCalc, gOutPutDoc) - bMakeImpressTest = GetUserFieldState (cUserFieldTestImpress, gOutPutDoc) - bMakeDrawTest = GetUserFieldState (cUserFieldTestDraw, gOutPutDoc) - bMakeHTMLTest = GetUserFieldState (cUserFieldTestHTML, gOutPutDoc) - bMakeMathTest = GetUserFieldState (cUserFieldTestMath, gOutPutDoc) - bMakeChartTest = GetUserFieldState (cUserFieldTestChart, gOutPutDoc) - bMakeJavaTest = GetUserFieldState (cUserFieldTestJava, gOutPutDoc) - bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutPutDoc) - bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutPutDoc) - bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutPutDoc) - bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc) - bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutPutDoc) - bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutPutDoc) + bMakeWriterTest = GetUserFieldState (cUserFieldTestWriter, gOutputDoc) + bMakeCalcTest = GetUserFieldState (cUserFieldTestCalc, gOutputDoc) + bMakeImpressTest = GetUserFieldState (cUserFieldTestImpress, gOutputDoc) + bMakeDrawTest = GetUserFieldState (cUserFieldTestDraw, gOutputDoc) + bMakeHTMLTest = GetUserFieldState (cUserFieldTestHTML, gOutputDoc) + bMakeMathTest = GetUserFieldState (cUserFieldTestMath, gOutputDoc) + bMakeChartTest = GetUserFieldState (cUserFieldTestChart, gOutputDoc) + bMakeJavaTest = GetUserFieldState (cUserFieldTestJava, gOutputDoc) + bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutputDoc) + bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutputDoc) + bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc) + bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc) + bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc) end Sub Sub SetDefaultOptions @@ -565,11 +625,6 @@ Sub SetDefaultOptions End If bMakeSaveOpenXMLTest = true REM Disable StarOffice 5.0 tests in case binfilter has not been included - if Environ("WITH_BINFILTER") = "NO" then - bMakeOpen50Test = false - else - bMakeOpen50Test = true - End If bMakeSaveOpen8Test = true bMakeTerminateAfterTest = false end Sub @@ -579,8 +634,8 @@ Sub StartTestByOptions call ReadOptions call Main if bMakeTerminateAfterTest then - ClearDocFull (gOutPutDoc) - gOutPutDoc.dispose + ClearDocFull (gOutputDoc) + gOutputDoc.dispose 'StarDesktop.Terminate 'EnableReschedule( false ) @@ -608,7 +663,7 @@ Function StartTestWithDefaultOptions action(cDocNew) = "new" action(cDocSaveOpen8) = "V8.0" action(cDocSaveOpenXML) = "XML" - action(cDocOpen50) = "V5.0" + action(cDocClose) = "close" dim baseAction(5) as string baseAction(cDBService) = "services" baseAction(cDBOpen) = "open" diff --git a/smoketestoo_native/data/OptionsDlg.xml b/smoketestdoc/data/OptionsDlg.xml index 5b1af9dfd..c03026185 100644 --- a/smoketestoo_native/data/OptionsDlg.xml +++ b/smoketestdoc/data/OptionsDlg.xml @@ -28,35 +28,37 @@ <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> <dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="OptionsDlg" dlg:left="173" dlg:top="100" dlg:width="223" dlg:height="214" dlg:closeable="true" dlg:moveable="true" dlg:title="Options for smoketest"> <dlg:bulletinboard> - <dlg:titledbox dlg:id="fmTests" dlg:tab-index="0" dlg:left="114" dlg:top="7" dlg:width="101" dlg:height="157"> + <dlg:titledbox dlg:id="fmTests" dlg:tab-index="0" dlg:left="114" dlg:top="7" dlg:width="100" dlg:height="157"> <dlg:title dlg:value="Tests"/> </dlg:titledbox> - <dlg:titledbox dlg:id="fmInstalls" dlg:tab-index="1" dlg:left="7" dlg:top="7" dlg:width="100" dlg:height="157"> + <dlg:checkbox dlg:id="cbWriterTest" dlg:tab-index="1" dlg:left="19" dlg:top="21" dlg:width="80" dlg:height="8" dlg:value="Writer" dlg:checked="false"/> + <dlg:checkbox dlg:id="cbCalcTest" dlg:tab-index="2" dlg:left="19" dlg:top="35" dlg:width="80" dlg:height="8" dlg:value="Calc" dlg:checked="false"/> + <dlg:checkbox dlg:id="cbImpressTest" dlg:tab-index="3" dlg:left="19" dlg:top="49" dlg:width="80" dlg:height="8" dlg:value="Impress" dlg:checked="false"/> + <dlg:checkbox dlg:id="cbDrawTest" dlg:tab-index="4" dlg:left="19" dlg:top="63" dlg:width="80" dlg:height="8" dlg:value="Draw" dlg:checked="false"/> + <dlg:checkbox dlg:id="cbHTMLTest" dlg:tab-index="5" dlg:left="19" dlg:top="77" dlg:width="80" dlg:height="8" dlg:value="HTML" dlg:checked="false"/> + <dlg:checkbox dlg:id="cbMathTest" dlg:tab-index="6" dlg:left="19" dlg:top="91" dlg:width="80" dlg:height="8" dlg:value="Math" dlg:checked="false"/> + <dlg:checkbox dlg:id="cbChartTest" dlg:tab-index="7" dlg:left="19" dlg:top="105" dlg:width="80" dlg:height="8" dlg:value="Chart" dlg:checked="false"/> + <dlg:checkbox dlg:id="cbJavaTest" dlg:tab-index="8" dlg:left="19" dlg:top="119" dlg:width="80" dlg:height="8" dlg:value="Java" dlg:checked="false"/> + <dlg:checkbox dlg:id="cbDatabaseTest" dlg:tab-index="9" dlg:left="19" dlg:top="133" dlg:width="80" dlg:height="8" dlg:value="Database" dlg:checked="false"/> + <dlg:checkbox dlg:id="cbExtensionTest" dlg:tab-index="10" dlg:left="19" dlg:top="147" dlg:width="80" dlg:height="8" dlg:value="Extension" dlg:checked="false"/> + + <dlg:titledbox dlg:id="fmInstalls" dlg:tab-index="11" dlg:left="7" dlg:top="7" dlg:width="100" dlg:height="157"> <dlg:title dlg:value="Functions"/> </dlg:titledbox> - <dlg:checkbox dlg:id="cbWriterTest" dlg:tab-index="2" dlg:left="126" dlg:top="21" dlg:width="80" dlg:height="8" dlg:value="Writer" dlg:checked="false"/> - <dlg:checkbox dlg:id="cbCalcTest" dlg:tab-index="3" dlg:left="126" dlg:top="35" dlg:width="80" dlg:height="8" dlg:value="Calc" dlg:checked="false"/> - <dlg:checkbox dlg:id="cbImpressTest" dlg:tab-index="4" dlg:left="126" dlg:top="49" dlg:width="80" dlg:height="8" dlg:value="Impress" dlg:checked="false"/> - <dlg:checkbox dlg:id="cbDrawTest" dlg:tab-index="5" dlg:left="126" dlg:top="63" dlg:width="80" dlg:height="8" dlg:value="Draw" dlg:checked="false"/> - <dlg:checkbox dlg:id="cbHTMLTest" dlg:tab-index="6" dlg:left="126" dlg:top="77" dlg:width="80" dlg:height="8" dlg:value="HTML" dlg:checked="false"/> - <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="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="cbTerminateAfterTest" dlg:tab-index="11" dlg:disabled="true" dlg:left="19" dlg:top="174" dlg:width="190" dlg:height="8" dlg:value="Terminate Office after test" dlg:checked="false"/> - <dlg:titledbox dlg:id="fmBroker" dlg:tab-index="12" dlg:left="7" dlg:top="169" dlg:width="208" dlg:height="17"/> - <dlg:button dlg:id="btOk" dlg:tab-index="13" dlg:left="7" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Ok" dlg:button-type="ok"> + <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:titledbox dlg:id="fmBroker" dlg:tab-index="15" dlg:left="7" dlg:top="169" dlg:width="208" dlg:height="17"/> + <dlg:checkbox dlg:id="cbTerminateAfterTest" dlg:tab-index="16" dlg:disabled="true" dlg:left="19" dlg:top="174" dlg:width="190" dlg:height="8" dlg:value="Terminate Office after test" dlg:checked="false"/> + + <dlg:button dlg:id="btOk" dlg:tab-index="17" dlg:left="7" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Ok" dlg:button-type="ok" dlg:default="true"> <script:event script:event-name="on-performaction" script:location="document" script:macro-name="Standard.Events.PressOk" script:language="StarBasic"/> </dlg:button> - <dlg:button dlg:id="btCancel" dlg:tab-index="14" dlg:left="80" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Cancel" dlg:button-type="ok"> + <dlg:button dlg:id="btCancel" dlg:tab-index="18" dlg:left="80" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Cancel" dlg:button-type="ok"> <script:event script:event-name="on-performaction" script:location="document" script:macro-name="Standard.Events.PressCancel" script:language="StarBasic"/> </dlg:button> - <dlg:button dlg:id="btStart" dlg:tab-index="15" dlg:left="152" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Smoketest"> + <dlg:button dlg:id="btStart" dlg:tab-index="19" dlg:left="152" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Smoketest"> <script:event script:event-name="on-performaction" script:location="vnd.sun.star.script" script:macro-name="Standard.Events.PressTest?language=Basic&location=document" script:language="Script"/> </dlg:button> - <dlg:checkbox dlg:id="cbJavaTest" dlg:tab-index="16" dlg:left="126" dlg:top="119" dlg:width="80" dlg:height="8" dlg:value="Java" dlg:checked="false"/> - <dlg:checkbox dlg:id="cbSaveOpen8Test" dlg:tab-index="17" dlg:left="19" dlg:top="35" dlg:width="80" dlg:height="8" dlg:value="Save / Open V8.0" dlg:checked="false"/> - <dlg:checkbox dlg:id="cbDatabaseTest" dlg:tab-index="18" dlg:left="126" dlg:top="133" dlg:width="80" dlg:height="8" dlg:value="Database" dlg:checked="false"/> - <dlg:checkbox dlg:id="cbExtensionTest" dlg:tab-index="19" dlg:left="126" dlg:top="147" dlg:width="80" dlg:height="8" dlg:value="Extension" dlg:checked="false"/> </dlg:bulletinboard> </dlg:window> diff --git a/smoketestoo_native/data/Test_10er.xml b/smoketestdoc/data/Test_10er.xml index 2864da8c3..26c85ea0b 100644 --- a/smoketestoo_native/data/Test_10er.xml +++ b/smoketestdoc/data/Test_10er.xml @@ -30,12 +30,13 @@ const sSWLogFileName = "swlog.dat", sSCLogFileName = "sclog.dat" const sSDLogFileName = "sdlog.dat", sSMathLogFileName = "smalog.dat" -const sSImDLogFileName = "simlog.dat", sSChartLogFileName = "schlog.dat" -const sSHptLogFileName = "shptlog.dat", sSMessageLogFileName = "smeslog.dat" +const sSChartLogFileName = "schlog.dat" +const sSHptLogFileName = "shptlog.dat" const sSDrawLogFileName = "sdrwlog.dat", sJavaLogFileName = "javalog.dat" const sSDBLogFileName = "dblog.dat", sExtLogFileName = "extlog.dat" -const sLogFileName = "log.dat" -const cTempFileName = "ttt" +const sTestGlueLogFileName = "testclosure.log" +const sLogFileName = "smoketest.log" +const cTempFileName = "smoketest_file" const cMessageSaveOpen8Doc = "Save/Open open Documents (8.0)" const cMessageSaveOpenXMLDoc = "Save/Open Document XML (6/7)" @@ -45,8 +46,8 @@ const cMessageCloseDoc = "Close Document" Global sWorkPath$ Global sWorkPathURL$ -Global FileChannel% -Global MainFileChannel% +Global LocalTestLog% +Global GlobalTestLog% Sub Main call TestAllDocs() @@ -108,24 +109,21 @@ Sub DeleteAllLogFiles() If FileExists (sWorkPath+sSMathLogFileName) then Kill (sWorkPath+sSMathLogFileName) End If - If FileExists (sWorkPath+sSImDLogFileName) then - Kill (sWorkPath+sSImDLogFileName) - End If If FileExists (sWorkPath+sSChartLogFileName) then Kill (sWorkPath+sSChartLogFileName) End If If FileExists (sWorkPath+sSHptLogFileName) then Kill (sWorkPath+sSHptLogFileName) End If - If FileExists (sWorkPath+sSMessageLogFileName) then - Kill (sWorkPath+sSMessageLogFileName) - End If If FileExists (sWorkPath+sSDrawLogFileName) then Kill (sWorkPath+sSDrawLogFileName) End If If FileExists (sWorkPath+sJavaLogFileName) then Kill (sWorkPath+sJavaLogFileName) End If + If FileExists (sWorkPath+sTestGlueLogFileName) then + Kill (sWorkPath+sTestGlueLogFileName) + End If If FileExists (sWorkPath+sSDBLogFileName) then Kill (sWorkPath+sSDBLogFileName) End If @@ -144,15 +142,13 @@ Function OpenLogDat (sFileName as String) as Integer OpenLogDat = LocaleFileChannel% end Function -Function GetWorkPath as string - sTemp = "$(userpath)/temp/" - GetWorkPath = CreateUnoService("com.sun.star.config.SpecialConfigManager").SubstituteVariables(sTemp) -End Function +Sub SetupWorkPath + Dim configManager as Object + configManager = CreateUnoService( "com.sun.star.config.SpecialConfigManager" ) -Function GetWorkURL as string - sTemp = "$(userurl)/temp/" - GetWorkURL = CreateUnoService("com.sun.star.config.SpecialConfigManager").SubstituteVariables(sTemp) -End Function + sWorkPath = configManager.SubstituteVariables( "$(userpath)/temp/" ) + sWorkPathURL = configManager.SubstituteVariables( "$(userurl)/temp/" ) +End Sub Function GetSystem (sTmpWorkPath as string) as string GetSystem = "" @@ -181,100 +177,104 @@ Sub TestAllDocs() DIM sDocURL as String, sDocPath as String DIM nStrPos as Long - sWorkPath = GetWorkPath - sWorkPathURL = GetWorkURL - - if GetSystem (sWorkPath) = "windows" then - sWorkPath = ConvertPathToWin (sWorkPath) - end if - 'search ExtensionURL - sDocURL = gOutPutDoc.URL + sDocURL = gOutputDoc.URL CompatibilityMode(true) nStrPos = InStrRev (sDocURL, "/" ) CompatibilityMode(false) sExtensionURL = Left (sDocURL, nStrPos) - call DeleteAllSavedFiles() - call DeleteAllLogFiles() - MainFileChannel = OpenLogDat (sLogFileName) - call WriteTestSequence (MainFileChannel) + GlobalTestLog = OpenLogDat (sLogFileName) + call WriteTestSequence if bMakeWriterTest then - call MakeDocTest (frmWriter) + gCurrentDocTest = frmWriter + call MakeDocTest end if if bMakeCalcTest then - call MakeDocTest (frmCalc) + gCurrentDocTest = frmCalc + call MakeDocTest end if if bMakeImpressTest then - call MakeDocTest (frmImpress) + gCurrentDocTest = frmImpress + call MakeDocTest end if if bMakeDrawTest then - call MakeDocTest (frmDraw) + gCurrentDocTest = frmDraw + call MakeDocTest end if if bMakeHTMLTest then - call MakeDocTest (frmHyperText) + gCurrentDocTest = frmHyperText + call MakeDocTest end if if bMakeChartTest then - call MakeChartTest (frmChart) + gCurrentDocTest = frmChart + call MakeChartTest end if if bMakeMathTest then - call MakeNewDoc (frmMath) + gCurrentDocTest = frmMath + call MakeNewDoc end if if bMakeJavaTest then - call TestJava (frmJava) + gCurrentDocTest = frmJava + call TestJava end if if bMakeDBTest then - call Test_DB.TestDB (frmDataBase) + gCurrentDocTest = frmDataBase + call Test_DB.TestDB end if if bMakeExtensionTest then - call Test_Ext.TestExtensions (frmExtension) + gCurrentDocTest = frmExtension + call Test_Ext.TestExtensions end if - Close #MainFileChannel + Close #GlobalTestLog + GlobalTestLog = 0 end Sub -Sub WriteTestSequence (FileChannel as integer) - Print #FileChannel, "Sequence of testing" +Sub WriteTestSequence + Print #GlobalTestLog, "Sequence of testing" if bMakeWriterTest then - WriteTests ("writer : ", true, FileChannel) + WriteTests ("writer : ", true, GlobalTestLog) end if if bMakeCalcTest then - WriteTests ("calc : ", true, FileChannel) + WriteTests ("calc : ", true, GlobalTestLog) end if if bMakeImpressTest then - WriteTests ("impress : ", true, FileChannel) + WriteTests ("impress : ", true, GlobalTestLog) end if if bMakeDrawTest then - WriteTests ("draw : ", true, FileChannel) + WriteTests ("draw : ", true, GlobalTestLog) end if if bMakeHTMLTest then - WriteTests ("HTML : ", true, FileChannel) + WriteTests ("HTML : ", true, GlobalTestLog) end if if bMakeChartTest then - WriteTests ("chart : ", false, FileChannel) + WriteTests ("chart : ", false, GlobalTestLog) end if if bMakeMathTest then - WriteTests ("math : ", false, FileChannel) + WriteTests ("math : ", false, GlobalTestLog) end if if bMakeJavaTest then - WriteTests ("Java : ", false, FileChannel) + WriteTests ("Java : ", false, GlobalTestLog) end if if bMakeDBTest then - WriteDBTests ("Database : ", FileChannel) + WriteDBTests ("Database : ", GlobalTestLog) end if if bMakeExtensionTest then - WriteExtensionTests ("Extension : ", FileChannel) - end if - - Print #FileChannel -end Sub + WriteExtensionTests ("Extension : ", GlobalTestLog) + end if -Sub WriteTests (sText as string, bTestAll as boolean, nFileChannel as integer) - Dim sWriteStr as string - - sWriteStr = sText - sWriteStr = sWriteStr + "new" + Print #GlobalTestLog, "testclosure : setup, write_status" + + Print #GlobalTestLog + end Sub + + Sub WriteTests (sText as string, bTestAll as boolean) + Dim sWriteStr as string + + sWriteStr = sText + sWriteStr = sWriteStr + "new" if bTestAll then if bMakeSaveOpen8Test then sWriteStr = sWriteStr + ", save 8.0" @@ -295,7 +295,7 @@ Sub WriteTests (sText as string, bTestAll as boolean, nFileChannel as integer) sWriteStr = sWriteStr + ", close" - Print #nFileChannel, sWriteStr + Print #GlobalTestLog, sWriteStr end Sub Sub WriteDBTests (sText as string, nFileChannel as integer) @@ -322,67 +322,53 @@ Sub WriteExtensionTests (sText as string, nFileChannel as integer) Print #nFileChannel, sWriteStr end Sub -Sub MakeDocTest (FilterType as Integer) +Sub MakeDocTest Dim oDoc as Object Dim sFileNameXML$, sFileName8$ - Dim bError as Boolean - Dim nCurrentAction as Integer + Dim bSuccess as Boolean On Local Error GoTo DOCTESTERROR - nCurrentAction = cLogfileFailed - FileChannel% = OpenLogDat (GetLogFileName(FilterType)) - nCurrentAction = cDocNew - 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)) + gCurrentTestCase = cLogfileFailed + LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest)) + gCurrentTestCase = cDocNew + oDoc = LoadDoc ("private:factory/" + GetDocFilter(gCurrentDocTest or cFltNewDoc)) + LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ cMessageNewDoc, not IsNull (oDoc) ) if not IsNull (oDoc) then - nCurrentAction = cDocSaveOpen8 - if bMakeSaveOpen8Test and IsFilterAvailable (FilterType or cFlt8) then - sFileName8 = sWorkPathURL+cTempFileName+"."+GetDocEndings(FilterType or cFlt8) - SaveDoc (sFileName8, oDoc, GetDocFilter(FilterType or cFlt8)) + gCurrentTestCase = cDocSaveOpen8 + if bMakeSaveOpen8Test and IsFilterAvailable (gCurrentDocTest or cFlt8) then + sFileName8 = sWorkPathURL+cTempFileName+"."+GetDocEndings(gCurrentDocTest or cFlt8) + SaveDoc (sFileName8, oDoc, GetDocFilter(gCurrentDocTest or cFlt8)) end if - nCurrentAction = cDocSaveOpenXML - if bMakeSaveOpenXMLTest and IsFilterAvailable (FilterType or cFltXML) then - sFileNameXML = sWorkPathURL+cTempFileName+"."+GetDocEndings(FilterType or cFltXML) - SaveDoc (sFileNameXML, oDoc, GetDocFilter(FilterType or cFltXML)) + gCurrentTestCase = cDocSaveOpenXML + if bMakeSaveOpenXMLTest and IsFilterAvailable (gCurrentDocTest or cFltXML) then + sFileNameXML = sWorkPathURL+cTempFileName+"."+GetDocEndings(gCurrentDocTest or cFltXML) + SaveDoc (sFileNameXML, oDoc, GetDocFilter(gCurrentDocTest or cFltXML)) end if - nCurrentAction = cDocOpen50 -' 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) - nCurrentAction = cDocSaveOpen8 - if bMakeSaveOpen8Test and IsFilterAvailable (FilterType or cFlt8) then + gCurrentTestCase = cDocClose + bSuccess = CloseDoc( oDoc ) + LogTestResult( GetDocFilter(gCurrentDocTest)+" "+ cMessageCloseDoc, bSuccess ) + gCurrentTestCase = cDocSaveOpen8 + if bMakeSaveOpen8Test and IsFilterAvailable (gCurrentDocTest or cFlt8) then oDoc = LoadDoc (sFileName8) ' 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)) + LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ cMessageSaveOpen8Doc, not IsNull (oDoc) ) if not IsNull (oDoc) then -' oDoc.dispose - nCurrentAction = cDocClose + gCurrentTestCase = cDocClose oDoc.close (true) end If end if - nCurrentAction = cDocSaveOpenXML - if bMakeSaveOpenXMLTest and IsFilterAvailable (FilterType or cFltXML) then + gCurrentTestCase = cDocSaveOpenXML + if bMakeSaveOpenXMLTest and IsFilterAvailable (gCurrentDocTest or cFltXML) then oDoc = LoadDoc (sFileNameXML) ' 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)) + LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ cMessageSaveOpenXMLDoc, not IsNull (oDoc) ) if not IsNull (oDoc) then -' oDoc.dispose - nCurrentAction = cDocClose + gCurrentTestCase = cDocClose oDoc.close (true) end If end if @@ -405,103 +391,90 @@ Sub MakeDocTest (FilterType as Integer) end If end if end If - Print #FileChannel, "---" - Close #FileChannel% + Print #LocalTestLog, "---" + Close #LocalTestLog% + LocalTestLog = 0 Exit Sub ' Without error DOCTESTERROR: - If (nCurrentAction = cLogfileFailed) then - SetStatus (FilterType, cDocNew, False) + If ( gCurrentTestCase = cLogfileFailed ) then + LogTestResult( " ", False ) Exit Sub else - LogState (False, GetDocFilter(FilterType or cFltNewDoc)+" "+ GetErrorMessage(nCurrentAction), FileChannel) - LogState (False, GetDocFilter(FilterType or cFltNewDoc)+" "+ GetErrorMessage(nCurrentAction), MainFileChannel) - SetStatus (FilterType, nCurrentAction, False) - Close #FileChannel% + LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ GetErrorMessage(gCurrentTestCase), False ) + Close #LocalTestLog% + LocalTestLog = 0 End If Exit Sub ' With error End Sub -Sub MakeNewDoc (FilterType as Integer) +Sub MakeNewDoc DIM oDoc as Object - Dim bError as Boolean - Dim nCurrentAction as Integer + Dim bSuccess as Boolean On Local Error GoTo DOCTESTERROR2 - nCurrentAction = cLogfileFailed - FileChannel% = OpenLogDat (GetLogFileName(FilterType)) - nCurrentAction = cDocNew -' 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)) + gCurrentTestCase = cLogfileFailed + LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest)) + gCurrentTestCase = cDocNew +' oDoc = Documents.Add(GetDocFilter(gCurrentDocTest)) + oDoc = LoadDoc ("private:factory/" + GetDocFilter(gCurrentDocTest or cFltNewDoc)) + LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ cMessageNewDoc, not IsNull (oDoc) ) if not IsNull (oDoc) then - nCurrentAction = cDocClose -' 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) + gCurrentTestCase = cDocClose + bSuccess = CloseDoc( oDoc ) + LogTestResult( GetDocFilter(gCurrentDocTest)+" "+ cMessageCloseDoc, bSuccess ) end If - Print #FileChannel, "---" - Close #FileChannel% + Print #LocalTestLog, "---" + Close #LocalTestLog% + LocalTestLog = 0 Exit Sub ' Without error DOCTESTERROR2: - If (nCurrentAction = cLogfileFailed) then - SetStatus (FilterType, cDocNew, False) + If ( gCurrentTestCase = cLogfileFailed ) then + LogTestResult( " ", False ) Exit Sub else - LogState (False, GetDocFilter(FilterType or cFltNewDoc)+" "+ GetErrorMessage(nCurrentAction), FileChannel) - LogState (False, GetDocFilter(FilterType or cFltNewDoc)+" "+ GetErrorMessage(nCurrentAction), MainFileChannel) - SetStatus (FilterType, nCurrentAction, False) - Close #FileChannel% + LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ GetErrorMessage(gCurrentTestCase), False ) + Close #LocalTestLog% + LocalTestLog = 0 End If Exit Sub ' With error End Sub -Sub MakeChartTest (FilterType as Integer) +Sub MakeChartTest Dim oCharts as Object Dim oDoc as Object Dim oRange(0) as New com.sun.star.table.CellRangeAddress Dim oRect as New com.sun.star.awt.Rectangle const cChartName="TestChart" - Dim bError as Boolean - Dim nCurrentAction as Integer - On Local Error GoTo CHARTTESTERROR - nCurrentAction = cLogfileFailed - FileChannel% = OpenLogDat (GetLogFileName(FilterType)) - nCurrentAction = cDocNew - oDoc = LoadDoc ("private:factory/" + GetDocFilter(frmCalc or cFltNewDoc)) + Dim bSuccess as Boolean + On Local Error GoTo CHARTTESTERROR + gCurrentTestCase = cLogfileFailed + LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest)) + gCurrentTestCase = cDocNew + oDoc = LoadDoc ("private:factory/" + GetDocFilter(frmCalc or cFltNewDoc)) if not IsNull (oDoc) then oCharts = oDoc.sheets(0).Charts oCharts.AddNewByName (cChartName, oRect, oRange(), true, true) - bError=oCharts.HasByName(cChartName) - LogState (bError, GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageNewDoc, FileChannel) - LogState (bError, GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageNewDoc, MainFileChannel) - SetStatus (FilterType, cDocNew, bError) -' oDoc.dispose - nCurrentAction = cDocClose + bSuccess=oCharts.HasByName(cChartName) + LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ cMessageNewDoc, bSuccess ) + gCurrentTestCase = cDocClose oDoc.close (true) else - LogState (not IsNull (oDoc), GetDocFilter(frmCalc or cFltNewDoc)+" "+ cMessageNewDoc, FileChannel) - LogState (not IsNull (oDoc), GetDocFilter(frmCalc or cFltNewDoc)+" "+ cMessageNewDoc, MainFileChannel) - SetStatus (frmCalc, cDocNew, not IsNull (oDoc)) + LogTestResult( GetDocFilter(frmCalc or cFltNewDoc)+" "+ cMessageNewDoc, FALSE ) End if - Print #FileChannel, "---" - Close #FileChannel% + Print #LocalTestLog, "---" + Close #LocalTestLog% + LocalTestLog = 0 Exit Sub ' Without error CHARTTESTERROR: - If (nCurrentAction = cLogfileFailed) then - SetStatus (FilterType, cDocNew, False) + If ( gCurrentTestCase = cLogfileFailed ) then + LogTestResult( " ", False ) Exit Sub else - LogState (False, GetDocFilter(FilterType or cFltNewDoc)+" "+ GetErrorMessage(nCurrentAction), FileChannel) - LogState (False, GetDocFilter(FilterType or cFltNewDoc)+" "+ GetErrorMessage(nCurrentAction), MainFileChannel) - SetStatus (FilterType, nCurrentAction, False) - Close #FileChannel% + LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ GetErrorMessage(gCurrentTestCase), FALSE ) + Close #LocalTestLog% + LocalTestLog = 0 End If Exit Sub ' With error End Sub @@ -550,29 +523,29 @@ end Function Function GetDocFilter (DocType as Integer) as String Select Case ( DocType ) case frmWriter or cFlt8 - GetDocFilter = "writer8" ' Textdokument + GetDocFilter = "writer8" ' text document case frmCalc or cFlt8 - GetDocFilter = "calc8" 'Tabellendokument + GetDocFilter = "calc8" ' spreadsheet document case frmImpress or cFlt8 - GetDocFilter = "impress8" 'Präsentation + GetDocFilter = "impress8" ' presentation case frmDraw or cFlt8 - GetDocFilter = "draw8" 'Zeichen + GetDocFilter = "draw8" ' drawing case frmMath or cFlt8 - GetDocFilter = "math8" 'Formel + GetDocFilter = "math8" ' formula case frmWriter or cFltXML - GetDocFilter = "StarOffice XML (Writer)" ' Textdokument + GetDocFilter = "StarOffice XML (Writer)" ' text document case frmCalc or cFltXML - GetDocFilter = "StarOffice XML (Calc)" 'Tabellendokument + GetDocFilter = "StarOffice XML (Calc)" ' spreadsheet document case frmImpress or cFltXML - GetDocFilter = "StarOffice XML (Impress)" 'Präsentation + GetDocFilter = "StarOffice XML (Impress)" ' presentation case frmDraw or cFltXML - GetDocFilter = "StarOffice XML (Draw)" 'Zeichen + GetDocFilter = "StarOffice XML (Draw)" ' drawing case frmMath or cFltXML - GetDocFilter = "StarOffice XML (Math)" 'Formel + GetDocFilter = "StarOffice XML (Math)" ' formula case frmHyperText, frmHyperText or cFlt50, frmHyperText or cFltXML - GetDocFilter = "HTML" 'Hypertext-Dokument + GetDocFilter = "HTML" ' HTML document case frmWriter or cFlt50 GetDocFilter = "StarWriter 5.0" ' Textdokument 5.0 case frmCalc or cFlt50 @@ -585,23 +558,19 @@ Function GetDocFilter (DocType as Integer) as String GetDocFilter = "StarMath 5.0" 'Formel 5.0 case frmWriter or cFltNewDoc - GetDocFilter = "swriter" ' Textdokument + GetDocFilter = "swriter" ' text document case frmCalc or cFltNewDoc - GetDocFilter = "scalc" 'Tabellendokument - case frmMessage or cFltNewDoc - GetDocFilter = "Message" 'Nachricht + GetDocFilter = "scalc" ' spreadsheet document case frmImpress or cFltNewDoc - GetDocFilter = "simpress" 'Präsentation + GetDocFilter = "simpress" ' presentation case frmDraw or cFltNewDoc - GetDocFilter = "sdraw" 'Zeichen + GetDocFilter = "sdraw" ' drawing case frmMath or cFltNewDoc - GetDocFilter = "smath" 'Formel - case frmImage or cFltNewDoc - GetDocFilter = "simage" 'Bild + GetDocFilter = "smath" ' formula case frmHyperText or cFltNewDoc - GetDocFilter = "swriter/web" 'Hypertext-Dokument + GetDocFilter = "swriter/web" ' HTML document case frmChart or cFltNewDoc - GetDocFilter = "schart" 'Diagramm + GetDocFilter = "schart" ' chart case else GetDocFilter = "" end Select @@ -610,25 +579,23 @@ end Function Function GetLogFileName (DocType as Integer) as String Select Case ( DocType ) case frmWriter - GetLogFileName = sSWLogFileName ' Textdokument + GetLogFileName = sSWLogFileName ' text document case frmCalc - GetLogFileName = sSCLogFileName 'Tabellendokument - case frmMessage - GetLogFileName = sSMessageLogFileName 'Nachricht + GetLogFileName = sSCLogFileName ' spreadsheet document case frmImpress - GetLogFileName = sSDLogFileName 'PrÕsentation + GetLogFileName = sSDLogFileName ' presentation case frmDraw - GetLogFileName = sSDrawLogFileName 'Zeichnen + GetLogFileName = sSDrawLogFileName ' drawing case frmMath - GetLogFileName = sSMathLogFileName 'Formel - case frmImage - GetLogFileName = sSImDLogFileName 'Bild + GetLogFileName = sSMathLogFileName ' formula case frmHyperText - GetLogFileName = sSHptLogFileName 'Hypertext-Dokument + GetLogFileName = sSHptLogFileName ' HTML document case frmChart - GetLogFileName = sSChartLogFileName 'Diagramm + GetLogFileName = sSChartLogFileName ' chart case frmJava GetLogFileName = sJavaLogFileName 'Java + case frmTestClosure + GetLogFileName = sTestGlueLogFileName ' test framework case frmDataBase GetLogFileName = sSDBLogFileName 'Database case frmExtension @@ -662,16 +629,17 @@ Function IsFilterAvailable (FilterType as Integer) as boolean end if End Function -Function TestJava (FilterType as Integer) as boolean +Function TestJava Dim oObj as Object - FileChannel% = OpenLogDat (GetLogFileName(FilterType)) - oObj = createUnoService(cUnoJavaLoader) - LogState (not IsNull (oObj), "Java "+ cMessageNewDoc, FileChannel) - LogState (not IsNull (oObj), "Java "+ cMessageNewDoc, MainFileChannel) - SetStatus (FilterType, cDocNew, not IsNull (oObj)) + gCurrentTestCase = cLogfileFailed + LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest)) + gCurrentTestCase = cDocNew + oObj = createUnoService( cUnoJavaLoader ) + LogTestResult( "Java "+ cMessageNewDoc, not IsNull (oObj) ) - Print #FileChannel, "---" - Close #FileChannel% + Print #LocalTestLog, "---" + Close #LocalTestLog% + LocalTestLog = 0 TestJava = not IsNull (oObj) End Function @@ -736,4 +704,19 @@ Sub SaveDoc (DocName as String, oDoc as Object, sFilterName as string ) MessageBox "Filtername is unknown!" end if end Sub + +Function CloseDoc( oDoc as Object ) + Dim oListener as Object + oListener = CreateUnoListener( "Events.closeListener_", "com.sun.star.util.XCloseListener" ) + oDoc.addCloseListener( oListener ) + + Events.ResetCloseListenerFlag() + oDoc.close( true ) + closeDoc = Events.HasCloseListenerBeenCalled() + + if ( Not Events.HasCloseListenerBeenCalled() ) Then + ' do this only if closing was not successful - otherwise, we'd get a DisposedException + oDoc.removeCloseListener( oListener ) + End If +End Function </script:module> diff --git a/smoketestoo_native/data/Test_DB.xml b/smoketestdoc/data/Test_DB.xml index 37fdc0948..f60df015d 100644 --- a/smoketestoo_native/data/Test_DB.xml +++ b/smoketestdoc/data/Test_DB.xml @@ -35,59 +35,53 @@ const cMessageDatabaseDelete = "Delete record from Database" const cMessageDatabaseSeek = "Read other record from Database" const cMessageDatabaseClose = "Close Database" -Sub TestDB (FilterType as Integer) - -Dim oDBConnection as Object, oDataSource as Object, oDBContext as Object -Dim sDBName as String, sTable as String, sCurrentMessage as String -Dim nRowCount as Integer, nCurrentAction as Integer -Dim bResult as Boolean -Const sTestString = "Automatical Test" +Sub TestDB + Dim oDBConnection as Object, oDataSource as Object, oDBContext as Object + Dim sDBName as String, sTable as String, sCurrentMessage as String + Dim nRowCount as Integer + Dim bResult as Boolean + Const sTestString = "Automatical Test" On Local Error GoTo DBERROR - nCurrentAction = cLogfileFailed - FileChannel% = OpenLogDat (GetLogFileName(FilterType)) + gCurrentTestCase = cLogfileFailed + LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest)) - nCurrentAction = cDBService + gCurrentTestCase = cDBService sCurrentMessage = cMessageDatabaseService + " " + cUnoDatabaseContext oDBContext = CreateUnoService(cUnoDatabaseContext) sDBName="Bibliography" 'Names of Databases - nCurrentAction = cDBOpen + gCurrentTestCase = 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)) + LogTestResult( "Database "+ cMessageDatabaseOpen, not IsNull (oDBConnection) ) if (IsNull(oDBConnection)) then - Close #FileChannel% + Close #LocalTestLog% + LocalTestLog = 0 Exit Sub End If ' Database is open now - nCurrentAction = cDBService + gCurrentTestCase = cDBService sCurrentMessage = cMessageDatabaseService + " " + cUnoRowSet oRowSet = createUnoService(cUnoRowSet) if (IsNull(oRowSet)) then - LogState (not IsNull (oRowSet), "Database "+ cMessageDatabaseService + " " + cUnoRowSet, FileChannel) - LogState (not IsNull (oRowSet), "Database "+ cMessageDatabaseService + " " + cUnoRowSet, MainFileChannel) - SetStatus (FilterType, cDBService, not IsNull (oRowSet)) + LogTestResult( "Database "+ cMessageDatabaseService + " " + cUnoRowSet, not IsNull (oRowSet) ) Exit Sub else - LogState (not IsNull (oRowSet), "Database "+ cMessageDatabaseService, FileChannel) - LogState (not IsNull (oRowSet), "Database "+ cMessageDatabaseService, MainFileChannel) - SetStatus (FilterType, cDBService, not IsNull (oRowSet)) + LogTestResult( "Database "+ cMessageDatabaseService, TRUE ) End If - nCurrentAction = cDBInsert + gCurrentTestCase = cDBInsert sCurrentMessage = cMessageDatabaseInsert oRowSet.ActiveConnection = oDBConnection @@ -105,14 +99,12 @@ Const sTestString = "Automatical Test" oRowSet.moveToCurrentRow() bResult = (oRowSet.getString(5) = sTestString) - LogState (bResult, "Database "+ cMessageDatabaseInsert, FileChannel) - LogState (bResult, "Database "+ cMessageDatabaseInsert, MainFileChannel) - SetStatus (FilterType, cDBInsert, bResult) + LogTestResult( "Database "+ cMessageDatabaseInsert, bResult ) 'delete only if insert passed if (bResult) Then - nCurrentAction = cDBDelete + gCurrentTestCase = cDBDelete sCurrentMessage = cMessageDatabaseDelete oRowSet.deleteRow() bResult = (nRowCount - oRowSet.RowCount = 0) @@ -120,41 +112,35 @@ Const sTestString = "Automatical Test" oRowSet.next() bResult = (nRowCount - oRowSet.RowCount = 1) End If - LogState (bResult, "Database "+ cMessageDatabaseDelete, FileChannel) - LogState (bResult, "Database "+ cMessageDatabaseDelete, MainFileChannel) - SetStatus (FilterType, cDBDelete, bResult) + LogTestResult( "Database "+ cMessageDatabaseDelete, bResult ) End If ' read other record - nCurrentAction = cDBSeek + gCurrentTestCase = cDBSeek sCurrentMessage = cMessageDatabaseSeek oRowSet.first() bResult = not (oRowSet.getString(5) = sTestString) - LogState (bResult, "Database "+ cMessageDatabaseSeek, FileChannel) - LogState (bResult, "Database "+ cMessageDatabaseSeek, MainFileChannel) - SetStatus (FilterType, cDBSeek, bResult) + LogTestResult( "Database "+ cMessageDatabaseSeek, bResult ) - nCurrentAction = cDBClose + gCurrentTestCase = cDBClose sCurrentMessage = cMessageDatabaseClose oDBConnection.Dispose() - LogState (True, "Database "+ cMessageDatabaseClose, FileChannel) - LogState (True, "Database "+ cMessageDatabaseClose, MainFileChannel) - SetStatus (FilterType, cDBClose, True) + LogTestResult( "Database "+ cMessageDatabaseClose, True ) - Print #FileChannel, "---" - Close #FileChannel% + Print #LocalTestLog, "---" + Close #LocalTestLog% + LocalTestLog = 0 Exit Sub ' Without error DBERROR: - If (nCurrentAction = cLogfileFailed) then - SetStatus (FilterType, cDBOpen, False) + If ( gCurrentTestCase = cLogfileFailed ) then + LogTestResult( " ", False ) Exit Sub else - LogState (False, "Database "+ sCurrentMessage, FileChannel) - LogState (False, "Database "+ sCurrentMessage, MainFileChannel) - SetStatus (FilterType, nCurrentAction, False) - Close #FileChannel% + LogTestResult( "Database "+ sCurrentMessage, FALSE ) + Close #LocalTestLog% + LocalTestLog = 0 End If Exit Sub ' With error End Sub diff --git a/smoketestoo_native/data/Test_Ext.xml b/smoketestdoc/data/Test_Ext.xml index 9235b9600..4d4da0006 100644 --- a/smoketestoo_native/data/Test_Ext.xml +++ b/smoketestdoc/data/Test_Ext.xml @@ -32,21 +32,20 @@ const cMessageExtensionService = "Extension Service" const cMessageExtensionInstall = "Install Extension" const cMessageExtensionUninstall = "Uninstall Extension" -Sub TestExtensions (FilterType as Integer) -Dim oTestExtension as Object, obj_null as Object -Dim sCurrentMessage as String -Dim nCurrentAction as Integer -Dim bResult as Boolean -Dim sImplementationNameString as String -sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension" +Sub TestExtensions + Dim oTestExtension as Object, obj_null as Object + Dim sCurrentMessage as String + Dim bResult as Boolean + Dim sImplementationNameString as String + sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension" On Local Error GoTo EXTERROR - nCurrentAction = cLogfileFailed - FileChannel% = OpenLogDat (GetLogFileName(FilterType)) + gCurrentTestCase = cLogfileFailed + LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest)) sCurrentMessage = cMessageExtensionService - nCurrentAction = cEXTService + gCurrentTestCase = cEXTService 'Create an implementation of com.sun.star.ucb.XCommandEnvironment which is needed for 'adding the extension. The implementation is in @@ -58,16 +57,15 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q ctx = getDefaultContext ext_mgr = ctx.getValueByName("/singletons/" + cExtensionManager) - LogState (not IsNull (ext_mgr), "Extension "+ cMessageExtensionService, FileChannel) - LogState (not IsNull (ext_mgr), "Extension "+ cMessageExtensionService, MainFileChannel) - SetStatus (FilterType, cEXTService, not IsNull (ext_mgr)) + LogTestResult( "Extension "+ cMessageExtensionService, not IsNull (ext_mgr) ) if (IsNull(ext_mgr)) then - Close #FileChannel% + Close #LocalTestLog% + LocalTestLog = 0 Exit Sub End If sCurrentMessage = cMessageExtensionInstall - nCurrentAction = cEXTInstall + gCurrentTestCase = cEXTInstall 'Add the extension. We must provide a file URL here. 'By passing "user" we determine that the actions we perform on @@ -79,16 +77,15 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q 'Check if the extension has been added by creating a service which is contained in the extension. oTestExtension = createUnoService(cUnoSmoketestTestExtension) bResult = (oTestExtension.getImplementationName = sImplementationNameString) - LogState (bResult, "Extension "+ cMessageExtensionInstall, FileChannel) - LogState (bResult, "Extension "+ cMessageExtensionInstall, MainFileChannel) - SetStatus (FilterType, cEXTInstall, bResult) + LogTestResult( "Extension "+ cMessageExtensionInstall, bResult ) if (not bResult) then - Close #FileChannel% + Close #LocalTestLog% + LocalTestLog = 0 Exit Sub End If sCurrentMessage = cMessageExtensionUninstall - nCurrentAction = cEXTUninstall + gCurrentTestCase = cEXTUninstall 'Remove the package ext_mgr.removeExtension("org.openoffice.legacy." + cExtensionFileName, cExtensionFileName, "user",obj_null, cmdEnv) @@ -97,23 +94,21 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q oTestExtension = createUnoService(cUnoSmoketestTestExtension) 'The service must not be available anymore. Therefor isNull must return true. - LogState (IsNull (oTestExtension), "Extension "+ cMessageExtensionUninstall, FileChannel) - LogState (IsNull (oTestExtension), "Extension "+ cMessageExtensionUninstall, MainFileChannel) - SetStatus (FilterType, cEXTUninstall, IsNull (oTestExtension)) + LogTestResult( "Extension "+ cMessageExtensionUninstall, IsNull (oTestExtension) ) - Print #FileChannel, "---" - Close #FileChannel% + Print #LocalTestLog, "---" + Close #LocalTestLog% + LocalTestLog = 0 Exit Sub ' Without error EXTERROR: - If (nCurrentAction = cLogfileFailed) then - SetStatus (FilterType, cEXTService, False) + If ( gCurrentTestCase = cLogfileFailed ) then + LogTestResult( " ", False ) Exit Sub else - LogState (False, "Extension "+ sCurrentMessage, FileChannel) - LogState (False, "Extension "+ sCurrentMessage, MainFileChannel) - SetStatus (FilterType, nCurrentAction, False) - Close #FileChannel% + LogTestResult( "Extension "+ sCurrentMessage, False ) + Close #LocalTestLog% + LocalTestLog = 0 End If Exit Sub ' With error diff --git a/smoketestdoc/data/content.xml b/smoketestdoc/data/content.xml new file mode 100644 index 000000000..3c81bbfba --- /dev/null +++ b/smoketestdoc/data/content.xml @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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 +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> +<office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl" office:class="text"> + <office:script/> + <office:font-decls> + <style:font-decl style:name="Arial Unicode MS" fo:font-family="'Arial Unicode MS'" style:font-pitch="variable"/> + <style:font-decl style:name="HG Mincho Light J" fo:font-family="'HG Mincho Light J', 'MS Mincho', 'HG Mincho J', 'HG Mincho L', 'HG Mincho', Mincho, 'MS PMincho', 'MS Gothic', 'HG Gothic J', 'HG Gothic B', 'HG Gothic', Gothic, 'MS PGothic', 'Andale Sans UI', 'Arial Unicode MS', 'Lucida Sans Unicode', Tahoma" style:font-pitch="variable"/> + <style:font-decl style:name="Thorndale" fo:font-family="Thorndale, 'Times New Roman', Times, 'Lucida Serif', 'Lucida Bright', Timmons, 'New York', Serif" style:font-family-generic="roman" style:font-pitch="variable"/> + <style:font-decl style:name="Arial" fo:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/> + </office:font-decls> + <office:automatic-styles> + <style:style style:name="P1" style:family="paragraph"> + <style:properties fo:text-align="center"/> + </style:style> + <style:style style:name="gr1" style:family="graphics"> + <style:properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph"/> + </style:style> + </office:automatic-styles> + <office:body> + <office:forms form:automatic-focus="true" form:apply-design-mode="false"> + <form:form form:name="Standard" form:apply-filter="true" form:command-type="table" form:service-name="com.sun.star.form.component.Form" office:target-frame="" xlink:href=""> + <form:control form:name="start" form:service-name="com.sun.star.form.component.CommandButton" form:id="control1"> + <form:button form:label="start smoketest" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"> + <form:properties> + <form:property form:property-name="DefaultControl" form:property-type="string"> + <form:property-value>stardiv.one.form.control.CommandButton</form:property-value> + </form:property> + </form:properties> + <office:events> + <script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.StartTestByOptions" script:location="document" script:library="document"/> + </office:events> + </form:button> + </form:control> + <form:control form:name="options" form:service-name="com.sun.star.form.component.CommandButton" form:id="control2"> + <form:button form:label="options" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"> + <form:properties> + <form:property form:property-name="DefaultControl" form:property-type="string"> + <form:property-value>stardiv.one.form.control.CommandButton</form:property-value> + </form:property> + </form:properties> + <office:events> + <script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ShowOptionsDlg" script:location="document" script:library="document"/> + </office:events> + </form:button> + </form:control> + <form:control form:name="table" form:service-name="com.sun.star.form.component.CommandButton" form:id="control3"> + <form:button form:label="delete table" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"> + <form:properties> + <form:property form:property-name="DefaultControl" form:property-type="string"> + <form:property-value>stardiv.one.form.control.CommandButton</form:property-value> + </form:property> + </form:properties> + <office:events> + <script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ClearAllText" script:location="document" script:library="document"/> + </office:events> + </form:button> + </form:control> + </form:form> + </office:forms> + <text:sequence-decls> + <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/> + <text:sequence-decl text:display-outline-level="0" text:name="Table"/> + <text:sequence-decl text:display-outline-level="0" text:name="Text"/> + <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/> + </text:sequence-decls> + <text:user-field-decls> + <text:user-field-decl text:value-type="string" text:string-value="y" text:name="Writer"/> + <text:user-field-decl text:value-type="string" text:string-value="y" text:name="Calc"/> + <text:user-field-decl text:value-type="string" text:string-value="y" text:name="Impress"/> + <text:user-field-decl text:value-type="string" text:string-value="y" text:name="Draw"/> + <text:user-field-decl text:value-type="string" text:string-value="y" text:name="HTML"/> + <text:user-field-decl text:value-type="string" text:string-value="y" text:name="Math"/> + <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="SaveOpen50"/> + <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"/> + <text:user-field-decl text:value-type="string" text:string-value="y" text:name="Database"/> + <text:user-field-decl text:value-type="string" text:string-value="y" text:name="Extension"/> + </text:user-field-decls> + <text:p text:style-name="Standard"> + <draw:control text:anchor-type="page" text:anchor-page-number="1" svg:x="2cm" svg:y="2cm" draw:z-index="1" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control1"/> + <draw:control text:anchor-type="page" text:anchor-page-number="1" svg:x="5cm" svg:y="2cm" draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control2"/> + <draw:control text:anchor-type="page" text:anchor-page-number="1" svg:x="8cm" svg:y="2cm" draw:z-index="2" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control3"/> + </text:p> + </office:body> +</office:document-content> diff --git a/smoketestoo_native/data/dialog-lb.xml b/smoketestdoc/data/dialog-lb.xml index 973dfe688..973dfe688 100644 --- a/smoketestoo_native/data/dialog-lb.xml +++ b/smoketestdoc/data/dialog-lb.xml diff --git a/smoketestoo_native/data/dialog-lc.xml b/smoketestdoc/data/dialog-lc.xml index e3a5a0e32..e3a5a0e32 100644 --- a/smoketestoo_native/data/dialog-lc.xml +++ b/smoketestdoc/data/dialog-lc.xml diff --git a/smoketestoo_native/data/makefile.mk b/smoketestdoc/data/makefile.mk index 2096d07de..6cf2706b5 100644 --- a/smoketestoo_native/data/makefile.mk +++ b/smoketestdoc/data/makefile.mk @@ -26,7 +26,7 @@ #***********************************************************************/ PRJ = .. -PRJNAME = smoketestoo_native +PRJNAME = smoketestdoc TARGET = data .INCLUDE: settings.mk @@ -50,21 +50,21 @@ $(MISC)/zip/smoketestdoc.sxw: \ script-lc.xml \ settings.xml \ styles.xml - $(RM) -r $(MISC)/zip - $(MKDIR) $(MISC)/zip - $(COPY) content.xml meta.xml settings.xml styles.xml $(MISC)/zip/ - printf application/vnd.sun.xml.writer > $(MISC)/zip/mimetype - $(MKDIR) $(MISC)/zip/META-INF - $(COPY) manifest.xml $(MISC)/zip/META-INF/ - $(MKDIR) $(MISC)/zip/Basic - $(COPY) script-lc.xml $(MISC)/zip/Basic/ - $(MKDIR) $(MISC)/zip/Basic/Standard - $(COPY) script-lb.xml Events.xml Global.xml Test_10er.xml Test_DB.xml \ + $(COMMAND_ECHO)$(RM) -r $(MISC)/zip + $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip + $(COMMAND_ECHO)$(COPY) content.xml meta.xml settings.xml styles.xml $(MISC)/zip/ + $(COMMAND_ECHO)printf application/vnd.sun.xml.writer > $(MISC)/zip/mimetype + $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/META-INF + $(COMMAND_ECHO)$(COPY) manifest.xml $(MISC)/zip/META-INF/ + $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Basic + $(COMMAND_ECHO)$(COPY) script-lc.xml $(MISC)/zip/Basic/ + $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Basic/Standard + $(COMMAND_ECHO)$(COPY) script-lb.xml Events.xml Global.xml Test_10er.xml Test_DB.xml \ Test_Ext.xml $(MISC)/zip/Basic/Standard/ - $(MKDIR) $(MISC)/zip/Dialogs - $(COPY) dialog-lc.xml $(MISC)/zip/Dialogs/ - $(MKDIR) $(MISC)/zip/Dialogs/Standard - $(COPY) dialog-lb.xml OptionsDlg.xml $(MISC)/zip/Dialogs/Standard/ - cd $(MISC)/zip && zip -rD $(@:f) . + $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Dialogs + $(COMMAND_ECHO)$(COPY) dialog-lc.xml $(MISC)/zip/Dialogs/ + $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Dialogs/Standard + $(COMMAND_ECHO)$(COPY) dialog-lb.xml OptionsDlg.xml $(MISC)/zip/Dialogs/Standard/ + $(COMMAND_ECHO)cd $(MISC)/zip && zip -rD $(@:f) . .INCLUDE: target.mk diff --git a/smoketestoo_native/data/manifest.xml b/smoketestdoc/data/manifest.xml index 48fc9ce90..48fc9ce90 100644 --- a/smoketestoo_native/data/manifest.xml +++ b/smoketestdoc/data/manifest.xml diff --git a/smoketestoo_native/data/meta.xml b/smoketestdoc/data/meta.xml index 43f14295e..43f14295e 100644 --- a/smoketestoo_native/data/meta.xml +++ b/smoketestdoc/data/meta.xml diff --git a/smoketestoo_native/data/script-lb.xml b/smoketestdoc/data/script-lb.xml index fc4f6c637..fc4f6c637 100644 --- a/smoketestoo_native/data/script-lb.xml +++ b/smoketestdoc/data/script-lb.xml diff --git a/smoketestoo_native/data/script-lc.xml b/smoketestdoc/data/script-lc.xml index e3a5a0e32..e3a5a0e32 100644 --- a/smoketestoo_native/data/script-lc.xml +++ b/smoketestdoc/data/script-lc.xml diff --git a/smoketestoo_native/data/settings.xml b/smoketestdoc/data/settings.xml index cd4524b74..cd4524b74 100644 --- a/smoketestoo_native/data/settings.xml +++ b/smoketestdoc/data/settings.xml diff --git a/smoketestoo_native/data/styles.xml b/smoketestdoc/data/styles.xml index 3f8d75fa6..3f8d75fa6 100644 --- a/smoketestoo_native/data/styles.xml +++ b/smoketestdoc/data/styles.xml diff --git a/smoketestdoc/prj/build.lst b/smoketestdoc/prj/build.lst new file mode 100755 index 000000000..ec825ab48 --- /dev/null +++ b/smoketestdoc/prj/build.lst @@ -0,0 +1,4 @@ +smdoc smoketestdoc :: soltools codemaker unoil javaunohelper NULL +smdoc smoketestdoc usr1 - all smdoc_mkout NULL +smdoc smoketestdoc\data nmake - all smdoc_data NULL +smdoc smoketestdoc\com\sun\star\comp\smoketest nmake - all smdoc_ext NULL diff --git a/smoketestdoc/prj/d.lst b/smoketestdoc/prj/d.lst new file mode 100755 index 000000000..618cd83a1 --- /dev/null +++ b/smoketestdoc/prj/d.lst @@ -0,0 +1,4 @@ +mkdir: %_DEST%\bin%_EXT% + +..\%__SRC%\bin\smoketestdoc.sxw %_DEST%\bin%_EXT%\smoketestdoc.sxw +..\%__SRC%\bin\TestExtension.oxt %_DEST%\bin%_EXT%\TestExtension.oxt diff --git a/smoketestoo_native/data/content.xml b/smoketestoo_native/data/content.xml deleted file mode 100644 index 021be8971..000000000 --- a/smoketestoo_native/data/content.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--********************************************************************** -* -* 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 -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* <http://www.openoffice.org/license.html> -* for a copy of the LGPLv3 License. -* -**********************************************************************--> -<office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl" office:class="text"><office:script/><office:font-decls><style:font-decl style:name="Arial Unicode MS" fo:font-family="'Arial Unicode MS'" style:font-pitch="variable"/><style:font-decl style:name="HG Mincho Light J" fo:font-family="'HG Mincho Light J', 'MS Mincho', 'HG Mincho J', 'HG Mincho L', 'HG Mincho', Mincho, 'MS PMincho', 'MS Gothic', 'HG Gothic J', 'HG Gothic B', 'HG Gothic', Gothic, 'MS PGothic', 'Andale Sans UI', 'Arial Unicode MS', 'Lucida Sans Unicode', Tahoma" style:font-pitch="variable"/><style:font-decl style:name="Thorndale" fo:font-family="Thorndale, 'Times New Roman', Times, 'Lucida Serif', 'Lucida Bright', Timmons, 'New York', Serif" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-decl style:name="Arial" fo:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/></office:font-decls><office:automatic-styles><style:style style:name="P1" style:family="paragraph"><style:properties fo:text-align="center"/></style:style><style:style style:name="gr1" style:family="graphics"><style:properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph"/></style:style></office:automatic-styles><office:body><office:forms form:automatic-focus="false" form:apply-design-mode="false"><form:form form:name="Standard" form:apply-filter="true" form:command-type="table" form:service-name="com.sun.star.form.component.Form" office:target-frame="" xlink:href=""><form:control form:name="options" form:service-name="com.sun.star.form.component.CommandButton" form:id="control1"><form:button form:label="options" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ShowOptionsDlg" script:location="document" script:library="document"/></office:events></form:button></form:control><form:control form:name="start" form:service-name="com.sun.star.form.component.CommandButton" form:id="control2"><form:button form:label="start smoketest" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.StartTestByOptions" script:location="document" script:library="document"/></office:events></form:button></form:control><form:control form:name="table" form:service-name="com.sun.star.form.component.CommandButton" form:id="control3"><form:button form:label="delete table" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ClearAllText" script:location="document" script:library="document"/></office:events></form:button></form:control></form:form></office:forms><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/></text:sequence-decls><text:user-field-decls><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Writer"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Calc"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Impress"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Draw"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="HTML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Math"/><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="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"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Database"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Extension"/></text:user-field-decls><text:p text:style-name="Standard"><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="1" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control2"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control1"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="2" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control3"/></text:p><text:p text:style-name="Standard"/></office:body></office:document-content> diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index d9c4dace7..195ef4052 100644..100755 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -29,6 +29,8 @@ TARGET = smoketest ENABLE_EXCEPTIONS = TRUE +ABORT_ON_ASSERTION = TRUE + .INCLUDE: settings.mk CFLAGSCXX += $(CPPUNIT_CFLAGS) @@ -56,7 +58,7 @@ ALLTAR : cpptest cpptest : $(SHL1TARGETN) -TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw +TEST_ARGUMENTS = smoketest.doc=$(OUTDIR)/bin$(UPDMINOREXT)/smoketestdoc.sxw CPPTEST_LIBRARY = $(SHL1TARGETN) .IF "$(OS)" != "WNT" diff --git a/smoketestoo_native/prj/build.lst b/smoketestoo_native/prj/build.lst index 147a363d3..9527079f5 100644..100755 --- a/smoketestoo_native/prj/build.lst +++ b/smoketestoo_native/prj/build.lst @@ -1,5 +1,3 @@ -smtoon smoketestoo_native :: instsetoo_native test NULL +smtoon smoketestoo_native :: instsetoo_native test smoketestdoc NULL smtoon smoketestoo_native usr1 - all smoketestoonative_mkout NULL -smtoon smoketestoo_native\com\sun\star\comp\smoketest nmake - all smoketestoonative_csscs NULL -smtoon smoketestoo_native\data nmake - all smoketestoonative_data NULL -smtoon smoketestoo_native nmake - all,test10 smoketestoonative_mk smoketestoonative_csscs smoketestoonative_data NULL +smtoon smoketestoo_native nmake - all,test10 smoketestoonative_mk NULL diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx index 1767fa278..76acb326c 100644..100755 --- a/smoketestoo_native/smoketest.cxx +++ b/smoketestoo_native/smoketest.cxx @@ -152,13 +152,18 @@ void Test::test() { CPPUNIT_ASSERT( test::getTestArgument( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("smoketest.doc")), &doc)); - css::uno::Sequence< css::beans::PropertyValue > args(1); + css::uno::Sequence< css::beans::PropertyValue > args(2); args[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")); args[0].Handle = -1; args[0].Value <<= com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN; args[0].State = css::beans::PropertyState_DIRECT_VALUE; + args[1].Name = rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("ReadOnly")); + args[1].Handle = -1; + args[1].Value <<= sal_True; + args[1].State = css::beans::PropertyState_DIRECT_VALUE; css::util::URL url; url.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( diff --git a/test/prj/build.lst b/test/prj/build.lst index 7adea0c07..e22199a5c 100644 --- a/test/prj/build.lst +++ b/test/prj/build.lst @@ -1,5 +1,6 @@ -te test : BOOST:boost cppu cppuhelper CPPUNIT:cppunit javaunohelper offuh ridljar sal solenv unoil NULL +te test : BOOST:boost cppu cppuhelper CPPUNIT:cppunit javaunohelper offuh ridljar sal solenv stlport unoil NULL te test\inc nmake - all inc NULL te test\source\cpp nmake - all source_cpp inc NULL +te test\source\cpp\unoexceptionprotector nmake - all source_cpp_unoexceptionprotector inc NULL te test\source\java\org\openoffice\test nmake - all source_java NULL te test\source\java\org\openoffice\test\tools nmake - all source_java_tools NULL diff --git a/test/prj/d.lst b/test/prj/d.lst index 54da2062a..18a599fd5 100644 --- a/test/prj/d.lst +++ b/test/prj/d.lst @@ -1,9 +1,12 @@ mkdir: %_DEST%\inc%_EXT%\test mkdir: %_DEST%\inc%_EXT%\test\detail ..\%__SRC%\bin\test.dll %_DEST%\bin%_EXT%\test.dll +..\%__SRC%\bin\unoexceptionprotector.dll %_DEST%\bin%_EXT%\unoexceptionprotector.dll ..\%__SRC%\lib\itest.lib %_DEST%\lib%_EXT%\itest.lib ..\%__SRC%\lib\libtest.dylib %_DEST%\lib%_EXT%\libtest.dylib ..\%__SRC%\lib\libtest.so %_DEST%\lib%_EXT%\libtest.so +..\%__SRC%\lib\unoexceptionprotector.dylib %_DEST%\lib%_EXT%\unoexceptionprotector.dylib +..\%__SRC%\lib\unoexceptionprotector.so %_DEST%\lib%_EXT%\unoexceptionprotector.so ..\inc\test\detail\testdllapi.hxx %_DEST%\inc%_EXT%\test\detail\testdllapi.hxx ..\inc\test\gettestargument.hxx %_DEST%\inc%_EXT%\test\gettestargument.hxx ..\inc\test\officeconnection.hxx %_DEST%\inc%_EXT%\test\officeconnection.hxx diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk index 4c90dc678..2073f1500 100644 --- a/test/source/cpp/makefile.mk +++ b/test/source/cpp/makefile.mk @@ -33,14 +33,11 @@ VISIBILITY_HIDDEN = TRUE .INCLUDE: settings.mk CDEFS += -DOOO_DLLIMPLEMENTATION_TEST -CFLAGSCXX += $(CPPUNIT_CFLAGS) -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF +CFLAGSCXX += $(CPPUNIT_CFLAGS) +.IF "$(USE_SYSTEM_STL)" != "YES" && "$(SYSTEM_CPPUNIT)" == "YES" +CFLAGSCXX += -DADAPT_EXT_STL +.END SLOFILES = \ $(SLO)/getargument.obj \ diff --git a/test/source/cpp/unoexceptionprotector/makefile.mk b/test/source/cpp/unoexceptionprotector/makefile.mk new file mode 100644 index 000000000..7f62199f4 --- /dev/null +++ b/test/source/cpp/unoexceptionprotector/makefile.mk @@ -0,0 +1,56 @@ +#************************************************************************* +# 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 +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +#***********************************************************************/ + +PRJ = ../../.. +PRJNAME = test +TARGET = unoexceptionprotector + +ENABLE_EXCEPTIONS = TRUE +VISIBILITY_HIDDEN = TRUE + +.INCLUDE: settings.mk + +DLLPRE = + +CFLAGSCXX += $(CPPUNIT_CFLAGS) +.IF "$(USE_SYSTEM_STL)" != "YES" && "$(SYSTEM_CPPUNIT)" == "YES" +CFLAGSCXX += -DADAPT_EXT_STL +.END + +SLOFILES = $(SLO)/unoexceptionprotector.obj + +SHL1IMPLIB = i$(SHL1TARGET) +SHL1OBJS = $(SLOFILES) +SHL1RPATH = NONE +SHL1STDLIBS = \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(CPPUNITLIB) \ + $(SALLIB) +SHL1TARGET = unoexceptionprotector +SHL1USE_EXPORTS = name +DEF1NAME = $(SHL1TARGET) + +.INCLUDE: target.mk diff --git a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx new file mode 100644 index 000000000..da54d62d6 --- /dev/null +++ b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx @@ -0,0 +1,96 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2011 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ + +#include "precompiled_test.hxx" +#include "sal/config.h" + +#include <limits> +#include <string> + +#include "boost/noncopyable.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Exception.hpp" +#include "cppuhelper/exc_hlp.hxx" +#include "osl/thread.h" +#include "rtl/string.hxx" +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" +#include "sal/types.h" + +#include "cppunit/Message.h" +#include "cppunit/Protector.h" + +namespace { + +namespace css = com::sun::star; + +// Best effort conversion: +std::string convert(rtl::OUString const & s16) { + rtl::OString s8(rtl::OUStringToOString(s16, osl_getThreadTextEncoding())); + return std::string( + s8.getStr(), + ((static_cast< sal_uInt32 >(s8.getLength()) + > std::numeric_limits< std::string::size_type >::max()) + ? std::numeric_limits< std::string::size_type >::max() + : static_cast< std::string::size_type >(s8.getLength()))); +} + +class Prot: public CppUnit::Protector, private boost::noncopyable { +public: + Prot() {} + + virtual ~Prot() {} + + virtual bool protect( + CppUnit::Functor const & functor, + CppUnit::ProtectorContext const & context); +}; + +bool Prot::protect( + CppUnit::Functor const & functor, CppUnit::ProtectorContext const & context) +{ + try { + return functor(); + } catch (css::uno::Exception & e) { + css::uno::Any a(cppu::getCaughtException()); + reportError( + context, + CppUnit::Message( + convert( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "uncaught exception of type ")) + + a.getValueTypeName()), + convert(e.Message))); + } + return false; +} + +} + +extern "C" SAL_DLLPUBLIC_EXPORT CppUnit::Protector * SAL_CALL +unoexceptionprotector() { + return new Prot; +} diff --git a/testautomation/chart2/optional/includes/ch2_lvl1a.inc b/testautomation/chart2/optional/includes/ch2_lvl1a.inc index 6da6e29ac..e012dd025 100755 --- a/testautomation/chart2/optional/includes/ch2_lvl1a.inc +++ b/testautomation/chart2/optional/includes/ch2_lvl1a.inc @@ -84,6 +84,7 @@ testcase tPlotOptions printlog "Close and reopen data series dialog - checkbox should be still activated" TabDataSeriesOptions.Ok + sleep (1) Kontext "DocumentChart" FormatSelection printlog "Select tab page Options" diff --git a/testautomation/global/tools/includes/optional/t_ole.inc b/testautomation/global/tools/includes/optional/t_ole.inc index 23b3e02a7..714d708fc 100644 --- a/testautomation/global/tools/includes/optional/t_ole.inc +++ b/testautomation/global/tools/includes/optional/t_ole.inc @@ -126,6 +126,8 @@ end function '******************************************************************************* function GetOleDefaultNames() + dim sAllOle as string + dim j as integer const CFN = "global::tools::includes::optional::t_ole.inc::GetOleDefaultNames(): " if ( GVERBOSE ) then printlog( CFN & "Retrieving OLE names" ) @@ -138,6 +140,24 @@ function GetOleDefaultNames() gOLEDraw = hGetOleObjectName( "Draw" ) gOLEMath = hGetOleObjectName( "Math" ) + ' There is no programatical way to retrieve the word for 'further objects' + ' Only way to get it language independent is to retrieve all other words and take the last other entry that lasts + ' Only available on windows platform + if ( gPlatgroup = "w95" ) then + sAllOle = gOLEWriter & gOLECalc & gOLEChart & gOLEImpress & gOLEDraw & gOLEMath + Call hNewDocument + InsertObjectOLEObject + Kontext "OLEObjektEinfuegen" + NeuErstellen.Check + WaitSlot() + for j=1 to ObjektTyp.GetItemCount + ObjektTyp.Select j + if 0 = instr (sAllOle, ObjektTyp.GetSelText ) then + gOleOthers = ObjektTyp.GetSelText + endif + next j + OLEObjektEinfuegen.cancel + hCloseDocument + endif end function -'******************************************************************************* diff --git a/testautomation/graphics/optional/includes/global/g_stylist.inc b/testautomation/graphics/optional/includes/global/g_stylist.inc index 71d05f7d7..0c03e0738 100644 --- a/testautomation/graphics/optional/includes/global/g_stylist.inc +++ b/testautomation/graphics/optional/includes/global/g_stylist.inc @@ -486,6 +486,8 @@ testcase tFormatStylistTemplateNew endcase 'tFormatStylistTemplateNew '-------------------------------------------------------- testcase tiFormatStylist +warnlog "#i116803# - Crash when closing stylist with closer" +goto endsub Dim Num1 as integer ' graphics : first line indent ; the one with 0,6cm in the summary Dim Num2 as integer ' presentations : background ; just one tabpage pops up: Area @@ -530,6 +532,8 @@ testcase tiFormatStylist end if sleep 1 + + FormatStylist Kontext "Gestalter" printlog "opening graphics styles" @@ -559,7 +563,7 @@ testcase tiFormatStylist sleep 1 printlog "presentation styles" Praesentationsvorlagen.Click - + printlog "Select number 2" Vorlagenliste.Select Num2 sleep 1 printlog "opening context menu" @@ -681,6 +685,10 @@ testcase tiFormatStylist TabOptionenNumerierung.Cancel sleep 1 endif + + + + kontext "DocumentImpress" printlog "Closing Stylist" if lcase(gPlatform) = "osx" then diff --git a/testautomation/graphics/optional/includes/impress/i_us2_present.inc b/testautomation/graphics/optional/includes/impress/i_us2_present.inc index 1db9740b5..9ec6ceffe 100644 --- a/testautomation/graphics/optional/includes/impress/i_us2_present.inc +++ b/testautomation/graphics/optional/includes/impress/i_us2_present.inc @@ -172,8 +172,11 @@ testcase i_us2_pres1 SlidesControl.TypeKeys "<DOWN>" kontext "DocumentImpress" printlog "Insert three lines with text, all with different formatting." + sleep (1) call hTextrahmenErstellen ("First line with text",20,50,70,50) + sleep (1) call hTextrahmenErstellen ("Second line with text",20,60,70,60) + sleep (1) call hTextrahmenErstellen ("Third line with text",20,70,70,70) printlog "Go down to the third slide." kontext "Slides" diff --git a/testautomation/graphics/required/includes/global/id_004.inc b/testautomation/graphics/required/includes/global/id_004.inc index c06f88c68..fbcfde707 100644 --- a/testautomation/graphics/required/includes/global/id_004.inc +++ b/testautomation/graphics/required/includes/global/id_004.inc @@ -45,8 +45,6 @@ sub id_004 call tiInsertGraphic call tiInsertObjectSound call tiInsertObjectVideo - call tiInsertObjectSound - call tiInsertObjectVideo call tiInsertChart call tiInsertObjectOLEObjects call tiInsertSpreadsheet @@ -244,8 +242,10 @@ testcase tiInsertGraphic DialogTest (GrafikEinfuegenDlg) printlog " use file: global\input\graf_inp\stabler.tif) " Dateiname.settext Convertpath (gTesttoolPath + "global\input\graf_inp\stabler.tif") + wait(1000) printlog "click 'open' " Oeffnen.click + wait(1000) catch Warnlog "Insert graphic doesn't work :-(" endcatch diff --git a/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc b/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc index 0c9f976b1..c30bfd52d 100644 --- a/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc +++ b/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc @@ -55,13 +55,8 @@ function wPasteAvailableClipboardFormats(TheNumber as integer, CheckWhat as Stri printlog "- Paste as: " + ClipboardFormat Select Case CheckWhat Case "ctext", "DRAW" - if lcase(gPlatform) = "sol" and lcase(ClipboardFormat) = "bitmap" then - QAErrorlog "#i49505#Paste drawing object as bitmap crashes office" - goto s_next_item - else - InhaltEinfuegen.Ok - Sleep 3 - end if + InhaltEinfuegen.Ok + Sleep 3 Case else InhaltEinfuegen.Ok Sleep 3 diff --git a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc index 729659dfc..4965250e7 100644 --- a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc +++ b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc @@ -177,8 +177,6 @@ endcase testcase tPickGraphic - Warnlog "#i115132#Missing .uno Slots in context menus" - goto endsub printlog "Open context menu on not focussed graphic" Call hNewDocument Printlog " Set zoom to 100%" @@ -267,9 +265,6 @@ endcase testcase tHyperlinkEdit - Warnlog "#i115132#Missing .uno Slots in context menus" - goto endsub - printlog "Context menu on hyperlinks" printlog " Open a new text document" CALL hNewDocument @@ -392,9 +387,6 @@ endcase testcase tPickDrawingObjects - Warnlog "#i115132#Missing .uno Slots in context menus" - goto endsub - printlog "Context menu on drawing objects" printlog " Open a new text document" Call hNewDocument diff --git a/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc b/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc index 659bb2a4d..9537eb2ae 100644 --- a/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc +++ b/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc @@ -221,7 +221,7 @@ testcase tPositionAndSize_2 Sleep 1 fPositionAndSize("TabPositionAndSizeWriter") - if Horizontalby.Gettext <> sPositionX then Warnlog "#i40845# X-Position is wrong: Not -> "+sPositionX+" but -> "+Horizontalby.Gettext + if Horizontalby.Gettext <> sPositionX then Warnlog "X-Position is wrong: Not -> "+sPositionX+" but -> "+Horizontalby.Gettext if Verticalby.Gettext <> sPositionY then Warnlog "Y-Position is wrong: Not -> "+sPositionY+" but -> "+Verticalby.Gettext TabPositionAndSizeWriter.Cancel diff --git a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc index 08ebbfed4..17babc991 100644 --- a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc +++ b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc @@ -300,7 +300,7 @@ testcase tGroup_6 PrintLog "- Set the focus to rectangle , check if it is moved (Should NOT)" Call gMouseClick(41,40) Call fPositionAndSize("TabPositionAndSizeWriter") - if Horizontalby.Gettext <> sPositionX1 then Warnlog "#i106719#Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext + if Horizontalby.Gettext <> sPositionX1 then Warnlog "Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext if Verticalby.Gettext <> sPositionY1 then Warnlog "Rectangle should NOT be moved: Y Not -> "+sPositionY1+" but -> "+ Verticalby.Gettext TabPositionAndSizeWriter.Cancel @@ -371,7 +371,7 @@ testcase tGroup_7 PrintLog "- Set the focus to rectangle , check if it is moved (Should NOT)." Call gMouseClick(40,40) Call fPositionAndSize("TabPositionAndSizeWriter") - if Horizontalby.Gettext <> sPositionX1 then Warnlog "#i106719#Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext + if Horizontalby.Gettext <> sPositionX1 then Warnlog "Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext if Verticalby.Gettext <> sPositionY1 then Warnlog "Rectangle should NOT be moved: Y Not -> "+sPositionY1+" but -> "+ Verticalby.Gettext TabPositionAndSizeWriter.Cancel diff --git a/testautomation/writer/optional/includes/fields/w_fields2.inc b/testautomation/writer/optional/includes/fields/w_fields2.inc index 168fed204..4ac611f39 100644 --- a/testautomation/writer/optional/includes/fields/w_fields2.inc +++ b/testautomation/writer/optional/includes/fields/w_fields2.inc @@ -955,7 +955,7 @@ testcase tDocumentTemplate if GetClipboard <> sResult(i-1) then select case i-1 case 0 - QAErrorlog "#i70342#Field 'Templates->Category' is empty" + Warnlog "Field 'Templates->Category' is empty" case else Warnlog " - Should get " & sResult(i-1) & " but get " & GetClipboard end select diff --git a/testautomation/writer/optional/includes/fields/w_fields3.inc b/testautomation/writer/optional/includes/fields/w_fields3.inc index 64261c7e1..c2fe3d5d2 100644 --- a/testautomation/writer/optional/includes/fields/w_fields3.inc +++ b/testautomation/writer/optional/includes/fields/w_fields3.inc @@ -278,7 +278,7 @@ testcase tInsertReferenceChapter Call wTypeKeys "<Shift Home>" if fGetFieldContent( ) <> "2" then - Warnlog "#i40625# Should get 2 , but get " & fGetFieldContent() + Warnlog "Should get 2 , but get " & fGetFieldContent() end if '/// Close the document @@ -776,7 +776,7 @@ testcase tInsertBookmarkChapter Call wTypeKeys "<Shift Home>" if fGetFieldContent( ) <> "2" then - Warnlog "#i40625# Should get 2 , but get " & fGetFieldContent() + Warnlog "Should get 2 , but get " & fGetFieldContent() end if '/// Close the document diff --git a/testautomation/writer/optional/includes/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc index 315c6b0f9..459e91da7 100644 --- a/testautomation/writer/optional/includes/fields/w_fields4.inc +++ b/testautomation/writer/optional/includes/fields/w_fields4.inc @@ -261,7 +261,7 @@ endcase '----------------------------------------------------------------- testcase tDocInformationUserDefined - QAErrorLog "#i112077#Tabpage 'Custom properties' has no declaration" + Warnlog "#i95523#Tabpage 'Custom properties' has no declaration" goto endsub Dim sTestFile as String Dim sVarResult() as String diff --git a/testautomation/writer/optional/includes/fields/w_fields5.inc b/testautomation/writer/optional/includes/fields/w_fields5.inc index 75f94e8a3..6ff7f2c17 100644 --- a/testautomation/writer/optional/includes/fields/w_fields5.inc +++ b/testautomation/writer/optional/includes/fields/w_fields5.inc @@ -182,7 +182,7 @@ testcase tVariablesSetValueToNumber for i = 0 to j Call wTypeKeys "<Shift Right>" if fGetFieldContent() <> sResult(i) then - QaErrorLog i & "#i94596# - Should get " & sResult(i) & " but get " & fGetFieldContent() + Warnlog i & "Should get " & sResult(i) & " but get " & fGetFieldContent() end if Call wTypeKeys "<Down><Home>" next i @@ -194,8 +194,6 @@ endcase '----------------------------------------------------------------- testcase tVariablesSetFormats - qaerrorlog "#i94596# - tVariablesSetFormats outcommented due to bug." - goto endsub Dim sName as String Dim sValue as String diff --git a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc index df216304e..9cfd50567 100644 --- a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc +++ b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc @@ -225,7 +225,7 @@ testcase tFormatCharacter3 Kontext active.SetPage TabHyperlinkZeichen kontext "TabHyperlinkZeichen" - if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "##i105855##Wrong URL : " + URLName.GetText + if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i105855#Wrong URL : " + URLName.GetText SetClipboard UrlName.Gettext if NameText.GetText <> "A hyperlink with testtool" then Warnlog "#i105855#Wrong Linkname : " + NameText.GetText if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc index a7393d50f..ef6280b51 100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc @@ -753,7 +753,7 @@ testcase tFormatPage_13 if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 - if Seitennummer.GetText <> sPage2 then Warnlog "#i40333# 2nd pic isn't in page 3 !" + if Seitennummer.GetText <> sPage2 then Warnlog "2nd pic isn't in page 3 !" fCloseNavigator Wait 500 @@ -810,7 +810,7 @@ testcase tFormatPage_14 if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 - if Seitennummer.GetText <> sPage2 then Warnlog "#i40333# 2nd pic isn't in page 4 !" + if Seitennummer.GetText <> sPage2 then Warnlog "2nd pic isn't in page 4 !" fCloseNavigator Wait 500 diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc index 7c31482e3..686c246d0 100644 --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc @@ -939,7 +939,7 @@ testcase tParagraphIndent13 if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 - if Seitennummer.GetText <> "8" then Warnlog "#i73903#The 8th line should be in 8th page !" + if Seitennummer.GetText <> "8" then Warnlog "The 8th line should be in 8th page !" fCloseNavigator '/// check if the pic moves @@ -1008,7 +1008,7 @@ testcase tParagraphIndent14 if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 - if Seitennummer.GetText <> "8" then Warnlog "#i73903#The 8th line should be in 8th page !" + if Seitennummer.GetText <> "8" then Warnlog "The 8th line should be in 8th page !" fCloseNavigator '/// check if the pic moves diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc index d204f8f2e..7d34b25d8 100644 --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc @@ -197,7 +197,7 @@ testcase tParagraphAlignment4 Call fPositionAndSize("TabPositionAndSizeWriter") if fCalculateTolerance(Horizontalby.Gettext , sPositionX1) > 0.02 then if gPlatGroup = "unx" then - QaErrorLog "#i94769# - Different font-sizes under Linux/Unix compared with windows." + Warnlog "Different font-sizes under Linux/Unix compared with windows." else Warnlog "Alignment Justified doesn't work -1 !" end if @@ -210,7 +210,7 @@ testcase tParagraphAlignment4 Call fPositionAndSize("TabPositionAndSizeWriter") if Horizontalby.Gettext <> sPositionX2 then if gPlatGroup = "unx" then - QaErrorLog "#i94769# - Different font-sizes under Linux/Unix compared with windows." + Warnlog "Different font-sizes under Linux/Unix compared with windows." else warnlog "Alignment Justified doesn't work -2 !" end if @@ -310,7 +310,7 @@ testcase tParagraphAlignment6 Call fPositionAndSize("TabPositionAndSizeWriter") if Horizontalby.Gettext <> sPositionX1 then if gPlatGroup = "unx" then - QaErrorLog "#i94769# - Different font-sizes under Linux/Unix compared with windows." + Warnlog "Different font-sizes under Linux/Unix compared with windows." else warnlog "Alignment Justified doesn't work -1 !" end if diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc index 4e670f290..1def13881 100644 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc @@ -653,7 +653,7 @@ testcase tInsertGraphic_10 Call wTypeKeys ( "<Shift F4>" ) sleep(1) if fFormatGraphic("TabZusaetze") = false then - Warnlog "#i46300#linked JPEG pictures will disappear when doc is modified." + Warnlog "#linked JPEG pictures will disappear when doc is modified." kontext "TabZusatze" if ( TabZusaetze.exists() ) then TabZusaetze.close() diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc index 1a3624487..2a161b220 100644 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc @@ -903,7 +903,7 @@ testcase tInsertGraphic_29 fFormatGraphic("TabUmlauf") Sleep 1 - if Parallel.IsChecked <> TRUE then QaErrorLog "#i94558# - Graphic wrapping situation is wrong !" + if Parallel.IsChecked <> TRUE then Warnlog "Graphic wrapping situation is wrong !" if ErsterAbsatz.IsChecked <> TRUE then Warnlog "first paragraph configuration is wrong !" TabUmlauf.Cancel @@ -960,7 +960,7 @@ testcase tInsertGraphic_30 fFormatGraphic("TabUmlauf") Sleep 1 - if Parallel.IsChecked <> TRUE then QaErrorLog "#i94558# - Graphic wrapping situation is wrong !" + if Parallel.IsChecked <> TRUE then Warnlog "Graphic wrapping situation is wrong !" TabUmlauf.Cancel PrintLog " 3. Optimal Page Wrap:" @@ -1013,7 +1013,7 @@ testcase tInsertGraphic_30 fFormatGraphic("TabUmlauf") Sleep 1 - if Parallel.IsChecked <> TRUE then QaErrorLog "#i94558# - Graphic wrapping situation is wrong !" + if Parallel.IsChecked <> TRUE then Warnlog "Graphic wrapping situation is wrong !" if ErsterAbsatz.IsChecked <> TRUE then Warnlog "first paragraph configuration is wrong !" TabUmlauf.Cancel diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc index 33768d6ff..2598c2b5f 100644 --- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc +++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc @@ -80,7 +80,7 @@ testcase tExportAllReadableFormatsIntoODF if GetExtention ( sExportFile ) = "psw" then QAErrorlog "#i102221#Pocket Word filter puts General I/O Error" elseif LCase( sExceptionFile ) = "swdos.txt" then - QAErrorlog "#i114062#General I/O error loading StarWriter DOS file" + Warnlog "General I/O error loading StarWriter DOS file" else Call hFileOpenLocally( ImportFileList(i) ) printlog "- done" diff --git a/testautomation/writer/optional/includes/navigator/w_navigator.inc b/testautomation/writer/optional/includes/navigator/w_navigator.inc index e164bce47..1750b4de3 100644 --- a/testautomation/writer/optional/includes/navigator/w_navigator.inc +++ b/testautomation/writer/optional/includes/navigator/w_navigator.inc @@ -80,13 +80,13 @@ testcase tViewNavigator1 try Navigator.Size (300, 400) catch - Warnlog "Sizen Navigator doesn't work.. see #i32449" + Warnlog "Sizen Navigator doesn't work" endcatch Sleep 1 try Navigator.Size (xSize%, ySize%) catch - Printlog "Sizen Navigator doesn't work.. see #i32449" + Printlog "Sizen Navigator doesn't work" endcatch Sleep 1 @@ -176,12 +176,12 @@ testcase tViewNavigator2 try DocumentWriter.FadeOut catch - Warnlog "#i35096#Unable to Fade out Navigator!" + Warnlog "Unable to Fade out Navigator!" endcatch try DocumentWriter.FadeIn catch - Warnlog "#i35096#Unable to Fade out Navigator!" + Warnlog "Unable to Fade out Navigator!" endcatch Kontext "Navigator" @@ -231,7 +231,7 @@ testcase tViewNavigator3 Navigation.TearOff NavigationTearOff = true catch - Warnlog "Unable to tear off Navigation Toolbar! (#i32092)" + Warnlog "Unable to tear off Navigation Toolbar!" endcatch if NavigationTearOff = true then Sleep 1 diff --git a/testautomation/writer/optional/includes/number/w_205_.inc b/testautomation/writer/optional/includes/number/w_205_.inc index ade7afe66..2d9c844ff 100644 --- a/testautomation/writer/optional/includes/number/w_205_.inc +++ b/testautomation/writer/optional/includes/number/w_205_.inc @@ -274,35 +274,35 @@ testcase tFormatNumberingPosition Active.SetPage TabPositionNumerierung Kontext "TabPositionNumerierung" Level.Select 1 -' if Alignment.GetSelIndex <> 2 then Warnlog "#i38904#Level 1: Wrong alignment: Should = 2 Ist = "+ Alignment.GetSelIndex +' if Alignment.GetSelIndex <> 2 then Warnlog "Level 1: Wrong alignment: Should = 2 Ist = "+ Alignment.GetSelIndex if V1 <> AlignedAt.GetText then Warnlog "Level 1: Wrong Text <-> Rand: Should = "+ V1+ " Is = "+ AlignedAt.GetText if V2 <> IndentAt.GetText then Warnlog "Level 1: Wrong indent: Should = "+ V2+ " Is = "+ IndentAt.GetText Level.Select 3 ' if Not Relativ.IsChecked then Warnlog "Relativ is checked in Level 3!" - if Alignment.GetSelIndex <> 3 then Warnlog "#i38904#Level 3: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 3 then Warnlog "Level 3: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex if V3 <> AlignedAt.GetText then Warnlog "Level 3: Wrong Text <-> Spacing to text: Should = "+ V3+ " Is = "+ AlignedAt.GetText ' if V4 <> AbstandTextNumerierung.GetText then Warnlog "Level 3: Wrong indent: Should = "+ V4+ " Is = "+ AbstandTextNumerierung.GetText Level.Select 4 ' if Not Relativ.IsChecked then Warnlog "Relativ is checked in Level 4!" - if Alignment.GetSelIndex <> 1 then Warnlog "#i38904#Level 4: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 1 then Warnlog "Level 4: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex if V5 <> AlignedAt.GetText then Warnlog "Level 4: Wrong Text <-> Spacing to text: Should = "+ V5+ " Is = "+ AlignedAt.GetText ' if V6 <> AbstandTextNumerierung.GetText then Warnlog "Level 4: Wrong indent: Should = "+ V6+ " Is = "+ AbstandTextNumerierung.GetText if V7 <> IndentAt.GetText then Warnlog "Level 4: Wrong indent: Should = "+ V7+ " Is = "+ IndentAt.GetText Level.Select 6 ' if Not Relativ.IsChecked then Warnlog "Relativ is checked in Level 6!" - if Alignment.GetSelIndex <> 3 then Warnlog "#i38904#Level 6: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 3 then Warnlog "Level 6: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex if V8 <> AlignedAt.GetText then Warnlog "Level 6: Wrong Text <-> Spacing to text: Should = "+ V8+ " Is = "+ AlignedAt.GetText ' if V9 <> AbstandTextNumerierung.GetText then Warnlog "Level 6: Wrong indent: Should = "+ V9+ " Is = "+ AbstandTextNumerierung.GetText if V10 <> IndentAt.GetText then Warnlog "Level 6: Wrong indent: Should = "+ V10+ " Is = "+ IndentAt.GetText Level.Select 9 ' if Not Relativ.IsChecked then Warnlog "Relativ is checked in Level 9!" - if Alignment.GetSelIndex <> 1 then Warnlog "#i38904#Level 9: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 1 then Warnlog "Level 9: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex if V11 <> AlignedAt.GetText then Warnlog "Level 9: Wrong Text <-> Spacing to text: Should = "+ V11+ " Is = "+ AlignedAt.GetText ' if V12 <> AbstandTextNumerierung.GetText then Warnlog "Level 9: Wrong indent: Should = "+ V12+ " Is = "+ AbstandTextNumerierung.GetText if V13 <> IndentAt.GetText then Warnlog "Level 9: Wrong indent: Should = "+ V13+ " Is = "+ IndentAt.GetText Level.Select 10 ' if Not Relativ.IsChecked then Warnlog "Relativ is checked in Level 10!" - if Alignment.GetSelIndex <> 3 then Warnlog "#i38904#Level 10: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 3 then Warnlog "Level 10: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex if V14 <> AlignedAt.GetText then Warnlog "Level 10: Wrong Text <-> Spacing to text: Should = "+ V14+ " Is = "+ AlignedAt.GetText ' if V15 <> AbstandTextNumerierung.GetText then Warnlog "Level 10: Wrong indent: Should = "+ V15+ " Is = "+ AbstandTextNumerierung.GetText if V16 <> IndentAt.GetText then Warnlog "Level 10: Wrong indent: Should = "+ V16+ " Is = "+ IndentAt.GetText @@ -324,35 +324,35 @@ testcase tFormatNumberingPosition Kontext "TabPositionNumerierung" Level.Select 1 - if Alignment.GetSelIndex <> 2 then Warnlog "#i38904#Level 1: Wrong alignment: Should = 2 Ist = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 2 then Warnlog "Level 1: Wrong alignment: Should = 2 Ist = "+ Alignment.GetSelIndex if V1 <> AlignedAt.GetText then Warnlog "Level 1: Wrong Text <-> Rand: Should = "+ V1+ " Is = "+ AlignedAt.GetText if V2 <> IndentAt.GetText then Warnlog "Level 1: Wrong indent: Should = "+ V2+ " Is = "+ IndentAt.GetText Level.Select 3 ' if Not Relativ.IsChecked then Relativ.Check - if Alignment.GetSelIndex <> 3 then Warnlog "#i38904#Level 3: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 3 then Warnlog "Level 3: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex if V3 <> AlignedAt.GetText then Warnlog "Level 3: Wrong Text <-> Spacing to text: Should = "+ V3+ " Is = "+ AlignedAt.GetText ' if V4 <> AbstandTextNumerierung.GetText then Warnlog "Level 3: Wrong indent: Should = "+ V4+ " Is = "+ AbstandTextNumerierung.GetText Level.Select 4 ' if Not Relativ.IsChecked then Relativ.Check - if Alignment.GetSelIndex <> 1 then Warnlog "#i38904#Level 4: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 1 then Warnlog "Level 4: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex if V5 <> AlignedAt.GetText then Warnlog "Level 4: Wrong Text <-> Spacing to text: Should = "+ V5+ " Is = "+ AlignedAt.GetText ' if V6 <> AbstandTextNumerierung.GetText then Warnlog "Level 4: Wrong indent: Should = "+ V6+ " Is = "+ AbstandTextNumerierung.GetText if V7 <> IndentAt.GetText then Warnlog "Level 4: Wrong indent: Should = "+ V7+ " Is = "+ IndentAt.GetText Level.Select 6 ' if Not Relativ.IsChecked then Relativ.Check - if Alignment.GetSelIndex <> 3 then Warnlog "#i38904#Level 6: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 3 then Warnlog "Level 6: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex if V8 <> AlignedAt.GetText then Warnlog "Level 6: Wrong Text <-> Spacing to text: Should = "+ V8+ " Is = "+ AlignedAt.GetText ' if V9 <> AbstandTextNumerierung.GetText then Warnlog "Level 6: Wrong indent: Should = "+ V9+ " Is = "+ AbstandTextNumerierung.GetText if V10 <> IndentAt.GetText then Warnlog "Level 6: Wrong indent: Should = "+ V10+ " Is = "+ IndentAt.GetText Level.Select 9 ' if Not Relativ.IsChecked then Relativ.Check - if Alignment.GetSelIndex <> 1 then Warnlog "#i38904#Level 9: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 1 then Warnlog "Level 9: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex if V11 <> AlignedAt.GetText then Warnlog "Level 9: Wrong Text <-> Spacing to text: Should = "+ V11+ " Is = "+ AlignedAt.GetText ' if V12 <> AbstandTextNumerierung.GetText then Warnlog "Level 9: Wrong indent: Should = "+ V12+ " Is = "+ AbstandTextNumerierung.GetText if V13 <> IndentAt.GetText then Warnlog "Level 9: Wrong indent: Should = "+ V13+ " Is = "+ IndentAt.GetText Level.Select 10 ' if Not Relativ.IsChecked then Relativ.Check - if Alignment.GetSelIndex <> 3 then Warnlog "#i38904#Level 10: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 3 then Warnlog "Level 10: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex if V14 <> AlignedAt.GetText then Warnlog "Level 10: Wrong Text <-> Spacing to text: Should = "+ V14+ " Is = "+ AlignedAt.GetText ' if V15 <> AbstandTextNumerierung.GetText then Warnlog "Level 10: Wrong indent: Should = "+ V15+ " Is = "+ AbstandTextNumerierung.GetText if V16 <> IndentAt.GetText then Warnlog "Level 10: Wrong indent: Should = "+ V16+ " Is = "+ IndentAt.GetText diff --git a/testautomation/writer/optional/includes/number/w_205a_.inc b/testautomation/writer/optional/includes/number/w_205a_.inc index 385d2a550..0d2853957 100644 --- a/testautomation/writer/optional/includes/number/w_205a_.inc +++ b/testautomation/writer/optional/includes/number/w_205a_.inc @@ -866,7 +866,7 @@ testcase tToolsFootnoteEndnote if Davor.GetText <> "Hihi " then Warnlog "Endnote: 'Before' is wrong. Not 'Hihi ' but " + Davor.GetText if Dahinter.GetText <> " HaHa" then Warnlog "Endnote: Text after is wrong. Not ' HaHa' but " + Dahinter.GetText if Absatz.GetSelIndex <> 3 then Warnlog "Endnote: Wrong entry selected in paragraph. Not 3 but " + Absatz.GetSelIndex - if Seite.GetSelIndex <> 2 then Warnlog "#i40579#Endnote: Wrong Page entry selected. Not 2 but " + Seite.GetSelIndex + if Seite.GetSelIndex <> 2 then Warnlog "Endnote: Wrong Page entry selected. Not 2 but " + Seite.GetSelIndex if ZeichenvorlageTextbereich.GetSelIndex <> 4 then Warnlog "Endnote: Text area has been changed!" if ZeichenvorlageEndnotenbereich.GetSelIndex <> 5 then Warnlog "Endnote: Endnote area has been changed!" TabEndnoten.Cancel diff --git a/testautomation/writer/optional/includes/option/wh_o_2.inc b/testautomation/writer/optional/includes/option/wh_o_2.inc index ff58ce4e4..841af13da 100644 --- a/testautomation/writer/optional/includes/option/wh_o_2.inc +++ b/testautomation/writer/optional/includes/option/wh_o_2.inc @@ -114,7 +114,7 @@ testcase tToolsOptionsHTMLPrint ToolsOptions Call hToolsOptions ( "HTML" , "PRINT" ) - if ( bCheckboxStatus(1) = Grafiken.IsChecked ) Then WarnLog "#i108219#'Graphics' state changed" + if ( bCheckboxStatus(1) = Grafiken.IsChecked ) Then WarnLog "'Graphics' state changed" if ( bCheckboxStatus(2) = Kontrollfelder.IsChecked ) Then WarnLog "'Controls' state changed" if ( bCheckboxStatus(3) = Hintergrund.IsChecked ) Then WarnLog "'Background' state changed" if ( bCheckboxStatus(4) = SchwarzDrucken.IsChecked ) Then WarnLog "'Print black' state changed" diff --git a/testautomation/writer/optional/includes/redlining/w_redlining1.inc b/testautomation/writer/optional/includes/redlining/w_redlining1.inc index b08faaf6d..f84205c34 100644 --- a/testautomation/writer/optional/includes/redlining/w_redlining1.inc +++ b/testautomation/writer/optional/includes/redlining/w_redlining1.inc @@ -1149,7 +1149,7 @@ testcase tRedlining_16 try EditCopy catch - Warnlog "#i41424# Bullets cannot be removed by Del key" + Warnlog "Bullets cannot be removed by Del key" Call wTypeKeys "<Down><End>" Call wTypeKeys "<Shift Left>" EditCopy @@ -1199,7 +1199,7 @@ testcase tRedlining_16 try EditCopy catch - Warnlog "#i41424# Bullets cannot be removed by Del key" + Warnlog "Bullets cannot be removed by Del key" Call wTypeKeys "<Down><End>" Call wTypeKeys "<Shift Left>" EditCopy diff --git a/testautomation/writer/optional/includes/redlining/w_redlining2.inc b/testautomation/writer/optional/includes/redlining/w_redlining2.inc index 4b442a8b3..f3930b8db 100644 --- a/testautomation/writer/optional/includes/redlining/w_redlining2.inc +++ b/testautomation/writer/optional/includes/redlining/w_redlining2.inc @@ -440,7 +440,7 @@ testcase tAcceptReject_6 try AutoListe.Select 2 catch - QAErrorlog "#i99937#Change of author (User name) disregarded when changed during Office session" + Warnlog "Change of author (User name) disregarded when changed during Office session" Redlining.Close Call hCloseDocument goto endsub diff --git a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc index b10f029b1..aa5cc4672 100644 --- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc +++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc @@ -123,7 +123,7 @@ testcase i64991 Kontext Active.Setpage TabSeite Kontext "TabSeite" - if Not Quer.IsChecked then Warnlog "#i64991#Setting a printer make the page styles to be lost" + if Not Quer.IsChecked then Warnlog "Setting a printer make the page styles to be lost" TabSeite.Cancel Call wTypeKeys ("<Down>") @@ -134,7 +134,7 @@ testcase i64991 Kontext Active.Setpage TabSeite Kontext "TabSeite" - if Not Hoch.IsChecked then Warnlog "#i64991#Setting a printer make the page styles to be lost" + if Not Hoch.IsChecked then Warnlog "Setting a printer make the page styles to be lost" TabSeite.Cancel end if diff --git a/testautomation/writer/optional/includes/section/w_section_2.inc b/testautomation/writer/optional/includes/section/w_section_2.inc index 1d79405df..92aa69bff 100644 --- a/testautomation/writer/optional/includes/section/w_section_2.inc +++ b/testautomation/writer/optional/includes/section/w_section_2.inc @@ -1038,7 +1038,7 @@ testcase tDisplaySection_9 end if if GetClipBoardtext <> shouldbe then - qaerrorlog "#i85766# - Copied text not correctly exported through the clipboard" ' "Problem with section" + Warnlog "Copied text not correctly exported through the clipboard" ' "Problem with section" end if Case 3 Call wTypeKeys "<Shift End>" diff --git a/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc b/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc index 22d64c36e..da1b7dd17 100644 --- a/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc +++ b/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc @@ -805,7 +805,7 @@ testcase tShortcutPasteUnformattedText printlog "- shortcut did work" else if gPlatgroup = "osx" then - Warnlog "#103102#It is not possible to customize the keyboard combination cmd+option on MAC OSX." + Warnlog "It is not possible to customize the keyboard combination cmd+option on MAC OSX." Call hCloseDocument goto endsub else diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc index a6dd6c18b..df7e2c5db 100644 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc @@ -69,7 +69,7 @@ testcase tToolsSpellcheckWithShortcut case 39 : Call wTypeKeys ("Don Cara Mio, capitoliooo?<Home>") case 49 : Call wTypeKeys ("Dies ist ein Rechtschreibtexxxxt<Home>") case 46 : Call wTypeKeys ("Det här är en rättstavningstexxxxt<Home>") - case 50 : Call wTypeKeys ("To je test črkvana<Home>") + case 50 : Call wTypeKeys ("To je test ?rkvana<Home>") case 07 : Printlog "- No Spellcheck in Russian!" goto endsub case 48 : Printlog "- No Spellcheck in Polish!" @@ -108,7 +108,7 @@ testcase tToolsSpellcheckWithShortcut printlog "OK, Spellchecker comes up" Spellcheck.Close 'closing spellchecker else - Warnlog "#i35000#Spellchecker does not come up with shortcut 'F7'" + Warnlog "Spellchecker does not come up with shortcut 'F7'" end if end if Call hCloseDocument @@ -169,7 +169,7 @@ testcase tToolsSpellcheckCorrect select case iSprache case 01 : FFText = "This is a text without any error.<Return>" case 03 : FFText = "Escreva os seus dados de utilizador correctamente e tome nota deles (guardar / imprimir).<Return>" - case 07 : FFText = "принятый Государственной Думой в первом чтении 16 ноября 1999 года.<Return>" + case 07 : FFText = "прин?тый Го?удар?твенной Думой в первом чтении 16 но?бр? 1999 года.<Return>" case 31 : FFText = "Dit werk is beschermd door de Auteurswet.<Return>" case 33 : FFText = "Il nous faut donc un de temps pour examiner avec soin tous les dossiers.<Return>" case 34 : FFText = "Este archivo contiene información importante sobre el programa.<Return>" @@ -235,9 +235,9 @@ testcase tToolsSpellcheck1Mistake case 03 : sErrorSampleText = "Escrive os seus dados de utilizador correctamente e tome nota deles." sWordToBeChecked = "Escrive" sLanguageName = "Português" - case 07 : sErrorSampleText = "Военная технического сaтрудничества, проблему задолженности и вопросы региональных связей." - sWordToBeChecked = "сaтрудничества" - sLanguageName = "Русский" + case 07 : sErrorSampleText = "Военна? техниче?кого ?aтрудниче?тва, проблему задолженно?ти и вопро?ы региональных ?в?зей." + sWordToBeChecked = "?aтрудниче?тва" + sLanguageName = "Ру??кий" case 31 : sErrorSampleText = "Wijek danken u voor uw interesse in het samenwerken met Sun Microsystems." sWordToBeChecked = "Wijek" sLanguageName = "Nederlands (NL)" @@ -267,7 +267,7 @@ testcase tToolsSpellcheck1Mistake sLanguageName = "Deutsch (Deutschland)" case 50 : sErrorSampleText = "Tuki je nekaj narobe." sWordToBeChecked = "Tuki" - sLanguageName = "Slovenščina" + sLanguageName = "Slovenš?ina" case 55 : sErrorSampleText = "Esta poderia ser a respista para suas preces?" sWordToBeChecked = "respista" sLanguageName = "Português (Brasil)" @@ -406,7 +406,7 @@ testcase tToolsSpellcheckForward case 46 : sDummy = "handbroken" : sWordToBeAdded = "viktikt" case 48 : sDummy = "znajdujacej" : sWordToBeAdded = "usuniete" case 49 : sDummy = "reichtt" : sWordToBeAdded = "viierter" - case 50 : sDummy = "Paglejmo" : sWordToBeAdded = "čtrto" + case 50 : sDummy = "Paglejmo" : sWordToBeAdded = "?trto" case 55 : sDummy = "horat" : sWordToBeAdded = "dpa" end select @@ -568,7 +568,7 @@ testcase tToolsSpellcheckOnlyOneWord select case iSprache case 01 : sWordToBeChecked = "excetionally" ' this word is wrong - case 07 : sWordToBeChecked = "Кaнституции" + case 07 : sWordToBeChecked = "Кaн?титуции" case 03 : sWordToBeChecked = "semstre" ' this word is wrong case 31 : sWordToBeChecked = "lidstartesn" ' this word is wrong case 33 : sWordToBeChecked = "heues" ' this word is wrong @@ -675,7 +675,7 @@ testcase tToolsSpellcheckOnlyOneWord try EditCopy if GetClipboardtext = sWordToBeChecked then - Warnlog "#i40498#Spellchecker does not commit changes correctly (" & GetClipboardtext & " found )" + Warnlog "Spellchecker does not commit changes correctly (" & GetClipboardtext & " found )" Call hCloseDocument goto endsub end if @@ -697,7 +697,7 @@ testcase tToolsSpellcheckOnlyOneWord if Active.Exists then if Active.GetRT = 304 then Active.Ok - Warnlog "#i40480#Spellchecker finishes though wrong words in documents" + Warnlog "Spellchecker finishes though wrong words in documents" end if end if catch diff --git a/testautomation/writer/optional/includes/stylist/w_stylist.inc b/testautomation/writer/optional/includes/stylist/w_stylist.inc index f5d3e7061..ce607be28 100644 --- a/testautomation/writer/optional/includes/stylist/w_stylist.inc +++ b/testautomation/writer/optional/includes/stylist/w_stylist.inc @@ -112,13 +112,13 @@ testcase tFormatStylist1 try Stylist.Size 300, 400 catch - Warnlog "Sizen Stylist doesn't work.. see #i32449" + Warnlog "Sizen Stylist doesn't work" endcatch Sleep 1 try Stylist.Size xSize%, ySize% catch - Warnlog "Sizen Stylist doesn't work.. see #i32449" + Warnlog "Sizen Stylist doesn't work" endcatch Sleep 1 @@ -498,7 +498,7 @@ testcase tFormatStylist6 Kontext Active.Setpage TabHyperlinkZeichen Kontext "TabHyperlinkZeichen" - if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i41171#TabHyperlink: URL is wrong " + URLName.Gettext + if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "TabHyperlink: URL is wrong " + URLName.Gettext TabHyperlinkZeichen.OK end if @@ -635,7 +635,7 @@ testcase tAssigningStyles1 printlog "More..." Select Case iSprache Case 01 : sStyles = Array("Clear formatting", "Default", "Heading 1", "Heading 2", "Heading 3", "Text body", "More...") - Case 07 : sStyles = Array("Отменить форматирование", "Базовый", "Заголовок 1", "Заголовок 2", "Заголовок 3", "Основной текст", "Дополнительно...") + Case 07 : sStyles = Array("Отменить форматирование", "Базовый", "Заголовок 1", "Заголовок 2", "Заголовок 3", "О?новной тек?т", "Дополнительно...") Case 31 : sStyles = Array("Opmaak wissen", "Kop 1", "Kop 2", "Kop 3", "Standaard", "Tekstblok", "Meer...") Case 33 : sStyles = Array("Effacer le formatage", "Corps de texte", "Par défaut", "Titre 1", "Titre 2", "Titre 3", "Autres...") Case 34 : sStyles = Array("Borrar formato", "Cuerpo de texto", "Encabezado 1", "Encabezado 2", "Encabezado 3", "Predeterminado", "Más...") @@ -645,10 +645,10 @@ testcase tAssigningStyles1 Case 48 : sStyles = Array("Wyczyść formatowanie", "Domyślnie", "Nagłówek 1", "Nagłówek 2", "Nagłówek 3", "Treść tekstu", "Więcej...") Case 49 : sStyles = Array("Formatierung löschen", "Standard", "Textkörper", "Überschrift 1", "Überschrift 2", "Überschrift 3", "Weitere...") Case 55 : sStyles = Array("Limpar formatação", "Corpo do texto", "Padrão", "Título 1", "Título 2", "Título 3", "Mais...") - Case 81 : sStyles = Array("書式設定の解除", "本文", "標準", "見出し 1", "見出し 2", "見出し 3", "詳細...") - Case 82 : sStyles = Array("서식 지우기", "기본값", "제목 1", "제목 2", "제목 3", "텍스트 본문", "자세히...") - Case 86 : sStyles = Array("清除格式", "默认", "标题 1", "标题 2", "标题 3", "正文", "更多(~M)...") - Case 88 : sStyles = Array("清除格式", "內文", "標題 1", "標題 2", "標題 3", "預設", "更多...") + Case 81 : sStyles = Array("書?設定?解除", "本文", "標準", "見出? 1", "見出? 2", "見出? 3", "詳細...") + Case 82 : sStyles = Array("서? 지우기", "기본값", "제목 1", "제목 2", "제목 3", "?스트 본문", "?세히...") + Case 86 : sStyles = Array("清除格?", "默认", "标题 1", "标题 2", "标题 3", "正文", "更多(~M)...") + Case 88 : sStyles = Array("清除格?", "內文", "標題 1", "標題 2", "標題 3", "?設", "更多...") Case 90 : sStyles = Array("Biçimlendirmeyi temizle", "Başlık 1", "Başlık 2", "Başlık 3", "Metin gövdesi", "Varsayılan", "Diğer...") Case else : Warnlog "Current language not supported. Please add styles to list!" Kontext "Textobjectbar" diff --git a/testautomation/writer/optional/includes/textframes/w_textframes2.inc b/testautomation/writer/optional/includes/textframes/w_textframes2.inc index 466b0c99a..c4cc19006 100644 --- a/testautomation/writer/optional/includes/textframes/w_textframes2.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes2.inc @@ -178,7 +178,7 @@ testcase tTextframes_19 Kontext "Active" if Active.Exists then - Warnlog "#i40348# The frame should move by keyboard!" + Warnlog "The frame should move by keyboard!" Active.Ok end if @@ -188,7 +188,7 @@ testcase tTextframes_19 Wait 500 if GetClipboardText <> sTestText then Warnlog "Something wrong in the test . Clipboard:" +GetClipboardText catch - Warnlog "#i40348#" + Warnlog "The frame should move by keyboard!" endcatch Call hCloseDocument diff --git a/testautomation/writer/required/includes/w_001_.inc b/testautomation/writer/required/includes/w_001_.inc index 1fc2001e7..c798b26b4 100644 --- a/testautomation/writer/required/includes/w_001_.inc +++ b/testautomation/writer/required/includes/w_001_.inc @@ -941,7 +941,7 @@ testcase tFileSaveWithPassword if ( gPlatgroup = "unx" ) then QAErrorlog "#i73968#Opening a password protected file looses focus after loading" else - Warnlog "#i36015#Checkbox 'Save with password' is not checked in file-dialog !" + Warnlog "Checkbox 'Save with password' is not checked in file-dialog !" Passwort.Check end if SpeichernDlg.Cancel diff --git a/testautomation/writer/required/includes/w_001a_.inc b/testautomation/writer/required/includes/w_001a_.inc index b33751752..cb9739cd0 100644 --- a/testautomation/writer/required/includes/w_001a_.inc +++ b/testautomation/writer/required/includes/w_001a_.inc @@ -89,7 +89,7 @@ testcase tFileProperties Call DialogTest (TabDokumentinfo) - QAErrorlog "#i95523# - FileProperties - Tabpage 'User Defined' has changed. - Adaption of testcases needed." + Warnlog "#i95523# - FileProperties - Tabpage 'User Defined' has changed. - Adaption of testcases needed." ' printlog " Switch to Tabpage 'User defined'" ' Kontext ' active.SetPage TabBenutzer diff --git a/testautomation/writer/required/includes/w_001b_.inc b/testautomation/writer/required/includes/w_001b_.inc index 4d8e68838..65f4794dc 100644 --- a/testautomation/writer/required/includes/w_001b_.inc +++ b/testautomation/writer/required/includes/w_001b_.inc @@ -134,7 +134,7 @@ testcase tFileSendOutlineToPresentation try FileSendOutlineToPresentation catch - Warnlog "#i38723#Unable to execute 'File -> Send -> Outline to Presentation'" + Warnlog "Unable to execute 'File -> Send -> Outline to Presentation'" Call hCloseDocument goto endsub endcatch @@ -182,7 +182,7 @@ testcase tFileSendOutlineToClipboard try FileSendOutlineToClipboard catch - Warnlog "#i38723#Unable to execute 'File -> Send -> Outline to Clipboard'" + Warnlog "Unable to execute 'File -> Send -> Outline to Clipboard'" Call hCloseDocument goto endsub endcatch @@ -233,7 +233,7 @@ testcase tFileSendCreateAutoabstract try FileSendCreateAutoabstract catch - Warnlog "#i38723#Unable to execute 'File -> Send -> Create Autoabstract'" + Warnlog "Unable to execute 'File -> Send -> Create Autoabstract'" Call hCloseDocument goto endsub endcatch @@ -284,7 +284,7 @@ testcase tFileSendAutoabstractToPresentation try FileSendAutoabstractToPresentation catch - Warnlog "#i38723#Unable to execute 'File -> Send -> Autoabstract to Presentation'" + Warnlog "Unable to execute 'File -> Send -> Autoabstract to Presentation'" Call hCloseDocument goto endsub endcatch @@ -666,7 +666,7 @@ testcase tMasterDocFileSendOutlineToPresentation try FileSendOutlineToPresentation catch - Warnlog "#i38723#Unable to execute 'File -> Send -> Outline to Presentation'" + Warnlog "Unable to execute 'File -> Send -> Outline to Presentation'" Call hCloseDocument goto endsub endcatch @@ -705,7 +705,7 @@ testcase tMasterDocFileSendOutlineToClipboard try FileSendOutlineToClipboard catch - Warnlog "#i38723#Unable to execute 'File -> Send -> Outline to Clipboard'" + Warnlog "Unable to execute 'File -> Send -> Outline to Clipboard'" Call hCloseDocument goto endsub endcatch @@ -749,7 +749,7 @@ testcase tMasterDocFileSendCreateAutoabstract try FileSendCreateAutoabstract catch - Warnlog "#i38723#Unable to execute 'File -> Send -> Create Autoabstract'" + Warnlog "Unable to execute 'File -> Send -> Create Autoabstract'" Call hCloseDocument goto endsub endcatch @@ -799,7 +799,7 @@ testcase tMasterDocFileSendAutoabstractToPresentation try FileSendAutoabstractToPresentation catch - Warnlog "#i38723#Unable to execute 'File -> Send -> Autoabstract to Presentation'" + Warnlog "Unable to execute 'File -> Send -> Autoabstract to Presentation'" Call hCloseDocument goto endsub endcatch diff --git a/testautomation/writer/required/includes/w_002_.inc b/testautomation/writer/required/includes/w_002_.inc index 20ddaf92a..e19b37514 100644 --- a/testautomation/writer/required/includes/w_002_.inc +++ b/testautomation/writer/required/includes/w_002_.inc @@ -565,7 +565,7 @@ testcase tViewNavigator PrintLog "Tear Off Toolbox from Navigator" Toolbox.TearOff Navigation catch - Warnlog "Unable to tear off Toolbox (#i32092)" + Warnlog "Unable to tear off Toolbox" ToolboxOk = False endcatch @@ -1300,7 +1300,7 @@ testcase tEditImageMap printlog( "Check for <Imagemap changed> messagebox (should not appear)" ) kontext "Active" if ( Active.exists( 1 ) ) then - qaerrorlog( "#i109605# - <imagemap changed> message displayed." ) + Warnlog( "<imagemap changed> message displayed." ) printlog( Active.getText ) Active.no() else diff --git a/testautomation/writer/required/includes/w_004_.inc b/testautomation/writer/required/includes/w_004_.inc index ea1972cba..8a536b715 100644 --- a/testautomation/writer/required/includes/w_004_.inc +++ b/testautomation/writer/required/includes/w_004_.inc @@ -636,7 +636,6 @@ testcase tInsertIndexesIndex Kontext "TabVerzeichnisseVerzeichnis" For i= 1 to VerzeichnisTyp.GetItemCount Sleep 1 - if i = 2 then printlog "Alphabetical index see bug #i33671 (ok in m54)" VerzeichnisTyp.Select i printlog "- " + VerzeichnisTyp.GetSelText Call DialogTest (TabVerzeichnisseVerzeichnis) @@ -934,7 +933,7 @@ testcase tInsertFrame Call DialogTest (TabHintergrund, 2) Sleep 1 catch - Warnlog "Maybe missing combobox! (#i29517)" + Warnlog "Maybe missing combobox!" endcatch if gApplication <> "HTML" then diff --git a/testautomation/writer/required/includes/w_004b_.inc b/testautomation/writer/required/includes/w_004b_.inc index 3769ee9ee..3252e30fd 100644 --- a/testautomation/writer/required/includes/w_004b_.inc +++ b/testautomation/writer/required/includes/w_004b_.inc @@ -202,18 +202,6 @@ testcase tInsertAllGraphicsFromFile Call hNewDocument for iCurrentFile = 1 to 25 - - ' MODIFY and ENABLE this SAMPLE snippet to exclude one fileformat from testing - ' if ( iCurrentFile = 7 ) AND (gtPlatform="x86") then - ' qaErrorLog("#<issue-id># crash on <platform> on loading <image-file>") - ' goto skipformat - ' endif - ' Note: Can be locale dependent! - if (iCurrentFile = 4) AND (gPlatform="osx") then - qaerrorlog("#i100253# crash on MacOS X on loading ball.eps") - goto skipformat - endif - Kontext "GrafikEinfuegenDlg" if ( not GrafikEinfuegenDlg.exists() ) then InsertGraphicsFromFile diff --git a/testautomation/writer/required/includes/w_005b_.inc b/testautomation/writer/required/includes/w_005b_.inc index 707af57a1..89e04a29e 100644 --- a/testautomation/writer/required/includes/w_005b_.inc +++ b/testautomation/writer/required/includes/w_005b_.inc @@ -1192,7 +1192,7 @@ testcase tFormatStyleEdit Kontext "Drawbar" Drawbar.Close else - Warnlog "#i33132#Toolbar 'Drawbar' is not opened!" + Warnlog "Toolbar 'Drawbar' is not opened!" end if printlog " Close active document" Call hCloseDocument diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index 64eae4878..86fd50a3f 100644 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -1069,7 +1069,7 @@ testcase tToolsChineseTranslation if ChineseTranslation.Exists then Call DialogTest ( ChineseTranslation ) else - Warnlog "#i41364#Tools-> Language -> Chinese Translation does not work!" + Warnlog "Tools-> Language -> Chinese Translation does not work!" Call hCloseDocument goto endsub end if diff --git a/testautomation/writer/required/includes/w_010_.inc b/testautomation/writer/required/includes/w_010_.inc index 5e2a596fb..7f717166e 100644 --- a/testautomation/writer/required/includes/w_010_.inc +++ b/testautomation/writer/required/includes/w_010_.inc @@ -358,7 +358,7 @@ testcase tNumLevelUpDown if Hochstufen.IsEnabled then Hochstufen.Click else - if i = 1 then Warnlog "Level up is disabled! (#i28550)" + if i = 1 then Warnlog "Level up is disabled!" end if sleep (2) next i @@ -394,7 +394,7 @@ testcase tNumSubpointsUpDown if HinunterstufenMitUnterpunkten.IsEnabled then HinunterstufenMitUnterpunkten.Click else - if i = 1 then Warnlog "Move up with subpoints is disabled! (#i28550)" + if i = 1 then Warnlog "Move up with subpoints is disabled!" end if Sleep (1) @@ -767,7 +767,7 @@ testcase tUpLevelUpDown if Hochstufen.IsEnabled then Hochstufen.Click else - if i = 1 then Warnlog "Level up is disabled ! (#i28550)" + if i = 1 then Warnlog "Level up is disabled !" end if sleep (2) next i @@ -825,7 +825,7 @@ testcase tUpSubpointsUpDown if HochstufenMitUnterpunkten.IsEnabled then HochstufenMitUnterpunkten.Click else - if i = 1 then Warnlog "Move with Subpoints up is disabled! (#i28550)" + if i = 1 then Warnlog "Move with Subpoints up is disabled!" end if Sleep 1 next i diff --git a/testautomation/writer/required/includes/w_011_.inc b/testautomation/writer/required/includes/w_011_.inc index bc2fc42cf..9cd7bbc9f 100644 --- a/testautomation/writer/required/includes/w_011_.inc +++ b/testautomation/writer/required/includes/w_011_.inc @@ -333,7 +333,7 @@ testcase tZOEditPoints try Points.Click catch - Warnlog "#i56594#Shortcut selecting objects doesn't work" + Warnlog "Shortcut selecting objects doesn't work" Printlog "Close active document" Call hCloseDocument goto endsub @@ -372,7 +372,7 @@ testcase tZOLine Linie.Click printlog "In Toolbox click 'Line'" catch - Warnlog "#i56594#Shortcut selecting objects doesn't work" + Warnlog "Shortcut selecting objects doesn't work" Call hCloseDocument goto endsub endcatch @@ -425,7 +425,7 @@ testcase tZOArea printlog "In toolbox click 'Area'" Flaeche.Click catch - Warnlog "#i56594#Shortcut selecting objects doesn't work" + Warnlog "Shortcut selecting objects doesn't work" Call hCloseDocument goto endsub endcatch diff --git a/testautomation/writer/required/includes/w_020_.inc b/testautomation/writer/required/includes/w_020_.inc index 9235d1b83..3eee667be 100644 --- a/testautomation/writer/required/includes/w_020_.inc +++ b/testautomation/writer/required/includes/w_020_.inc @@ -387,7 +387,7 @@ testcase t_TB_Form Kontext "FormControls" if NOT ControlProperties.IsEnabled then if gPlatform = "osx" then - warnlog "#i82427#-Mac OS X (Aqua): Drawing function does not draw anything" + warnlog "Mac OS X (Aqua): Drawing function does not draw anything" else warnlog "Control properties button disabled!" end if @@ -848,7 +848,7 @@ testcase tHtmlDoc_TB_Form Kontext "FormControls" if NOT ControlProperties.IsEnabled then if gPlatform = "osx" then - warnlog "#i82427#-Mac OS X (Aqua): Drawing function does not draw anything" + warnlog "Mac OS X (Aqua): Drawing function does not draw anything" else warnlog "Control properties button disabled!" end if diff --git a/testautomation/writer/tools/includes/w_tool1.inc b/testautomation/writer/tools/includes/w_tool1.inc index a39fa5773..17f5432ed 100644 --- a/testautomation/writer/tools/includes/w_tool1.inc +++ b/testautomation/writer/tools/includes/w_tool1.inc @@ -345,7 +345,7 @@ sub sMenufunktionen(Fuer_Was as string) Sleep 1 if i >= 20 then if gPlatform = "osx" then - Warnlog "#i82427#-Mac OS X (Aqua): Drawing function does not draw anything" + Warnlog "Mac OS X (Aqua): Drawing function does not draw anything" else Warnlog "Button (" + i + ")" + Fuer_Was + " is disabled " end if @@ -363,7 +363,7 @@ sub sMenufunktionen(Fuer_Was as string) printlog Fuer_Was else if gPlatform = "osx" then - Warnlog "#i82427#-Mac OS X (Aqua): Drawing function does not draw anything" + Warnlog "Mac OS X (Aqua): Drawing function does not draw anything" else Warnlog " - Controlfieldproperties "+ Fuer_Was +" from Menu not available!" end if diff --git a/testautomation/writer/tools/includes/w_tool2.inc b/testautomation/writer/tools/includes/w_tool2.inc index 1378e751f..c067977ec 100755 --- a/testautomation/writer/tools/includes/w_tool2.inc +++ b/testautomation/writer/tools/includes/w_tool2.inc @@ -400,7 +400,7 @@ end function sub wChangeDefaultView() - ' #i107038: This code forces the writer to display one page only which is + ' #This code forces the writer to display one page only which is ' zoomed to pagewidth, filling the entire - previously maximized - window. ' This is required because the VCL Testtool might eventually draw objects ' outside the document window depending on display size diff --git a/testautomation/writer/tools/includes/w_tool6.inc b/testautomation/writer/tools/includes/w_tool6.inc index 9bc7ed688..6bac06fb9 100644 --- a/testautomation/writer/tools/includes/w_tool6.inc +++ b/testautomation/writer/tools/includes/w_tool6.inc @@ -294,7 +294,7 @@ sub ZeilenHoeheTesten ( Wert as Double ) FormatRowHeight Kontext "ZellenHoehe" zWert = ZahlAusSpinnfield ( Hoehe.GetText ) - if (LiberalMeasurement (Wert, zWert) <> TRUE) then QAErrorlog "#i94556# - Die Zeilenhöhe ist nicht "+ Wert + " sondern "+ zWert + "." + if (LiberalMeasurement (Wert, zWert) <> TRUE) then QAErrorlog "Die Zeilenhhe ist nicht "+ Wert + " sondern "+ zWert + "." ZellenHoehe.OK end sub diff --git a/testautomation/writer/tools/includes/w_tools_undo.inc b/testautomation/writer/tools/includes/w_tools_undo.inc index 423e2cecb..ff25c3889 100644 --- a/testautomation/writer/tools/includes/w_tools_undo.inc +++ b/testautomation/writer/tools/includes/w_tools_undo.inc @@ -78,7 +78,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: vTypeString = "Replace" Case 34: vTypeString = "Reemplazar" - Case 86: vTypeString = "替换" + Case 86: vTypeString = "替?" Case else: QAErrorlog "Please adapt tests for current language! (" & CurrentUndoString(0) & ")" end select ' Delete @@ -96,7 +96,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Replace: 14 occurrences of 'and'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Reemplazar: 6 ocurrencias de 'and'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入自动图文集" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入自动图文集" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select end select @@ -105,7 +105,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Sort text" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Ordenar texto" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "排序文字" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "排?文字" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select ' Convert text -> table @@ -113,7 +113,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Convert text -> table" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Convertir texto en tabla" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "文字转换成表格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "文字转??表格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -124,7 +124,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "New Paragraph" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Párrafo nuevo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "新建段落" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "新建段?" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -132,7 +132,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Delete paragraph" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Eliminar Párrafo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "删除 段落" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "删除 段?" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select end select @@ -142,7 +142,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Paste clipboard" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Pegar del portapapeles" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "粘贴剪贴板" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "粘贴剪贴?" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -152,7 +152,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Accept change: Insert 'This is a test'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Aplicar cambio: Insertar 'This is a test'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "接受修改：插入 'This is a test'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "接?修改：?入 'This is a test'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -160,19 +160,19 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Reject change: Insert 'This is a test'" then elseif UndoStringFromUndoList = "Reject change: $1" then - QaErrorlog "#i94489# - Bug with Undo - Reject." + QaErrorlog "#i97506# - Bug with Undo - Reject." else Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList end if Case 34: if UndoStringFromUndoList = "Rechazar cambio: $1" then - QaErrorlog "#i94489# - Bug with Undo - Reject." + QaErrorlog "#i97506# - Bug with Undo - Reject." else - Warnlog "Tell script-writer issue i94489 seems to be fixed, or that a string has to be set to: " & UndoStringFromUndoList + Warnlog "Tell script-writer issue i97506 seems to be fixed, or that a string has to be set to: " & UndoStringFromUndoList end if - Case 86: if UndoStringFromUndoList = "拒绝修改：$1" then - QaErrorlog "#i94489# - Bug with Undo - Reject." + Case 86: if UndoStringFromUndoList = "拒?修改：$1" then + QaErrorlog "#i97506# - Bug with Undo - Reject." else - Warnlog "Tell script-writer issue i94489 seems to be fixed, or that a string has to be set to: " & UndoStringFromUndoList + Warnlog "Tell script-writer issue i97506 seems to be fixed, or that a string has to be set to: " & UndoStringFromUndoList end if Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -181,7 +181,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Typing: 1 line break(s)" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Escritura: 1 salto(s) de línea" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "键入: 1 换行符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "键入: 1 ?行符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -189,7 +189,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Delete 1 line break(s)" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Eliminar 1 salto(s) de línea" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "删除 1 换行符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "删除 1 ?行符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -197,7 +197,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert column break" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar salto de columna" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入分栏符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入分?符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -205,7 +205,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Delete paragraph" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Eliminar Párrafo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "删除 段落" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "删除 段?" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -213,7 +213,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert page break" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar salto de página" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入分页符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入分页符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -221,7 +221,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Delete paragraph" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Eliminar Párrafo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "删除 段落" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "删除 段?" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -229,7 +229,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert field" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar campo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入 字段" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入 字段" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -237,7 +237,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Field changed" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Cambio modificado" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "字段已经被修改" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "字段已?被修改" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -253,7 +253,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert special character" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar carácter especial" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入 特殊字符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入 特殊字符" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -269,7 +269,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Apply Styles: AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Aplicar estilos: AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "应用样式: AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "应用样?: AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -277,7 +277,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Change style: AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Cambiar estilo: AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "修改样式：AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "修改样?：AUndoHistory" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -285,7 +285,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Promote/demote outline" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Aumentar/Disminuir nivel" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "升级/降级外框" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?级/?级外框" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -293,7 +293,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Promote/demote outline" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Aumentar/Disminuir nivel" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "升级/降级外框" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?级/?级外框" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -301,7 +301,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert section" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar área" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入区域" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入区域" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -325,7 +325,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert Hyperlink" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar hiperenlace" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入超链接" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入超链接" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -333,7 +333,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "insert URL button" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar botón URL" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入 URL 按钮" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入 URL 按钮" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -348,7 +348,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert footnote" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar nota al pie" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入脚注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入脚注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -372,7 +372,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert caption: 'This capt...aracters'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar título: 'This capt...aracters'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入标题: 'This capt...aracters'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入标题: 'This capt...aracters'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -380,7 +380,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert AutoText" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar AutoTexto" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入自动图文集" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入自动图文集" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -388,7 +388,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert bookmark: I'm a bookmark" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar marcador: I'm a bookmark" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入书签: I'm a bookmark" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入书签: I'm a bookmark" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -396,7 +396,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Rename bookmark: 'I'm a bookmark' -> 'a book'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList & " -> #i33498" Case 34: if UndoStringFromUndoList <> "marcador renombrado: 'I'm a bookmark' -> 'a book'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList & " -> #i33498" - Case 86: if UndoStringFromUndoList <> "重命名书签: 'I'm a bookmark' -> 'a book'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList & " -> #i33498" + Case 86: if UndoStringFromUndoList <> "?命??书签: 'I'm a bookmark' -> 'a book'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList & " -> #i33498" Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -412,7 +412,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert comment" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar nota" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入 批注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入 批注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -428,7 +428,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert script" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar secuencia de comandos" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入 脚本" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入 脚本" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -444,7 +444,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert index entry" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar entrada de índice" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入索引条目" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入索引?目" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -460,7 +460,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert bibliography entry" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar entrada de bibliografía" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入 文献目录条目" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入 文献目录?目" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -468,7 +468,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Delete bibliography entry" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Eliminar entrada de bibliografía" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "删除 文献目录条目" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "删除 文献目录?目" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -476,7 +476,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert frame" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar marco" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入 框架" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入 框架" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -484,7 +484,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Rename frame: 'MyFrame' -> 'MyRenamedFrame'" then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if InStr(UndoStringFromUndoList, "renombrado") then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入 框架" then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入 框架" then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -500,7 +500,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert table: 'Table1'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar tabla: 'Tabla1'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入表格: '表格1'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入表格: '表格1'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -508,7 +508,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert Row" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar fila" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入行" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入行" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -516,7 +516,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert Column" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar columna" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入列" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入列" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -540,7 +540,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Format cell" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Formatear celda" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "格式化单元格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "格?化?元格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -556,7 +556,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Merge table" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "unir tablas" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "合并表格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?并表格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -564,7 +564,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Convert text -> table" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Convertir texto en tabla" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "文字转换成表格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "文字转??表格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -572,7 +572,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Sort table" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Ordenar tabla" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "排序表格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "排?表格" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -596,7 +596,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert horizontal ruler" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar regla horizontal" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入水平标尺" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入水平标尺" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -610,7 +610,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) else Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList end if - Case 86: if (UndoStringFromUndoList = "插入 图形") OR (UndoStringFromUndoList = "插入 图片") then + Case 86: if (UndoStringFromUndoList = "?入 图形") OR (UndoStringFromUndoList = "?入 图片") then else Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList end if @@ -629,7 +629,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Replace graphics" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Reemplazar imagen" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "替换图形" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "替?图形" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -637,7 +637,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert OLE-object" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar Objeto OLE" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入 OLE 对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入 OLE 对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -653,7 +653,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert OLE-object" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar Objeto OLE" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入 OLE 对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入 OLE 对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -669,7 +669,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert file" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar archivo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入文件" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入文件" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -677,7 +677,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Asian Phonetic Guides Setting" then QaErrorLog "#i94534# - Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Aplicar símbolos fonéticos" then QaErrorLog "#i94534# - Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "加上拼音或注音符号" then QaErrorLog "#i94534# - Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "加上拼音或注音符?" then QaErrorLog "#i94534# - Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -693,7 +693,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "AutoFormat" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Formateado automático" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "自动格式" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "自动格?" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -713,8 +713,8 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList end if end if - Case 86: if UndoStringFromUndoList <> "插入 有 3 个角的折线" then - if UndoStringFromUndoList = "插入 有 %2 个角的折线" then + Case 86: if UndoStringFromUndoList <> "?入 有 3 个角的折线" then + if UndoStringFromUndoList = "?入 有 %2 个角的折线" then QaErrorlog "#i94530# - Bug with Undo-History for Polygon-Line-tool. " + UndoStringFromUndoList else Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList @@ -727,7 +727,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Group draw objects" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Agrupar objetos de dibujo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "组合绘图对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "组?绘图对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -735,7 +735,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Ungroup drawing objects" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Resolver objeto de grupo" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "取消组合绘图对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?消组?绘图对象" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -743,7 +743,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Rename 2 Rectangles" then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "" then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "组合绘图对象" then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "组?绘图对象" then QaErrorLog "#i94486# - Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -757,15 +757,15 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Case "Autocheck/Spellcheck" Select Case iSprache - Case 01: if UndoStringFromUndoList <> "Replace: 'Testp' -> 'Test'" then QaErrorLog "#i94489# - Wrong text in Undo-List: " & UndoStringFromUndoList + Case 01: if UndoStringFromUndoList <> "Replace: 'Testp' -> 'Test'" then QaErrorLog "#i97506# - Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList = "Sobrescribir: $1" then elseif InStr(UndoStringFromUndoList, "'Testp'") then - QaErrorLog "#i94489# - Wrong text in Undo-List: " & UndoStringFromUndoList + QaErrorLog "#i97506# - Wrong text in Undo-List: " & UndoStringFromUndoList end if Case 86: if UndoStringFromUndoList = "覆盖: $1" then - QaErrorLog "#i94489# - Wrong text in Undo-List: " & UndoStringFromUndoList + QaErrorLog "#i97506# - Wrong text in Undo-List: " & UndoStringFromUndoList elseif InStr(UndoStringFromUndoList, "'Testp'") then - QaErrorlog "#i94489# - Bug fixed: " & UndoStringFromUndoList + QaErrorlog "#i97506# - Bug fixed: " & UndoStringFromUndoList end if Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -774,7 +774,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Insert Control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Insertar Campo de control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入 控制" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入 控制" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -790,7 +790,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Resize Control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Modificar el tamaño de Campo de control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "更改大小 控制" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "更改大? 控制" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -798,7 +798,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Replace Control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Reemplazar campo de control" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "替换控制" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "替?控制" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList end select @@ -835,7 +835,7 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string) Select Case iSprache Case 01: if UndoStringFromUndoList <> "Delete ' ###'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case 34: if UndoStringFromUndoList <> "Eliminar 'g'" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList - Case 86: if UndoStringFromUndoList <> "插入自动图文集" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList + Case 86: if UndoStringFromUndoList <> "?入自动图文集" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList Case else: QAErrorlog "Please adapt tests for current language! (" & CurrentUndoString(0) & ")" end select diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 33a6be377..75b832443 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -114,7 +114,7 @@ bool checkEmpty(rtl::OUString const & string, char const * message) { } //================================================================================================== -class TestBridgeImpl : protected osl::DebugBase<TestBridgeImpl>, +class TestBridgeImpl : public osl::DebugBase<TestBridgeImpl>, public WeakImplHelper2< XMain, XServiceInfo > { Reference< XComponentContext > m_xContext; diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 1d7a35758..608dda401 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -127,7 +127,7 @@ static void assign( TestData & rData, //================================================================================================== class Test_Impl : - protected osl::DebugBase<Test_Impl>, + public osl::DebugBase<Test_Impl>, public WeakImplHelper3< XBridgeTest2, XServiceInfo , XRecursiveCall > { TestData _aData, _aStructData; @@ -483,7 +483,7 @@ public: }; //Dummy class for XComponent implementation -class Dummy : protected osl::DebugBase<Dummy>, +class Dummy : public osl::DebugBase<Dummy>, public WeakComponentImplHelperBase { public: diff --git a/testtools/source/cliversioning/version_libs/version_3_3.dll b/testtools/source/cliversioning/version_libs/version_3_3.dll Binary files differnew file mode 100755 index 000000000..a63a43632 --- /dev/null +++ b/testtools/source/cliversioning/version_libs/version_3_3.dll |