dbaccess/qa/unit/dbtest_base.cxx | 25 +++++++++++++++++++++--- dbaccess/qa/unit/embeddeddb_performancetest.cxx | 21 ++------------------ helpcontent2 | 2 - 3 files changed, 26 insertions(+), 22 deletions(-)
New commits: commit 022ace59fa76a7ca6aa0e73fa276197ea569d633 Author: Olivier Hallot <[email protected]> AuthorDate: Thu Jun 20 10:44:36 2024 -0300 Commit: Gerrit Code Review <[email protected]> CommitDate: Thu Jun 20 15:44:36 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to b0425a000fa79d8152652b031c1be8d3d3b2af56 - Update term Organizer -> General in shared/ pages Change-Id: I455cc5e0f115638fb1c9312db8d8cd50e7b1b0cf Reviewed-on: https://gerrit.libreoffice.org/c/help/+/169272 Tested-by: Jenkins Reviewed-by: Olivier Hallot <[email protected]> diff --git a/helpcontent2 b/helpcontent2 index ba5e40d637b9..b0425a000fa7 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ba5e40d637b9dac0575f982d48666bb45423c628 +Subproject commit b0425a000fa79d8152652b031c1be8d3d3b2af56 commit fb8f4b57ceaa2462cd966de7afeb0971a655f647 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Jun 20 14:13:18 2024 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Jun 20 15:44:26 2024 +0200 DBTestBase: Add createDBDocument it can be used later on when porting the java tests to CppUnittest Change-Id: I17420fdf490d979392f5aeb90c3b3bfb319d7764 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169274 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx index 5ec6950efe03..63a3951ad7b4 100644 --- a/dbaccess/qa/unit/dbtest_base.cxx +++ b/dbaccess/qa/unit/dbtest_base.cxx @@ -11,15 +11,15 @@ #include <string_view> -#include <cppunit/TestAssert.h> - #include <test/unoapi_test.hxx> -#include <unotools/tempfile.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> using namespace ::com::sun::star; +using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::uno; @@ -35,6 +35,8 @@ public: uno::Reference< XConnection > getConnectionForDocument( uno::Reference< XOfficeDatabaseDocument > const & xDocument); + + void createDBDocument(const OUString& rDriverURL); }; uno::Reference<XOfficeDatabaseDocument> DBTestBase::getDocumentForUrl(OUString const & url) { @@ -55,4 +57,21 @@ uno::Reference< XConnection > DBTestBase::getConnectionForDocument( return xConnection; } +void DBTestBase::createDBDocument(const OUString& rDriverURL) +{ + uno::Reference< XOfficeDatabaseDocument > xDocument( + m_xSFactory->createInstance(u"com.sun.star.sdb.OfficeDatabaseDocument"_ustr), + UNO_QUERY_THROW); + uno::Reference< com::sun::star::frame::XStorable > xStorable(xDocument, UNO_QUERY_THROW); + + uno::Reference< XDataSource > xDataSource = xDocument->getDataSource(); + uno::Reference< XPropertySet > xPropertySet(xDataSource, UNO_QUERY_THROW); + xPropertySet->setPropertyValue(u"URL"_ustr, Any(rDriverURL)); + + xStorable->storeAsURL(maTempFile.GetURL(), uno::Sequence< beans::PropertyValue >()); + + mxComponent = loadFromDesktop(maTempFile.GetURL()); + CPPUNIT_ASSERT(mxComponent); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/qa/unit/embeddeddb_performancetest.cxx b/dbaccess/qa/unit/embeddeddb_performancetest.cxx index 0698690c44c0..d142580f2655 100644 --- a/dbaccess/qa/unit/embeddeddb_performancetest.cxx +++ b/dbaccess/qa/unit/embeddeddb_performancetest.cxx @@ -14,7 +14,6 @@ #include <osl/time.h> #include <rtl/ustrbuf.hxx> #include <tools/stream.hxx> -#include <unotools/tempfile.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XStorable.hpp> @@ -194,24 +193,10 @@ void EmbeddedDBPerformanceTest::doPerformanceTestOnODB( std::u16string_view rDBName, const bool bUsePreparedStatement) { - { - uno::Reference< XOfficeDatabaseDocument > xDocument( - m_xSFactory->createInstance(u"com.sun.star.sdb.OfficeDatabaseDocument"_ustr), - UNO_QUERY_THROW); - uno::Reference< XStorable > xStorable(xDocument, UNO_QUERY_THROW); - - uno::Reference< XDataSource > xDataSource = xDocument->getDataSource(); - uno::Reference< XPropertySet > xPropertySet(xDataSource, UNO_QUERY_THROW); - xPropertySet->setPropertyValue(u"URL"_ustr, Any(rDriverURL)); - - xStorable->storeAsURL(maTempFile.GetURL(), uno::Sequence< beans::PropertyValue >()); - } - - uno::Reference< XOfficeDatabaseDocument > xDocument( - loadFromDesktop(maTempFile.GetURL()), UNO_QUERY_THROW); + createDBDocument(rDriverURL); + uno::Reference< XOfficeDatabaseDocument > xDocument(mxComponent, UNO_QUERY_THROW); - uno::Reference< XConnection > xConnection = - getConnectionForDocument(xDocument); + uno::Reference< XConnection > xConnection = getConnectionForDocument(xDocument); setupTestTable(xConnection);
