sw/CppunitTest_sw_txtimport.mk | 7 ++++++-
sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt |binary
sw/qa/extras/txtexport/data/UTF16LECRLF.txt |binary
sw/qa/extras/txtexport/data/UTF8BOMCRLF.txt | 4 ++--
sw/qa/extras/txtexport/data/UTF8CRLF.txt | 4 ++--
sw/qa/extras/txtexport/txtexport.cxx | 8 ++++----
6 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 7d0c6a0b0b44bdc81d2248b9b73cd75a6b9506b9
Author: Jonathan Clark <jonat...@libreoffice.org>
AuthorDate: Wed Jun 12 11:08:29 2024 -0600
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Aug 23 21:55:26 2024 +0200
Related: tdf#161533 Test fixes for CJK systems
Previously, `CppunitTest_sw_txtexport` and `CppunitTest_sw_txtimport`
passed on most systems, but failed on fontconfig systems with CJK
fallback fonts available.
This change updates `CppunitTest_sw_txtexport` to remove the CJK
requirement.
This change also updates `CppunitTest_sw_txtimport` to temporarily
remove `SAL_NON_APPLICATION_FONT_USE=abort`, which was responsible for
the test failure.
This fixes the build on Ubuntu 24.04 for example.
I figured it might be useful to include this for long-term branches.
Change-Id: I0a91f5cccb367825adbcd0f93abbc3b8e9005698
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168752
Reviewed-by: Jonathan Clark <jonat...@libreoffice.org>
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171881
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-by: Justin Luth <jl...@mail.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/sw/CppunitTest_sw_txtimport.mk b/sw/CppunitTest_sw_txtimport.mk
index 1f1cc01a4109..1c9fc7114cef 100644
--- a/sw/CppunitTest_sw_txtimport.mk
+++ b/sw/CppunitTest_sw_txtimport.mk
@@ -62,7 +62,12 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_txtimport,services))
$(eval $(call gb_CppunitTest_use_configuration,sw_txtimport))
ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
-$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_txtimport,abort))
+# Note: This test intentionally sets non-application font use to 'deny',
+# rather than 'abort'. This temporarily works around an issue causing
+# these tests to fail on fontconfig systems with CJK fonts installed.
+#
+# See tdf#161533
+$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_txtimport,deny))
endif
# vim: set noet sw=4 ts=4:
diff --git a/sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt
b/sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt
index be232521eafc..0825a97c41eb 100644
Binary files a/sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt and
b/sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt differ
diff --git a/sw/qa/extras/txtexport/data/UTF16LECRLF.txt
b/sw/qa/extras/txtexport/data/UTF16LECRLF.txt
index b74e964113de..89f5e143181a 100644
Binary files a/sw/qa/extras/txtexport/data/UTF16LECRLF.txt and
b/sw/qa/extras/txtexport/data/UTF16LECRLF.txt differ
diff --git a/sw/qa/extras/txtexport/data/UTF8BOMCRLF.txt
b/sw/qa/extras/txtexport/data/UTF8BOMCRLF.txt
index eed02bb9ff59..a2f631e2665a 100644
--- a/sw/qa/extras/txtexport/data/UTF8BOMCRLF.txt
+++ b/sw/qa/extras/txtexport/data/UTF8BOMCRLF.txt
@@ -1,2 +1,2 @@
-フー
-バー
+AB
+CD
diff --git a/sw/qa/extras/txtexport/data/UTF8CRLF.txt
b/sw/qa/extras/txtexport/data/UTF8CRLF.txt
index 62d4d44677b6..6b39a70a1235 100644
--- a/sw/qa/extras/txtexport/data/UTF8CRLF.txt
+++ b/sw/qa/extras/txtexport/data/UTF8CRLF.txt
@@ -1,2 +1,2 @@
-フー
-バー
+AB
+CD
diff --git a/sw/qa/extras/txtexport/txtexport.cxx
b/sw/qa/extras/txtexport/txtexport.cxx
index 3d3154f34c91..c8091be8d0ca 100644
--- a/sw/qa/extras/txtexport/txtexport.cxx
+++ b/sw/qa/extras/txtexport/txtexport.cxx
@@ -82,28 +82,28 @@ DECLARE_TXTEXPORT_TEST(testTdf120574_utf8bom,
"UTF8BOMCRLF.txt")
{
std::vector<char> aMemStream = readMemoryStream<char>();
OString aData(std::string_view(aMemStream.data(), aMemStream.size()));
- CPPUNIT_ASSERT_EQUAL(u8"\uFEFFフー
バー
"_ostr, aData);
+ CPPUNIT_ASSERT_EQUAL(u8"\uFEFFAB
CD
"_ostr, aData);
}
DECLARE_TXTEXPORT_TEST(testTdf120574_utf16lebom, "UTF16LEBOMCRLF.txt")
{
std::vector<sal_Unicode> aMemStream = readMemoryStream<sal_Unicode>();
OUString aData(aMemStream.data(), aMemStream.size());
- CPPUNIT_ASSERT_EQUAL(u"\uFEFFフー
バー
"_ustr, aData);
+ CPPUNIT_ASSERT_EQUAL(u"\uFEFFAB
CD
"_ustr, aData);
}
DECLARE_TXTEXPORT_TEST(testTdf142669_utf8, "UTF8CRLF.txt")
{
std::vector<char> aMemStream = readMemoryStream<char>();
OString aData(std::string_view(aMemStream.data(), aMemStream.size()));
- CPPUNIT_ASSERT_EQUAL(u8"フー
バー
"_ostr, aData);
+ CPPUNIT_ASSERT_EQUAL(u8"AB
CD
"_ostr, aData);
}
DECLARE_TXTEXPORT_TEST(testTdf142669_utf16le, "UTF16LECRLF.txt")
{
std::vector<sal_Unicode> aMemStream = readMemoryStream<sal_Unicode>();
OUString aData(aMemStream.data(), aMemStream.size());
- CPPUNIT_ASSERT_EQUAL(u"フー
バー
"_ustr, aData);
+ CPPUNIT_ASSERT_EQUAL(u"AB
CD
"_ustr, aData);
}
CPPUNIT_TEST_FIXTURE(TxtExportTest, testClearingBreakExport)
