move unoapi_property_tester to include so it can be used outside

Change-Id: Id6eebba7d80aa287274e921fdd872d37d0e09ef0
Reviewed-on: https://gerrit.libreoffice.org/53986
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

6 files changed, 4 insertions, 126 deletions

diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index e854b0d17551..378720b3f6f9 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,subsequenttest))
 
 $(eval $(call gb_Library_set_include,subsequenttest,\
-    -I$(SRCDIR)/test/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/test/Library_test.mk b/test/Library_test.mk
index 553eb2a3f148..92097613eb4d 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,test))
 
 $(eval $(call gb_Library_set_include,test,\
-    -I$(SRCDIR)/test/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/test/inc/unoapi_property_testers.hxx b/test/inc/unoapi_property_testers.hxx
deleted file mode 100644
index fce19763e21f..000000000000
--- a/test/inc/unoapi_property_testers.hxx
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
-/*
- * 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_INC_UNOAPIPROPERTYTESTERS_HXX
-#define INCLUDED_TEST_INC_UNOAPIPROPERTYTESTERS_HXX
-
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/uno/Reference.hxx>
-
-#include <sal/config.h>
-#include <test/testdllapi.hxx>
-
-namespace apitest
-{
-/** @brief Tester for property type 'boolean' of a @see com::sun::star::beans::XPropertySet.
- *
- * @param   xPropertySet    The property set, which contains the property to test against.
- * @param   name            Name of property to test.
- */
-void OOO_DLLPUBLIC_TEST testBooleanProperty(
-    css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, const OUString& name);
-
-/** @brief Tester for read-only property type 'boolean' of a @see com::sun::star::beans::XPropertySet.
- *
- * @param   xPropertySet    The property set, which contains the property to test against.
- * @param   name            Name of property to test.
- */
-void OOO_DLLPUBLIC_TEST testBooleanReadonlyProperty(
-    css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, const OUString& name);
-
-/** @brief Tester for property type 'double' of a @see com::sun::star::beans::XPropertySet.
- *
- * @param   xPropertySet    The property set, which contains the property to test against.
- * @param   name            Name of property to test.
- * @param   nValue          Value to use when setting a new value.
- */
-void OOO_DLLPUBLIC_TEST
-testDoubleProperty(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet,
-                   const OUString& name, const double& dValue = 42.0);
-
-/** @brief Tester for read-only property type 'double' of a @see com::sun::star::beans::XPropertySet.
- *
- * @param   xPropertySet    The property set, which contains the property to test against.
- * @param   name            Name of property to test.
- * @param   nValue          Value to use when setting a new value.
- */
-void OOO_DLLPUBLIC_TEST
-testDoubleReadonlyProperty(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet,
-                           const OUString& name, const double& dValue = 42.0);
-
-/** @brief Tester for property type 'long' of a @see com::sun::star::beans::XPropertySet.
- *
- * @param   xPropertySet    The property set, which contains the property to test against.
- * @param   name            Name of property to test.
- * @param   nValue          Value to use when setting a new value.
- */
-void OOO_DLLPUBLIC_TEST
-testLongProperty(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet,
-                 const OUString& name, const sal_Int32& nValue = 42);
-
-/** @brief Tester for read-only property type 'long' of a @see com::sun::star::beans::XPropertySet.
- *
- * @param   xPropertySet    The property set, which contains the property to test against.
- * @param   name            Name of property to test.
- * @param   nValue          Value to use when setting a new value.
- */
-void OOO_DLLPUBLIC_TEST
-testLongReadonlyProperty(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet,
-                         const OUString& name, const sal_Int32& nValue = 42);
-
-/** @brief Tester for property type 'short' of a @see com::sun::star::beans::XPropertySet.
- *
- * @param   xPropertySet    The property set, which contains the property to test against.
- * @param   name            Name of property to test.
- * @param   nValue          Value to use when setting a new value.
- */
-void OOO_DLLPUBLIC_TEST
-testShortProperty(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet,
-                  const OUString& name, const sal_Int16& nValue = 42);
-
-/** @brief Tester for read-only property type 'short' of a @see com::sun::star::beans::XPropertySet.
- *
- * @param   xPropertySet    The property set, which contains the property to test against.
- * @param   name            Name of property to test.
- * @param   nValue          Value to use when setting a new value.
- */
-void OOO_DLLPUBLIC_TEST
-testShortReadonlyProperty(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet,
-                          const OUString& name, const sal_Int16& nValue = 42);
-
-/** @brief Tester for property type 'string' of a @see com::sun::star::beans::XPropertySet.
- *
- * @param   xPropertySet    The property set, which contains the property to test against.
- * @param   name            Name of property to test.
- * @param   rValue          Value to use when setting a new value.
- */
-void OOO_DLLPUBLIC_TEST
-testStringProperty(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet,
-                   const OUString& name, const OUString& rValue);
-
-/** @brief Tester for read-only property type 'string' of a @see com::sun::star::beans::XPropertySet.
- *
- * @param   xPropertySet    The property set, which contains the property to test against.
- * @param   name            Name of property to test.
- * @param   rValue          Value to use when setting a new value.
- */
-void OOO_DLLPUBLIC_TEST
-testStringReadonlyProperty(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet,
-                           const OUString& name, const OUString& rValue);
-} // namespace apitest
-#endif // INCLUDED_TEST_INC_UNOAPIPROPERTYTESTERS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/test/source/sheet/spreadsheet.cxx b/test/source/sheet/spreadsheet.cxx
index f63c3667deee..6ff83c475e46 100644
--- a/test/source/sheet/spreadsheet.cxx
+++ b/test/source/sheet/spreadsheet.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <test/sheet/spreadsheet.hxx>
-#include <unoapi_property_testers.hxx>
+#include <test/unoapi_property_testers.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/test/source/sheet/spreadsheetdocumentsettings.cxx b/test/source/sheet/spreadsheetdocumentsettings.cxx
index cd464b2e15a8..cb68576a34de 100644
--- a/test/source/sheet/spreadsheetdocumentsettings.cxx
+++ b/test/source/sheet/spreadsheetdocumentsettings.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <unoapi_property_testers.hxx>
+#include <test/unoapi_property_testers.hxx>
 #include <test/sheet/spreadsheetdocumentsettings.hxx>
 
 #include <com/sun/star/awt/XDevice.hpp>
diff --git a/test/source/unoapi_property_testers.cxx b/test/source/unoapi_property_testers.cxx
index b54bd396cc30..421079a01093 100644
--- a/test/source/unoapi_property_testers.cxx
+++ b/test/source/unoapi_property_testers.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <unoapi_property_testers.hxx>
+#include <test/unoapi_property_testers.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/Any.hxx>
@@ -15,8 +15,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-using namespace com::sun::star;
-using namespace com::sun::star::uno;
+using namespace css;
 
 namespace apitest
 {