dbaccess/Module_dbaccess.mk | 6 +++++- sc/Module_sc.mk | 1 + sc/qa/extras/scdatabaserangeobj.cxx | 6 ++++-- sc/qa/unit/filters-test.cxx | 2 +- test/inc/test/sheet/xdatabaserange.hxx | 2 ++ test/source/sheet/xdatabaserange.cxx | 13 +++++++++++++ 6 files changed, 26 insertions(+), 4 deletions(-)
New commits: commit a5661d717197a6723b80fb65cde463c479983934 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Thu Feb 16 00:52:44 2012 +0100 add two more test cases to XDatabaseRange diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx index 93eb261..e9f09c6 100644 --- a/sc/qa/extras/scdatabaserangeobj.cxx +++ b/sc/qa/extras/scdatabaserangeobj.cxx @@ -37,7 +37,7 @@ namespace sc_apitest { -#define NUMBER_OF_TESTS 3 +#define NUMBER_OF_TESTS 5 class ScDatabaseRangeObj : public UnoApiTest, apitest::XDatabaseRange { @@ -51,6 +51,8 @@ public: CPPUNIT_TEST(testDataArea); CPPUNIT_TEST(testGetSortDescriptor); CPPUNIT_TEST(testGetSubtotalDescriptor); + CPPUNIT_TEST(testGetImportDescriptor); + CPPUNIT_TEST(testGetFilterDescriptor); CPPUNIT_TEST_SUITE_END(); private: static sal_Int32 nTest; diff --git a/test/inc/test/sheet/xdatabaserange.hxx b/test/inc/test/sheet/xdatabaserange.hxx index 6c5eac0..d388aa3 100644 --- a/test/inc/test/sheet/xdatabaserange.hxx +++ b/test/inc/test/sheet/xdatabaserange.hxx @@ -43,6 +43,8 @@ public: void testDataArea(); void testGetSortDescriptor(); void testGetSubtotalDescriptor(); + void testGetImportDescriptor(); + void testGetFilterDescriptor(); }; } diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx index ef68e8e..51e3c32 100644 --- a/test/source/sheet/xdatabaserange.cxx +++ b/test/source/sheet/xdatabaserange.cxx @@ -140,6 +140,19 @@ void XDatabaseRange::testGetSortDescriptor() } } +void XDatabaseRange::testGetFilterDescriptor() +{ + uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterDescriptor"))), UNO_QUERY_THROW); + uno::Reference< uno::XInterface > xFilterDescr( xDBRange->getFilterDescriptor(), UNO_QUERY_THROW); + CPPUNIT_ASSERT(xFilterDescr.is()); +} + +void XDatabaseRange::testGetImportDescriptor() +{ + uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImportDescriptor"))), UNO_QUERY_THROW); + uno::Sequence< beans::PropertyValue > xImportDescr = xDBRange->getImportDescriptor(); +} + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 1263cafe8e487b5db0c439966056516be99bc1e4 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Thu Feb 16 00:18:03 2012 +0100 enable XDatabaseRangeTest again diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 074b1f1..a221f22 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ JunitTest_sc_complex \ JunitTest_sc_unoapi \ CppunitTest_sc_cellrangeobj \ + CppunitTest_sc_databaserangeobj \ CppunitTest_sc_datapilottableobj \ CppunitTest_sc_datapilotfieldobj \ CppunitTest_sc_macros_test \ diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx index 69a3d48..93eb261 100644 --- a/sc/qa/extras/scdatabaserangeobj.cxx +++ b/sc/qa/extras/scdatabaserangeobj.cxx @@ -63,7 +63,7 @@ uno::Reference< lang::XComponent > ScDatabaseRangeObj::mxComponent; uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const rtl::OUString& rDBName ) { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xdatabaserange.ods")), aFileURL); + createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScDatabaseRangeObj.ods")), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT(mxComponent.is()); commit a05286296b3ba51029f0ff57a5a9173d3623b864 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Wed Feb 15 22:27:11 2012 +0100 dbaccess' macros_test is still failing in some situations diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index 11a7cf6..f087ba8 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -46,9 +46,13 @@ $(eval $(call gb_Module_add_targets,dbaccess,\ )) $(eval $(call gb_Module_add_check_targets,dbaccess,\ - CppunitTest_dbaccess_macros_test \ )) +# disable test because it still fails in some situations +# CppunitTest_dbaccess_macros_test \ +# + + $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\ JunitTest_dbaccess_complex \ JunitTest_dbaccess_unoapi \ commit 2bedc40e55fd7b51f948f60ba1d757d2912d3afb Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Wed Feb 15 22:24:58 2012 +0100 this should test ods and not xls diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index bf1cb72..a7d9b6f 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -298,7 +298,7 @@ ScDocShellRef ScFiltersTest::loadDoc(const rtl::OUString& rName, sal_Int32 nForm void ScFiltersTest::testRangeNameODS() { const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("named-ranges-global.")); - ScDocShellRef xDocSh = loadDoc(aFileNameBase, 1); + ScDocShellRef xDocSh = loadDoc(aFileNameBase, 0); CPPUNIT_ASSERT_MESSAGE("Failed to load named-ranges-globals.*", xDocSh.Is()); _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits