core.git: sw/qa

[Miklos Vajna (via logerrit)]

 sw/qa/extras/txtexport/txtexport.cxx |   29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

New commits:
commit a8b2efcd2124f08e6f3ba3613ce6993af9760e0a
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Mar 6 08:11:26 2024 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Mar 6 09:16:37 2024 +0100

    CppunitTest_sw_txtexport: rework to avoid DECLARE_DOCBOOKEXPORT_TEST()
    
    No need go via Writer-specific macros.
    
    Change-Id: Icb5c3d699e03e299f9c93cd92120bc4db800828a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164447
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins

diff --git a/sw/qa/extras/txtexport/txtexport.cxx 
b/sw/qa/extras/txtexport/txtexport.cxx
index fb0ac453dff2..f71df3428f92 100644
--- a/sw/qa/extras/txtexport/txtexport.cxx
+++ b/sw/qa/extras/txtexport/txtexport.cxx
@@ -52,11 +52,10 @@ protected:
     }
 };
 
-#define DECLARE_TXTEXPORT_TEST(TestName, filename)                             
                    \
-    DECLARE_SW_EXPORT_TEST(TestName, filename, nullptr, TxtExportTest)
-
-DECLARE_TXTEXPORT_TEST(testBullets, "bullets.odt")
+CPPUNIT_TEST_FIXTURE(TxtExportTest, testBullets)
 {
+    createSwDoc("bullets.odt");
+    save(mpFilter);
     OString aData = readExportedFile();
 
     OUString aString = OStringToOUString(
@@ -80,29 +79,37 @@ DECLARE_TXTEXPORT_TEST(testBullets, "bullets.odt")
     CPPUNIT_ASSERT_EQUAL(aExpected, aData);
 }
 
-DECLARE_TXTEXPORT_TEST(testTdf120574_utf8bom, "UTF8BOMCRLF.txt")
+CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf120574_utf8bom)
 {
+    createSwDoc("UTF8BOMCRLF.txt");
+    save(mpFilter);
     std::vector<char> aMemStream = readMemoryStream<char>();
     OString aData(std::string_view(aMemStream.data(), aMemStream.size()));
     CPPUNIT_ASSERT_EQUAL(u8"\uFEFFフー
バー
"_ostr, aData);
 }
 
-DECLARE_TXTEXPORT_TEST(testTdf120574_utf16lebom, "UTF16LEBOMCRLF.txt")
+CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf120574_utf16lebom)
 {
+    createSwDoc("UTF16LEBOMCRLF.txt");
+    save(mpFilter);
     std::vector<sal_Unicode> aMemStream = readMemoryStream<sal_Unicode>();
     OUString aData(aMemStream.data(), aMemStream.size());
     CPPUNIT_ASSERT_EQUAL(u"\uFEFFフー
バー
"_ustr, aData);
 }
 
-DECLARE_TXTEXPORT_TEST(testTdf142669_utf8, "UTF8CRLF.txt")
+CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf142669_utf8)
 {
+    createSwDoc("UTF8CRLF.txt");
+    save(mpFilter);
     std::vector<char> aMemStream = readMemoryStream<char>();
     OString aData(std::string_view(aMemStream.data(), aMemStream.size()));
     CPPUNIT_ASSERT_EQUAL(u8"フー
バー
"_ostr, aData);
 }
 
-DECLARE_TXTEXPORT_TEST(testTdf142669_utf16le, "UTF16LECRLF.txt")
+CPPUNIT_TEST_FIXTURE(TxtExportTest, testTdf142669_utf16le)
 {
+    createSwDoc("UTF16LECRLF.txt");
+    save(mpFilter);
     std::vector<sal_Unicode> aMemStream = readMemoryStream<sal_Unicode>();
     OUString aData(aMemStream.data(), aMemStream.size());
     CPPUNIT_ASSERT_EQUAL(u"フー
バー
"_ustr, aData);
@@ -126,11 +133,7 @@ CPPUNIT_TEST_FIXTURE(TxtExportTest, 
testClearingBreakExport)
     xText->insertString(xCursor, "bar", /*bAbsorb=*/false);
 
     // When exporting to plain text:
-    uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
-    uno::Sequence<beans::PropertyValue> aStoreProps = {
-        comphelper::makePropertyValue("FilterName", OUString("Text")),
-    };
-    xStorable->storeToURL(maTempFile.GetURL(), aStoreProps);
+    save(mpFilter);
 
     // Then make sure that the newline is not lost:
     OString aActual = readExportedFile();