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.

Change-Id: I0a91f5cccb367825adbcd0f93abbc3b8e9005698
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168752
Reviewed-by: Jonathan Clark <jonathan@libreoffice.org>
Tested-by: Jenkins

5 files changed, 8 insertions, 8 deletions

diff --git a/sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt b/sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt
index be232521eafc..0825a97c41eb 100644
--- a/sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt
+++ b/sw/qa/extras/txtexport/data/UTF16LEBOMCRLF.txt
diff --git a/sw/qa/extras/txtexport/data/UTF16LECRLF.txt b/sw/qa/extras/txtexport/data/UTF16LECRLF.txt
index b74e964113de..89f5e143181a 100644
--- a/sw/qa/extras/txtexport/data/UTF16LECRLF.txt
+++ b/sw/qa/extras/txtexport/data/UTF16LECRLF.txt
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 a628fc56ed64..8a958a4579f8 100644
--- a/sw/qa/extras/txtexport/txtexport.cxx
+++ b/sw/qa/extras/txtexport/txtexport.cxx
@@ -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)