[Libreoffice-commits] .: 72 commits - smoketestdoc/com smoketestdoc/data smoketestdoc/prj smoketestoo_native/com smoketestoo_native/data smoketestoo_native/makefile.mk smoketestoo_native/prj smoketestoo_native/smoketest.cxx testautomation/chart2 testautomation/global testautomation/graphics testautomation/writer test/prj test/source testtools/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Mar 23 09:27:09 PDT 2011
smoketestdoc/com/sun/star/comp/smoketest/MANIFEST.MF | 2
smoketestdoc/com/sun/star/comp/smoketest/TestExtension.idl | 40
smoketestdoc/com/sun/star/comp/smoketest/TestExtension.java | 166 ++
smoketestdoc/com/sun/star/comp/smoketest/delzip | 1
smoketestdoc/com/sun/star/comp/smoketest/makefile.mk | 88 +
smoketestdoc/com/sun/star/comp/smoketest/manifest.xml | 5
smoketestdoc/data/Events.xml | 66
smoketestdoc/data/Global.xml | 821 ++++++++++
smoketestdoc/data/OptionsDlg.xml | 64
smoketestdoc/data/Test_10er.xml | 722 ++++++++
smoketestdoc/data/Test_DB.xml | 147 +
smoketestdoc/data/Test_Ext.xml | 116 +
smoketestdoc/data/content.xml | 113 +
smoketestdoc/data/dialog-lb.xml | 31
smoketestdoc/data/dialog-lc.xml | 31
smoketestdoc/data/makefile.mk | 70
smoketestdoc/data/manifest.xml | 49
smoketestdoc/data/meta.xml | 28
smoketestdoc/data/script-lb.xml | 35
smoketestdoc/data/script-lc.xml | 31
smoketestdoc/data/settings.xml | 28
smoketestdoc/data/styles.xml | 28
smoketestdoc/prj/build.lst | 4
smoketestdoc/prj/d.lst | 4
smoketestoo_native/com/sun/star/comp/smoketest/MANIFEST.MF | 2
smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl | 40
smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java | 166 --
smoketestoo_native/com/sun/star/comp/smoketest/delzip | 1
smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk | 89 -
smoketestoo_native/com/sun/star/comp/smoketest/manifest.xml | 5
smoketestoo_native/data/Events.xml | 43
smoketestoo_native/data/Global.xml | 766 ---------
smoketestoo_native/data/OptionsDlg.xml | 62
smoketestoo_native/data/Test_10er.xml | 739 ---------
smoketestoo_native/data/Test_DB.xml | 161 -
smoketestoo_native/data/Test_Ext.xml | 121 -
smoketestoo_native/data/content.xml | 28
smoketestoo_native/data/dialog-lb.xml | 31
smoketestoo_native/data/dialog-lc.xml | 31
smoketestoo_native/data/makefile.mk | 70
smoketestoo_native/data/manifest.xml | 49
smoketestoo_native/data/meta.xml | 28
smoketestoo_native/data/script-lb.xml | 35
smoketestoo_native/data/script-lc.xml | 31
smoketestoo_native/data/settings.xml | 28
smoketestoo_native/data/styles.xml | 28
smoketestoo_native/makefile.mk | 4
smoketestoo_native/prj/build.lst | 6
smoketestoo_native/smoketest.cxx | 7
test/prj/build.lst | 3
test/prj/d.lst | 3
test/source/cpp/makefile.mk | 11
test/source/cpp/unoexceptionprotector/makefile.mk | 56
test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx | 96 +
testautomation/chart2/optional/includes/ch2_lvl1a.inc | 1
testautomation/global/tools/includes/optional/t_ole.inc | 22
testautomation/graphics/optional/includes/global/g_stylist.inc | 10
testautomation/graphics/optional/includes/impress/i_us2_present.inc | 3
testautomation/graphics/required/includes/global/id_004.inc | 4
testautomation/writer/optional/includes/clipboard/clipbrd_func.inc | 9
testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc | 8
testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc | 2
testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc | 4
testautomation/writer/optional/includes/fields/w_fields2.inc | 2
testautomation/writer/optional/includes/fields/w_fields3.inc | 4
testautomation/writer/optional/includes/fields/w_fields4.inc | 2
testautomation/writer/optional/includes/fields/w_fields5.inc | 4
testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc | 2
testautomation/writer/optional/includes/formatpage/w_formatpage1.inc | 4
testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc | 4
testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc | 6
testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc | 2
testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc | 6
testautomation/writer/optional/includes/loadsave/w_loadsave.inc | 2
testautomation/writer/optional/includes/navigator/w_navigator.inc | 10
testautomation/writer/optional/includes/number/w_205_.inc | 24
testautomation/writer/optional/includes/number/w_205a_.inc | 2
testautomation/writer/optional/includes/option/wh_o_2.inc | 2
testautomation/writer/optional/includes/redlining/w_redlining1.inc | 4
testautomation/writer/optional/includes/redlining/w_redlining2.inc | 2
testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc | 4
testautomation/writer/optional/includes/section/w_section_2.inc | 2
testautomation/writer/optional/includes/shortcut/w_shortcuts.inc | 2
testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc | 22
testautomation/writer/optional/includes/stylist/w_stylist.inc | 16
testautomation/writer/optional/includes/textframes/w_textframes2.inc | 4
testautomation/writer/required/includes/w_001_.inc | 2
testautomation/writer/required/includes/w_001a_.inc | 2
testautomation/writer/required/includes/w_001b_.inc | 16
testautomation/writer/required/includes/w_002_.inc | 4
testautomation/writer/required/includes/w_004_.inc | 3
testautomation/writer/required/includes/w_004b_.inc | 12
testautomation/writer/required/includes/w_005b_.inc | 2
testautomation/writer/required/includes/w_007_.inc | 2
testautomation/writer/required/includes/w_010_.inc | 8
testautomation/writer/required/includes/w_011_.inc | 6
testautomation/writer/required/includes/w_020_.inc | 4
testautomation/writer/tools/includes/w_tool1.inc | 4
testautomation/writer/tools/includes/w_tool2.inc | 2
testautomation/writer/tools/includes/w_tool6.inc | 2
testautomation/writer/tools/includes/w_tools_undo.inc | 140 -
testtools/source/bridgetest/bridgetest.cxx | 2
testtools/source/bridgetest/cppobj.cxx | 4
testtools/source/cliversioning/version_libs/version_3_3.dll |binary
104 files changed, 3069 insertions(+), 2771 deletions(-)
New commits:
commit 8d2d57012c83f3a42a905b582fcb0eeca6365c67
Merge: c5cf3aa... 9ffef9a...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Mar 23 16:59:41 2011 +0100
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
diff --cc smoketestdoc/com/sun/star/comp/smoketest/TestExtension.idl
index 0000000,1126799..83c370e
mode 000000,100755..100755
--- a/smoketestdoc/com/sun/star/comp/smoketest/TestExtension.idl
+++ b/smoketestdoc/com/sun/star/comp/smoketest/TestExtension.idl
@@@ -1,0 -1,40 +1,40 @@@
+ /*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
-#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 --cc smoketestdoc/com/sun/star/comp/smoketest/makefile.mk
index 0000000,1738989..be7af05
mode 000000,100755..100755
--- a/smoketestdoc/com/sun/star/comp/smoketest/makefile.mk
+++ b/smoketestdoc/com/sun/star/comp/smoketest/makefile.mk
@@@ -1,0 -1,89 +1,88 @@@
+ #*************************************************************************
+ #
+ # 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 = smoketestdoc
+ PACKAGE = com/sun/star/comp/smoketest
+ TARGET = com_sun_star_comp_smoketest
+
+ no_common_build_zip:=TRUE
+
+ # --- Settings -----------------------------------------------------
+
+ .IF "$(SOLAR_JAVA)" != ""
+
+ .INCLUDE : settings.mk
+
+ JARFILES = ridl.jar jurt.jar unoil.jar juh.jar
+
+ JARTARGET = TestExtension.jar
+ JARCOMPRESS = TRUE
+ CUSTOMMANIFESTFILE = MANIFEST.MF
+
+ ZIP1TARGET=TestExtension
+ ZIP1LIST=*
+ ZIPFLAGS=-r
+ ZIP1DIR=$(MISC)/$(TARGET)
+ ZIP1EXT=.oxt
+
+ # --- Files --------------------------------------------------------
+
-#COPY_OXT_MANIFEST:= $(MISC)/$(TARGET)/META-INF/manifest.xml
+ JAVAFILES = TestExtension.java
+
+ # --- Targets ------------------------------------------------------
+
+ ZIP1DEPS=$(MISC)/$(TARGET)/$(JARTARGET)\
+ $(MISC)/$(TARGET)/TestExtension.rdb\
+ $(MISC)/$(TARGET)/META-INF/manifest.xml
+
+ .INCLUDE : target.mk
+
+ $(MISC)/$(TARGET)/META-INF:
+ @-$(MKDIRHIER) $(@)
+
+ $(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: manifest.xml
+ $(COMMAND_ECHO)$(COPY) $< $@
+
+ $(MISC)/$(TARGET)/TestExtension.rdb: $(MISC)/TestExtension.urd
+ $(COMMAND_ECHO)$(REGMERGE) $@ /UCR $<
+
+ $(JAVACLASSFILES) .UPDATEALL: $(MISC)/$(TARGET)/TestExtension.rdb
+ $(COMMAND_ECHO)$(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $<
+
+ $(MISC)/$(TARGET)/$(JARTARGET) : $(JARTARGETN)
+ $(COMMAND_ECHO)$(COPY) $< $@
+
+ .ELSE
+ @all:
+ @echo "Java disabled. Nothing to do."
+ .ENDIF
diff --cc smoketestdoc/com/sun/star/comp/smoketest/manifest.xml
index 0000000,7e3e794..fcedabf
mode 000000,100755..100755
--- a/smoketestdoc/com/sun/star/comp/smoketest/manifest.xml
+++ b/smoketestdoc/com/sun/star/comp/smoketest/manifest.xml
@@@ -1,0 -1,5 +1,5 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
-<manifest:manifest>
++<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+ <manifest:file-entry manifest:full-path="TestExtension.jar" manifest:media-type="application/vnd.sun.star.uno-component;type=Java"/>
+ <manifest:file-entry manifest:full-path="TestExtension.rdb" manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB"/>
-</manifest:manifest>
++</manifest:manifest>
diff --cc smoketestdoc/data/Test_10er.xml
index 0000000,795ca59..26c85ea
mode 000000,100644..100644
--- a/smoketestdoc/data/Test_10er.xml
+++ b/smoketestdoc/data/Test_10er.xml
@@@ -1,0 -1,681 +1,722 @@@
+ <?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.
+ *
+ **********************************************************************-->
+ <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
+ <script:module xmlns:script="http://openoffice.org/2000/script" script:name="Test_10er" script:language="StarBasic">REM 10er Test
+
+ const sSWLogFileName = "swlog.dat", sSCLogFileName = "sclog.dat"
+ const sSDLogFileName = "sdlog.dat", sSMathLogFileName = "smalog.dat"
+ const sSChartLogFileName = "schlog.dat"
+ const sSHptLogFileName = "shptlog.dat"
+ const sSDrawLogFileName = "sdrwlog.dat", sJavaLogFileName = "javalog.dat"
+ const sSDBLogFileName = "dblog.dat", sExtLogFileName = "extlog.dat"
+ 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)"
++const cMessageOpen50Doc = "Open Document 5.0"
+ const cMessageNewDoc = "New Document"
+ const cMessageCloseDoc = "Close Document"
+
+ Global sWorkPath$
+ Global sWorkPathURL$
+ Global LocalTestLog%
+ Global GlobalTestLog%
+
+ Sub Main
+ call TestAllDocs()
+ end Sub
+
+ Sub DeleteAllSavedFiles()
+ Dim sFileName as String
+ sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmWriter)
+ If FileExists (sFileName) then
+ Kill (sFileName)
+ End If
+ sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmCalc)
+ If FileExists (sFileName) then
+ Kill (sFileName)
+ End If
+ sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmImpress)
+ If FileExists (sFileName) then
+ Kill (sFileName)
+ End If
+ sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmDraw)
+ If FileExists (sFileName) then
+ Kill (sFileName)
+ End If
+ sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmHyperText)
+ If FileExists (sFileName) then
+ Kill (sFileName)
+ End If
+ sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmWriter or cFltXML)
+ If FileExists (sFileName) then
+ Kill (sFileName)
+ End If
+ sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmCalc or cFltXML)
+ If FileExists (sFileName) then
+ Kill (sFileName)
+ End If
+ sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmImpress or cFltXML)
+ If FileExists (sFileName) then
+ Kill (sFileName)
+ End If
+ sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmDraw or cFltXML)
+ If FileExists (sFileName) then
+ Kill (sFileName)
+ End If
+ End Sub
+
+ Sub DeleteAllLogFiles()
+ If FileExists (sWorkPath+sLogFileName) then
+ Kill (sWorkPath+sLogFileName)
+ End If
+ If FileExists (sWorkPath+sSWLogFileName) then
+ Kill (sWorkPath+sSWLogFileName)
+ End If
+ If FileExists (sWorkPath+sSCLogFileName) then
+ Kill (sWorkPath+sSCLogFileName)
+ End If
+ If FileExists (sWorkPath+sSDLogFileName) then
+ Kill (sWorkPath+sSDLogFileName)
+ End If
+ If FileExists (sWorkPath+sSMathLogFileName) then
+ Kill (sWorkPath+sSMathLogFileName)
+ 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+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
+ If FileExists (sWorkPath+sExtLogFileName) then
+ Kill (sWorkPath+sExtLogFileName)
+ End If
+ end Sub
+
+ Function OpenLogDat (sFileName as String) as Integer
+ Dim LocaleFileChannel%
+ If FileExists (sWorkPath+sFileName) then
+ Kill (sWorkPath+sFileName)
+ End If
+ LocaleFileChannel% = Freefile
+ Open sWorkPath+sFileName For Output As LocaleFileChannel%
+ OpenLogDat = LocaleFileChannel%
+ end Function
+
+ Sub SetupWorkPath
+ Dim configManager as Object
+ configManager = CreateUnoService( "com.sun.star.config.SpecialConfigManager" )
+
+ sWorkPath = configManager.SubstituteVariables( "$(userpath)/temp/" )
+ sWorkPathURL = configManager.SubstituteVariables( "$(userurl)/temp/" )
+ End Sub
+
+ Function GetSystem (sTmpWorkPath as string) as string
+ GetSystem = ""
+ if InStr (sTmpWorkPath, ":") then
+ GetSystem = "windows"
+ else
+ GetSystem = "unix"
+ End If
+ end Function
+
+ Function ConvertPathToWin (sTmpWorkPath as string) as string
+ for i%=1 to Len(sTmpWorkPath)
+ sTemp = Mid (sTmpWorkPath, i%, 1)
+ if sTemp = "/" then
+ sTmpWorkPath = Left (sTmpWorkPath, i%-1) + "\" + Right (sTmpWorkPath, Len(sTmpWorkPath)-i%)
+ else
+ if sTemp = "|" then
+ sTmpWorkPath = Left (sTmpWorkPath, i%-1) + ":" + Right (sTmpWorkPath, Len(sTmpWorkPath)-i%)
+ end If
+ end If
+ next i%
+ ConvertPathToWin = sTmpWorkPath
+ end Function
+
+ Sub TestAllDocs()
+ DIM sDocURL as String, sDocPath as String
+ DIM nStrPos as Long
+
+ 'search ExtensionURL
+ sDocURL = gOutputDoc.URL
+ CompatibilityMode(true)
+ nStrPos = InStrRev (sDocURL, "/" )
+ CompatibilityMode(false)
+ sExtensionURL = Left (sDocURL, nStrPos)
+
+ GlobalTestLog = OpenLogDat (sLogFileName)
+ call WriteTestSequence
+ if bMakeWriterTest then
+ gCurrentDocTest = frmWriter
+ call MakeDocTest
+ end if
+ if bMakeCalcTest then
+ gCurrentDocTest = frmCalc
+ call MakeDocTest
+ end if
+ if bMakeImpressTest then
+ gCurrentDocTest = frmImpress
+ call MakeDocTest
+ end if
+ if bMakeDrawTest then
+ gCurrentDocTest = frmDraw
+ call MakeDocTest
+ end if
+ if bMakeHTMLTest then
+ gCurrentDocTest = frmHyperText
+ call MakeDocTest
+ end if
+ if bMakeChartTest then
+ gCurrentDocTest = frmChart
+ call MakeChartTest
+ end if
+ if bMakeMathTest then
+ gCurrentDocTest = frmMath
+ call MakeNewDoc
+ end if
+ if bMakeJavaTest then
+ gCurrentDocTest = frmJava
+ call TestJava
+ end if
+ if bMakeDBTest then
+ gCurrentDocTest = frmDataBase
+ call Test_DB.TestDB
+ end if
+ if bMakeExtensionTest then
+ gCurrentDocTest = frmExtension
+ call Test_Ext.TestExtensions
+ end if
+
+ Close #GlobalTestLog
+ GlobalTestLog = 0
+ end Sub
+
+ Sub WriteTestSequence
+ Print #GlobalTestLog, "Sequence of testing"
+
+ if bMakeWriterTest then
+ WriteTests ("writer : ", true, GlobalTestLog)
+ end if
+ if bMakeCalcTest then
+ WriteTests ("calc : ", true, GlobalTestLog)
+ end if
+ if bMakeImpressTest then
+ WriteTests ("impress : ", true, GlobalTestLog)
+ end if
+ if bMakeDrawTest then
+ WriteTests ("draw : ", true, GlobalTestLog)
+ end if
+ if bMakeHTMLTest then
+ WriteTests ("HTML : ", true, GlobalTestLog)
+ end if
+ if bMakeChartTest then
+ WriteTests ("chart : ", false, GlobalTestLog)
+ end if
+ if bMakeMathTest then
+ WriteTests ("math : ", false, GlobalTestLog)
+ end if
+ if bMakeJavaTest then
+ WriteTests ("Java : ", false, GlobalTestLog)
+ end if
+ if bMakeDBTest then
+ WriteDBTests ("Database : ", GlobalTestLog)
+ end if
+ if bMakeExtensionTest then
+ WriteExtensionTests ("Extension : ", GlobalTestLog)
+ end if
+
+ 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"
+ end if
+ if bMakeSaveOpenXMLTest then
+ sWriteStr = sWriteStr + ", save XML"
+ end if
+ if bMakeSaveOpen8Test then
+ sWriteStr = sWriteStr + ", open 8.0"
+ end if
+ if bMakeSaveOpenXMLTest then
+ sWriteStr = sWriteStr + ", open XML"
+ end if
++ if bMakeOpen50Test then
++ sWriteStr = sWriteStr + ", open 5.0"
++ end if
+ end if
+
+ sWriteStr = sWriteStr + ", close"
+
+ Print #GlobalTestLog, sWriteStr
+ end Sub
+
+ Sub WriteDBTests (sText as string, nFileChannel as integer)
+ Dim sWriteStr as string
+
+ sWriteStr = sText
+ sWriteStr = sWriteStr + "open / services"
+ sWriteStr = sWriteStr + ", insert"
+ sWriteStr = sWriteStr + ", delete"
+ sWriteStr = sWriteStr + ", seek"
+ sWriteStr = sWriteStr + ", close"
+
+ Print #nFileChannel, sWriteStr
+ end Sub
+
+ Sub WriteExtensionTests (sText as string, nFileChannel as integer)
+ Dim sWriteStr as string
+
+ sWriteStr = sText
+ sWriteStr = sWriteStr + "services"
+ sWriteStr = sWriteStr + ", install"
+ sWriteStr = sWriteStr + ", uninstall"
+
+ Print #nFileChannel, sWriteStr
+ end Sub
+
+ Sub MakeDocTest
+ Dim oDoc as Object
+ Dim sFileNameXML$, sFileName8$
+ Dim bSuccess as Boolean
+
+ On Local Error GoTo DOCTESTERROR
+ 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
+ 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
+ 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
+ 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)
+ LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ cMessageSaveOpen8Doc, not IsNull (oDoc) )
+
+ if not IsNull (oDoc) then
+ gCurrentTestCase = cDocClose
+ oDoc.close (true)
+ end If
+ end if
+
+ gCurrentTestCase = cDocSaveOpenXML
+ if bMakeSaveOpenXMLTest and IsFilterAvailable (gCurrentDocTest or cFltXML) then
+ oDoc = LoadDoc (sFileNameXML)
+
+ ' oDoc = Documents.open(sFileName)
+ LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ cMessageSaveOpenXMLDoc, not IsNull (oDoc) )
+
+ if not IsNull (oDoc) then
+ gCurrentTestCase = cDocClose
+ oDoc.close (true)
+ end If
+ end if
+
++ nCurrentAction = cDocOpen50
++ if bMakeOpen50Test and IsFilterAvailable (FilterType or cFlt50) then
++ SOLARSRC = ConvertToURL(Environ("SOLARSRC"))
++ sFileName50 = SOLARSRC+"/qadevOOo/testdocs/"+cTempFileName+"."+GetDocEndings(FilterType or cFlt50)
++ oDoc = LoadDoc (sFileName50)
++
++' oDoc = Documents.open(sFileName)
++ LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSave50Doc, FileChannel)
++ LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageOpen50Doc, MainFileChannel)
++ SetStatus (FilterType, cDocOpen50, not IsNull (oDoc))
++
++ if not IsNull (oDoc) then
++' oDoc.dispose
++ nCurrentAction = cDocClose
++ oDoc.close (true)
++ end If
++ end if
+ end If
+ Print #LocalTestLog, "---"
+ Close #LocalTestLog%
+ LocalTestLog = 0
+ Exit Sub ' Without error
+
+ DOCTESTERROR:
+ If ( gCurrentTestCase = cLogfileFailed ) then
+ LogTestResult( " ", False )
+ Exit Sub
+ else
+ LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ GetErrorMessage(gCurrentTestCase), False )
+ Close #LocalTestLog%
+ LocalTestLog = 0
+ End If
+ Exit Sub ' With error
+ End Sub
+
+ Sub MakeNewDoc
+ DIM oDoc as Object
+ Dim bSuccess as Boolean
+ On Local Error GoTo DOCTESTERROR2
+ 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
+ gCurrentTestCase = cDocClose
+ bSuccess = CloseDoc( oDoc )
+ LogTestResult( GetDocFilter(gCurrentDocTest)+" "+ cMessageCloseDoc, bSuccess )
+ end If
+ Print #LocalTestLog, "---"
+ Close #LocalTestLog%
+ LocalTestLog = 0
+ Exit Sub ' Without error
+
+ DOCTESTERROR2:
+ If ( gCurrentTestCase = cLogfileFailed ) then
+ LogTestResult( " ", False )
+ Exit Sub
+ else
+ LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ GetErrorMessage(gCurrentTestCase), False )
+ Close #LocalTestLog%
+ LocalTestLog = 0
+ End If
+ Exit Sub ' With error
+ End Sub
+
+ 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 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)
+ bSuccess=oCharts.HasByName(cChartName)
+ LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ cMessageNewDoc, bSuccess )
+ gCurrentTestCase = cDocClose
+ oDoc.close (true)
+ else
+ LogTestResult( GetDocFilter(frmCalc or cFltNewDoc)+" "+ cMessageNewDoc, FALSE )
+ End if
+ Print #LocalTestLog, "---"
+ Close #LocalTestLog%
+ LocalTestLog = 0
+ Exit Sub ' Without error
+
+ CHARTTESTERROR:
+ If ( gCurrentTestCase = cLogfileFailed ) then
+ LogTestResult( " ", False )
+ Exit Sub
+ else
+ LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ GetErrorMessage(gCurrentTestCase), FALSE )
+ Close #LocalTestLog%
+ LocalTestLog = 0
+ End If
+ Exit Sub ' With error
+ End Sub
+
+ Sub LogState (bState as Boolean, sText as String, nLocaleFileChannel as integer)
+ if bState then
+ Print #nLocaleFileChannel, sText+" -> ok"
+ else
+ Print #nLocaleFileChannel, sText+" -> error"
+ end If
+ end Sub
+
+ Function GetDocEndings (DocType as Integer) as String
+ Select Case ( DocType )
+ case frmWriter or cFlt8
+ GetDocEndings = "odt" ' Textdokument
+ case frmCalc or cFlt8
+ GetDocEndings = "ods" 'Tabellendokument
+ case frmImpress or cFlt8
+ GetDocEndings = "odp" 'PrÕsentation
+ case frmDraw or cFlt8
+ GetDocEndings = "odg" 'Zeichen
- case frmHyperText, frmHyperText or cFltXML
++ case frmHyperText, frmHyperText or cFlt50, frmHyperText or cFltXML
+ GetDocEndings = "html" 'Hypertext-Dokument
++ case frmWriter or cFlt50
++ GetDocEndings = "sdw" ' Textdokument 5.0
++ case frmCalc or cFlt50
++ GetDocEndings = "sdc" 'Tabellendokument 5.0
++ case frmImpress or cFlt50
++ GetDocEndings = "sdd" 'PrÕsentation 5.0
++ case frmDraw or cFlt50
++ GetDocEndings = "sda" 'Zeichen 5.0
+ case frmWriter or cFltXML
+ GetDocEndings = "sxw" ' Textdokument
+ case frmCalc or cFltXML
+ GetDocEndings = "sxc" 'Tabellendokument
+ case frmImpress or cFltXML
+ GetDocEndings = "sxi" 'PrÕsentation
+ case frmDraw or cFltXML
+ GetDocEndings = "sxd" 'Zeichen
+ case else
+ GetDocEndings = ""
+ end Select
+ end Function
+
+ Function GetDocFilter (DocType as Integer) as String
+ Select Case ( DocType )
+ case frmWriter or cFlt8
+ GetDocFilter = "writer8" ' text document
+ case frmCalc or cFlt8
+ GetDocFilter = "calc8" ' spreadsheet document
+ case frmImpress or cFlt8
+ GetDocFilter = "impress8" ' presentation
+ case frmDraw or cFlt8
+ GetDocFilter = "draw8" ' drawing
+ case frmMath or cFlt8
+ GetDocFilter = "math8" ' formula
+
+ case frmWriter or cFltXML
+ GetDocFilter = "StarOffice XML (Writer)" ' text document
+ case frmCalc or cFltXML
+ GetDocFilter = "StarOffice XML (Calc)" ' spreadsheet document
+ case frmImpress or cFltXML
+ GetDocFilter = "StarOffice XML (Impress)" ' presentation
+ case frmDraw or cFltXML
+ GetDocFilter = "StarOffice XML (Draw)" ' drawing
+ case frmMath or cFltXML
+ GetDocFilter = "StarOffice XML (Math)" ' formula
+
- case frmHyperText, frmHyperText or cFltXML
++ case frmHyperText, frmHyperText or cFlt50, frmHyperText or cFltXML
+ GetDocFilter = "HTML" ' HTML document
++ case frmWriter or cFlt50
++ GetDocFilter = "StarWriter 5.0" ' Textdokument 5.0
++ case frmCalc or cFlt50
++ GetDocFilter = "StarCalc 5.0" 'Tabellendokument 5.0
++ case frmImpress or cFlt50
++ GetDocFilter = "StarImpress 5.0" 'Präsentation 5.0
++ case frmDraw or cFlt50
++ GetDocFilter = "StarDraw 5.0" 'Zeichen 5.0
++ case frmMath or cFlt50
++ GetDocFilter = "StarMath 5.0" 'Formel 5.0
+
+ case frmWriter or cFltNewDoc
+ GetDocFilter = "swriter" ' text document
+ case frmCalc or cFltNewDoc
+ GetDocFilter = "scalc" ' spreadsheet document
+ case frmImpress or cFltNewDoc
+ GetDocFilter = "simpress" ' presentation
+ case frmDraw or cFltNewDoc
+ GetDocFilter = "sdraw" ' drawing
+ case frmMath or cFltNewDoc
+ GetDocFilter = "smath" ' formula
+ case frmHyperText or cFltNewDoc
+ GetDocFilter = "swriter/web" ' HTML document
+ case frmChart or cFltNewDoc
+ GetDocFilter = "schart" ' chart
+ case else
+ GetDocFilter = ""
+ end Select
+ end Function
+
+ Function GetLogFileName (DocType as Integer) as String
+ Select Case ( DocType )
+ case frmWriter
+ GetLogFileName = sSWLogFileName ' text document
+ case frmCalc
+ GetLogFileName = sSCLogFileName ' spreadsheet document
+ case frmImpress
+ GetLogFileName = sSDLogFileName ' presentation
+ case frmDraw
+ GetLogFileName = sSDrawLogFileName ' drawing
+ case frmMath
+ GetLogFileName = sSMathLogFileName ' formula
+ case frmHyperText
+ GetLogFileName = sSHptLogFileName ' HTML document
+ case frmChart
+ GetLogFileName = sSChartLogFileName ' chart
+ case frmJava
+ GetLogFileName = sJavaLogFileName 'Java
+ case frmTestClosure
+ GetLogFileName = sTestGlueLogFileName ' test framework
+ case frmDataBase
+ GetLogFileName = sSDBLogFileName 'Database
+ case frmExtension
+ GetLogFileName = sExtLogFileName 'Extension
+ case else
+ GetLogFileName = ""
+ end Select
+ end Function
+
+ Function GetErrorMessageOnAction (nAction as Integer) as String
+ Select Case ( nAction )
+ case cDocNew
+ GetErrorMessageOnAction = cMessageNewDoc
+ case cDocSaveOpen8
+ GetErrorMessageOnAction = cMessageSaveOpen8Doc
+ case cDocSaveOpenXML
+ GetErrorMessageOnAction = cMessageSaveOpenXMLDoc
++ case cDocOpen50
++ GetErrorMessageOnAction = cMessageOpen50Doc
+ case cDocClose
+ GetErrorMessageOnAction = cMessageCloseDoc
+ case else
+ GetErrorMessageOnAction = ""
+ end Select
+ end Function
+
+ Function IsFilterAvailable (FilterType as Integer) as boolean
+ IsFilterAvailable = true
- if ((FilterType = (frmHyperText or cFltXML))) then
++ if ((FilterType = (frmHyperText or cFlt50)) or (FilterType = (frmHyperText or cFltXML))) then
+ IsFilterAvailable = false
+ end if
+ End Function
+
+ Function TestJava
+ Dim oObj as Object
+ gCurrentTestCase = cLogfileFailed
+ LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest))
+ gCurrentTestCase = cDocNew
+ oObj = createUnoService( cUnoJavaLoader )
+ LogTestResult( "Java "+ cMessageNewDoc, not IsNull (oObj) )
+
+ Print #LocalTestLog, "---"
+ Close #LocalTestLog%
+ LocalTestLog = 0
+
+ TestJava = not IsNull (oObj)
+ End Function
+
+ Sub LoadLibrary( LibName as String )
+
+ dim args(1)
+ dim arg as new com.sun.star.beans.PropertyValue
+ arg.Name = "LibraryName"
+ arg.Value = LibName
+ args(0) = arg
+
+ dim url as new com.sun.star.util.URL
+ dim trans as object
+ trans = createUnoService("com.sun.star.util.URLTransformer" )
+ url.Complete = "slot:6517"
+ trans.parsestrict( url )
+
+ dim disp as object
+ disp = StarDesktop.currentFrame.queryDispatch( url, "", 0 )
+ disp.dispatch( url, args() )
+
+ End Sub
+
+ Sub LoadDoc (DocName as String) as Object
+ dim trans as object
+ trans = createUnoService("com.sun.star.util.URLTransformer" )
+ url = createUnoStruct("com.sun.star.util.URL" )
+ url.Complete = DocName
+ if Left(DocName, 5 ) <> "file:" then
+ trans.parsestrict( url )
+ endif
+
+ Dim aPropArray(0) as Object
+ aPropArray(0) = CreateUnoStruct("com.sun.star.beans.PropertyValue")
+ aPropArray(0).Name = "OpenFlags"
+ aPropArray(0).Value = "S"
+
+ dim doc as object
+ dim noargs()
+ doc = StarDesktop.loadComponentFromURL( url.Complete, "_blank", 0, aPropArray() ) ' XModel
+ LoadDoc = doc
+ End Sub
+
+ Sub SaveDoc (DocName as String, oDoc as Object, sFilterName as string )
+ dim trans as object
+ trans = createUnoService("com.sun.star.util.URLTransformer" )
+ url = createUnoStruct("com.sun.star.util.URL" )
+ url.Complete = DocName
+ if Left(DocName, 5 ) <> "file:" then
+ trans.parsestrict( url )
+ endif
+
+ if not (sFilterName = "") then
+ Dim aPropArray(0) as Object
+ aPropArray(0) = CreateUnoStruct("com.sun.star.beans.PropertyValue")
+ aPropArray(0).Name = "FilterName"
+ aPropArray(0).Value = sFilterName
+
+ oDoc.storeAsURL( url.Complete, aPropArray() )
+ else
+ MessageBox "Filtername is unknown!"
+ end if
+ end 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 --cc smoketestdoc/data/Test_DB.xml
index 0000000,98f1747..f60df01
mode 000000,100644..100644
--- a/smoketestdoc/data/Test_DB.xml
+++ b/smoketestdoc/data/Test_DB.xml
@@@ -1,0 -1,147 +1,147 @@@
+ <?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.
+ *
+ **********************************************************************-->
+ <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
+ <script:module xmlns:script="http://openoffice.org/2000/script" script:name="Test_DB" script:language="StarBasic">REM ***** Database Test *****
+
+ const cMessageDatabaseService = "Database Service"
+ const cMessageDatabaseOpen = "Open Database"
+ const cMessageDatabaseInsert = "Insert record into Database"
+ const cMessageDatabaseDelete = "Delete record from Database"
+ const cMessageDatabaseSeek = "Read other record from Database"
+ const cMessageDatabaseClose = "Close Database"
+
+ 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
+
+ gCurrentTestCase = cLogfileFailed
+ LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest))
+
+ gCurrentTestCase = cDBService
+ sCurrentMessage = cMessageDatabaseService + " " + cUnoDatabaseContext
+
+ oDBContext = CreateUnoService(cUnoDatabaseContext)
- sDBName=oDBContext.ElementNames(0) 'Names of Databases
++ sDBName="Bibliography" 'Names of Databases
+
+ gCurrentTestCase = cDBOpen
+ sCurrentMessage = cMessageDatabaseOpen
+
+ oDataSource = oDBContext.GetByName(sDBName)
+ sTable=oDataSource.Tables.ElementNames(0)
+ oDBConnection = oDBContext.GetByName(sDBName).GetConnection("","")
+
+ LogTestResult( "Database "+ cMessageDatabaseOpen, not IsNull (oDBConnection) )
+ if (IsNull(oDBConnection)) then
+ Close #LocalTestLog%
+ LocalTestLog = 0
+ Exit Sub
+ End If
+
+ ' Database is open now
+
+ gCurrentTestCase = cDBService
+ sCurrentMessage = cMessageDatabaseService + " " + cUnoRowSet
+ oRowSet = createUnoService(cUnoRowSet)
+
+ if (IsNull(oRowSet)) then
+ LogTestResult( "Database "+ cMessageDatabaseService + " " + cUnoRowSet, not IsNull (oRowSet) )
+ Exit Sub
+ else
+ LogTestResult( "Database "+ cMessageDatabaseService, TRUE )
+ End If
+
+ gCurrentTestCase = cDBInsert
+ sCurrentMessage = cMessageDatabaseInsert
+
+ oRowSet.ActiveConnection = oDBConnection
+
+ oRowSet.CommandType = com.sun.star.sdb.CommandType.COMMAND
+ oRowSet.Command = "SELECT * FROM " + sTable
+ oRowSet.execute()
+
+ oRowSet.moveToInsertRow
+ oRowSet.updateString(5, sTestString)
+
+ oRowSet.insertRow()
+ nRowCount=oRowSet.RowCount
+
+ oRowSet.moveToCurrentRow()
+
+ bResult = (oRowSet.getString(5) = sTestString)
+ LogTestResult( "Database "+ cMessageDatabaseInsert, bResult )
+
+ 'delete only if insert passed
+
+ if (bResult) Then
+ gCurrentTestCase = cDBDelete
+ sCurrentMessage = cMessageDatabaseDelete
+ oRowSet.deleteRow()
+ bResult = (nRowCount - oRowSet.RowCount = 0)
+ if ( bResult ) Then
+ oRowSet.next()
+ bResult = (nRowCount - oRowSet.RowCount = 1)
+ End If
+ LogTestResult( "Database "+ cMessageDatabaseDelete, bResult )
+ End If
+
+ ' read other record
+
+ gCurrentTestCase = cDBSeek
+ sCurrentMessage = cMessageDatabaseSeek
+ oRowSet.first()
+ bResult = not (oRowSet.getString(5) = sTestString)
+ LogTestResult( "Database "+ cMessageDatabaseSeek, bResult )
+
+ gCurrentTestCase = cDBClose
+ sCurrentMessage = cMessageDatabaseClose
+ oDBConnection.Dispose()
+ LogTestResult( "Database "+ cMessageDatabaseClose, True )
+
+ Print #LocalTestLog, "---"
+ Close #LocalTestLog%
+ LocalTestLog = 0
+ Exit Sub ' Without error
+
+ DBERROR:
+ If ( gCurrentTestCase = cLogfileFailed ) then
+ LogTestResult( " ", False )
+ Exit Sub
+ else
+ LogTestResult( "Database "+ sCurrentMessage, FALSE )
+ Close #LocalTestLog%
+ LocalTestLog = 0
+ End If
+ Exit Sub ' With error
+ End Sub
+ </script:module>
diff --cc smoketestoo_native/makefile.mk
index d9c4dac,aab2453..195ef40
mode 100644,100755..100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
diff --cc smoketestoo_native/smoketest.cxx
index 1767fa2,5fd1691..76acb32
mode 100644,100755..100755
--- a/smoketestoo_native/smoketest.cxx
+++ b/smoketestoo_native/smoketest.cxx
diff --cc test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index 0000000,4f9ee9b..da54d62
mode 000000,100644..100644
--- a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@@ -1,0 -1,98 +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 "preextstl.h"
+ #include "cppunit/Message.h"
+ #include "cppunit/Protector.h"
-#include "postextstl.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;
+ }
commit 9ffef9aeb36763304689c1aa02bce8f913c94b1c
Author: obo <obo at openoffice.org>
Date: Wed Mar 16 16:16:13 2011 +0100
masterfix DEV300: #i10000# fix build.lst, remove obsolete makefile.mk
diff --git a/smoketestdoc/makefile.mk b/smoketestdoc/makefile.mk
deleted file mode 100755
index 2096d07..0000000
--- a/smoketestdoc/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# 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 = smoketestoo_native
-TARGET = data
-
-.INCLUDE: settings.mk
-
-$(BIN)/smoketestdoc.sxw: $(MISC)/zip/smoketestdoc.sxw
- $(COPY) $< $@
-
-$(MISC)/zip/smoketestdoc.sxw: \
- Events.xml \
- Global.xml \
- OptionsDlg.xml \
- Test_10er.xml \
- Test_DB.xml \
- Test_Ext.xml \
- content.xml \
- dialog-lb.xml \
- dialog-lc.xml \
- manifest.xml \
- meta.xml \
- script-lb.xml \
- 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 \
- 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) .
-
-.INCLUDE: target.mk
diff --git a/smoketestdoc/prj/build.lst b/smoketestdoc/prj/build.lst
index e778131..ec825ab 100755
--- a/smoketestdoc/prj/build.lst
+++ b/smoketestdoc/prj/build.lst
@@ -1,5 +1,4 @@
smdoc smoketestdoc :: soltools codemaker unoil javaunohelper NULL
smdoc smoketestdoc usr1 - all smdoc_mkout NULL
-smdoc smoketestdoc nmake - all smdoc_main NULL
smdoc smoketestdoc\data nmake - all smdoc_data NULL
smdoc smoketestdoc\com\sun\star\comp\smoketest nmake - all smdoc_ext NULL
commit 9206720c6b835745d6940d182c50a41654bf0b9b
Author: obo <obo at openoffice.org>
Date: Wed Mar 16 14:02:20 2011 +0100
masterfix DEV300: #i10000# fix damaged build.lst
diff --git a/smoketestdoc/prj/build.lst b/smoketestdoc/prj/build.lst
index 57eb373..e778131 100755
--- a/smoketestdoc/prj/build.lst
+++ b/smoketestdoc/prj/build.lst
@@ -1,4 +1,5 @@
smdoc smoketestdoc :: soltools codemaker unoil javaunohelper NULL
smdoc smoketestdoc usr1 - all smdoc_mkout NULL
+smdoc smoketestdoc nmake - all smdoc_main NULL
smdoc smoketestdoc\data nmake - all smdoc_data NULL
-smtoon smoketestoo_native\com\sun\star\comp\smoketest nmake - all smdoc_ext NULL
+smdoc smoketestdoc\com\sun\star\comp\smoketest nmake - all smdoc_ext NULL
commit fe7839474d528f51726ebe841621baedbdabd9fb
Merge: 6f2d0a0... d6d0e75...
Author: obo <obo at openoffice.org>
Date: Wed Mar 16 09:28:51 2011 +0100
CWS-TOOLING: integrate CWS chart51
commit 6f2d0a0eeda6f6082d38287c6405e65ff8034a00
Merge: e360db5... c4451ce...
Author: obo <obo at openoffice.org>
Date: Wed Mar 16 08:29:30 2011 +0100
CWS-TOOLING: integrate CWS debuglevels
commit c4451ce8134734e970212a5d8942dcdba29a59c6
Merge: 1cb6489... e360db5...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Mar 14 09:47:56 2011 +0100
debuglevels: pulled and merged DEV300.m102
commit e360db55a779747595b15cf4b2d3b74f251f0643
Merge: 411d6ce... ef51565...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Mar 7 13:15:24 2011 +0100
CWS-TOOLING: integrate CWS jl165
commit d6d0e75b736005d47ae1b38a56b6e03810be6145
Author: Marc Neumann [msc] <Marc.Neumann at oracle.com>
Date: Thu Mar 3 11:09:20 2011 +0100
cws chart51: #i117182# add wait
diff --git a/testautomation/graphics/required/includes/global/id_004.inc b/testautomation/graphics/required/includes/global/id_004.inc
index c06f88c..d0d9ae6 100644
--- a/testautomation/graphics/required/includes/global/id_004.inc
+++ b/testautomation/graphics/required/includes/global/id_004.inc
@@ -244,8 +244,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
commit 1cb6489a3a9cdd949eb11979c5841e9d76b5729f
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Thu Mar 3 10:42:58 2011 +0100
debuglevels: open the smoketest doc read-only
diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx
index a4e5321..5fd1691 100755
--- a/smoketestoo_native/smoketest.cxx
+++ b/smoketestoo_native/smoketest.cxx
@@ -151,13 +151,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(
commit 411d6ce2669f230d4b1b2a0ac9f4791549d5ce2c
Merge: 64fdea6... 7901eec...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Mar 2 12:20:29 2011 +0100
CWS-TOOLING: integrate CWS automationdev300m100
commit 64fdea69c2b392b243dbac96df76de02e0b9030e
Merge: b2bec9b... f2899f8...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Mar 2 12:10:39 2011 +0100
CWS-TOOLING: integrate CWS mhu21
commit 7901eecefdc56d0ed2edcba208c5d027438c4914
Author: Wolfram Garten [wg] <Wolfram.Garten at oracle.com>
Date: Tue Mar 1 15:21:51 2011 +0100
Bug 116803 - [Automation]:crash when closing stylist.
diff --git a/testautomation/graphics/optional/includes/global/g_stylist.inc b/testautomation/graphics/optional/includes/global/g_stylist.inc
index 71d05f7..0c03e07 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
commit b2bec9b47d56010e78d706bd96aa5f88679c26b5
Merge: 49e5cb3... cccf967...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Feb 28 18:38:34 2011 +0100
CWS-TOOLING: integrate CWS automationdev300m99
commit ef515658796870c2039486f98d28cf9172891e3f
Merge: 49e5cb3... 1ef680d...
Author: Joachim Lingner <jl at openoffice.org>
Date: Mon Feb 28 16:13:56 2011 +0100
jl165 merging heads
commit d84ecc9e18d1158cc58ede6211731fde9accba69
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Feb 25 16:01:35 2011 +0100
debuglevels: GCC WaE / replace cppunit's DynamicLibraryManager (which does not seem to be public API) with osl_loadModule
diff --git a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index 28a0462..4f9ee9b 100644
--- a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -23,6 +23,7 @@
* for a copy of the LGPLv3 License.
************************************************************************/
+#include "precompiled_test.hxx"
#include "sal/config.h"
#include <limits>
@@ -52,7 +53,8 @@ std::string convert(rtl::OUString const & s16) {
rtl::OString s8(rtl::OUStringToOString(s16, osl_getThreadTextEncoding()));
return std::string(
s8.getStr(),
- (s8.getLength() > std::numeric_limits< std::string::size_type >::max()
+ ((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())));
}
@@ -85,6 +87,7 @@ bool Prot::protect(
+ a.getValueTypeName()),
convert(e.Message)));
}
+ return false;
}
}
commit d8012f0d50bba64704f796cf9028a3cdad0ea3b2
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Feb 25 14:37:23 2011 +0100
debuglevels: yet another module dependency fix :-\
diff --git a/smoketestdoc/prj/build.lst b/smoketestdoc/prj/build.lst
index f76d815..57eb373 100755
--- a/smoketestdoc/prj/build.lst
+++ b/smoketestdoc/prj/build.lst
@@ -1,4 +1,4 @@
-smdoc smoketestdoc :: soltools idlc NULL
+smdoc smoketestdoc :: soltools codemaker unoil javaunohelper NULL
smdoc smoketestdoc usr1 - all smdoc_mkout NULL
smdoc smoketestdoc\data nmake - all smdoc_data NULL
smtoon smoketestoo_native\com\sun\star\comp\smoketest nmake - all smdoc_ext NULL
commit ad6f6acf9bd5441294b55ba9a3930a8ae4e0f61e
Author: Wolfram Garten [wg] <Wolfram.Garten at oracle.com>
Date: Fri Feb 25 12:26:54 2011 +0100
Bug 117075 - [Automation]: inserting sleeps in i_us2_present.inc
diff --git a/testautomation/graphics/optional/includes/impress/i_us2_present.inc b/testautomation/graphics/optional/includes/impress/i_us2_present.inc
index 1db9740..9ec6cef 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"
commit 82cf6648478c2c2e7c6dd04f4f061797cfe32111
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Feb 25 11:35:19 2011 +0100
debuglevels: fixed module dependencies
diff --git a/smoketestdoc/prj/build.lst b/smoketestdoc/prj/build.lst
index 4fd727f..f76d815 100755
--- a/smoketestdoc/prj/build.lst
+++ b/smoketestdoc/prj/build.lst
@@ -1,4 +1,4 @@
-smdoc smoketestdoc :: NULL
+smdoc smoketestdoc :: soltools idlc NULL
smdoc smoketestdoc usr1 - all smdoc_mkout NULL
smdoc smoketestdoc\data nmake - all smdoc_data NULL
smtoon smoketestoo_native\com\sun\star\comp\smoketest nmake - all smdoc_ext NULL
commit a56ef85dcf7a790eceaa091f8e6654faa288af71
Author: sb <sb at openoffice.org>
Date: Fri Feb 25 11:32:55 2011 +0100
debuglevels: #i117073# added cppunittester --protector support; added unoexceptionprotector and use it in installationtest.mk; reverted changes to smoketest.cxx obsoleted by these additions
diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx
index 0029678..a4e5321 100755
--- a/smoketestoo_native/smoketest.cxx
+++ b/smoketestoo_native/smoketest.cxx
@@ -48,7 +48,6 @@
#include "com/sun/star/uno/Sequence.hxx"
#include "com/sun/star/util/URL.hpp"
#include <preextstl.h>
-#include "cppuhelper/exc_hlp.hxx"
#include "cppuhelper/implbase1.hxx"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
@@ -57,7 +56,6 @@
#include <postextstl.h>
#include "osl/conditn.hxx"
#include "osl/diagnose.h"
-#include "rtl/strbuf.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "test/gettestargument.hxx"
@@ -132,46 +130,23 @@ public:
private:
CPPUNIT_TEST_SUITE(Test);
- CPPUNIT_TEST(runSmoketestDoc);
+ CPPUNIT_TEST(test);
CPPUNIT_TEST_SUITE_END();
- void runSmoketestDoc();
-
- ::rtl::OString getFailMessage( sal_Char const * i_context, css::uno::Any const & i_exception );
+ void test();
test::OfficeConnection connection_;
};
-::rtl::OString Test::getFailMessage( sal_Char const * i_context, css::uno::Any const & i_exception )
-{
- ::rtl::OStringBuffer failMessage;
- failMessage.append( i_context );
- failMessage.append( ": caught a " );
- failMessage.append( ::rtl::OUStringToOString( i_exception.getValueTypeName(), RTL_TEXTENCODING_ASCII_US ) );
- return failMessage.makeStringAndClear();
-}
-
void Test::setUp() {
- try {
- connection_.setUp();
- }
- catch( css::uno::Exception const & ) {
- CPPUNIT_FAIL( getFailMessage( "setting up the connection failed", ::cppu::getCaughtException() ).getStr() );
- }
+ connection_.setUp();
}
void Test::tearDown() {
- try {
- connection_.tearDown();
- }
- catch( css::uno::Exception const & ) {
- CPPUNIT_FAIL( getFailMessage( "tearing down the connection failed", ::cppu::getCaughtException() ).getStr() );
- }
+ connection_.tearDown();
}
-void Test::runSmoketestDoc() {
- try
- {
+void Test::test() {
rtl::OUString doc;
CPPUNIT_ASSERT(
test::getTestArgument(
@@ -220,10 +195,6 @@ void Test::runSmoketestDoc() {
result.condition.wait();
CPPUNIT_ASSERT(result.success);
CPPUNIT_ASSERT_EQUAL(rtl::OUString(), result.result);
- }
- catch( css::uno::Exception const & ) {
- CPPUNIT_FAIL( getFailMessage( "executing the smoketest macro", ::cppu::getCaughtException() ).getStr() );
- }
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/test/prj/build.lst b/test/prj/build.lst
index 7adea0c..e22199a 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 54da206..18a599f 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 4c90dc6..2073f15 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 0000000..7f62199
--- /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 0000000..28a0462
--- /dev/null
+++ b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -0,0 +1,95 @@
+/*************************************************************************
+* 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 "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 "preextstl.h"
+#include "cppunit/Message.h"
+#include "cppunit/Protector.h"
+#include "postextstl.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(),
+ (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)));
+ }
+}
+
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT CppUnit::Protector * SAL_CALL
+unoexceptionprotector() {
+ return new Prot;
+}
commit aff7c3f38e612c2653c649c9d0f66dcd066541f0
Merge: a123761... 49e5cb3...
Author: Ingrid Halama [iha] <Ingrid.Halama at oracle.com>
Date: Thu Feb 24 17:39:29 2011 +0100
chart51: merge with DEV300_m101
commit 6e17ebbb26bb34e520bc0319f212aaab85c93bad
Merge: 51f858c... 49e5cb3...
Author: Oliver Craemer [oc] <oliver.craemer at oracle.com>
Date: Thu Feb 24 14:23:05 2011 +0100
automationdev300m100: merge with DEV300m101
commit 51f858c2249f8450ea6ef25b7e05bc6e1569f385
Author: Wolfram Garten [wg] <Wolfram.Garten at oracle.com>
Date: Thu Feb 24 14:02:18 2011 +0100
Deleting double entry.
diff --git a/testautomation/graphics/required/includes/global/id_004.inc b/testautomation/graphics/required/includes/global/id_004.inc
index c06f88c..f04a3ba 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
commit 095d95c71e0b3a9251bfd5143cc2f4a9e5e94e73
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Thu Feb 24 13:26:56 2011 +0100
debuglevels: fixed file permissions
diff --git a/smoketestdoc/data/Events.xml b/smoketestdoc/data/Events.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/Global.xml b/smoketestdoc/data/Global.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/OptionsDlg.xml b/smoketestdoc/data/OptionsDlg.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/Test_10er.xml b/smoketestdoc/data/Test_10er.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/Test_DB.xml b/smoketestdoc/data/Test_DB.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/Test_Ext.xml b/smoketestdoc/data/Test_Ext.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/content.xml b/smoketestdoc/data/content.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/dialog-lb.xml b/smoketestdoc/data/dialog-lb.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/dialog-lc.xml b/smoketestdoc/data/dialog-lc.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/makefile.mk b/smoketestdoc/data/makefile.mk
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/manifest.xml b/smoketestdoc/data/manifest.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/meta.xml b/smoketestdoc/data/meta.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/script-lb.xml b/smoketestdoc/data/script-lb.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/script-lc.xml b/smoketestdoc/data/script-lc.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/settings.xml b/smoketestdoc/data/settings.xml
old mode 100755
new mode 100644
diff --git a/smoketestdoc/data/styles.xml b/smoketestdoc/data/styles.xml
old mode 100755
new mode 100644
commit 03a614549e783b2ed3af999c7dca13dffe7ef4e4
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Thu Feb 24 12:31:22 2011 +0100
debuglevels: reintroduced lost row headers in first status table
diff --git a/smoketestdoc/data/Global.xml b/smoketestdoc/data/Global.xml
index cf13fc6..a35a830 100755
--- a/smoketestdoc/data/Global.xml
+++ b/smoketestdoc/data/Global.xml
@@ -250,19 +250,20 @@ Sub CreateStatusTable
xCursor.GoRight (1, False)
table = aDoc.createInstance("com.sun.star.text.TextTable")
- table.initialize(6,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
tableCell = table.getCellByPosition( i% + 1, 0 )
tableCell.String = tableHeaders( i% )
next i%
+
+ for i% = LBound( tableRows ) to UBound( tableRows )
+ tableCell = table.getCellByPosition( 0, i% + 1 )
+ tableCell.String=tableRows(i%)
+ next i%
end Sub
Sub CreateStatusTable2
@@ -335,7 +336,7 @@ Sub CreateDocState
table = aDoc.TextTables.GetByIndex (1)
for j% = 0 to 7
- for i% = 0 to 4
+ for i% = 0 to 3
sRangeName = GetRangeName(j%, i%+1)
tableCursor = table.createCursorByCellName(sRangeName)
commit f2899f8528ccfae003ec8a992ef7ff5ea3e5fc5e
Merge: 684b15b... 49e5cb3...
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Wed Feb 23 21:03:15 2011 +0100
Update from master repository (DEV300_m100).
diff --cc testautomation/framework/optional/includes/basic_issues.inc
index 3fec49f,32ddb13..32ddb13
mode 100755,100644..100755
--- a/testautomation/framework/optional/includes/basic_issues.inc
+++ b/testautomation/framework/optional/includes/basic_issues.inc
diff --cc testautomation/framework/optional/includes/filedlg_rename.inc
index 513a652,c5f983d..c5f983d
mode 100644,100644..100755
--- a/testautomation/framework/optional/includes/filedlg_rename.inc
+++ b/testautomation/framework/optional/includes/filedlg_rename.inc
commit c036f5815723991ab3c9d7b7d738150a4e2e21ef
Merge: 328e996... aef87b3...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Wed Feb 23 12:54:26 2011 +0100
debuglevels: merged latest CWS fixes done in another repo
commit aef87b39c105895906cf81001f1a774c5fd481c7
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Wed Feb 23 10:46:57 2011 +0100
debuglevels: fixed index access in StartTestWithDefaultOptions
diff --git a/smoketestdoc/data/Global.xml b/smoketestdoc/data/Global.xml
index 323f537..cf13fc6 100755
--- a/smoketestdoc/data/Global.xml
+++ b/smoketestdoc/data/Global.xml
@@ -658,10 +658,11 @@ Function StartTestWithDefaultOptions
component(cStJava) = "Java"
component(cStDataBase) = "Base"
component(cStExtension) = "Extensions"
- dim action(2) as string
+ dim action(3) as string
action(cDocNew) = "new"
action(cDocSaveOpen8) = "V8.0"
action(cDocSaveOpenXML) = "XML"
+ action(cDocClose) = "close"
dim baseAction(5) as string
baseAction(cDBService) = "services"
baseAction(cDBOpen) = "open"
commit 328e996374f8f9b87a5e170e289bac529c71e6e6
Merge: 54c3e28... 49e5cb3...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Wed Feb 23 09:58:44 2011 +0100
debuglevels: merged to-be-m101
commit 6dd8b0a2247fe044fa4c42903902f6215137ad72
Author: Thorsten Bosbach <tbo at OpenOffice.org>
Date: Mon Feb 21 11:10:45 2011 +0100
#i116972# fix gOleOthers for win32 only
diff --git a/testautomation/global/tools/includes/optional/t_ole.inc b/testautomation/global/tools/includes/optional/t_ole.inc
index 23b3e02..714d708 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
-'*******************************************************************************
commit 54c3e280ff5c5464406ff5cfb4c481a89aff3485
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Feb 21 10:32:07 2011 +0100
debuglevels: let smoketestoo_native use a dedicated version of dbgsvrc/DBGSV_INIT, instead of using the default which the build env points to - it might direct assertion output to whereever ...
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index 76ea6c2..aab2453 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)
commit 1ef680d8d0521b1645caa96b3f96f0579046d293
Author: Joachim Lingner <jl at openoffice.org>
Date: Fri Feb 18 12:42:54 2011 +0100
jl64 #i117009# increase versions of cli assemblies
diff --git a/testtools/source/cliversioning/version_libs/version_3_3.dll b/testtools/source/cliversioning/version_libs/version_3_3.dll
new file mode 100755
index 0000000..a63a436
Binary files /dev/null and b/testtools/source/cliversioning/version_libs/version_3_3.dll differ
commit fadba4a81ec340f179e336c8c810318419ad6deb
Author: Oliver Craemer [oc] <oliver.craemer at oracle.com>
Date: Fri Feb 18 11:00:09 2011 +0100
#i116997# [ch2_lv1.bas] Timingproblem on Solaris
diff --git a/testautomation/chart2/optional/includes/ch2_lvl1a.inc b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
index 6da6e29..e012dd0 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"
commit 64a9ac08a56f943aa0219ed5a6b8f8cf6767c852
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Wed Feb 16 10:23:55 2011 +0100
debuglevels: explicit failure upon catching an UNO exception (which gives a slightly better idea of the failure than what cppunit emits by default)
diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx
index a4e5321..0029678 100755
--- a/smoketestoo_native/smoketest.cxx
+++ b/smoketestoo_native/smoketest.cxx
@@ -48,6 +48,7 @@
#include "com/sun/star/uno/Sequence.hxx"
#include "com/sun/star/util/URL.hpp"
#include <preextstl.h>
+#include "cppuhelper/exc_hlp.hxx"
#include "cppuhelper/implbase1.hxx"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
@@ -56,6 +57,7 @@
#include <postextstl.h>
#include "osl/conditn.hxx"
#include "osl/diagnose.h"
+#include "rtl/strbuf.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "test/gettestargument.hxx"
@@ -130,23 +132,46 @@ public:
private:
CPPUNIT_TEST_SUITE(Test);
- CPPUNIT_TEST(test);
+ CPPUNIT_TEST(runSmoketestDoc);
CPPUNIT_TEST_SUITE_END();
- void test();
+ void runSmoketestDoc();
+
+ ::rtl::OString getFailMessage( sal_Char const * i_context, css::uno::Any const & i_exception );
test::OfficeConnection connection_;
};
+::rtl::OString Test::getFailMessage( sal_Char const * i_context, css::uno::Any const & i_exception )
+{
+ ::rtl::OStringBuffer failMessage;
+ failMessage.append( i_context );
+ failMessage.append( ": caught a " );
+ failMessage.append( ::rtl::OUStringToOString( i_exception.getValueTypeName(), RTL_TEXTENCODING_ASCII_US ) );
+ return failMessage.makeStringAndClear();
+}
+
void Test::setUp() {
- connection_.setUp();
+ try {
+ connection_.setUp();
+ }
+ catch( css::uno::Exception const & ) {
+ CPPUNIT_FAIL( getFailMessage( "setting up the connection failed", ::cppu::getCaughtException() ).getStr() );
+ }
}
void Test::tearDown() {
- connection_.tearDown();
+ try {
+ connection_.tearDown();
+ }
+ catch( css::uno::Exception const & ) {
+ CPPUNIT_FAIL( getFailMessage( "tearing down the connection failed", ::cppu::getCaughtException() ).getStr() );
+ }
}
-void Test::test() {
+void Test::runSmoketestDoc() {
+ try
+ {
rtl::OUString doc;
CPPUNIT_ASSERT(
test::getTestArgument(
@@ -195,6 +220,10 @@ void Test::test() {
result.condition.wait();
CPPUNIT_ASSERT(result.success);
CPPUNIT_ASSERT_EQUAL(rtl::OUString(), result.result);
+ }
+ catch( css::uno::Exception const & ) {
+ CPPUNIT_FAIL( getFailMessage( "executing the smoketest macro", ::cppu::getCaughtException() ).getStr() );
+ }
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
commit a1237618cf05874529567f103c6ec6eccf33991d
Merge: 6b94dd4... dac6d5d...
Author: Ingrid Halama [iha] <Ingrid.Halama at oracle.com>
Date: Tue Feb 15 14:04:40 2011 +0100
chart51: merge with DEV300_m100
diff --cc testautomation/framework/optional/includes/basic_issues.inc
index 3fec49f,32ddb13..32ddb13
mode 100755,100644..100755
--- a/testautomation/framework/optional/includes/basic_issues.inc
+++ b/testautomation/framework/optional/includes/basic_issues.inc
diff --cc testautomation/framework/optional/includes/filedlg_rename.inc
index 513a652,c5f983d..c5f983d
mode 100644,100644..100755
--- a/testautomation/framework/optional/includes/filedlg_rename.inc
+++ b/testautomation/framework/optional/includes/filedlg_rename.inc
commit 006d566b40cc0ec71eaecf150ce2502943a7ba5f
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Feb 14 11:15:55 2011 +0100
debuglevels: fixed various issues around the test closure's log file
diff --git a/smoketestdoc/data/Global.xml b/smoketestdoc/data/Global.xml
index 3b9026c..323f537 100755
--- a/smoketestdoc/data/Global.xml
+++ b/smoketestdoc/data/Global.xml
@@ -38,7 +38,7 @@ global const cExtensionFileName = "TestExtension.oxt"
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 cOtherSetupDoc = 0, cOtherWriteStatus = 1
+global const cTestClosureSetupDoc = 0, cTestClosureWriteStatus = 1
global const cLogfileFailed = 255
global const cStWriter = 0, cStCalc = 1, cStPraesentation = 2, cStZeichnen = 3
@@ -54,7 +54,7 @@ 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 frmTestGlue = 15
+global const frmTestClosure = 15
Global gCurrentDocTest As Integer
Global gCurrentTestCase As Integer
@@ -139,11 +139,23 @@ Sub AssertionHandler( sMessage as String )
End Sub
Sub Main
- gCurrentDocTest = frmTestGlue
- gCurrentTestCase = cOtherSetupDoc
-
On Local Error Goto MainError
- CaptureAssertions( "AssertionHandler" )
+
+ 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
@@ -157,11 +169,14 @@ Sub Main
call ClearStatus
LogTestResult( GetTestGlueDescription( gCurrentTestCase ), TRUE )
-
+
+ Dim nPreserveFileHandle%
+ nPreserveFileHandle% = LocalTestLog%
Call Test_10er.Main
+ LocalTestLog% = nPreserveFileHandle%
- gCurrentDocTest = frmTestGlue
- gCurrentTestCase = cOtherWriteStatus
+ gCurrentDocTest = frmTestClosure
+ gCurrentTestCase = cTestClosureWriteStatus
if bShowTable then
call CreateStatusTable2
call CreateStatusTable
@@ -170,7 +185,13 @@ Sub Main
' 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 )
@@ -178,15 +199,22 @@ Sub Main
Exit Sub
MainError:
- LogTestResult( GetTestGlueDescription( gCurrentTestCase ), FALSE )
+ 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 cOtherSetupDoc
- GetTestGlueDescription = "setup test document"
- case cOtherWriteStatus
- GetTestGlueDescription = "write test status"
+ case cTestClosureSetupDoc
+ GetTestGlueDescription = "setup"
+ case cTestClosureWriteStatus
+ GetTestGlueDescription = "write_status"
case Else
GetTestGlueDescription = ""
End Select
@@ -259,8 +287,8 @@ Sub CreateStatusTable2
tableRows2(cEXTUninstall ) = "uninstall"
dim tableRows3(1) as string
- tableRows3(cOtherSetupDoc ) = "setup test"
- tableRows3(cOtherWriteStatus ) = "write test result"
+ tableRows3(cTestClosureSetupDoc ) = "setup test"
+ tableRows3(cTestClosureWriteStatus ) = "write test result"
aDoc = gOutputDoc
@@ -380,24 +408,29 @@ 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, MainFileChannel )
- SetStatus( 0, FALSE, sAnnotation )
+ LogState( FALSE, sAnnotation, GlobalTestLog )
+ RecordTestCaseStatus( 0, FALSE, sAnnotation )
Else
- If ( LocalFileChannel <> 0 ) Then
- LogState( bSuccess, sTestCaseDescription, LocalFileChannel )
+ bSuccess = RecordTestCaseStatus( gCurrentTestCase, bSuccess, sTestCaseDescription )
+ If ( LocalTestLog <> 0 ) Then
+ LogState( bSuccess, sTestCaseDescription, LocalTestLog )
EndIf
- if ( MainFileChannel <> 0 ) Then
- LogState( bSuccess, sTestCaseDescription, MainFileChannel )
+ if ( GlobalTestLog <> 0 ) Then
+ LogState( bSuccess, sTestCaseDescription, GlobalTestLog )
EndIf
- SetStatus( gCurrentTestCase, bSuccess, sTestCaseDescription )
End If
End Sub
-Sub SetStatus( nAction as Integer, bState as Boolean, sFailureAnnotation as String )
+Function RecordTestCaseStatus( nAction as Integer, bState as Boolean, sFailureAnnotation as String ) as Boolean
Dim nStatusType as Integer
Dim nState as integer
nStatusType = GetStatusType( gCurrentDocTest )
- If nStatusType = cStNone then Exit Sub
+ 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
@@ -405,17 +438,14 @@ Sub SetStatus( nAction as Integer, bState as Boolean, sFailureAnnotation as Stri
nState = cLogFalse
end If
- If ( gErrorState( nStatusType, nAction ) = cLogFalse ) Then
- ' don't overwrite a previous "failed" state for this this
- nState = cLogFalse
- End If
-
gErrorState (nStatusType, nAction) = nState
If ( nState = cLogFalse ) And ( sFailureAnnotation <> "" ) Then
gTestCaseAnnotations( nStatusType, nAction ) = gTestCaseAnnotations( nStatusType, nAction ) + sFailureAnnotation + chr(13)
End If
-end Sub
+
+ RecordTestCaseStatus = bState
+End Function
Function GetStatusType (nDocType as Integer) as Integer
Select Case ( nDocType )
@@ -435,7 +465,7 @@ Function GetStatusType (nDocType as Integer) as Integer
GetStatusType = cStChart ' chart
case frmJava
GetStatusType = cStJava 'Java
- case frmTestGlue
+ case frmTestClosure
GetStatusType = cStTestGlue ' test framework
case frmDataBase
GetStatusType = cStDataBase 'DataBase
diff --git a/smoketestdoc/data/Test_10er.xml b/smoketestdoc/data/Test_10er.xml
index e2b8113..795ca59 100755
--- a/smoketestdoc/data/Test_10er.xml
+++ b/smoketestdoc/data/Test_10er.xml
@@ -36,7 +36,7 @@ const sSDrawLogFileName = "sdrwlog.dat", sJavaLogFileName = "java
const sSDBLogFileName = "dblog.dat", sExtLogFileName = "extlog.dat"
const sTestGlueLogFileName = "testclosure.log"
const sLogFileName = "smoketest.log"
-const cTempFileName = "ttt"
+const cTempFileName = "smoketest_file"
const cMessageSaveOpen8Doc = "Save/Open open Documents (8.0)"
const cMessageSaveOpenXMLDoc = "Save/Open Document XML (6/7)"
@@ -45,8 +45,8 @@ const cMessageCloseDoc = "Close Document"
Global sWorkPath$
Global sWorkPathURL$
-Global LocalFileChannel%
-Global MainFileChannel%
+Global LocalTestLog%
+Global GlobalTestLog%
Sub Main
call TestAllDocs()
@@ -141,15 +141,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 = ""
@@ -178,13 +176,6 @@ 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
CompatibilityMode(true)
@@ -192,9 +183,7 @@ DIM nStrPos as Long
CompatibilityMode(false)
sExtensionURL = Left (sDocURL, nStrPos)
- call DeleteAllSavedFiles()
- call DeleteAllLogFiles()
- MainFileChannel = OpenLogDat (sLogFileName)
+ GlobalTestLog = OpenLogDat (sLogFileName)
call WriteTestSequence
if bMakeWriterTest then
gCurrentDocTest = frmWriter
@@ -237,47 +226,47 @@ DIM nStrPos as Long
call Test_Ext.TestExtensions
end if
- Close #MainFileChannel
- MainFileChannel = 0
+ Close #GlobalTestLog
+ GlobalTestLog = 0
end Sub
Sub WriteTestSequence
- Print #MainFileChannel, "Sequence of testing"
+ Print #GlobalTestLog, "Sequence of testing"
if bMakeWriterTest then
- WriteTests ("writer : ", true, MainFileChannel)
+ WriteTests ("writer : ", true, GlobalTestLog)
end if
if bMakeCalcTest then
- WriteTests ("calc : ", true, MainFileChannel)
+ WriteTests ("calc : ", true, GlobalTestLog)
end if
if bMakeImpressTest then
- WriteTests ("impress : ", true, MainFileChannel)
+ WriteTests ("impress : ", true, GlobalTestLog)
end if
if bMakeDrawTest then
- WriteTests ("draw : ", true, MainFileChannel)
+ WriteTests ("draw : ", true, GlobalTestLog)
end if
if bMakeHTMLTest then
- WriteTests ("HTML : ", true, MainFileChannel)
+ WriteTests ("HTML : ", true, GlobalTestLog)
end if
if bMakeChartTest then
- WriteTests ("chart : ", false, MainFileChannel)
+ WriteTests ("chart : ", false, GlobalTestLog)
end if
if bMakeMathTest then
- WriteTests ("math : ", false, MainFileChannel)
+ WriteTests ("math : ", false, GlobalTestLog)
end if
if bMakeJavaTest then
- WriteTests ("Java : ", false, MainFileChannel)
+ WriteTests ("Java : ", false, GlobalTestLog)
end if
if bMakeDBTest then
- WriteDBTests ("Database : ", MainFileChannel)
+ WriteDBTests ("Database : ", GlobalTestLog)
end if
if bMakeExtensionTest then
- WriteExtensionTests ("Extension : ", MainFileChannel)
+ WriteExtensionTests ("Extension : ", GlobalTestLog)
end if
- Print #MainFileChannel, "testclosure : setup, write_status"
+ Print #GlobalTestLog, "testclosure : setup, write_status"
- Print #MainFileChannel
+ Print #GlobalTestLog
end Sub
Sub WriteTests (sText as string, bTestAll as boolean)
@@ -302,7 +291,7 @@ Sub WriteTestSequence
sWriteStr = sWriteStr + ", close"
- Print #MainFileChannel, sWriteStr
+ Print #GlobalTestLog, sWriteStr
end Sub
Sub WriteDBTests (sText as string, nFileChannel as integer)
@@ -336,7 +325,7 @@ Sub MakeDocTest
On Local Error GoTo DOCTESTERROR
gCurrentTestCase = cLogfileFailed
- LocalFileChannel% = OpenLogDat (GetLogFileName(gCurrentDocTest))
+ LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest))
gCurrentTestCase = cDocNew
oDoc = LoadDoc ("private:factory/" + GetDocFilter(gCurrentDocTest or cFltNewDoc))
LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ cMessageNewDoc, not IsNull (oDoc) )
@@ -381,19 +370,19 @@ Sub MakeDocTest
end if
end If
- Print #LocalFileChannel, "---"
- Close #LocalFileChannel%
- LocalFileChannel = 0
+ Print #LocalTestLog, "---"
+ Close #LocalTestLog%
+ LocalTestLog = 0
Exit Sub ' Without error
DOCTESTERROR:
If ( gCurrentTestCase = cLogfileFailed ) then
- LogTestResult( "", False )
+ LogTestResult( " ", False )
Exit Sub
else
LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ GetErrorMessage(gCurrentTestCase), False )
- Close #LocalFileChannel%
- LocalFileChannel = 0
+ Close #LocalTestLog%
+ LocalTestLog = 0
End If
Exit Sub ' With error
End Sub
@@ -403,7 +392,7 @@ Sub MakeNewDoc
Dim bSuccess as Boolean
On Local Error GoTo DOCTESTERROR2
gCurrentTestCase = cLogfileFailed
- LocalFileChannel% = OpenLogDat (GetLogFileName(gCurrentDocTest))
+ LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest))
gCurrentTestCase = cDocNew
' oDoc = Documents.Add(GetDocFilter(gCurrentDocTest))
oDoc = LoadDoc ("private:factory/" + GetDocFilter(gCurrentDocTest or cFltNewDoc))
@@ -413,19 +402,19 @@ Sub MakeNewDoc
bSuccess = CloseDoc( oDoc )
LogTestResult( GetDocFilter(gCurrentDocTest)+" "+ cMessageCloseDoc, bSuccess )
end If
- Print #LocalFileChannel, "---"
- Close #LocalFileChannel%
- LocalFileChannel = 0
+ Print #LocalTestLog, "---"
+ Close #LocalTestLog%
+ LocalTestLog = 0
Exit Sub ' Without error
DOCTESTERROR2:
If ( gCurrentTestCase = cLogfileFailed ) then
- LogTestResult( "", False )
+ LogTestResult( " ", False )
Exit Sub
else
LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ GetErrorMessage(gCurrentTestCase), False )
- Close #LocalFileChannel%
- LocalFileChannel = 0
+ Close #LocalTestLog%
+ LocalTestLog = 0
End If
Exit Sub ' With error
End Sub
@@ -439,7 +428,7 @@ Sub MakeChartTest
Dim bSuccess as Boolean
On Local Error GoTo CHARTTESTERROR
gCurrentTestCase = cLogfileFailed
- LocalFileChannel% = OpenLogDat (GetLogFileName(gCurrentDocTest))
+ LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest))
gCurrentTestCase = cDocNew
oDoc = LoadDoc ("private:factory/" + GetDocFilter(frmCalc or cFltNewDoc))
if not IsNull (oDoc) then
@@ -452,19 +441,19 @@ Sub MakeChartTest
else
LogTestResult( GetDocFilter(frmCalc or cFltNewDoc)+" "+ cMessageNewDoc, FALSE )
End if
- Print #LocalFileChannel, "---"
- Close #LocalFileChannel%
- LocalFileChannel = 0
+ Print #LocalTestLog, "---"
+ Close #LocalTestLog%
+ LocalTestLog = 0
Exit Sub ' Without error
CHARTTESTERROR:
If ( gCurrentTestCase = cLogfileFailed ) then
- LogTestResult( "", False )
+ LogTestResult( " ", False )
Exit Sub
else
LogTestResult( GetDocFilter(gCurrentDocTest or cFltNewDoc)+" "+ GetErrorMessage(gCurrentTestCase), FALSE )
- Close #LocalFileChannel%
- LocalFileChannel = 0
+ Close #LocalTestLog%
+ LocalTestLog = 0
End If
Exit Sub ' With error
End Sub
@@ -566,7 +555,7 @@ Function GetLogFileName (DocType as Integer) as String
GetLogFileName = sSChartLogFileName ' chart
case frmJava
GetLogFileName = sJavaLogFileName 'Java
- case frmOther
+ case frmTestClosure
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list