[Libreoffice-commits] core.git: sw/CppunitTest_sw_uibase_uiview.mk sw/CppunitTest_sw_updateall_object_replacements.mk sw/Module_sw.mk sw/qa
Miklos Vajna (via logerrit)
logerrit at kemper.freedesktop.org
Wed Sep 9 08:36:47 UTC 2020
sw/CppunitTest_sw_uibase_uiview.mk | 74 +++++++++++++++++++++
sw/CppunitTest_sw_updateall_object_replacements.mk | 74 ---------------------
sw/Module_sw.mk | 2
sw/qa/uibase/uiview/uiview.cxx | 8 +-
4 files changed, 79 insertions(+), 79 deletions(-)
New commits:
commit 0be6168c5a7b1493a22222dc0967b5e8a0153386
Author: Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Sep 8 20:55:32 2020 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Sep 9 10:36:12 2020 +0200
sw: rename CppunitTest_sw_updateall_object_replacements to sw_uibase_uiview
All these new test suites are named in a way, so that in case the fix is
in sw/source/foo/bar/, then the matching test suite is sw_foo_bar.
Rename to this schema, so next time a bug is fixed in that directory, we
don't need to add a new suite.
Change-Id: I968711754cb587cc2f97fff6431be416b477728f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102274
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/sw/CppunitTest_sw_uibase_uiview.mk b/sw/CppunitTest_sw_uibase_uiview.mk
new file mode 100644
index 000000000000..5e73ce9c266f
--- /dev/null
+++ b/sw/CppunitTest_sw_uibase_uiview.mk
@@ -0,0 +1,74 @@
+# -*- 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,sw_uibase_uiview))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_uibase_uiview))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_uibase_uiview, \
+ sw/qa/uibase/uiview/uiview \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_uibase_uiview, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sfx \
+ svxcore \
+ sw \
+ swqahelper \
+ test \
+ unotest \
+ utl \
+ vcl \
+ svt \
+ tl \
+ svl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_uibase_uiview,\
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_uibase_uiview,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/source/uibase/inc \
+ -I$(SRCDIR)/sw/qa/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_uibase_uiview,\
+ udkapi \
+ offapi \
+ oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_uibase_uiview))
+$(eval $(call gb_CppunitTest_use_vcl,sw_uibase_uiview))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_uibase_uiview,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_uibase_uiview,\
+ officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_uibase_uiview))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_uibase_uiview, \
+ modules/swriter \
+))
+
+$(eval $(call gb_CppunitTest_use_more_fonts,sw_uibase_uiview))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_updateall_object_replacements.mk b/sw/CppunitTest_sw_updateall_object_replacements.mk
deleted file mode 100644
index a8aa95e73258..000000000000
--- a/sw/CppunitTest_sw_updateall_object_replacements.mk
+++ /dev/null
@@ -1,74 +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,sw_updateall_object_replacements))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_updateall_object_replacements))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_updateall_object_replacements, \
- sw/qa/core/updateall_objectreplacements \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_updateall_object_replacements, \
- comphelper \
- cppu \
- cppuhelper \
- sal \
- sfx \
- svxcore \
- sw \
- swqahelper \
- test \
- unotest \
- utl \
- vcl \
- svt \
- tl \
- svl \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_updateall_object_replacements,\
- boost_headers \
- libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_updateall_object_replacements,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/source/uibase/inc \
- -I$(SRCDIR)/sw/qa/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_updateall_object_replacements,\
- udkapi \
- offapi \
- oovbaapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_updateall_object_replacements))
-$(eval $(call gb_CppunitTest_use_vcl,sw_updateall_object_replacements))
-
-$(eval $(call gb_CppunitTest_use_rdb,sw_updateall_object_replacements,services))
-
-$(eval $(call gb_CppunitTest_use_custom_headers,sw_updateall_object_replacements,\
- officecfg/registry \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_updateall_object_replacements))
-
-$(eval $(call gb_CppunitTest_use_uiconfigs,sw_updateall_object_replacements, \
- modules/swriter \
-))
-
-$(eval $(call gb_CppunitTest_use_more_fonts,sw_updateall_object_replacements))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 12610ebb6c49..7087d76806e9 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -120,7 +120,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_core_unocore \
CppunitTest_sw_core_crsr \
CppunitTest_sw_core_undo \
- CppunitTest_sw_updateall_object_replacements \
+ CppunitTest_sw_uibase_uiview \
CppunitTest_sw_core_draw \
))
diff --git a/sw/qa/core/data/updateall-objectreplacements.odt b/sw/qa/uibase/uiview/data/updateall-objectreplacements.odt
similarity index 100%
rename from sw/qa/core/data/updateall-objectreplacements.odt
rename to sw/qa/uibase/uiview/data/updateall-objectreplacements.odt
diff --git a/sw/qa/core/updateall_objectreplacements.cxx b/sw/qa/uibase/uiview/uiview.cxx
similarity index 93%
rename from sw/qa/core/updateall_objectreplacements.cxx
rename to sw/qa/uibase/uiview/uiview.cxx
index 92997d498e59..8827cea10752 100644
--- a/sw/qa/core/updateall_objectreplacements.cxx
+++ b/sw/qa/uibase/uiview/uiview.cxx
@@ -23,14 +23,14 @@
#include <wrtsh.hxx>
#include <swdtflvr.hxx>
-char const DATA_DIRECTORY[] = "/sw/qa/core/data/";
+char const DATA_DIRECTORY[] = "/sw/qa/uibase/uiview/data/";
-/// Covers sw/source/core/undo/ fixes.
-class SwCoreUpdateAllObjectReplacementsTest : public SwModelTestBase
+/// Covers sw/source/uibase/uiview/ fixes.
+class SwUibaseUiviewTest : public SwModelTestBase
{
};
-CPPUNIT_TEST_FIXTURE(SwCoreUpdateAllObjectReplacementsTest, testDoIt)
+CPPUNIT_TEST_FIXTURE(SwUibaseUiviewTest, testUpdateAllObjectReplacements)
{
// Make a temporary copy of the test document
utl::TempFile tmp;
More information about the Libreoffice-commits
mailing list