filter/qa/unit/textfilterdetect.cxx | 71 +++++++++++++++++------------------- 1 file changed, 34 insertions(+), 37 deletions(-)
New commits: commit efaa7a2a8760aabf4370164c93bb3c35ec80c6e9 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Mar 6 12:49:05 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Mar 6 15:35:47 2026 +0100 CppunitTest_filter_textfilterdetect: split single test into different ones it fails on Windows Change-Id: Iba2a045c963e06a79d3222bb6327acb5074940b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201118 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/filter/qa/unit/textfilterdetect.cxx b/filter/qa/unit/textfilterdetect.cxx index 135b939d5ea7..2766683d7672 100644 --- a/filter/qa/unit/textfilterdetect.cxx +++ b/filter/qa/unit/textfilterdetect.cxx @@ -217,51 +217,48 @@ CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testEmptyFileDOC_Template) // there, let it be Windows-only, since the original issue tested here was Windows-specific. // See https://lists.freedesktop.org/archives/libreoffice/2023-December/091265.html for details. #ifdef _WIN32 -CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testHybridPDFFile) +CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testHybridPDFFile_Writer) { // Make sure that file locking is ON ScopedConfigValue<officecfg::Office::Common::Misc::UseDocumentSystemFileLocking> aCfg(true); // Given a hybrid PDF file - { - // Created in Writer - utl::TempFileNamed nonAsciiName(u"абв_αβγ_"); - nonAsciiName.EnableKillingFile(); - CPPUNIT_ASSERT_EQUAL( - osl::FileBase::E_None, - osl::File::copy(createFileURL(u"hybrid_writer.pdf"), nonAsciiName.GetURL())); - loadFromURL(nonAsciiName.GetURL()); - // Make sure it opens in Writer. - // Without the accompanying fix in place, this test would have failed on Windows, as it was - // opened in Draw instead. - CPPUNIT_ASSERT(supportsService(mxComponent, "com.sun.star.text.TextDocument")); - } + // Created in Writer + utl::TempFileNamed nonAsciiName(u"абв_αβγ_"); + nonAsciiName.EnableKillingFile(); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, osl::File::copy(createFileURL(u"hybrid_writer.pdf"), + nonAsciiName.GetURL())); + loadFromURL(nonAsciiName.GetURL()); + // Make sure it opens in Writer. + // Without the accompanying fix in place, this test would have failed on Windows, as it was + // opened in Draw instead. + CPPUNIT_ASSERT(supportsService(mxComponent, "com.sun.star.text.TextDocument")); +} - { - // Created in Calc - utl::TempFileNamed nonAsciiName(u"абв_αβγ_"); - nonAsciiName.EnableKillingFile(); - CPPUNIT_ASSERT_EQUAL( - osl::FileBase::E_None, - osl::File::copy(createFileURL(u"hybrid_calc.pdf"), nonAsciiName.GetURL())); - loadFromURL(nonAsciiName.GetURL()); - // Make sure it opens in Calc. - CPPUNIT_ASSERT(supportsService(mxComponent, "com.sun.star.sheet.SpreadsheetDocument")); - } +CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testHybridPDFFile_Calc) +{ + // Created in Calc + utl::TempFileNamed nonAsciiName(u"абв_αβγ_"); + nonAsciiName.EnableKillingFile(); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, + osl::File::copy(createFileURL(u"hybrid_calc.pdf"), nonAsciiName.GetURL())); + loadFromURL(nonAsciiName.GetURL()); + // Make sure it opens in Calc. + CPPUNIT_ASSERT(supportsService(mxComponent, "com.sun.star.sheet.SpreadsheetDocument")); +} - { - // Created in Impress - utl::TempFileNamed nonAsciiName(u"абв_αβγ_"); - nonAsciiName.EnableKillingFile(); - CPPUNIT_ASSERT_EQUAL( - osl::FileBase::E_None, - osl::File::copy(createFileURL(u"hybrid_impress.pdf"), nonAsciiName.GetURL())); - loadFromURL(nonAsciiName.GetURL()); - // Make sure it opens in Impress. - CPPUNIT_ASSERT( - supportsService(mxComponent, "com.sun.star.presentation.PresentationDocument")); - } +CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testHybridPDFFile_Impress) +{ + // Created in Impress + utl::TempFileNamed nonAsciiName(u"абв_αβγ_"); + nonAsciiName.EnableKillingFile(); + CPPUNIT_ASSERT_EQUAL( + osl::FileBase::E_None, + osl::File::copy(createFileURL(u"hybrid_impress.pdf"), nonAsciiName.GetURL())); + loadFromURL(nonAsciiName.GetURL()); + // Make sure it opens in Impress. + CPPUNIT_ASSERT(supportsService(mxComponent, "com.sun.star.presentation.PresentationDocument")); } #endif // _WIN32
