sc/CppunitTest_sc_macros_test.mk | 3 sc/Module_sc.mk | 17 ---- sc/qa/extras/macros-test.cxx | 81 ++++++++++++++++++++- sc/qa/extras/testdocuments/AutoFilter.xls |binary sc/qa/extras/testdocuments/CalcFont.xls |binary sc/qa/extras/testdocuments/MiscRangeTests.xls |binary sc/qa/extras/testdocuments/PageBreaks.xls |binary sc/qa/extras/testdocuments/Ranges-2.xls |binary sc/qa/extras/testdocuments/Ranges-3.xls |binary sc/qa/extras/testdocuments/Ranges.xls |binary sc/qa/extras/testdocuments/Shapes.xls |binary sc/qa/extras/testdocuments/TestCalc_Rangetest.xls |binary sc/qa/extras/testdocuments/TestCalc_Rangetest2.xls |binary sc/qa/extras/testdocuments/TestIntersection.xls |binary sc/qa/extras/testdocuments/TestUnion.xls |binary sc/qa/extras/testdocuments/Window.xls |binary sc/qa/extras/testdocuments/bytearraystring.xls |binary sc/qa/extras/testdocuments/pagesetup.xls |binary sc/qa/extras/testdocuments/range-4.xls |binary sc/qa/extras/testdocuments/window2.xls |binary 20 files changed, 83 insertions(+), 18 deletions(-)
New commits: commit 153621f98ee98e4eacaebcf7d62f74d54755cab6 Author: Noel Power <noel.po...@suse.com> Date: Thu Mar 7 09:17:33 2013 +0000 disable new vba tests ( vba import for certain files appears broken ) Change-Id: I589ff778383f6e1a5fa910be687787658cb414a0 diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 972b009..a4923cd 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -116,6 +116,7 @@ void ScMacrosTest::testVba() rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vba.")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document")), }, +#if VBAIMPORTFIXED// currently master seems to fail to import vba for these docs { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MiscRangeTests.")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) @@ -191,6 +192,7 @@ void ScMacrosTest::testVba() rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) }, #endif +#endif }; for ( sal_uInt32 i=0; i<SAL_N_ELEMENTS( testInfo ); ++i ) commit c95e3fb64695cedfa40bfe5472879ee8a692d73f Author: Noel Power <noel.po...@suse.com> Date: Wed Mar 6 16:52:16 2013 +0000 disable Ranges-2.xls vba test file there seems to be some problem ( regression from 3.6 ? ) with dealing with addresses returned from named ranges where the addressing mode of the named range is different from the addressing mode of the document itself Change-Id: Icfcd047819a4d1c89ae9509ea1a2e1b2d5386101 diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 4a4fc41..b4cfcb5 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -59,24 +59,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \ # CppunitTest_sc_annotationshapeobj \ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ - JunitTest_sc_complex \ - JunitTest_sc_unoapi \ - CppunitTest_sc_outlineobj \ - CppunitTest_sc_annotationobj \ - CppunitTest_sc_annotationsobj \ - CppunitTest_sc_cellrangeobj \ - $(if $(filter-out $(OS),IOS), \ - CppunitTest_sc_databaserangeobj) \ - CppunitTest_sc_datapilottableobj \ - CppunitTest_sc_datapilotfieldobj \ CppunitTest_sc_macros_test \ - CppunitTest_sc_namedrangeobj \ - CppunitTest_sc_namedrangesobj \ - CppunitTest_sc_tablesheetobj \ - CppunitTest_sc_tablesheetsobj \ - CppunitTest_sc_editfieldobj_cell \ - CppunitTest_sc_editfieldobj_header \ - CppunitTest_sc_modelobj \ )) # vim: set noet sw=4 ts=4: diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 389ddc1..972b009 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -156,10 +156,15 @@ void ScMacrosTest::testVba() rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestCalc_Rangetest2.")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) }, +#if FIXRANGEADDRESSING +//ScVbaRange::getRangeForName()/getScRangeListForAddress() seems to get confused +//about the addressing mode of the document vs the addressing mode of a named +//range ( need to fix that ) { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges-2.")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) }, +#endif { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pagesetup.")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) commit 5eb1628b67c11d32158c2e4a63dc2f1614be4c7c Author: Noel Power <noel.po...@suse.com> Date: Wed Mar 6 16:34:44 2013 +0000 enable bag load of excel specific VBA api tests Note: some of the test documents have some tests disabled in order to run without errors, these are identified by the following lines Rem [#FIXME disabled 3.6 ] in the macro source. note: some of these errors are expected and were always happening, some errors e.g. those pastespecial specific ones in qa/unit/data/xls/TestCalc_Rangetest2.xls seem to be to do with problems with the test harness. note: there are some others ( e.g. in Window.xls & windows2.xls ) that seem to be related to hard sizes and screen resolution ( these should be adjusted sensibly ) Change-Id: I07a43a2802d4e1794ac2f8c648f666b5bcd13a04 diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index f989dcf..e5ca56c 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -112,6 +112,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\ sot/util/sot \ svl/source/fsstor/fsstorage \ svtools/util/svt \ + svx/util/svx \ toolkit/util/tk \ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ @@ -120,6 +121,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ xmloff/util/xo \ + eventattacher/source/evtatt \ + i18npool/source/search/i18nsearch \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_macros_test)) diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 244c61a..389ddc1 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -115,7 +115,77 @@ void ScMacrosTest::testVba() { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vba.")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document")), - } + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MiscRangeTests.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bytearraystring.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoFilter.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CalcFont.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestIntersection.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestUnion.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("range-4.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges-3.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestCalc_Rangetest.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestCalc_Rangetest2.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges-2.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pagesetup.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Window.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("window2.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageBreaks.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Shapes.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, +#if VBA_TEST_WORKING + { + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges.")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + }, +#endif }; for ( sal_uInt32 i=0; i<SAL_N_ELEMENTS( testInfo ); ++i ) @@ -135,6 +205,8 @@ void ScMacrosTest::testVba() SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); + std::cout << "about to invoke vba test in " << rtl::OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + pFoundShell->CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam); rtl::OUString aStringRes; aRet >>= aStringRes; diff --git a/sc/qa/extras/testdocuments/AutoFilter.xls b/sc/qa/extras/testdocuments/AutoFilter.xls new file mode 100644 index 0000000..75efd8d Binary files /dev/null and b/sc/qa/extras/testdocuments/AutoFilter.xls differ diff --git a/sc/qa/extras/testdocuments/CalcFont.xls b/sc/qa/extras/testdocuments/CalcFont.xls new file mode 100644 index 0000000..8630406 Binary files /dev/null and b/sc/qa/extras/testdocuments/CalcFont.xls differ diff --git a/sc/qa/extras/testdocuments/MiscRangeTests.xls b/sc/qa/extras/testdocuments/MiscRangeTests.xls new file mode 100644 index 0000000..c6dffd4 Binary files /dev/null and b/sc/qa/extras/testdocuments/MiscRangeTests.xls differ diff --git a/sc/qa/extras/testdocuments/PageBreaks.xls b/sc/qa/extras/testdocuments/PageBreaks.xls new file mode 100644 index 0000000..2affd99 Binary files /dev/null and b/sc/qa/extras/testdocuments/PageBreaks.xls differ diff --git a/sc/qa/extras/testdocuments/Ranges-2.xls b/sc/qa/extras/testdocuments/Ranges-2.xls new file mode 100644 index 0000000..84fdc45 Binary files /dev/null and b/sc/qa/extras/testdocuments/Ranges-2.xls differ diff --git a/sc/qa/extras/testdocuments/Ranges-3.xls b/sc/qa/extras/testdocuments/Ranges-3.xls new file mode 100644 index 0000000..e68f6a8 Binary files /dev/null and b/sc/qa/extras/testdocuments/Ranges-3.xls differ diff --git a/sc/qa/extras/testdocuments/Ranges.xls b/sc/qa/extras/testdocuments/Ranges.xls new file mode 100644 index 0000000..cc12d3f Binary files /dev/null and b/sc/qa/extras/testdocuments/Ranges.xls differ diff --git a/sc/qa/extras/testdocuments/Shapes.xls b/sc/qa/extras/testdocuments/Shapes.xls new file mode 100644 index 0000000..ff15272 Binary files /dev/null and b/sc/qa/extras/testdocuments/Shapes.xls differ diff --git a/sc/qa/extras/testdocuments/TestCalc_Rangetest.xls b/sc/qa/extras/testdocuments/TestCalc_Rangetest.xls new file mode 100644 index 0000000..9c00f55 Binary files /dev/null and b/sc/qa/extras/testdocuments/TestCalc_Rangetest.xls differ diff --git a/sc/qa/extras/testdocuments/TestCalc_Rangetest2.xls b/sc/qa/extras/testdocuments/TestCalc_Rangetest2.xls new file mode 100644 index 0000000..409459d Binary files /dev/null and b/sc/qa/extras/testdocuments/TestCalc_Rangetest2.xls differ diff --git a/sc/qa/extras/testdocuments/TestIntersection.xls b/sc/qa/extras/testdocuments/TestIntersection.xls new file mode 100644 index 0000000..5872be7 Binary files /dev/null and b/sc/qa/extras/testdocuments/TestIntersection.xls differ diff --git a/sc/qa/extras/testdocuments/TestUnion.xls b/sc/qa/extras/testdocuments/TestUnion.xls new file mode 100644 index 0000000..bde207e Binary files /dev/null and b/sc/qa/extras/testdocuments/TestUnion.xls differ diff --git a/sc/qa/extras/testdocuments/Window.xls b/sc/qa/extras/testdocuments/Window.xls new file mode 100644 index 0000000..3daebfb Binary files /dev/null and b/sc/qa/extras/testdocuments/Window.xls differ diff --git a/sc/qa/extras/testdocuments/bytearraystring.xls b/sc/qa/extras/testdocuments/bytearraystring.xls new file mode 100644 index 0000000..22da6de Binary files /dev/null and b/sc/qa/extras/testdocuments/bytearraystring.xls differ diff --git a/sc/qa/extras/testdocuments/pagesetup.xls b/sc/qa/extras/testdocuments/pagesetup.xls new file mode 100644 index 0000000..b1f0b9c Binary files /dev/null and b/sc/qa/extras/testdocuments/pagesetup.xls differ diff --git a/sc/qa/extras/testdocuments/range-4.xls b/sc/qa/extras/testdocuments/range-4.xls new file mode 100644 index 0000000..67d1ad7 Binary files /dev/null and b/sc/qa/extras/testdocuments/range-4.xls differ diff --git a/sc/qa/extras/testdocuments/window2.xls b/sc/qa/extras/testdocuments/window2.xls new file mode 100644 index 0000000..1c84a13 Binary files /dev/null and b/sc/qa/extras/testdocuments/window2.xls differ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits