strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Related: tdf#161533 Test fixes for CJK systems

Browse source 
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.

Change-Id: I0a91f5cccb367825adbcd0f93abbc3b8e9005698
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168752
Reviewed-by: Jonathan Clark <jonathan@libreoffice.org>
Tested-by: Jenkins
This commit is contained in:
Jonathan Clark 2024-06-12 11:08:29 -06:00
parent f463d9e8e9
commit 95dd795e75
6 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sw/CppunitTest_sw_txtimport.mk
View file

@ -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:

BIN
sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt
View file

Binary file not shown.

BIN
sw/qa/extras/txtexport/data/UTF16LECRLF.txt
View file

Binary file not shown.

4
sw/qa/extras/txtexport/data/UTF8BOMCRLF.txt
View file

@ -1,2 +1,2 @@
フー
バー
AB
CD

4
sw/qa/extras/txtexport/data/UTF8CRLF.txt
View file

@ -1,2 +1,2 @@
フー
バー
AB
CD

8
sw/qa/extras/txtexport/txtexport.cxx
View file

@ -85,7 +85,7 @@ CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf120574_utf8bom)
save(mpFilter);
std::vector<char> aMemStream = readMemoryStream<char>();
OString aData(std::string_view(aMemStream.data(), aMemStream.size()));
CPPUNIT_ASSERT_EQUAL(u8"\uFEFFフー\r\nバー\r\n"_ostr, aData);
CPPUNIT_ASSERT_EQUAL(u8"\uFEFFAB\r\nCD\r\n"_ostr, aData);
}
CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf120574_utf16lebom)
@ -94,7 +94,7 @@ CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf120574_utf16lebom)
save(mpFilter);
std::vector<sal_Unicode> aMemStream = readMemoryStream<sal_Unicode>();
OUString aData(aMemStream.data(), aMemStream.size());
CPPUNIT_ASSERT_EQUAL(u"\uFEFFフー\r\nバー\r\n"_ustr, aData);
CPPUNIT_ASSERT_EQUAL(u"\uFEFFAB\r\nCD\r\n"_ustr, aData);
}
CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf142669_utf8)
@ -103,7 +103,7 @@ CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf142669_utf8)
save(mpFilter);
std::vector<char> aMemStream = readMemoryStream<char>();
OString aData(std::string_view(aMemStream.data(), aMemStream.size()));
CPPUNIT_ASSERT_EQUAL(u8"フー\r\nバー\r\n"_ostr, aData);
CPPUNIT_ASSERT_EQUAL(u8"AB\r\nCD\r\n"_ostr, aData);
}
CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf142669_utf16le)
@ -112,7 +112,7 @@ CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf142669_utf16le)
save(mpFilter);
std::vector<sal_Unicode> aMemStream = readMemoryStream<sal_Unicode>();
OUString aData(aMemStream.data(), aMemStream.size());
CPPUNIT_ASSERT_EQUAL(u"フー\r\nバー\r\n"_ustr, aData);
CPPUNIT_ASSERT_EQUAL(u"AB\r\nCD\r\n"_ustr, aData);
}
CPPUNIT_TEST_FIXTURE(TxtExportTest, testClearingBreakExport)