test: merge CalcUnoApiTest and UnoApiTest into one

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

11 files changed, 25 insertions, 42 deletions

diff --git a/dbaccess/qa/extras/dialog-save.cxx b/dbaccess/qa/extras/dialog-save.cxx
index 212127d48ea9..39705f549574 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -51,9 +51,9 @@ void DialogSaveTest::test()
 {
     const OUString aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testDialogSave.odb"));
     {
-        uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
-        uno::Reference< frame::XStorable > xDocStorable(xComponent, UNO_QUERY_THROW);
-        uno::Reference< document::XEmbeddedScripts > xDocScr(xComponent, UNO_QUERY_THROW);
+        mxComponent = loadFromDesktop(aFileName);
+        uno::Reference< frame::XStorable > xDocStorable(mxComponent, UNO_QUERY_THROW);
+        uno::Reference< document::XEmbeddedScripts > xDocScr(mxComponent, UNO_QUERY_THROW);
         uno::Reference< script::XStorageBasedLibraryContainer > xStorBasLib(xDocScr->getBasicLibraries());
         CPPUNIT_ASSERT(xStorBasLib.is());
         uno::Reference< script::XLibraryContainer > xBasLib(xStorBasLib, UNO_QUERY_THROW);
@@ -68,21 +68,17 @@ void DialogSaveTest::test()
         CPPUNIT_ASSERT(!xDlgLib->isLibraryLoaded(sStandard));
 
         // make some change to enable a save
-        // uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSuppl(xComponent, UNO_QUERY_THROW);
+        // uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSuppl(mxComponent, UNO_QUERY_THROW);
         // uno::Reference< document::XDocumentPropertiesSupplier > xDocProps(xDocPropSuppl->getDocumentProperties());
         // CPPUNIT_ASSERT(xDocProps.is());
         // xDocProps.setTitle(xDocProps.getTitle() + " suffix");
-        uno::Reference< util::XModifiable > xDocMod(xComponent, UNO_QUERY_THROW);
+        uno::Reference< util::XModifiable > xDocMod(mxComponent, UNO_QUERY_THROW);
         xDocMod->setModified(true);
 
         // now save; the code path to exercise in this test is the "store to same location"
         //           do *not* change to store(As|To|URL)!
         xDocStorable->store();
 
-        // close
-        uno::Reference< util::XCloseable > xDocCloseable(xComponent, UNO_QUERY_THROW);
-        xDocCloseable->close(false);
-
         // All our uno::References are (should?) be invalid now -> let them go out of scope
     }
     {
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx b/dbaccess/qa/extras/empty-stdlib-save.cxx
index 440fc19d4945..d3b383d1fa88 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -49,9 +49,9 @@ void DialogSaveTest::test()
 {
     const OUString aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testEmptyStdlibSave.odb"));
     {
-        uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
-        uno::Reference< frame::XStorable > xDocStorable(xComponent, UNO_QUERY_THROW);
-        uno::Reference< document::XEmbeddedScripts > xDocScr(xComponent, UNO_QUERY_THROW);
+        mxComponent = loadFromDesktop(aFileName);
+        uno::Reference< frame::XStorable > xDocStorable(mxComponent, UNO_QUERY_THROW);
+        uno::Reference< document::XEmbeddedScripts > xDocScr(mxComponent, UNO_QUERY_THROW);
         uno::Reference< script::XStorageBasedLibraryContainer > xStorBasLib(xDocScr->getBasicLibraries());
         CPPUNIT_ASSERT(xStorBasLib.is());
         uno::Reference< script::XLibraryContainer > xBasLib(xStorBasLib, UNO_QUERY_THROW);
@@ -83,7 +83,7 @@ void DialogSaveTest::test()
         // uno::Reference< util::XModifiable > xScrMod(xDocScr, UNO_QUERY_THROW);
         // xScrMod->setModified(sal_True);
 
-        // uno::Reference< util::XModifiable > xDocMod(xComponent, UNO_QUERY_THROW);
+        // uno::Reference< util::XModifiable > xDocMod(mxComponent, UNO_QUERY_THROW);
         // std::cerr << "** Modified: " << static_cast<bool>(xDocMod->isModified()) << std::endl;
         // xDocMod->setModified(sal_True);
         // std::cerr << "** Modified: " << static_cast<bool>(xDocMod->isModified()) << std::endl;
@@ -93,10 +93,6 @@ void DialogSaveTest::test()
         //           do *not* change to store(As|To|URL)!
         xDocStorable->store();
 
-        // close
-        uno::Reference< util::XCloseable > xDocCloseable(xComponent, UNO_QUERY_THROW);
-        xDocCloseable->close(false);
-
         // All our uno::References are (should?) be invalid now -> let them go out of scope
     }
     {
diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx
index dee5919c3463..8adcc8a2a9bd 100644
--- a/dbaccess/qa/extras/macros-test.cxx
+++ b/dbaccess/qa/extras/macros-test.cxx
@@ -37,9 +37,7 @@ void DBAccessTest::test()
 {
     OUString aFileName;
     createFileURL(u"testdb.odb", aFileName);
-    uno::Reference<lang::XComponent> xComponent = loadFromDesktop(aFileName);
-    uno::Reference<util::XCloseable> xDocCloseable(xComponent, UNO_QUERY_THROW);
-    xDocCloseable->close(false);
+    mxComponent = loadFromDesktop(aFileName);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(DBAccessTest);
diff --git a/dbaccess/qa/extras/nolib-save.cxx b/dbaccess/qa/extras/nolib-save.cxx
index 59fee844fd78..bf6093c96875 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -49,9 +49,9 @@ void DialogSaveTest::test()
 {
     const OUString aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testNolibSave.odb"));
     {
-        uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
-        uno::Reference< frame::XStorable > xDocStorable(xComponent, UNO_QUERY_THROW);
-        uno::Reference< document::XEmbeddedScripts > xDocScr(xComponent, UNO_QUERY_THROW);
+        mxComponent = loadFromDesktop(aFileName);
+        uno::Reference< frame::XStorable > xDocStorable(mxComponent, UNO_QUERY_THROW);
+        uno::Reference< document::XEmbeddedScripts > xDocScr(mxComponent, UNO_QUERY_THROW);
         uno::Reference< script::XStorageBasedLibraryContainer > xStorBasLib(xDocScr->getBasicLibraries());
         CPPUNIT_ASSERT(xStorBasLib.is());
         uno::Reference< script::XLibraryContainer > xBasLib(xStorBasLib, UNO_QUERY_THROW);
@@ -73,7 +73,7 @@ void DialogSaveTest::test()
         // uno::Reference< util::XModifiable > xScrMod(xDocScr, UNO_QUERY_THROW);
         // xScrMod->setModified(sal_True);
 
-        // uno::Reference< util::XModifiable > xDocMod(xComponent, UNO_QUERY_THROW);
+        // uno::Reference< util::XModifiable > xDocMod(mxComponent, UNO_QUERY_THROW);
         // std::cerr << "** Modified: " << static_cast<bool>(xDocMod->isModified()) << std::endl;
         // xDocMod->setModified(sal_True);
         // std::cerr << "** Modified: " << static_cast<bool>(xDocMod->isModified()) << std::endl;
@@ -83,10 +83,6 @@ void DialogSaveTest::test()
         //           do *not* change to store(As|To|URL)!
         xDocStorable->store();
 
-        // close
-        uno::Reference< util::XCloseable > xDocCloseable(xComponent, UNO_QUERY_THROW);
-        xDocCloseable->close(false);
-
         // All our uno::References are (should?) be invalid now -> let them go out of scope
     }
     {
diff --git a/dbaccess/qa/extras/rowsetclones.cxx b/dbaccess/qa/extras/rowsetclones.cxx
index d83d160ca132..be4e52d3cd35 100644
--- a/dbaccess/qa/extras/rowsetclones.cxx
+++ b/dbaccess/qa/extras/rowsetclones.cxx
@@ -50,8 +50,8 @@ void RowSetClones::test()
 {
     const OUString sFilePath(m_directories.getURLFromWorkdir(u"CppunitTest/RowSetClones.odb"));
 
-    uno::Reference< lang::XComponent > xComponent (loadFromDesktop(sFilePath));
-    uno::Reference< XOfficeDatabaseDocument > xDocument(xComponent, UNO_QUERY_THROW);
+    mxComponent = loadFromDesktop(sFilePath);
+    uno::Reference< XOfficeDatabaseDocument > xDocument(mxComponent, UNO_QUERY_THROW);
 
     uno::Reference< XDataSource > xDataSource = xDocument->getDataSource();
     CPPUNIT_ASSERT(xDataSource.is());
@@ -122,8 +122,6 @@ void RowSetClones::test()
     CPPUNIT_ASSERT(xResultSetClone->isLast());
     CPPUNIT_ASSERT(xResultSet->isFirst());
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), xRow->getInt(1));
-
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(RowSetClones);
diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx
index 6a2bbb2ef706..798c5523a929 100644
--- a/dbaccess/qa/unit/dbtest_base.cxx
+++ b/dbaccess/qa/unit/dbtest_base.cxx
@@ -66,8 +66,8 @@ uno::Reference< XOfficeDatabaseDocument >
 }
 
 uno::Reference<XOfficeDatabaseDocument> DBTestBase::getDocumentForUrl(OUString const & url) {
-    uno::Reference< lang::XComponent > xComponent (loadFromDesktop(url));
-    uno::Reference< XOfficeDatabaseDocument > xDocument(xComponent, UNO_QUERY_THROW);
+    mxComponent = loadFromDesktop(url);
+    uno::Reference< XOfficeDatabaseDocument > xDocument(mxComponent, UNO_QUERY_THROW);
     return xDocument;
 }
 
diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx
index 7a8143810097..9e1c76dd0700 100644
--- a/dbaccess/qa/unit/firebird.cxx
+++ b/dbaccess/qa/unit/firebird.cxx
@@ -15,6 +15,7 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XStatement.hpp>
+#include <com/sun/star/util/XCloseable.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::sdb;
@@ -48,7 +49,8 @@ void FirebirdTest::testEmptyDBConnection()
 
     getConnectionForDocument(xDocument);
 
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
+    css::uno::Reference<util::XCloseable> xCloseable(mxComponent, css::uno::UNO_QUERY_THROW);
+    xCloseable->close(false);
 }
 
 /**
@@ -89,7 +91,8 @@ void FirebirdTest::testIntegerDatabase()
 
     CPPUNIT_ASSERT(!xResultSet->next()); // Should only be one row
 
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
+    css::uno::Reference<util::XCloseable> xCloseable(mxComponent, css::uno::UNO_QUERY_THROW);
+    xCloseable->close(false);
 }
 
 void FirebirdTest::testTdf132924()
@@ -115,7 +118,8 @@ void FirebirdTest::testTdf132924()
     CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xRow->getShort(xColumnLocate->findColumn("TestId")));
     CPPUNIT_ASSERT_EQUAL(OUString("TestName"), xRow->getString(xColumnLocate->findColumn("TestName")));
 
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
+    css::uno::Reference<util::XCloseable> xCloseable(mxComponent, css::uno::UNO_QUERY_THROW);
+    xCloseable->close(false);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(FirebirdTest);
diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx b/dbaccess/qa/unit/hsql_binary_import.cxx
index c77d9e5328d3..fb9185a82b4c 100644
--- a/dbaccess/qa/unit/hsql_binary_import.cxx
+++ b/dbaccess/qa/unit/hsql_binary_import.cxx
@@ -86,7 +86,6 @@ void HsqlBinaryImportTest::testBinaryImport()
     CPPUNIT_ASSERT_EQUAL(sal_uInt16{ 2 }, date.Month);
     CPPUNIT_ASSERT_EQUAL(sal_Int16{ 1998 }, date.Year);
 
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
     if (!oldValue)
     {
         std::shared_ptr<comphelper::ConfigurationChanges> xChanges(
diff --git a/dbaccess/qa/unit/hsqldb.cxx b/dbaccess/qa/unit/hsqldb.cxx
index 5ee011af276e..7d792b3c26a8 100644
--- a/dbaccess/qa/unit/hsqldb.cxx
+++ b/dbaccess/qa/unit/hsqldb.cxx
@@ -36,8 +36,6 @@ void HSQLDBTest::testEmptyDBConnection()
     uno::Reference<XOfficeDatabaseDocument> xDocument = getDocumentForUrl(file.GetURL());
 
     getConnectionForDocument(xDocument);
-
-    css::uno::Reference<css::lang::XComponent>(xDocument, css::uno::UNO_QUERY_THROW)->dispose();
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(HSQLDBTest);
diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx
index 267730286561..7486f9f44fe2 100644
--- a/dbaccess/qa/unit/tdf119625.cxx
+++ b/dbaccess/qa/unit/tdf119625.cxx
@@ -106,7 +106,6 @@ void Tdf119625Test::testTime()
     }
     CPPUNIT_ASSERT(!xRes->next());
 
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
     if (!oldValue)
     {
         std::shared_ptr<comphelper::ConfigurationChanges> xChanges(
diff --git a/dbaccess/qa/unit/tdf126268.cxx b/dbaccess/qa/unit/tdf126268.cxx
index b325d8dc1f62..c565648b6150 100644
--- a/dbaccess/qa/unit/tdf126268.cxx
+++ b/dbaccess/qa/unit/tdf126268.cxx
@@ -82,7 +82,6 @@ void Tdf126268Test::testNumbers()
     }
     CPPUNIT_ASSERT(!xRes->next());
 
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
     if (!oldValue)
     {
         std::shared_ptr<comphelper::ConfigurationChanges> xChanges(