diff options
| -rw-r--r-- | configmgr/CppunitTest_configmgr_unit.mk | 53 | ||||
| -rw-r--r-- | configmgr/Module_configmgr.mk | 4 | ||||
| -rw-r--r-- | configmgr/qa/unit/test.cxx | 11 |
3 files changed, 63 insertions, 5 deletions
diff --git a/configmgr/CppunitTest_configmgr_unit.mk b/configmgr/CppunitTest_configmgr_unit.mk new file mode 100644 index 000000000000..15647b67254e --- /dev/null +++ b/configmgr/CppunitTest_configmgr_unit.mk @@ -0,0 +1,53 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# 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/. +# +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,configmgr_unit)) + +$(eval $(call gb_CppunitTest_add_exception_objects,configmgr_unit, \ + configmgr/qa/unit/test \ +)) + +$(eval $(call gb_CppunitTest_use_library_objects,configmgr_unit,configmgr)) + +$(eval $(call gb_CppunitTest_use_sdk_api,configmgr_unit,)) + +$(eval $(call gb_Library_use_libraries,configmgr_unit, \ + comphelper \ + cppu \ + cppuhelper \ + sal \ + salhelper \ + test \ + unotest \ + xmlreader \ + i18nlangtag \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_CppunitTest_use_components,configmgr_unit,\ + configmgr/source/configmgr \ + fileaccess/source/fileacc \ + framework/util/fwk \ + i18npool/util/i18npool \ + i18npool/source/search/i18nsearch \ + sax/source/expatwrap/expwrap \ + sfx2/util/sfx \ + ucb/source/core/ucb1 \ + ucb/source/ucp/file/ucpfile1 \ + unoxml/source/service/unoxml \ + uui/util/uui \ +)) + +$(eval $(call gb_CppunitTest_use_externals,configmgr_unit,\ + boost_headers \ + icu_headers \ + icudata \ +)) diff --git a/configmgr/Module_configmgr.mk b/configmgr/Module_configmgr.mk index d465efb549de..eb401787f240 100644 --- a/configmgr/Module_configmgr.mk +++ b/configmgr/Module_configmgr.mk @@ -17,4 +17,8 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,configmgr,\ JunitTest_configmgr_unoapi \ )) +#$(eval $(call gb_Module_add_check_targets,configmgr,\ +# CppunitTest_configmgr_unit \ +#)) + # vim: set noet sw=4 ts=4: diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index 1e609a302277..bf119b473034 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -41,7 +41,6 @@ #include "com/sun/star/uno/XInterface.hpp" #include "com/sun/star/util/XChangesBatch.hpp" #include "cppuhelper/implbase1.hxx" -#include "cppuhelper/servicefactory.hxx" #include "osl/conditn.hxx" #include "osl/thread.h" #include "osl/thread.hxx" @@ -53,7 +52,9 @@ #include "rtl/ustring.h" #include "rtl/ustring.hxx" #include "sal/types.h" -#include "testshl/simpleheader.hxx" +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> namespace { @@ -478,7 +479,7 @@ void Test::testReadCommands() { } } n = osl_getGlobalTimer() - n; - t_print("Reading elements took %" SAL_PRIuUINT32 " ms\n", n); + printf("Reading elements took %" SAL_PRIuUINT32 " ms\n", n); css::uno::Reference< css::lang::XComponent >( access, css::uno::UNO_QUERY_THROW)->dispose(); } @@ -629,10 +630,10 @@ css::uno::Reference< css::uno::XInterface > Test::createUpdateAccess( css::uno::Sequence< css::uno::Any >(&arg, 1)); } -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltest"); +CPPUNIT_TEST_SUITE_REGISTRATION(Test); } -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |