summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2011-12-05 00:22:12 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2011-12-05 01:44:05 +0100
commit1e3b55e23029fcade3b8f708fc037830402dbd28 (patch)
treeed11a96fcf4b639537b05a9c276dbf6e038d2eb2
parentd96ef98abe2dfd91918d84efbbf9119c44dce4d3 (diff)
adjust sc's c++ subsequenttest concept
create one test suite per implementation class: move xcellrangesquery into ScCellRangesBase
-rw-r--r--sc/CppunitTest_sc_cellrangesbase.mk (renamed from sc/CppunitTest_sc_xcellrangesquery.mk)22
-rw-r--r--sc/Module_sc.mk2
-rw-r--r--sc/qa/extras/xcellrangesquery.cxx2
3 files changed, 13 insertions, 13 deletions
diff --git a/sc/CppunitTest_sc_xcellrangesquery.mk b/sc/CppunitTest_sc_cellrangesbase.mk
index a0e4bf45e26c..2c1063fcdf29 100644
--- a/sc/CppunitTest_sc_xcellrangesquery.mk
+++ b/sc/CppunitTest_sc_cellrangesbase.mk
@@ -28,13 +28,13 @@
# instead of those above.
#*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,sc_xcellrangesquery))
+$(eval $(call gb_CppunitTest_CppunitTest,sc_cellrangesbase))
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_xcellrangesquery, \
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellrangesbase, \
sc/qa/extras/xcellrangesquery \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_xcellrangesquery, \
+$(eval $(call gb_CppunitTest_add_linked_libs,sc_cellrangesbase, \
avmedia \
basegfx \
comphelper \
@@ -71,25 +71,25 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_xcellrangesquery, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,sc_xcellrangesquery,\
+$(eval $(call gb_CppunitTest_set_include,sc_cellrangesbase,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_CppunitTest_add_api,sc_xcellrangesquery,\
+$(eval $(call gb_CppunitTest_add_api,sc_cellrangesbase,\
offapi \
udkapi \
))
-$(eval $(call gb_CppunitTest_uses_ure,sc_xcellrangesquery))
+$(eval $(call gb_CppunitTest_uses_ure,sc_cellrangesbase))
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_xcellrangesquery,\
+$(eval $(call gb_CppunitTest_add_type_rdbs,sc_cellrangesbase,\
types \
))
-$(eval $(call gb_CppunitTest_add_components,sc_xcellrangesquery,\
+$(eval $(call gb_CppunitTest_add_components,sc_cellrangesbase,\
basic/util/sb \
comphelper/util/comphelp \
dbaccess/util/dba \
@@ -118,14 +118,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_xcellrangesquery,\
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_xcellrangesquery,\
+$(eval $(call gb_CppunitTest_add_old_components,sc_cellrangesbase,\
configmgr \
ucb1 \
ucpfile1 \
ucptdoc1 \
))
-$(eval $(call gb_CppunitTest_set_args,sc_xcellrangesquery,\
+$(eval $(call gb_CppunitTest_set_args,sc_cellrangesbase,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
"-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(SRCDIR)/sc/qa/unit/data/registry)" \
@@ -136,6 +136,6 @@ $(eval $(call gb_CppunitTest_set_args,sc_xcellrangesquery,\
# a) explicitly depend on library msword because it is not implied by a link
# relation
# b) explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_xcellrangesquery) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
+$(call gb_CppunitTest_get_target,sc_cellrangesbase) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index c39589bc7ba6..9c8696b8007f 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
$(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_macros_test \
- CppunitTest_sc_xcellrangesquery \
+ CppunitTest_sc_cellrangesbase \
CppunitTest_sc_subsequent_filters_test \
CppunitTest_sc_tableautoformatfield \
JunitTest_sc_complex \
diff --git a/sc/qa/extras/xcellrangesquery.cxx b/sc/qa/extras/xcellrangesquery.cxx
index 5df4f71ea796..dc9b77777747 100644
--- a/sc/qa/extras/xcellrangesquery.cxx
+++ b/sc/qa/extras/xcellrangesquery.cxx
@@ -38,7 +38,7 @@
using namespace com::sun::star;
-namespace ScCellRangeObj {
+namespace ScCellRangeBase {
class ScXCellRangesQuery : public UnoApiTest
{