sw/qa/uitest/data/section-columns-separator.fodt | 24 +++++++++++++++++++
sw/qa/uitest/writer_tests5/columns.py | 28 ++++++++++++++++++++++-
2 files changed, 51 insertions(+), 1 deletion(-)
New commits:
commit a1c536543df90723f33851609e78f3ace177d6a5
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Aug 8 12:47:25 2022 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Aug 8 15:17:31 2022 +0200
tdf#150293: UITest
Change-Id: I662e82cce6dd8dbf13bac8608af064b34e21e0fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137949
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/qa/uitest/data/section-columns-separator.fodt
b/sw/qa/uitest/data/section-columns-separator.fodt
new file mode 100644
index 000000000000..b9c97eb9e38e
--- /dev/null
+++ b/sw/qa/uitest/data/section-columns-separator.fodt
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<office:document
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+ <office:automatic-styles>
+ <style:style style:name="Sect1" style:family="section">
+ <style:section-properties text:dont-balance-text-columns="false"
style:editable="false">
+ <style:columns fo:column-count="2" fo:column-gap="0.6cm">
+ <style:column-sep style:width="0.009cm" style:color="#99AABB"
style:height="50%" style:style="dotted" style:vertical-align="bottom"/>
+ <style:column style:rel-width="32767*" fo:start-indent="0cm"
fo:end-indent="0.248cm"/>
+ <style:column style:rel-width="32768*" fo:start-indent="0.248cm"
fo:end-indent="0cm"/>
+ </style:columns>
+ </style:section-properties>
+ </style:style>
+ </office:automatic-styles>
+ <office:body>
+ <office:text>
+ <text:section text:style-name="Sect1" text:name="Section1">
+ <text:p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Vestibulum consequat mi quis pretium semper. Proin luctus orci ac neque
venenatis, quis commodo dolor posuere. Curabitur dignissim sapien quis cursus
egestas. Donec blandit auctor arcu, nec pellentesque eros molestie eget. In
consectetur aliquam hendrerit. Sed cursus mauris vitae ligula pellentesque, non
pellentesque urna aliquet. Fusce placerat mauris enim, nec rutrum purus semper
vel. Praesent tincidunt neque eu pellentesque pharetra. Fusce pellentesque est
orci.</text:p>
+ <text:p>Integer sodales tincidunt tristique. Sed a metus posuere,
adipiscing nunc et, viverra odio. Donec auctor molestie sem, sit amet tristique
lectus hendrerit sed. Cras sodales nisl sed orci mattis iaculis. Nunc eget
dolor accumsan, pharetra risus a, vestibulum mauris. Nunc vulputate lobortis
mollis. Vivamus nec tellus faucibus, tempor magna nec, facilisis felis. Donec
commodo enim a vehicula pellentesque. Nullam vehicula vestibulum est vel
ultricies.</text:p>
+ <text:p>Aliquam velit massa, laoreet vel leo nec, volutpat facilisis eros.
Donec consequat arcu ut diam tempor luctus. Cum sociis natoque penatibus et
magnis dis parturient montes, nascetur ridiculus mus. Praesent vitae lacus vel
leo sodales pharetra a a nibh. Vestibulum ante ipsum primis in faucibus orci
luctus et ultrices posuere cubilia Curae; Nam luctus tempus nibh, fringilla
dictum augue consectetur eget. Curabitur at ante sit amet tortor pharetra
molestie eu nec ante. Mauris tincidunt, nibh eu sollicitudin molestie, dolor
sapien congue tortor, a pulvinar sapien turpis sed ante. Donec nec est
elementum, euismod nulla in, mollis nunc.</text:p>
+ </text:section>
+ </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/sw/qa/uitest/writer_tests5/columns.py
b/sw/qa/uitest/writer_tests5/columns.py
index 223534930a0e..b14bb56e7992 100644
--- a/sw/qa/uitest/writer_tests5/columns.py
+++ b/sw/qa/uitest/writer_tests5/columns.py
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
from uitest.framework import UITestCase
-from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
from uitest.uihelper.common import change_measurement_unit
from libreoffice.uno.propertyvalue import mkPropertyValues
#uitest sw / Columns dialog
@@ -43,5 +43,31 @@ class columns(UITestCase):
self.assertEqual(get_state_as_dict(spacing1mf)["Text"], "1.00
cm")
self.assertEqual(get_state_as_dict(autowidth)["Selected"],
"false")
+ def test_tdf150293_separator_width_unit_conversion(self):
+ with
self.ui_test.load_file(get_url_for_data_file("section-columns-separator.fodt")):
+
+ #dialog Columns
+ with
self.ui_test.execute_dialog_through_command(".uno:FormatColumns") as xDialog:
+ linewidthmf = xDialog.getChild("linewidthmf")
+
+ # Without the fix in place, this test would have failed with
+ # AssertionError: '0.45 pt' != '0.25 pt'
+ self.assertEqual(get_state_as_dict(linewidthmf)["Text"], "0.25
pt")
+
+ # Set it to 0.5 pt
+ linewidthmf.executeAction("UP", tuple())
+ self.assertEqual(get_state_as_dict(linewidthmf)["Text"], "0.50
pt")
+
+ # save and reload: the new value of line width must roundtrip
unchanged
+ self.xUITest.executeCommand('.uno:Save')
+ self.xUITest.executeCommand('.uno:Reload')
+
+ with
self.ui_test.execute_dialog_through_command(".uno:FormatColumns",
close_button="cancel") as xDialog:
+ linewidthmf = xDialog.getChild("linewidthmf")
+
+ # Without the fix in place, this test would have failed with
+ # AssertionError: '0.55 pt' != '0.50 pt'
+ self.assertEqual(get_state_as_dict(linewidthmf)["Text"], "0.50
pt")
+
# vim: set shiftwidth=4 softtabstop=4 expandtab:
