sc/qa/unit/dataproviders_test.cxx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
New commits: commit 3aad5f67d04357af8a87bf30d2bf27eeec8695b4 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Nov 26 10:48:03 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Nov 26 13:55:53 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]> 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)
