sc/CppunitTest_sc_macros_test.mk | 3 + sc/qa/extras/macros-test.cxx | 74 +++++++++++++++++++++++++++- sc/qa/unit/data/xls/AutoFilter.xls |binary sc/qa/unit/data/xls/CalcFont.xls |binary sc/qa/unit/data/xls/MiscRangeTests.xls |binary sc/qa/unit/data/xls/PageBreaks.xls |binary sc/qa/unit/data/xls/Ranges-2.xls |binary sc/qa/unit/data/xls/Ranges-3.xls |binary sc/qa/unit/data/xls/Ranges.xls |binary sc/qa/unit/data/xls/Shapes.xls |binary sc/qa/unit/data/xls/TestCalc_Rangetest.xls |binary sc/qa/unit/data/xls/TestCalc_Rangetest2.xls |binary sc/qa/unit/data/xls/TestIntersection.xls |binary sc/qa/unit/data/xls/TestUnion.xls |binary sc/qa/unit/data/xls/Window.xls |binary sc/qa/unit/data/xls/bytearraystring.xls |binary sc/qa/unit/data/xls/pagesetup.xls |binary sc/qa/unit/data/xls/range-4.xls |binary sc/qa/unit/data/xls/window2.xls |binary 19 files changed, 76 insertions(+), 1 deletion(-)
New commits: commit 6aea437d06ce9cbde6a6ce4cca70af434e564735 Author: Noel Power <[email protected]> Date: Wed Mar 6 16:19:54 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: I0e798fc763ee988f8f032829a912239594a35583 diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 7d1a8fb..ba794ca 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -107,6 +107,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 \ @@ -114,6 +115,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + 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 c5aa5a2..61f6918 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -132,7 +132,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 }; rtl::OUString aFileExtension("xls"); @@ -154,6 +224,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/unit/data/xls/AutoFilter.xls b/sc/qa/unit/data/xls/AutoFilter.xls new file mode 100644 index 0000000..75efd8d Binary files /dev/null and b/sc/qa/unit/data/xls/AutoFilter.xls differ diff --git a/sc/qa/unit/data/xls/CalcFont.xls b/sc/qa/unit/data/xls/CalcFont.xls new file mode 100644 index 0000000..8630406 Binary files /dev/null and b/sc/qa/unit/data/xls/CalcFont.xls differ diff --git a/sc/qa/unit/data/xls/MiscRangeTests.xls b/sc/qa/unit/data/xls/MiscRangeTests.xls new file mode 100644 index 0000000..c6dffd4 Binary files /dev/null and b/sc/qa/unit/data/xls/MiscRangeTests.xls differ diff --git a/sc/qa/unit/data/xls/PageBreaks.xls b/sc/qa/unit/data/xls/PageBreaks.xls new file mode 100644 index 0000000..2affd99 Binary files /dev/null and b/sc/qa/unit/data/xls/PageBreaks.xls differ diff --git a/sc/qa/unit/data/xls/Ranges-2.xls b/sc/qa/unit/data/xls/Ranges-2.xls new file mode 100644 index 0000000..84fdc45 Binary files /dev/null and b/sc/qa/unit/data/xls/Ranges-2.xls differ diff --git a/sc/qa/unit/data/xls/Ranges-3.xls b/sc/qa/unit/data/xls/Ranges-3.xls new file mode 100644 index 0000000..e68f6a8 Binary files /dev/null and b/sc/qa/unit/data/xls/Ranges-3.xls differ diff --git a/sc/qa/unit/data/xls/Ranges.xls b/sc/qa/unit/data/xls/Ranges.xls new file mode 100644 index 0000000..cc12d3f Binary files /dev/null and b/sc/qa/unit/data/xls/Ranges.xls differ diff --git a/sc/qa/unit/data/xls/Shapes.xls b/sc/qa/unit/data/xls/Shapes.xls new file mode 100644 index 0000000..ff15272 Binary files /dev/null and b/sc/qa/unit/data/xls/Shapes.xls differ diff --git a/sc/qa/unit/data/xls/TestCalc_Rangetest.xls b/sc/qa/unit/data/xls/TestCalc_Rangetest.xls new file mode 100644 index 0000000..9c00f55 Binary files /dev/null and b/sc/qa/unit/data/xls/TestCalc_Rangetest.xls differ diff --git a/sc/qa/unit/data/xls/TestCalc_Rangetest2.xls b/sc/qa/unit/data/xls/TestCalc_Rangetest2.xls new file mode 100644 index 0000000..409459d Binary files /dev/null and b/sc/qa/unit/data/xls/TestCalc_Rangetest2.xls differ diff --git a/sc/qa/unit/data/xls/TestIntersection.xls b/sc/qa/unit/data/xls/TestIntersection.xls new file mode 100644 index 0000000..5872be7 Binary files /dev/null and b/sc/qa/unit/data/xls/TestIntersection.xls differ diff --git a/sc/qa/unit/data/xls/TestUnion.xls b/sc/qa/unit/data/xls/TestUnion.xls new file mode 100644 index 0000000..bde207e Binary files /dev/null and b/sc/qa/unit/data/xls/TestUnion.xls differ diff --git a/sc/qa/unit/data/xls/Window.xls b/sc/qa/unit/data/xls/Window.xls new file mode 100644 index 0000000..3daebfb Binary files /dev/null and b/sc/qa/unit/data/xls/Window.xls differ diff --git a/sc/qa/unit/data/xls/bytearraystring.xls b/sc/qa/unit/data/xls/bytearraystring.xls new file mode 100644 index 0000000..22da6de Binary files /dev/null and b/sc/qa/unit/data/xls/bytearraystring.xls differ diff --git a/sc/qa/unit/data/xls/pagesetup.xls b/sc/qa/unit/data/xls/pagesetup.xls new file mode 100644 index 0000000..b1f0b9c Binary files /dev/null and b/sc/qa/unit/data/xls/pagesetup.xls differ diff --git a/sc/qa/unit/data/xls/range-4.xls b/sc/qa/unit/data/xls/range-4.xls new file mode 100644 index 0000000..67d1ad7 Binary files /dev/null and b/sc/qa/unit/data/xls/range-4.xls differ diff --git a/sc/qa/unit/data/xls/window2.xls b/sc/qa/unit/data/xls/window2.xls new file mode 100644 index 0000000..1c84a13 Binary files /dev/null and b/sc/qa/unit/data/xls/window2.xls differ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
