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>

2 files changed, 10 insertions, 39 deletions

diff --git a/include/test/calc_unoapi_test.hxx b/include/test/calc_unoapi_test.hxx
deleted file mode 100644
index a34418876bf3..000000000000
--- a/include/test/calc_unoapi_test.hxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_TEST_CALC_UNOAPI_TEST_HXX
-#define INCLUDED_TEST_CALC_UNOAPI_TEST_HXX
-
-#include <test/unoapi_test.hxx>
-#include <unotools/tempfile.hxx>
-
-// basic uno api test class for calc
-
-class OOO_DLLPUBLIC_TEST CalcUnoApiTest : public UnoApiTest
-{
-public:
-    CalcUnoApiTest(const OUString& path);
-
-    virtual void tearDown() override;
-
-    css::uno::Any executeMacro(const OUString& rScriptURL,
-                               const css::uno::Sequence<css::uno::Any>& rParams = {});
-
-    utl::TempFileNamed save(const OUString& rFilter);
-    void saveAndReload(const OUString& rFilter);
-
-protected:
-    // reference to document component that we are testing
-    css::uno::Reference<css::lang::XComponent> mxComponent;
-};
-
-#endif // INCLUDED_TEST_CALC_UNOAPI_TEST_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx
index ac5bd0675b12..8dbc3acc257e 100644
--- a/include/test/unoapi_test.hxx
+++ b/include/test/unoapi_test.hxx
@@ -18,6 +18,7 @@
 #include <unotest/macros_test.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <osl/file.hxx>
+#include <unotools/tempfile.hxx>
 
 // basic uno api test class
 
@@ -29,9 +30,17 @@ public:
     void createFileURL(std::u16string_view aFileBase, OUString& rFilePath);
 
     virtual void setUp() override;
+    virtual void tearDown() override;
+
+    css::uno::Any executeMacro(const OUString& rScriptURL,
+                               const css::uno::Sequence<css::uno::Any>& rParams = {});
+
+    utl::TempFileNamed save(const OUString& rFilter);
+    void saveAndReload(const OUString& rFilter);
 
 protected:
-    void closeDocument(css::uno::Reference<css::lang::XComponent> const& xDocument);
+    // reference to document component that we are testing
+    css::uno::Reference<css::lang::XComponent> mxComponent;
 
 private:
     OUString m_aBaseString;