ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

CppunitTest_sw_macros_test: fix tests fail when running individually

Browse Source 
They fail if run with
make CppunitTest_sw_macros_test CPPUNIT_TEST_NAME="SwMacrosTest::testFdo55289"
make CppunitTest_sw_macros_test CPPUNIT_TEST_NAME="SwMacrosTest::testBookmarkDeleteTdf90816"
make CppunitTest_sw_macros_test CPPUNIT_TEST_NAME="SwMacrosTest::testBookmarkDeleteAndJoin"

Change-Id: I16d7581137a57ce4d7721e6b32ca9081724ff062
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198705
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2026-02-05 08:53:45 +01:00
parent 3cbf4957d3
commit 2aa9e6a778
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/qa/core/macros-test.cxx
+13 -5
View File
@@ -49,10 +49,9 @@
#include <IDocumentUndoRedo.hxx>
#include <IDocumentContentOperations.hxx>
#include <docsh.hxx>
#include <swdll.hxx>
#include <unotxdoc.hxx>
typedef rtl::Reference<SwDocShell> SwDocShellRef;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -177,7 +176,11 @@ void SwMacrosTest::testModernVBADelete()
void SwMacrosTest::testBookmarkDeleteAndJoin()
{
rtl::Reference<SwDoc> const pDoc(new SwDoc);
loadFromURL(u"private:factory/swriter"_ustr);
SwXTextDocument *const pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
SwDoc *const pDoc = pTextDoc->GetDocShell()->GetDoc();
pDoc->GetIDocumentUndoRedo().DoUndo(true); // bug is in SwUndoDelete
SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
SwPaM aPaM(aIdx);
@@ -217,7 +220,11 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
void SwMacrosTest::testBookmarkDeleteTdf90816()
{
rtl::Reference<SwDoc> const pDoc(new SwDoc);
loadFromURL(u"private:factory/swriter"_ustr);
SwXTextDocument *const pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
SwDoc *const pDoc = pTextDoc->GetDocShell()->GetDoc();
pDoc->GetIDocumentUndoRedo().DoUndo(true); // bug is in SwUndoDelete
SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
SwPaM aPaM(aIdx);
@@ -387,8 +394,9 @@ void SwMacrosTest::testTdf162431()
void SwMacrosTest::testFdo55289()
{
SwGlobals::ensure();
SwDoc* const pDoc = new SwDoc;
SwDocShellRef pDocShell = new SwDocShell(*pDoc, SfxObjectCreateMode::EMBEDDED);
rtl::Reference<SwDocShell> pDocShell = new SwDocShell(*pDoc, SfxObjectCreateMode::EMBEDDED);
// this needs to run with no layout to tickle the bugs in the special
// cases in SwXShape re-anchoring
assert(!pDoc->getIDocumentLayoutAccess().GetCurrentLayout());