dbaccess/CppunitTest_dbaccess_macros_test.mk | 102 --------------------------- dbaccess/Module_dbaccess.mk | 1 dbaccess/qa/extras/macros-test.cxx | 42 ----------- dev/null |binary 4 files changed, 145 deletions(-)
New commits: commit ed54d14d5c9bf46b48741e37a12664921aed1c2a Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Tue Jun 11 16:16:13 2024 +0200 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Tue Jun 11 21:32:53 2024 +0200 CppunitTest_dbaccess_macros_test: remove redundant test This was added in 0f4451c0b3bda3d14c7672ca670b4de959495365 "first part of a c++ based test for base" as an example on how to test base documents. At this point we already have other base tests doing more interesting stuff so I believe this test is not needed anymore Change-Id: Ice747800f3ab6d887d63595fe9dbdd531acf9014 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168684 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk deleted file mode 100644 index 248a5520c66c..000000000000 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ /dev/null @@ -1,102 +0,0 @@ -# -*- 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,dbaccess_macros_test)) - -$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_macros_test, \ - dbaccess/qa/extras/macros-test \ -)) - -$(eval $(call gb_CppunitTest_use_externals,dbaccess_macros_test,\ - boost_headers \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ - basegfx \ - comphelper \ - cppu \ - cppuhelper \ - dba \ - dbu \ - sdbt \ - drawinglayer \ - editeng \ - for \ - forui \ - i18nlangtag \ - msfilter \ - oox \ - sal \ - salhelper \ - sax \ - sb \ - sfx \ - sot \ - svl \ - svt \ - svx \ - svxcore \ - test \ - subsequenttest \ - tl \ - tk \ - ucbhelper \ - unotest \ - utl \ - $(call gb_Helper_optional,SCRIPTING, \ - vbahelper) \ - vcl \ - xo \ -)) - -$(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\ - offapi \ - oovbaapi \ - udkapi \ -)) - -$(eval $(call gb_CppunitTest_use_ure,dbaccess_macros_test)) -$(eval $(call gb_CppunitTest_use_vcl,dbaccess_macros_test)) - -$(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\ - basic/util/sb \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - dbaccess/util/dba \ - dbaccess/util/dbu \ - dbaccess/util/sdbt \ - dbaccess/source/filter/xml/dbaxml \ - filter/source/config/cache/filterconfig1 \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - scripting/source/basprov/basprov \ - scripting/util/scriptframe \ - sfx2/util/sfx \ - sot/util/sot \ - svl/source/fsstor/fsstorage \ - svl/util/svl \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - ucb/source/ucp/tdoc/ucptdoc1 \ - unotools/util/utl \ - unoxml/source/rdf/unordf \ - unoxml/source/service/unoxml \ - uui/util/uui \ - xmloff/util/xo \ -)) - -$(eval $(call gb_CppunitTest_use_configuration,dbaccess_macros_test)) - -# vim: set noet sw=4 ts=4: diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index c51b66c3522d..e3df5dc33dc2 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -52,7 +52,6 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\ CppunitTest_dbaccess_dialog_save \ CppunitTest_dbaccess_empty_stdlib_save \ CppunitTest_dbaccess_nolib_save \ - CppunitTest_dbaccess_macros_test \ CppunitTest_dbaccess_hsqlschema_import \ )) endif diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx deleted file mode 100644 index 9b11863ef3da..000000000000 --- a/dbaccess/qa/extras/macros-test.cxx +++ /dev/null @@ -1,42 +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/. - */ - -#include <sal/config.h> -#include <test/unoapi_test.hxx> - -using namespace ::com::sun::star; - -#if !defined(MACOSX) && !defined(_WIN32) - -class DBAccessTest : public UnoApiTest -{ -public: - DBAccessTest(); - - void test(); - - CPPUNIT_TEST_SUITE(DBAccessTest); - CPPUNIT_TEST(test); - CPPUNIT_TEST_SUITE_END(); -}; - -DBAccessTest::DBAccessTest() - : UnoApiTest(u"/dbaccess/qa/extras/testdocuments"_ustr) -{ -} - -void DBAccessTest::test() { loadFromFile(u"testdb.odb"); } - -CPPUNIT_TEST_SUITE_REGISTRATION(DBAccessTest); - -#endif - -CPPUNIT_PLUGIN_IMPLEMENT(); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/qa/extras/testdocuments/testdb.odb b/dbaccess/qa/extras/testdocuments/testdb.odb deleted file mode 100644 index 038e998e6e96..000000000000 Binary files a/dbaccess/qa/extras/testdocuments/testdb.odb and /dev/null differ