strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#146266 Move WeakBag test to gbuild system

Browse source 
As part of the efforts in tdf#146266 to move parts of the codebase from
the older makefile.mk build system to the newer gbuild system, this
commit migrates the WeakBag test, and cleans it up a little.

The test can now be invoked using this command:

$ make CppunitTest_comphelper_weakbag

Change-Id: I4ac3771fa23e28abd38a2dab84cacd1ae57fb70f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165591
Tested-by: Hossein <hossein@libreoffice.org>
Reviewed-by: Hossein <hossein@libreoffice.org>
This commit is contained in:
RMZeroFour 2024-03-31 18:12:34 +05:30 committed by Hossein
parent a8fda337a8
commit 804caab067
5 changed files with 39 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
comphelper/CppunitTest_comphelper_weakbag_test.mk Normal file
View file

@ -0,0 +1,27 @@
# -*- 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,comphelper_weakbag))
$(eval $(call gb_CppunitTest_add_exception_objects,comphelper_weakbag,\
comphelper/qa/weakbag/test_weakbag \
))
$(eval $(call gb_CppunitTest_use_api,comphelper_weakbag,\
udkapi \
))
$(eval $(call gb_CppunitTest_use_libraries,comphelper_weakbag,\
comphelper \
cppu \
cppuhelper \
sal \
))
# vim: set noet sw=4 ts=4:

1
comphelper/Module_comphelper.mk
View file

@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_check_targets,comphelper,\
CppunitTest_comphelper_variadictemplates_test \
CppunitTest_comphelper_ifcontainer \
CppunitTest_comphelper_test \
CppunitTest_comphelper_weakbag_test \
))
# vim: set noet sw=4 ts=4:

44
comphelper/qa/weakbag/makefile.mk
View file

@ -1,44 +0,0 @@
#
# 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/.
#
# This file incorporates work covered by the following license notice:
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed
# with this work for additional information regarding copyright
# ownership. The ASF licenses this file to you under the Apache
# License, Version 2.0 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
PRJ := ..$/..
PRJNAME := comphelper
TARGET := qa_weakbag
ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
.INCLUDE : $(PRJ)$/version.mk
CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE = # no leading "lib" on .so files
INCPRE += $(MISC)$/$(TARGET)$/inc
SHL1TARGET = $(TARGET)_weakbag
SHL1OBJS = $(SLO)$/test_weakbag.obj $(SLO)$/test_weakbag_noadditional.obj
SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(COMPHELPERLIB)
SHL1VERSIONMAP = ..$/version.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
SLOFILES = $(SHL1OBJS)
.INCLUDE: target.mk
.INCLUDE: _cppunit.mk

16
comphelper/qa/weakbag/test_weakbag.cxx
View file

@ -28,7 +28,8 @@
namespace
{
class Test : public CppUnit::TestFixture
// Tests the behaviour of comphelper::WeakBag
class WeakBagTest : public CppUnit::TestFixture
{
public:
void test()
@ -36,7 +37,9 @@ public:
css::uno::Reference<css::uno::XInterface> ref1(new cppu::OWeakObject);
css::uno::Reference<css::uno::XInterface> ref2(new cppu::OWeakObject);
css::uno::Reference<css::uno::XInterface> ref3(new cppu::OWeakObject);
comphelper::WeakBag<css::uno::XInterface> bag;
bag.add(ref1);
bag.add(ref1);
bag.add(ref2);
@ -44,18 +47,21 @@ public:
ref1.clear();
bag.add(ref3);
ref3.clear();
CPPUNIT_ASSERT_MESSAGE("remove first ref2", bag.remove() == ref2);
CPPUNIT_ASSERT_MESSAGE("remove second ref2", bag.remove() == ref2);
CPPUNIT_ASSERT_EQUAL_MESSAGE("remove first ref2", bag.remove(), ref2);
CPPUNIT_ASSERT_EQUAL_MESSAGE("remove second ref2", bag.remove(), ref2);
CPPUNIT_ASSERT_MESSAGE("remove first null", !bag.remove().is());
CPPUNIT_ASSERT_MESSAGE("remove second null", !bag.remove().is());
}
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST_SUITE(WeakBagTest);
CPPUNIT_TEST(test);
CPPUNIT_TEST_SUITE_END();
};
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_TEST_SUITE_REGISTRATION(WeakBagTest);
}
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

25
comphelper/qa/weakbag/test_weakbag_noadditional.cxx
View file

@ -1,25 +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/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <sal/types.h>
#include <cppunit/plugin/TestPlugIn.h>
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */