comphelper/CppunitTest_comphelper_weakbag_test.mk | 27 ++++++++++++
comphelper/Module_comphelper.mk | 1
comphelper/qa/weakbag/makefile.mk | 44 --------------------
comphelper/qa/weakbag/test_weakbag.cxx | 16 +++++--
comphelper/qa/weakbag/test_weakbag_noadditional.cxx | 25 -----------
5 files changed, 39 insertions(+), 74 deletions(-)
New commits:
commit 804caab067acaedca85abb9e83170e1a3f01b185
Author: RMZeroFour <ritobrot...@gmail.com>
AuthorDate: Sun Mar 31 18:12:34 2024 +0530
Commit: Hossein <hoss...@libreoffice.org>
CommitDate: Fri Apr 12 16:50:31 2024 +0200
tdf#146266 Move WeakBag test to gbuild system
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 <hoss...@libreoffice.org>
Reviewed-by: Hossein <hoss...@libreoffice.org>
diff --git a/comphelper/CppunitTest_comphelper_weakbag_test.mk
b/comphelper/CppunitTest_comphelper_weakbag_test.mk
new file mode 100644
index 000000000000..3ee86b9b8549
--- /dev/null
+++ b/comphelper/CppunitTest_comphelper_weakbag_test.mk
@@ -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:
diff --git a/comphelper/Module_comphelper.mk b/comphelper/Module_comphelper.mk
index c483e50b0cc6..2ba6af1198f5 100644
--- a/comphelper/Module_comphelper.mk
+++ b/comphelper/Module_comphelper.mk
@@ -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:
diff --git a/comphelper/qa/weakbag/makefile.mk
b/comphelper/qa/weakbag/makefile.mk
deleted file mode 100644
index 495c68f5063d..000000000000
--- a/comphelper/qa/weakbag/makefile.mk
+++ /dev/null
@@ -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
diff --git a/comphelper/qa/weakbag/test_weakbag.cxx
b/comphelper/qa/weakbag/test_weakbag.cxx
index b646ca7aef42..10e10cd7da85 100644
--- a/comphelper/qa/weakbag/test_weakbag.cxx
+++ b/comphelper/qa/weakbag/test_weakbag.cxx
@@ -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: */
diff --git a/comphelper/qa/weakbag/test_weakbag_noadditional.cxx
b/comphelper/qa/weakbag/test_weakbag_noadditional.cxx
deleted file mode 100644
index d2d66a61ea93..000000000000
--- a/comphelper/qa/weakbag/test_weakbag_noadditional.cxx
+++ /dev/null
@@ -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: */
