[Libreoffice-commits] core.git: sw/qa

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter3.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 80eb0eb25158147c18621072849b6684faa2b5c3
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Fri Jun 12 11:22:04 2020 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Fri Jun 12 14:29:30 2020 +0200

    CppunitTest_sw_uiwriter: fix failing unittest
    
    When I wrote cd47dba9aa4b91bb0edf0744561d29e2eef61cc9, the image
    got removed when the paragraph was removed. I assumed that was
    the expected behaviour but it turned out it was actually a bug (tdf#132321)
    At the same time I pushed cd47dba9aa4b91bb0edf0744561d29e2eef61cc9,
    Michael S pushed be2f539012d818eaa2d40a9cf199b53d32e1dee4,
    that is why cd47dba9aa4b91bb0edf0744561d29e2eef61cc9 fails in master now
    
    Change-Id: I3d1df064d44388b00a871a9e1786a2febb824bf2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96196
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 2dbc522a59a3..003cfda6c0d8 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -251,7 +251,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132725)
     dispatchCommand(mxComponent, ".uno:SwBackspace", {});
     Scheduler::ProcessEventsToIdle();
 
-    CPPUNIT_ASSERT_EQUAL(0, getShapes());
+    CPPUNIT_ASSERT_EQUAL(1, getShapes());
     CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(1)->getString());
 
     dispatchCommand(mxComponent, ".uno:Undo", {});
@@ -265,7 +265,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132725)
     dispatchCommand(mxComponent, ".uno:Redo", {});
     Scheduler::ProcessEventsToIdle();
 
-    CPPUNIT_ASSERT_EQUAL(0, getShapes());
+    CPPUNIT_ASSERT_EQUAL(1, getShapes());
     CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(1)->getString());
 
     //Without the fix in place, it would crash here
@@ -273,7 +273,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132725)
     Scheduler::ProcessEventsToIdle();
 
     CPPUNIT_ASSERT_EQUAL(1, getShapes());
-    CPPUNIT_ASSERT_EQUAL(OUString("A"), getParagraph(1)->getString());
+    CPPUNIT_ASSERT_EQUAL(OUString("AA"), getParagraph(1)->getString());
 }
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126340)