summaryrefslogtreecommitdiff
path: root/sw/CppunitTest_sw_mailmerge.mk
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2016-01-20 10:48:37 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2016-08-17 10:22:40 +0000
commit9dbaf6b3b6112d9e16fd64ab0ed5dff6e513e5f8 (patch)
tree5ce85a6c11f53024bd5c99463e7f3fac4dcdcf8c /sw/CppunitTest_sw_mailmerge.mk
parent0dd82f4ffe7ae462bae30b93d245d2234c55ef84 (diff)
tdf#95292 MM: add unit test
bEndOfDB was handled inconsistently in ToNextRecord for record selections and normal record iteration. This unit test checks mail merge to generate the correct amount of three pages (actually five with the hidden, empty pages) for a five record data subset, mailing a linked label document with two labels. Previously the third / last page was missing. On Windows, this test originally failed, because the test document for synced labels opens the "synchronize" dialog, which is generated from an UI file, which are missing in the default test configuration. So this patch also switches the mail merge unit test to the "instdir configuration", which has locking enabled and prevents opening a documents twice. As a result we can't use a document for two test and have to load the source document for inspection after the UNO mail merge call, because it can just work with a file name as the source document. This way the document isn't opened twice, and the tests still pass on Windows. Change-Id: I98b33defc403c40b84af44d91ed7fdcf6cf347a3 Reviewed-on: https://gerrit.libreoffice.org/23503 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'sw/CppunitTest_sw_mailmerge.mk')
-rw-r--r--sw/CppunitTest_sw_mailmerge.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk
index 131fc81094a9..701bb934715d 100644
--- a/sw/CppunitTest_sw_mailmerge.mk
+++ b/sw/CppunitTest_sw_mailmerge.mk
@@ -77,7 +77,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_mailmerge, \
xmloff/util/xo \
))
-$(eval $(call gb_CppunitTest_use_configuration,sw_mailmerge))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,sw_mailmerge))
$(eval $(call gb_CppunitTest_use_ure,sw_mailmerge))
$(eval $(call gb_CppunitTest_use_vcl,sw_mailmerge))