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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/txtimport/txtimport.cxx    |   22 +++++++++++++++
 sw/qa/uitest/writer_tests4/tdf115088.py |   46 --------------------------------
 2 files changed, 22 insertions(+), 46 deletions(-)

New commits:
commit 1eac49c595505dbadeac3db4ec7cd686afca6d87
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue May 25 20:55:02 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed May 26 09:26:55 2021 +0200

    tdf#115088 convert UITest to CppunitTest
    
    So that when it fails, it's easier to debug because it's in-process.
    
    Change-Id: Ia7d12291b25304967a22e546b12803864a713541
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116127
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/qa/extras/txtimport/txtimport.cxx b/sw/qa/extras/txtimport/txtimport.cxx
index a97242641df8..c14ce8e0ad5b 100644
--- a/sw/qa/extras/txtimport/txtimport.cxx
+++ b/sw/qa/extras/txtimport/txtimport.cxx
@@ -14,6 +14,7 @@
 #include <iodetect.hxx>
 #include <unotxdoc.hxx>
 #include <docsh.hxx>
+#include <wrtsh.hxx>
 
 class TxtImportTest : public SwModelTestBase
 {
@@ -150,6 +151,27 @@ DECLARE_TXTIMPORT_TEST(testTdf60145_utf16bewithbom, "UTF16BEWITHBOM.txt")
     CPPUNIT_ASSERT_EQUAL(OUString(u"漢a'"), xPara->getString());
 }
 
+CPPUNIT_TEST_FIXTURE(TxtImportTest, testTdf115088)
+{
+    SwDoc* pDoc = createSwDoc();
+    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+    pWrtShell->Insert("1");
+    pWrtShell->SplitNode();
+    pWrtShell->Insert("1");
+
+    pWrtShell->SelAll();
+    dispatchCommand(mxComponent, ".uno:Cut", {});
+    pWrtShell->Insert("test");
+    pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 4, /*bBasicCall=*/false);
+    dispatchCommand(mxComponent, ".uno:PasteUnformatted", {});
+    uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
+    OUString aActual = xTextDocument->getText()->getString().copy(0, 2);
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 1\n
+    // - Actual  : 1t
+    CPPUNIT_ASSERT_EQUAL(OUString("1\n"), aActual.replaceAll("\r", "\n"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/uitest/writer_tests4/tdf115088.py b/sw/qa/uitest/writer_tests4/tdf115088.py
deleted file mode 100644
index 02a8618f4283..000000000000
--- a/sw/qa/uitest/writer_tests4/tdf115088.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from uitest.framework import UITestCase
-from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import type_text
-
-class tdf115088(UITestCase):
-
-   def test_tdf115088(self):
-        self.ui_test.create_doc_in_start_center("writer")
-        document = self.ui_test.get_component()
-        xWriterDoc = self.xUITest.getTopFocusWindow()
-        xWriterEdit = xWriterDoc.getChild("writer_edit")
-
-        type_text(xWriterEdit, "1")
-        xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"}))
-        type_text(xWriterEdit, "1")
-
-        selection = self.xUITest.executeCommand(".uno:SelectAll")  #select whole text
-        self.xUITest.executeCommand(".uno:Cut")   #cut  text
-        type_text(xWriterEdit, "test")
-        self.xUITest.executeCommand(".uno:GoLeft")
-        self.xUITest.executeCommand(".uno:GoLeft")
-        self.xUITest.executeCommand(".uno:GoLeft")
-        self.xUITest.executeCommand(".uno:GoLeft")
-        self.xUITest.executeCommand(".uno:PasteUnformatted")
-        self.assertEqual(document.Text.String[0:2].replace('\r', '\n'), "1\n")
-
-        self.ui_test.close_doc()
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
-
-
-
-
-
-
-
-
-
-
-
-