sc/CppunitTest_sc_dataprovider.mk | 49 -------------------------------------- sc/qa/unit/dataproviders_test.cxx | 12 +++------ 2 files changed, 6 insertions(+), 55 deletions(-)
New commits: commit 6fa74808253dc1a8770234e971b775e3af202aed Author: Xisco Fauli <[email protected]> AuthorDate: Wed Nov 26 10:48:03 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Nov 27 12:42:47 2025 +0100 CppunitTest_sc_dataprovider: re-enable testBaseImport test This is possible after my previous patch 22a987d3eecd80a1f50c1b72cf5ce921f1151ad5 "CppunitTest_sc_dataprovider: use gb_CppunitTest_use_rdb" Change-Id: Ibc73a0167479c9c3d77125f65a92cd2d1f74c9d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194553 Tested-by: Jenkins Code-Style: Xisco Fauli <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194690 diff --git a/sc/qa/unit/dataproviders_test.cxx b/sc/qa/unit/dataproviders_test.cxx index 01c118d4a73a..680769afbbfc 100644 --- a/sc/qa/unit/dataproviders_test.cxx +++ b/sc/qa/unit/dataproviders_test.cxx @@ -29,14 +29,14 @@ public: void testDataLargerThanDB(); void testHTMLImport(); void testXMLImport(); - // void testBaseImport(); + void testBaseImport(); CPPUNIT_TEST_SUITE(ScDataProvidersTest); CPPUNIT_TEST(testCSVImport); CPPUNIT_TEST(testDataLargerThanDB); CPPUNIT_TEST(testHTMLImport); CPPUNIT_TEST(testXMLImport); - // CPPUNIT_TEST(testBaseImport); + CPPUNIT_TEST(testBaseImport); CPPUNIT_TEST_SUITE_END(); }; @@ -188,21 +188,20 @@ void ScDataProvidersTest::testXMLImport() CPPUNIT_ASSERT_EQUAL(u"test4"_ustr, pDoc->GetString(1, 4, 0)); } -/* void ScDataProvidersTest::testBaseImport() { createScDoc(); ScDBData* pDBData = new ScDBData("testDB", 0, 0, 0, 10, 10); ScDocument* pDoc = getScDoc(); - bool bInserted = pDoc->GetDBCollection()->getNamedDBs().insert(pDBData); + bool bInserted + = pDoc->GetDBCollection()->getNamedDBs().insert(std::unique_ptr<ScDBData>(pDBData)); CPPUNIT_ASSERT(bInserted); sc::ExternalDataSource aDataSource("~/dummy.file", "org.libreoffice.calc.sql", pDoc); aDataSource.setDBData("testDB"); aDataSource.setID("biblio@Bibliography"); - pDoc->GetExternalDataMapper().insertDataSource(aDataSource); auto& rDataSources = pDoc->GetExternalDataMapper().getDataSources(); CPPUNIT_ASSERT(!rDataSources.empty()); @@ -211,9 +210,8 @@ void ScDataProvidersTest::testBaseImport() Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT_EQUAL(OUString("ARJ00"), pDoc->GetString(0, 0, 0)); - CPPUNIT_ASSERT_EQUAL(OUString("AVV00"), pDoc->GetString(1, 1, 0)); + CPPUNIT_ASSERT_EQUAL(OUString("AVV00"), pDoc->GetString(0, 1, 0)); } -*/ ScDataProvidersTest::ScDataProvidersTest() : ScModelTestBase(u"sc/qa/unit/data/dataprovider"_ustr) commit 0c1dfad3bd6efd872c838d8ea1793b234336a0f1 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Nov 26 10:40:22 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Nov 27 12:42:38 2025 +0100 CppunitTest_sc_dataprovider: use gb_CppunitTest_use_rdb Change-Id: I5aec844fbd5799acd62641050b57fd9fefc56b76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194552 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> Code-Style: Xisco Fauli <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194689 diff --git a/sc/CppunitTest_sc_dataprovider.mk b/sc/CppunitTest_sc_dataprovider.mk index e952eb5632b8..05701e977a11 100644 --- a/sc/CppunitTest_sc_dataprovider.mk +++ b/sc/CppunitTest_sc_dataprovider.mk @@ -80,54 +80,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_dataprovider,\ $(eval $(call gb_CppunitTest_use_ure,sc_dataprovider)) $(eval $(call gb_CppunitTest_use_vcl,sc_dataprovider)) -$(eval $(call gb_CppunitTest_use_components,sc_dataprovider,\ - basic/util/sb \ - chart2/source/chart2 \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - connectivity/source/cpool/dbpool2 \ - $(if $(ENABLE_JAVA),connectivity/source/drivers/hsqldb/hsqldb) \ - connectivity/source/drivers/dbase/dbase \ - $(if $(ENABLE_FIREBIRD_SDBC),connectivity/source/drivers/firebird/firebird_sdbc) \ - $(if $(ENABLE_JAVA),connectivity/source/drivers/jdbc/jdbc) \ - connectivity/source/manager/sdbc2 \ - dbaccess/source/filter/xml/dbaxml \ - dbaccess/util/dba \ - dbaccess/util/dbu \ - embeddedobj/util/embobj \ - eventattacher/source/evtatt \ - filter/source/config/cache/filterconfig1 \ - forms/util/frm \ - framework/util/fwk \ - i18npool/source/search/i18nsearch \ - i18npool/util/i18npool \ - linguistic/source/lng \ - extensions/source/logging/log \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - scaddins/source/analysis/analysis \ - scaddins/source/datefunc/date \ - sc/util/sc \ - sc/util/scfilt \ - sfx2/util/sfx \ - sot/util/sot \ - svl/util/svl \ - svl/source/fsstor/fsstorage \ - svtools/util/svt \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - ucb/source/ucp/tdoc/ucptdoc1 \ - unotools/util/utl \ - unoxml/source/rdf/unordf \ - unoxml/source/service/unoxml \ - uui/util/uui \ - vcl/vcl.common \ - xmloff/util/xo \ - xmlsecurity/util/xmlsecurity \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sc_dataprovider,services)) $(eval $(call gb_CppunitTest_use_externals,sc_dataprovider,\ orcus \
