UnoApiTest: factor out common code

Change-Id: Ia8874d65ea8d7eb26d10b18e37ba2bac1a7d756b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141730
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

4 files changed, 7 insertions, 24 deletions

diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx
index 8adcc8a2a9bd..296c4e4b1f04 100644
--- a/dbaccess/qa/extras/macros-test.cxx
+++ b/dbaccess/qa/extras/macros-test.cxx
@@ -33,12 +33,7 @@ DBAccessTest::DBAccessTest()
 {
 }
 
-void DBAccessTest::test()
-{
-    OUString aFileName;
-    createFileURL(u"testdb.odb", aFileName);
-    mxComponent = loadFromDesktop(aFileName);
-}
+void DBAccessTest::test() { loadFromURL(u"testdb.odb"); }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(DBAccessTest);
 
diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx
index 798c5523a929..8e7d2ab433c9 100644
--- a/dbaccess/qa/unit/dbtest_base.cxx
+++ b/dbaccess/qa/unit/dbtest_base.cxx
@@ -32,9 +32,6 @@ public:
 
     utl::TempFileNamed createTempCopy(std::u16string_view pathname);
 
-    uno::Reference< XOfficeDatabaseDocument >
-        getDocumentForFileName(std::u16string_view sFileName);
-
     uno::Reference<XOfficeDatabaseDocument> getDocumentForUrl(OUString const & url);
 
     uno::Reference< XConnection >
@@ -43,8 +40,7 @@ public:
 };
 
 utl::TempFileNamed DBTestBase::createTempCopy(std::u16string_view pathname) {
-    OUString url;
-    createFileURL(pathname, url);
+    OUString url = createFileURL(pathname);
     utl::TempFileNamed tmp;
     tmp.EnableKillingFile();
     auto const e = osl::File::copy(url, tmp.GetURL());
@@ -57,14 +53,6 @@ utl::TempFileNamed DBTestBase::createTempCopy(std::u16string_view pathname) {
     return tmp;
 }
 
-uno::Reference< XOfficeDatabaseDocument >
-    DBTestBase::getDocumentForFileName(std::u16string_view sFileName)
-{
-    OUString sFilePath;
-    createFileURL(sFileName, sFilePath);
-    return getDocumentForUrl(sFilePath);
-}
-
 uno::Reference<XOfficeDatabaseDocument> DBTestBase::getDocumentForUrl(OUString const & url) {
     mxComponent = loadFromDesktop(url);
     uno::Reference< XOfficeDatabaseDocument > xDocument(mxComponent, UNO_QUERY_THROW);
diff --git a/dbaccess/qa/unit/embeddeddb_performancetest.cxx b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
index 600704ef787d..921fc9977d98 100644
--- a/dbaccess/qa/unit/embeddeddb_performancetest.cxx
+++ b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
@@ -124,8 +124,7 @@ public:
 
 SvFileStream* EmbeddedDBPerformanceTest::getWordListStream()
 {
-    OUString wlPath;
-    createFileURL(u"wordlist", wlPath);
+    OUString wlPath = createFileURL(u"wordlist");
     return new SvFileStream(wlPath, StreamMode::READ);
 }
 
diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx
index 9e1c76dd0700..076144e1b054 100644
--- a/dbaccess/qa/unit/firebird.cxx
+++ b/dbaccess/qa/unit/firebird.cxx
@@ -59,8 +59,8 @@ void FirebirdTest::testEmptyDBConnection()
  */
 void FirebirdTest::testIntegerDatabase()
 {
-    uno::Reference< XOfficeDatabaseDocument > xDocument =
-        getDocumentForFileName(u"firebird_integer_ods12.odb");
+    loadFromURL(u"firebird_integer_ods12.odb");
+    uno::Reference< XOfficeDatabaseDocument > xDocument(mxComponent, UNO_QUERY_THROW);
 
     uno::Reference< XConnection > xConnection =
         getConnectionForDocument(xDocument);
@@ -97,7 +97,8 @@ void FirebirdTest::testIntegerDatabase()
 
 void FirebirdTest::testTdf132924()
 {
-    uno::Reference<XOfficeDatabaseDocument> xDocument = getDocumentForFileName(u"tdf132924.odb");
+    loadFromURL(u"tdf132924.odb");
+    uno::Reference< XOfficeDatabaseDocument > xDocument(mxComponent, UNO_QUERY_THROW);
     uno::Reference<XConnection> xConnection = getConnectionForDocument(xDocument);
 
     uno::Reference<XStatement> xStatement = xConnection->createStatement();