sc/CppunitTest_sc_datatransformation.mk | 135 --------------------------
sc/CppunitTest_sc_parallelism.mk | 110 ---------------------
sc/CppunitTest_sc_range_test.mk | 124 -----------------------
sc/CppunitTest_sc_rangelst_test.mk | 124 -----------------------
sc/CppunitTest_sc_sparkline_test.mk | 1
sc/CppunitTest_sc_ucalc_datatransformation.mk | 14 ++
sc/CppunitTest_sc_ucalc_parallelism.mk | 14 ++
sc/CppunitTest_sc_ucalc_range.mk | 14 ++
sc/CppunitTest_sc_ucalc_rangelst.mk | 14 ++
sc/CppunitTest_sc_ucalc_sparkline.mk | 75 ++++++++++++++
sc/Module_sc.mk | 9 -
sc/qa/unit/ucalc_sparkline.cxx | 2
solenv/clang-format/excludelist | 8 -
13 files changed, 142 insertions(+), 502 deletions(-)
New commits:
commit 077931c77e095f789eb62b60e66b0bc87535b57c
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Nov 18 11:04:26 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Nov 18 18:51:48 2022 +0100
sc: split CppunitTest_sc_sparkline_test into two
rename SparklineTest.cxx to ucalc_sparkline.cxx
for a follow-up refactoring
Change-Id: I2a8aeec5ffbd994c27102461a71cf0c0ec13dfed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142911
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/CppunitTest_sc_sparkline_test.mk
b/sc/CppunitTest_sc_sparkline_test.mk
index b756de2a815e..ca678f4829d8 100644
--- a/sc/CppunitTest_sc_sparkline_test.mk
+++ b/sc/CppunitTest_sc_sparkline_test.mk
@@ -15,7 +15,6 @@ $(eval $(call
gb_CppunitTest_use_common_precompiled_header,sc_sparkline_test))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_sparkline_test, \
sc/qa/unit/SparklineImportExportTest \
- sc/qa/unit/SparklineTest \
))
$(eval $(call gb_CppunitTest_use_externals,sc_sparkline_test, \
diff --git a/sc/CppunitTest_sc_ucalc_sparkline.mk
b/sc/CppunitTest_sc_ucalc_sparkline.mk
new file mode 100644
index 000000000000..99f75e086fc0
--- /dev/null
+++ b/sc/CppunitTest_sc_ucalc_sparkline.mk
@@ -0,0 +1,75 @@
+# -*- 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,sc_ucalc_sparkline))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_ucalc_sparkline))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc_sparkline, \
+ sc/qa/unit/ucalc_sparkline \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sc_ucalc_sparkline, \
+ boost_headers \
+ mdds_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc_sparkline, \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ sax \
+ sc \
+ scqahelper \
+ sfx \
+ subsequenttest \
+ test \
+ tl \
+ unotest \
+ utl \
+ vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sc_ucalc_sparkline,\
+ boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_ucalc_sparkline,\
+ -I$(SRCDIR)/sc/source/ui/inc \
+ -I$(SRCDIR)/sc/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sc_ucalc_sparkline,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_ucalc_sparkline))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_ucalc_sparkline))
+$(eval $(call gb_CppunitTest_use_vcl,sc_ucalc_sparkline))
+
+$(eval $(call gb_CppunitTest_use_rdb,sc_ucalc_sparkline,services))
+
+$(eval $(call gb_CppunitTest_use_components,sc_ucalc_sparkline))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_ucalc_sparkline))
+
+$(eval $(call gb_CppunitTest_add_arguments,sc_ucalc_sparkline, \
+
-env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}"
\
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index ea56a422091c..c829ee0ae3ca 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
CppunitTest_sc_ucalc_rangelst \
CppunitTest_sc_ucalc_range \
CppunitTest_sc_ucalc_sharedformula \
+ CppunitTest_sc_ucalc_sparkline \
CppunitTest_sc_ucalc_sort \
CppunitTest_sc_bugfix_test \
CppunitTest_sc_filters_test \
diff --git a/sc/qa/unit/SparklineTest.cxx b/sc/qa/unit/ucalc_sparkline.cxx
similarity index 99%
rename from sc/qa/unit/SparklineTest.cxx
rename to sc/qa/unit/ucalc_sparkline.cxx
index d6d8c9d23a2e..d2aa3b0ac342 100644
--- a/sc/qa/unit/SparklineTest.cxx
+++ b/sc/qa/unit/ucalc_sparkline.cxx
@@ -954,4 +954,6 @@ void SparklineTest::testSparklineList()
CPPUNIT_TEST_SUITE_REGISTRATION(SparklineTest);
+CPPUNIT_PLUGIN_IMPLEMENT();
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5cc9ab736aa61c7395be0f6960064de36063f677
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Nov 18 09:47:04 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Nov 18 18:51:33 2022 +0100
sc: rename these tests to ucalc_*
All inherit from the same class, just to be consistent.
this is part of a follow-up refactoring
Change-Id: I9f69ae16c9363996a95a684183d6c0e981594405
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142907
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/CppunitTest_sc_datatransformation.mk
b/sc/CppunitTest_sc_datatransformation.mk
deleted file mode 100644
index 0f39df80e84d..000000000000
--- a/sc/CppunitTest_sc_datatransformation.mk
+++ /dev/null
@@ -1,135 +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,sc_datatransformation))
-
-$(eval $(call
gb_CppunitTest_use_common_precompiled_header,sc_datatransformation))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_datatransformation, \
- sc/qa/unit/datatransformation_test \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sc_datatransformation, \
- boost_headers \
- mdds_headers \
- libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_datatransformation, \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- drawinglayer \
- drawinglayercore \
- editeng \
- for \
- forui \
- i18nlangtag \
- msfilter \
- oox \
- sal \
- salhelper \
- sax \
- sb \
- sc \
- scqahelper \
- sfx \
- sot \
- subsequenttest \
- svl \
- svt \
- svx \
- svxcore \
- test \
- tk \
- tl \
- ucbhelper \
- unotest \
- utl \
- $(call gb_Helper_optional,SCRIPTING, \
- vbahelper) \
- vcl \
- xo \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_datatransformation,\
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/inc \
- -I$(SRCDIR)/sc/source/filter/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_custom_headers,sc_datatransformation,\
- officecfg/registry \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_datatransformation,\
- udkapi \
- offapi \
- oovbaapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_datatransformation))
-$(eval $(call gb_CppunitTest_use_vcl,sc_datatransformation))
-
-$(eval $(call gb_CppunitTest_use_components,sc_datatransformation,\
- basic/util/sb \
- chart2/source/chartcore \
- chart2/source/controller/chartcontroller \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- dbaccess/util/dba \
- embeddedobj/util/embobj \
- eventattacher/source/evtatt \
- filter/source/config/cache/filterconfig1 \
- forms/util/frm \
- framework/util/fwk \
- i18npool/source/search/i18nsearch \
- i18npool/util/i18npool \
- linguistic/source/lng \
- oox/util/oox \
- package/source/xstor/xstor \
- package/util/package2 \
- sax/source/expatwrap/expwrap \
- scaddins/source/analysis/analysis \
- scaddins/source/datefunc/date \
- sc/util/sc \
- sc/util/scfilt \
- sfx2/util/sfx \
- sot/util/sot \
- svl/util/svl \
- svl/source/fsstor/fsstorage \
- svtools/util/svt \
- 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 \
- vcl/vcl.common \
- xmloff/util/xo \
- xmlsecurity/util/xmlsecurity \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sc_datatransformation,\
- orcus \
- orcus-parser \
- boost_filesystem \
- boost_system \
- boost_iostreams \
- zlib \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_datatransformation))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_parallelism.mk b/sc/CppunitTest_sc_parallelism.mk
deleted file mode 100644
index 74b88f3b7d80..000000000000
--- a/sc/CppunitTest_sc_parallelism.mk
+++ /dev/null
@@ -1,110 +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,sc_parallelism))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_parallelism, \
- sc/qa/unit/parallelism \
-))
-
-$(eval $(call gb_CppunitTest_use_library_objects,sc_parallelism, \
- sc \
- scqahelper \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sc_parallelism, \
- boost_headers \
- $(call gb_Helper_optional,OPENCL,clew) \
- icu_headers \
- icui18n \
- icuuc \
- libxml2 \
- mdds_headers \
- orcus \
- orcus-parser \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_parallelism, \
- $(call gb_Helper_optional,AVMEDIA,avmedia) \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- dbtools \
- drawinglayer \
- drawinglayercore \
- editeng \
- for \
- forui \
- i18nlangtag \
- i18nutil \
- $(call gb_Helper_optional,OPENCL,opencl) \
- sal \
- salhelper \
- sax \
- sb \
- sfx \
- sot \
- subsequenttest \
- svl \
- svt \
- svx \
- svxcore \
- test \
- tk \
- tl \
- ucbhelper \
- unotest \
- utl \
- $(call gb_Helper_optional,SCRIPTING, \
- vbahelper) \
- vcl \
- xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_parallelism,\
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/source/core/inc \
- -I$(SRCDIR)/sc/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_parallelism,\
- udkapi \
- offapi \
- oovbaapi \
-))
-
-$(eval $(call gb_CppunitTest_use_custom_headers,sc_parallelism,\
- officecfg/registry \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_parallelism))
-$(eval $(call gb_CppunitTest_use_vcl,sc_parallelism))
-
-$(eval $(call gb_CppunitTest_use_components,sc_parallelism,\
- configmgr/source/configmgr \
- framework/util/fwk \
- i18npool/source/search/i18nsearch \
- i18npool/util/i18npool \
- sax/source/expatwrap/expwrap \
- scaddins/source/analysis/analysis \
- scaddins/source/datefunc/date \
- scaddins/source/pricing/pricing \
- sfx2/util/sfx \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unoxml/source/service/unoxml \
- uui/util/uui \
- vcl/vcl.common \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_parallelism))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_range_test.mk b/sc/CppunitTest_sc_range_test.mk
deleted file mode 100644
index b2990f89d1cf..000000000000
--- a/sc/CppunitTest_sc_range_test.mk
+++ /dev/null
@@ -1,124 +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,sc_range_test))
-
-$(eval $(call gb_CppunitTest_use_externals,sc_range_test, \
- boost_headers \
- icu_headers \
- icui18n \
- icuuc \
- libxml2 \
- mdds_headers \
-))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_range_test))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_range_test, \
- sc/qa/unit/range \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_range_test, \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- drawinglayer \
- drawinglayercore \
- editeng \
- for \
- forui \
- i18nlangtag \
- msfilter \
- oox \
- sal \
- salhelper \
- sax \
- sb \
- sc \
- scqahelper \
- sfx \
- sot \
- svl \
- svt \
- svx \
- svxcore \
- test \
- tk \
- tl \
- ucbhelper \
- unotest \
- utl \
- $(call gb_Helper_optional,SCRIPTING, \
- vbahelper) \
- vcl \
- xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_range_test,\
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_range_test,\
- offapi \
- oovbaapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_range_test))
-$(eval $(call gb_CppunitTest_use_vcl,sc_range_test))
-
-$(eval $(call gb_CppunitTest_use_components,sc_range_test,\
- basic/util/sb \
- chart2/source/chartcore \
- chart2/source/controller/chartcontroller \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- dbaccess/util/dba \
- embeddedobj/util/embobj \
- eventattacher/source/evtatt \
- 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 \
- scaddins/source/analysis/analysis \
- scaddins/source/datefunc/date \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
- sc/util/sc \
- sc/util/scd \
- sc/util/scfilt \
- $(call gb_Helper_optional,SCRIPTING, \
- sc/util/vbaobj) \
- sfx2/util/sfx \
- sot/util/sot \
- svl/source/fsstor/fsstorage \
- svl/util/svl \
- svx/util/svx \
- svx/util/svxcore \
- 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 \
- vcl/vcl.common \
- xmloff/util/xo \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_range_test))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_rangelst_test.mk
b/sc/CppunitTest_sc_rangelst_test.mk
deleted file mode 100644
index 6a88ecac7df8..000000000000
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ /dev/null
@@ -1,124 +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,sc_rangelst_test))
-
-$(eval $(call gb_CppunitTest_use_externals,sc_rangelst_test, \
- boost_headers \
- icu_headers \
- icui18n \
- icuuc \
- libxml2 \
- mdds_headers \
-))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_rangelst_test))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_rangelst_test, \
- sc/qa/unit/rangelst_test \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- drawinglayer \
- drawinglayercore \
- editeng \
- for \
- forui \
- i18nlangtag \
- msfilter \
- oox \
- sal \
- salhelper \
- sax \
- sb \
- sc \
- scqahelper \
- sfx \
- sot \
- svl \
- svt \
- svx \
- svxcore \
- test \
- tk \
- tl \
- ucbhelper \
- unotest \
- utl \
- $(call gb_Helper_optional,SCRIPTING, \
- vbahelper) \
- vcl \
- xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_rangelst_test,\
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_rangelst_test,\
- offapi \
- oovbaapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_rangelst_test))
-$(eval $(call gb_CppunitTest_use_vcl,sc_rangelst_test))
-
-$(eval $(call gb_CppunitTest_use_components,sc_rangelst_test,\
- basic/util/sb \
- chart2/source/chartcore \
- chart2/source/controller/chartcontroller \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- dbaccess/util/dba \
- embeddedobj/util/embobj \
- eventattacher/source/evtatt \
- 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 \
- scaddins/source/analysis/analysis \
- scaddins/source/datefunc/date \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
- sc/util/sc \
- sc/util/scd \
- sc/util/scfilt \
- $(call gb_Helper_optional,SCRIPTING, \
- sc/util/vbaobj) \
- sfx2/util/sfx \
- sot/util/sot \
- svl/source/fsstor/fsstorage \
- svl/util/svl \
- svx/util/svx \
- svx/util/svxcore \
- 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 \
- vcl/vcl.common \
- xmloff/util/xo \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_rangelst_test))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_ucalc_datatransformation.mk
b/sc/CppunitTest_sc_ucalc_datatransformation.mk
new file mode 100644
index 000000000000..e66dadf9cfc0
--- /dev/null
+++ b/sc/CppunitTest_sc_ucalc_datatransformation.mk
@@ -0,0 +1,14 @@
+# -*- 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 sc_ucalc_test,_datatransformation))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_ucalc_parallelism.mk
b/sc/CppunitTest_sc_ucalc_parallelism.mk
new file mode 100644
index 000000000000..0c6ce0d7bb61
--- /dev/null
+++ b/sc/CppunitTest_sc_ucalc_parallelism.mk
@@ -0,0 +1,14 @@
+# -*- 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 sc_ucalc_test,_parallelism))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_ucalc_range.mk b/sc/CppunitTest_sc_ucalc_range.mk
new file mode 100644
index 000000000000..5baa7540467e
--- /dev/null
+++ b/sc/CppunitTest_sc_ucalc_range.mk
@@ -0,0 +1,14 @@
+# -*- 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 sc_ucalc_test,_range))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_ucalc_rangelst.mk
b/sc/CppunitTest_sc_ucalc_rangelst.mk
new file mode 100644
index 000000000000..fd9b93b028df
--- /dev/null
+++ b/sc/CppunitTest_sc_ucalc_rangelst.mk
@@ -0,0 +1,14 @@
+# -*- 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 sc_ucalc_test,_rangelst))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index c297527239ab..ea56a422091c 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -41,23 +41,23 @@ ifneq ($(OS),iOS)
ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_check_targets,sc,\
Library_scqahelper \
- CppunitTest_sc_parallelism \
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
CppunitTest_sc_ucalc) \
CppunitTest_sc_ucalc_condformat \
CppunitTest_sc_ucalc_copypaste \
+ CppunitTest_sc_ucalc_datatransformation \
CppunitTest_sc_ucalc_formula \
+ CppunitTest_sc_ucalc_parallelism \
CppunitTest_sc_ucalc_pivottable \
+ CppunitTest_sc_ucalc_rangelst \
+ CppunitTest_sc_ucalc_range \
CppunitTest_sc_ucalc_sharedformula \
CppunitTest_sc_ucalc_sort \
CppunitTest_sc_bugfix_test \
CppunitTest_sc_filters_test \
- CppunitTest_sc_rangelst_test \
- CppunitTest_sc_range_test \
CppunitTest_sc_mark_test \
CppunitTest_sc_core \
CppunitTest_sc_dataprovider \
- CppunitTest_sc_datatransformation \
CppunitTest_sc_cache_test \
CppunitTest_sc_shapetest \
))
diff --git a/sc/qa/unit/datatransformation_test.cxx
b/sc/qa/unit/ucalc_datatransformation.cxx
similarity index 100%
rename from sc/qa/unit/datatransformation_test.cxx
rename to sc/qa/unit/ucalc_datatransformation.cxx
diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/ucalc_parallelism.cxx
similarity index 100%
rename from sc/qa/unit/parallelism.cxx
rename to sc/qa/unit/ucalc_parallelism.cxx
diff --git a/sc/qa/unit/range.cxx b/sc/qa/unit/ucalc_range.cxx
similarity index 100%
rename from sc/qa/unit/range.cxx
rename to sc/qa/unit/ucalc_range.cxx
diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/ucalc_rangelst.cxx
similarity index 100%
rename from sc/qa/unit/rangelst_test.cxx
rename to sc/qa/unit/ucalc_rangelst.cxx
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index ac3a2a3c72f9..f3f6c774e7a3 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -8010,7 +8010,6 @@ sc/qa/extras/scnamedrangeobj.cxx
sc/qa/extras/sctablesheetobj.cxx
sc/qa/perf/scperfobj.cxx
sc/qa/unit/copy_paste_test.cxx
-sc/qa/unit/datatransformation_test.cxx
sc/qa/unit/filters-test.cxx
sc/qa/unit/functions_addin.cxx
sc/qa/unit/functions_array.cxx
@@ -8035,15 +8034,16 @@ sc/qa/unit/helper/xpath.cxx
sc/qa/unit/helper/xpath.hxx
sc/qa/unit/mark_test.cxx
sc/qa/unit/opencl-test.cxx
-sc/qa/unit/parallelism.cxx
-sc/qa/unit/range.cxx
-sc/qa/unit/rangelst_test.cxx
sc/qa/unit/screenshots/screenshots.cxx
sc/qa/unit/tiledrendering/tiledrendering.cxx
sc/qa/unit/ucalc.cxx
sc/qa/unit/ucalc_condformat.cxx
+sc/qa/unit/ucalc_datatransformation.cxx
sc/qa/unit/ucalc_formula.cxx
+sc/qa/unit/ucalc_parallelism.cxx
sc/qa/unit/ucalc_pivottable.cxx
+sc/qa/unit/ucalc_range.cxx
+sc/qa/unit/ucalc_rangelst.cxx
sc/qa/unit/ucalc_sharedformula.cxx
sc/qa/unit/ucalc_sort.cxx
sc/source/core/data/attarray.cxx
