[Libreoffice-commits] core.git: sc/qa sd/qa sw/qa uitest/impress_tests uitest/uitest

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests/columns.py|  286 +++---
 sc/qa/uitest/calc_tests/formatCells.py|  171 +--
 sc/qa/uitest/calc_tests/rows.py   |  216 ++--
 sc/qa/uitest/calc_tests7/tdf137397.py |   26 
 sc/qa/uitest/calc_tests9/tdf126673.py |   30 
 sc/qa/uitest/calc_tests9/tdf137446.py |   36 
 sc/qa/uitest/chart/chartArea.py   |  268 ++---
 sc/qa/uitest/chart/chartDataLabels.py |   40 
 sc/qa/uitest/chart/chartGrid.py   |  274 +++---
 sc/qa/uitest/chart/chartLegend.py |   38 
 sc/qa/uitest/chart/chartTitles.py |   38 
 sc/qa/uitest/chart/chartWall.py   |  246 ++---
 sc/qa/uitest/chart/chartXAxis.py  |  438 -
 sc/qa/uitest/chart/chartYAxis.py  |  442 -
 sc/qa/uitest/chart/formatDataSeries.py|  148 +--
 sc/qa/uitest/chart/tdf93506_trendline.py  |  820 +-
 sc/qa/uitest/chart2/tdf133630.py  |   58 -
 sc/qa/uitest/textToColumns/tdf89907.py|   80 -
 sd/qa/uitest/impress_tests/tdf119246.py   |   52 -
 sd/qa/uitest/impress_tests/tdf134734.py   |3 
 sd/qa/uitest/impress_tests/tdf137729.py   |4 
 sd/qa/uitest/impress_tests/tdf152295.py   |   65 -
 sd/qa/uitest/impress_tests/textColumnsDialog.py   |   53 -
 sd/qa/uitest/impress_tests2/tdf139511.py  |   34 
 sd/qa/uitest/impress_tests2/tdf82616.py   |   66 -
 sw/qa/uitest/chapterNumbering/chapterNumbering.py |  110 +-
 sw/qa/uitest/sidebar/tdf133189.py |   28 
 sw/qa/uitest/sidebar/tdf135590.py |   73 -
 sw/qa/uitest/sidebar/tdf99711.py  |   25 
 sw/qa/uitest/table/tableProperties.py |  342 +++
 sw/qa/uitest/table/tdf134881_colProportionalAdjust.py |   46 -
 sw/qa/uitest/writer_tests2/formatBulletsNumbering.py  |  138 +--
 sw/qa/uitest/writer_tests2/formatParagraph.py |  250 ++---
 sw/qa/uitest/writer_tests3/lineNumbering.py   |  102 +-
 sw/qa/uitest/writer_tests3/pageDialog.py  |   27 
 sw/qa/uitest/writer_tests4/tdf138546.py   |   28 
 sw/qa/uitest/writer_tests5/columns.py |   46 -
 sw/qa/uitest/writer_tests6/tdf128431.py   |   36 
 sw/qa/uitest/writer_tests7/forms.py   |   58 -
 sw/qa/uitest/writer_tests7/tdf132169.py   |   33 
 uitest/impress_tests/drawinglayer.py  |  137 +--
 uitest/uitest/uihelper/common.py  |   10 
 42 files changed, 2711 insertions(+), 2710 deletions(-)

New commits:
commit 7355c2ee8a9f0811d1cd3d37fc9dac2ad5f95774
Author: Xisco Fauli 
AuthorDate: Mon Feb 6 13:52:58 2023 +0100
Commit: Xisco Fauli 
CommitDate: Tue Feb 7 09:33:40 2023 +

uitest: reset value when changing the measurement unit

Otherwise, changing it in one test might affect other tests
Use @contextmanager decorator to change it back to default 'Inch'
at the end of the test even if the test hits an assert

Change-Id: I1e7b35019cd19b490aa619c0a866bb9f93820950
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146583
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests/columns.py 
b/sc/qa/uitest/calc_tests/columns.py
index 6813471d71fe..ed594510f175 100644
--- a/sc/qa/uitest/calc_tests/columns.py
+++ b/sc/qa/uitest/calc_tests/columns.py
@@ -14,97 +14,97 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
 class CalcColumns(UITestCase):
 def test_column_width(self):
 with self.ui_test.create_doc_in_start_center("calc"):
-xCalcDoc = self.xUITest.getTopFocusWindow()
-gridwin = xCalcDoc.getChild("grid_window")
 
-change_measurement_unit(self, "Centimeter")
-
-#select A1
-gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
-#column width
-with 
self.ui_test.execute_dialog_through_command(".uno:ColumnWidth") as xDialog:
-xvalue = xDialog.getChild("value")
-xdefault = xDialog.getChild("default")
-self.assertEqual(get_state_as_dict(xdefault)["Selected"], 
"true")  #default selected
-
-# tdf#144247: Without the fix in place, this test would have 
failed with
-# AssertionError: '2.26 cm' != '2.2578 cm'
-self.assertEqual("2.26 cm", get_state_as_dict(xvalue)["Text"])
-xvalue.executeAction("UP", tuple())
-self.assertEqual("2.30 cm", get_state_as_dict(xvalue)["Text"])
-self.assertEqual(get_state_as_dict(xdefault)["Selected"], 
"false")  #default not selected
-xdefault.executeAction("CLICK", tuple())  

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests4/exportToPDF.py  |2 --
 sc/qa/uitest/calc_tests4/saveToCSV.py|2 --
 sc/qa/uitest/calc_tests7/save_readonly_with_password.py  |4 
 sc/qa/uitest/calc_tests7/tdf150044.py|2 --
 sc/qa/uitest/calc_tests8/tdf144940.py|2 --
 sc/qa/uitest/calc_tests8/tdf147086.py|2 --
 sc/qa/uitest/conditional_format/tdf117899.py |2 --
 sd/qa/uitest/impress_tests/exportToPDF.py|2 --
 sd/qa/uitest/impress_tests/save_readonly_with_password.py|4 
 sd/qa/uitest/impress_tests2/tdf141297.py |2 --
 sw/qa/uitest/writer_tests/trackedChanges.py  |1 -
 sw/qa/uitest/writer_tests3/save_readonly_with_password.py|7 ---
 sw/qa/uitest/writer_tests4/exportToPDF.py|2 --
 sw/qa/uitest/writer_tests5/tdf145326.py  |2 --
 sw/qa/uitest/writer_tests6/edit_file_properties_before_saving.py |4 
 sw/qa/uitest/writer_tests7/tdf119661.py  |4 
 sw/qa/uitest/writer_tests7/tdf90401.py   |4 
 uitest/uitest/test.py|8 

 18 files changed, 56 deletions(-)

New commits:
commit 4f841e9a28a6f5d7ae9d5226cbc98db3cb992eb1
Author: Xisco Fauli 
AuthorDate: Tue Jan 31 12:22:14 2023 +0100
Commit: Xisco Fauli 
CommitDate: Tue Jan 31 15:03:30 2023 +

uitest: remove wait_until_file_is_available

Introduced in 33a49a99c76ca1879dbb0202384aa939a6d44a75
"uitest: introduce wait_until_file_is_available" as a blind
fix for 
https://gerrit.libreoffice.org/c/core/+/124654/5/sw/qa/uitest/writer_tests6/edit_file_properties_before_saving.py#91
It turned out the root problem was caused by another test
and the fix is addressed in https://gerrit.libreoffice.org/c/core/+/146385
"uitest: Always change doc info setting back to false"

Change-Id: I4b3d5e24e35a33de6c128dcbf2f144b4cf48a48c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146389
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests4/exportToPDF.py 
b/sc/qa/uitest/calc_tests4/exportToPDF.py
index a67b572e61d2..ef79a0ce7790 100644
--- a/sc/qa/uitest/calc_tests4/exportToPDF.py
+++ b/sc/qa/uitest/calc_tests4/exportToPDF.py
@@ -69,8 +69,6 @@ class exportToPDF(UITestCase):
 xFileName.executeAction('TYPE', 
mkPropertyValues({'KEYCODE':'BACKSPACE'}))
 xFileName.executeAction('TYPE', 
mkPropertyValues({'TEXT': xFilePath}))
 
-self.ui_test.wait_until_file_is_available(xFilePath)
-
 with self.ui_test.load_file(systemPathToFileUrl(xFilePath)) as 
document:
 
 self.assertEqual("Sheet1", document.DrawPages[0][0].String)
diff --git a/sc/qa/uitest/calc_tests4/saveToCSV.py 
b/sc/qa/uitest/calc_tests4/saveToCSV.py
index d3876f8174a6..09949b7d71e8 100644
--- a/sc/qa/uitest/calc_tests4/saveToCSV.py
+++ b/sc/qa/uitest/calc_tests4/saveToCSV.py
@@ -60,8 +60,6 @@ class saveToCSV(UITestCase):
 
 xFormulas.executeAction("CLICK", tuple())
 
-self.ui_test.wait_until_file_is_available(xFilePath)
-
 with open(xFilePath, "r") as f:
 lines = f.readlines()
 self.assertEqual("1", lines[0].strip())
diff --git a/sc/qa/uitest/calc_tests7/save_readonly_with_password.py 
b/sc/qa/uitest/calc_tests7/save_readonly_with_password.py
index 02f125e3008f..311293815398 100644
--- a/sc/qa/uitest/calc_tests7/save_readonly_with_password.py
+++ b/sc/qa/uitest/calc_tests7/save_readonly_with_password.py
@@ -46,8 +46,6 @@ class save_readonly_with_password(UITestCase):
 with self.ui_test.execute_dialog_through_action(xOk, 
"CLICK", close_button="save"):
 pass
 
-self.ui_test.wait_until_file_is_available(xFilePath)
-
 with self.ui_test.load_file(systemPathToFileUrl(xFilePath)) as 
document:
 
 self.assertTrue(document.isReadonly())
@@ -82,8 +80,6 @@ class save_readonly_with_password(UITestCase):
 xConfirmPassword = 
xPasswordDialog.getChild("confirmropassEntry")
 xConfirmPassword.executeAction("TYPE", 
mkPropertyValues({"TEXT": "password"}))
 
-self.ui_test.wait_until_file_is_available(xFilePath)
-
 with self.ui_test.load_file(systemPathToFileUrl(xFilePath)) as 
document:
 
 self.assertTrue(document.isReadonly())
diff --git a/sc/qa/uitest/calc_tests7/tdf150044.py 
b/sc/qa/uitest/calc_tests7/tdf150044.py
index 6f70eccc7921..ffa0077879ea 100644
--- a/sc/qa/uitest/calc_tests7/tdf150044.py
+++ b/sc/qa/uitest/calc_tests7/tdf150044.py
@@ -41,8 

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests4/exportToPDF.py  |2 ++
 sc/qa/uitest/calc_tests4/saveToCSV.py|2 ++
 sc/qa/uitest/calc_tests7/save_readonly_with_password.py  |4 
 sc/qa/uitest/calc_tests8/tdf144940.py|2 ++
 sc/qa/uitest/calc_tests8/tdf147086.py|2 ++
 sc/qa/uitest/conditional_format/tdf117899.py |2 ++
 sd/qa/uitest/impress_tests/exportToPDF.py|2 ++
 sd/qa/uitest/impress_tests/save_readonly_with_password.py|4 
 sd/qa/uitest/impress_tests/tdf141297.py  |2 ++
 sw/qa/uitest/writer_tests4/exportToPDF.py|2 ++
 sw/qa/uitest/writer_tests5/tdf145326.py  |2 ++
 sw/qa/uitest/writer_tests6/edit_file_properties_before_saving.py |4 
 sw/qa/uitest/writer_tests6/save_readonly_with_password.py|4 
 sw/qa/uitest/writer_tests7/tdf119661.py  |2 ++
 sw/qa/uitest/writer_tests7/tdf90401.py   |4 
 uitest/uitest/test.py|8 

 16 files changed, 48 insertions(+)

New commits:
commit 33a49a99c76ca1879dbb0202384aa939a6d44a75
Author: Xisco Fauli 
AuthorDate: Fri Feb 25 13:01:22 2022 +0100
Commit: Xisco Fauli 
CommitDate: Fri Feb 25 15:29:54 2022 +0100

uitest: introduce wait_until_file_is_available

For export - import tests
See 
https://gerrit.libreoffice.org/c/core/+/124654/5/sw/qa/uitest/writer_tests6/edit_file_properties_before_saving.py#91

Change-Id: I3c2537a43cc69067355f18162d6463e268420090
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130530
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests4/exportToPDF.py 
b/sc/qa/uitest/calc_tests4/exportToPDF.py
index 1e88659f1193..3cf589bbb9c3 100644
--- a/sc/qa/uitest/calc_tests4/exportToPDF.py
+++ b/sc/qa/uitest/calc_tests4/exportToPDF.py
@@ -67,6 +67,8 @@ class exportToPDF(UITestCase):
 xFileName.executeAction('TYPE', 
mkPropertyValues({'KEYCODE':'BACKSPACE'}))
 xFileName.executeAction('TYPE', 
mkPropertyValues({'TEXT': xFilePath}))
 
+self.ui_test.wait_until_file_is_available(xFilePath)
+
 with self.ui_test.load_file(systemPathToFileUrl(xFilePath)) as 
document:
 
 self.assertEqual("Sheet1", 
document.DrawPages[0].getByIndex(0).String)
diff --git a/sc/qa/uitest/calc_tests4/saveToCSV.py 
b/sc/qa/uitest/calc_tests4/saveToCSV.py
index 8ed168c9af3d..503c7ed2386a 100644
--- a/sc/qa/uitest/calc_tests4/saveToCSV.py
+++ b/sc/qa/uitest/calc_tests4/saveToCSV.py
@@ -59,6 +59,8 @@ class saveToCSV(UITestCase):
 
 xFormulas.executeAction("CLICK", tuple())
 
+self.ui_test.wait_until_file_is_available(xFilePath)
+
 with open(xFilePath, "r") as f:
 lines = f.readlines()
 self.assertEqual("1", lines[0].strip())
diff --git a/sc/qa/uitest/calc_tests7/save_readonly_with_password.py 
b/sc/qa/uitest/calc_tests7/save_readonly_with_password.py
index 311293815398..02f125e3008f 100644
--- a/sc/qa/uitest/calc_tests7/save_readonly_with_password.py
+++ b/sc/qa/uitest/calc_tests7/save_readonly_with_password.py
@@ -46,6 +46,8 @@ class save_readonly_with_password(UITestCase):
 with self.ui_test.execute_dialog_through_action(xOk, 
"CLICK", close_button="save"):
 pass
 
+self.ui_test.wait_until_file_is_available(xFilePath)
+
 with self.ui_test.load_file(systemPathToFileUrl(xFilePath)) as 
document:
 
 self.assertTrue(document.isReadonly())
@@ -80,6 +82,8 @@ class save_readonly_with_password(UITestCase):
 xConfirmPassword = 
xPasswordDialog.getChild("confirmropassEntry")
 xConfirmPassword.executeAction("TYPE", 
mkPropertyValues({"TEXT": "password"}))
 
+self.ui_test.wait_until_file_is_available(xFilePath)
+
 with self.ui_test.load_file(systemPathToFileUrl(xFilePath)) as 
document:
 
 self.assertTrue(document.isReadonly())
diff --git a/sc/qa/uitest/calc_tests8/tdf144940.py 
b/sc/qa/uitest/calc_tests8/tdf144940.py
index c61967ebf970..b117b56d2a9b 100644
--- a/sc/qa/uitest/calc_tests8/tdf144940.py
+++ b/sc/qa/uitest/calc_tests8/tdf144940.py
@@ -46,6 +46,8 @@ class tdf144940(UITestCase):
 xFileName.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
 xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": 
xFilePath}))
 
+self.ui_test.wait_until_file_is_available(xFilePath)
+
 with self.ui_test.load_file(systemPathToFileUrl(xFilePath)) as 
document:
 
 xPageStyles = 

[Libreoffice-commits] core.git: sc/qa sd/qa sw/qa uitest/test_main.py uitest/uitest

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/conditional_format/tdf105351.py |1 -
 sc/qa/uitest/inputLine/tdf54197.py   |1 -
 sc/qa/uitest/key_f4/f4.py|1 -
 sc/qa/uitest/protect/protectSheet.py |1 -
 sc/qa/uitest/protect/protectSpreadsheet.py   |1 -
 sc/qa/uitest/search_replace/tdf39917.py  |1 -
 sc/qa/uitest/search_replace/tdf44398.py  |1 -
 sc/qa/uitest/sort/naturalSort.py |1 -
 sc/qa/uitest/sort/sorting.py |1 -
 sc/qa/uitest/sort/tdf91305.py|1 -
 sc/qa/uitest/sort/tdf99773.py|1 -
 sc/qa/uitest/statistics/anova.py |1 -
 sc/qa/uitest/statistics/chiSquare.py |1 -
 sc/qa/uitest/statistics/correlation.py   |1 -
 sc/qa/uitest/statistics/covariance.py|1 -
 sc/qa/uitest/statistics/descriptiveStatistics.py |1 -
 sc/qa/uitest/statistics/exponentialSmoothing.py  |1 -
 sc/qa/uitest/statistics/fTest.py |1 -
 sc/qa/uitest/statistics/movingAverage.py |1 -
 sc/qa/uitest/statistics/sampling.py  |1 -
 sc/qa/uitest/statistics/tTest.py |1 -
 sc/qa/uitest/statistics/zTest.py |1 -
 sc/qa/uitest/validity/tdf53920.py|1 -
 sd/qa/uitest/impress_tests/autocorrectOptions.py |1 -
 sd/qa/uitest/impress_tests/customSlideShow.py|1 -
 sd/qa/uitest/impress_tests/insertSlide.py|1 -
 sd/qa/uitest/impress_tests/masterElements.py |1 -
 sw/qa/uitest/chart/tdf138556.py  |1 -
 uitest/test_main.py  |7 ++-
 uitest/uitest/config.py  |2 --
 uitest/uitest/debug.py   |   16 
 31 files changed, 2 insertions(+), 51 deletions(-)

New commits:
commit aa95913dd8e505123ba8974d5de27ac0ec928cce
Author: Xisco Fauli 
AuthorDate: Fri Feb 25 12:05:43 2022 +0100
Commit: Xisco Fauli 
CommitDate: Fri Feb 25 13:39:27 2022 +0100

uitest: remove debug option

it does nothing

Change-Id: I6fa67aa42b1de6199cbb49100624826f5b3b77d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130524
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/conditional_format/tdf105351.py 
b/sc/qa/uitest/conditional_format/tdf105351.py
index a42c6c6e2c2a..a75716568326 100644
--- a/sc/qa/uitest/conditional_format/tdf105351.py
+++ b/sc/qa/uitest/conditional_format/tdf105351.py
@@ -13,7 +13,6 @@ from uitest.uihelper.common import select_by_text
 from uitest.uihelper.calc import enter_text_to_cell
 from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.debug import sleep
 #Bug 105351 - FORMATTING: Unable to change Data Bar conditional formatting
 class tdf105351(UITestCase):
 def test_tdf105351_cond_format_data_bar(self):
diff --git a/sc/qa/uitest/inputLine/tdf54197.py 
b/sc/qa/uitest/inputLine/tdf54197.py
index 9afc77e6c6a9..999e9345fa7b 100644
--- a/sc/qa/uitest/inputLine/tdf54197.py
+++ b/sc/qa/uitest/inputLine/tdf54197.py
@@ -12,7 +12,6 @@ from uitest.uihelper.common import select_pos
 from uitest.uihelper.calc import enter_text_to_cell
 from libreoffice.calc.document import get_sheet_from_doc
 from libreoffice.calc.conditional_format import 
get_conditional_format_from_sheet
-from uitest.debug import sleep
 from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
 #Bug 54197 - Calc single cell filling (Ctrl+D) does not change data at input 
line
diff --git a/sc/qa/uitest/key_f4/f4.py b/sc/qa/uitest/key_f4/f4.py
index 678c02e89d2a..22565b4cb5c6 100644
--- a/sc/qa/uitest/key_f4/f4.py
+++ b/sc/qa/uitest/key_f4/f4.py
@@ -10,7 +10,6 @@ from uitest.framework import UITestCase
 import os
 from uitest.uihelper.common import get_state_as_dict
 from uitest.uihelper.common import select_by_text
-from uitest.debug import sleep
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from libreoffice.calc.document import get_cell_by_position
 from uitest.uihelper.calc import enter_text_to_cell
diff --git a/sc/qa/uitest/protect/protectSheet.py 
b/sc/qa/uitest/protect/protectSheet.py
index 28a2db054467..389e83dc680f 100644
--- a/sc/qa/uitest/protect/protectSheet.py
+++ b/sc/qa/uitest/protect/protectSheet.py
@@ -12,7 +12,6 @@ from uitest.uihelper.common import select_pos
 from uitest.uihelper.calc import enter_text_to_cell
 from libreoffice.calc.document import get_sheet_from_doc
 from libreoffice.calc.conditional_format import 
get_conditional_format_from_sheet
-from uitest.debug import sleep
 from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
diff --git a/sc/qa/uitest/protect/protectSpreadsheet.py 

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests4/exportToPDF.py   |2 +-
 sd/qa/uitest/impress_tests/exportToPDF.py |2 +-
 sw/qa/uitest/writer_tests4/exportToPDF.py |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ea25606de5f1a60430a74107b0e2e0986ac1bb15
Author: Xisco Fauli 
AuthorDate: Thu Feb 24 19:02:17 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 24 19:48:26 2022 +0100

uitest: check the value and not the text

This fails for me with

AssertionError: '90%' != '90\xa0%'
- 90%
+ 90 %

Change-Id: Ieec52a4aff721705451a0545eb606c97235b1248
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130507
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests4/exportToPDF.py 
b/sc/qa/uitest/calc_tests4/exportToPDF.py
index a990291693f1..1e88659f1193 100644
--- a/sc/qa/uitest/calc_tests4/exportToPDF.py
+++ b/sc/qa/uitest/calc_tests4/exportToPDF.py
@@ -57,7 +57,7 @@ class exportToPDF(UITestCase):
 self.assertEqual("false", 
get_state_as_dict(xDialog.getChild(child))['Checked'])
 
 self.assertEqual("300 DPI", 
get_state_as_dict(xDialog.getChild("resolution"))['Text'])
-self.assertEqual("90%", 
get_state_as_dict(xDialog.getChild("quality"))['Text'])
+self.assertEqual("90", 
get_state_as_dict(xDialog.getChild("quality"))['Value'])
 self.assertEqual("FDF", 
get_state_as_dict(xDialog.getChild("format"))['DisplayText'])
 
 xOk = xDialog.getChild("ok")
diff --git a/sd/qa/uitest/impress_tests/exportToPDF.py 
b/sd/qa/uitest/impress_tests/exportToPDF.py
index aef19907f61c..aa766741e3e3 100644
--- a/sd/qa/uitest/impress_tests/exportToPDF.py
+++ b/sd/qa/uitest/impress_tests/exportToPDF.py
@@ -60,7 +60,7 @@ class exportToPDF(UITestCase):
 self.assertEqual("false", 
get_state_as_dict(xDialog.getChild(child))['Checked'])
 
 self.assertEqual("300 DPI", 
get_state_as_dict(xDialog.getChild("resolution"))['Text'])
-self.assertEqual("90%", 
get_state_as_dict(xDialog.getChild("quality"))['Text'])
+self.assertEqual("90", 
get_state_as_dict(xDialog.getChild("quality"))['Value'])
 self.assertEqual("FDF", 
get_state_as_dict(xDialog.getChild("format"))['DisplayText'])
 
 xOk = xDialog.getChild("ok")
diff --git a/sw/qa/uitest/writer_tests4/exportToPDF.py 
b/sw/qa/uitest/writer_tests4/exportToPDF.py
index e242428c40a9..14cc9f5b3fac 100644
--- a/sw/qa/uitest/writer_tests4/exportToPDF.py
+++ b/sw/qa/uitest/writer_tests4/exportToPDF.py
@@ -57,7 +57,7 @@ class exportToPDF(UITestCase):
 self.assertEqual("false", 
get_state_as_dict(xDialog.getChild(child))['Checked'])
 
 self.assertEqual("300 DPI", 
get_state_as_dict(xDialog.getChild("resolution"))['Text'])
-self.assertEqual("90%", 
get_state_as_dict(xDialog.getChild("quality"))['Text'])
+self.assertEqual("90", 
get_state_as_dict(xDialog.getChild("quality"))['Value'])
 self.assertEqual("FDF", 
get_state_as_dict(xDialog.getChild("format"))['DisplayText'])
 
 xOk = xDialog.getChild("ok")

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/autofilter/colorfilter.py  |6 ++
 sc/qa/uitest/calc_tests/CellDropDownItems.py|3 ++-
 sc/qa/uitest/conditional_format/tdf105466.py|3 ++-
 sc/qa/uitest/csv_dialog/tdf92503.py |4 ++--
 sc/qa/uitest/manual_tests/calc.py   |8 
 sc/qa/uitest/textToColumns/tdf143008.py |4 ++--
 sd/qa/uitest/impress_tests/slideShowSettings.py |6 ++
 sw/qa/uitest/table/tdf128593.py |4 ++--
 sw/qa/uitest/writer_tests3/hyperlinkdialog.py   |   12 ++--
 sw/qa/uitest/writer_tests4/insertBreakDialog.py |3 ++-
 uitest/uitest/uihelper/common.py|4 +---
 11 files changed, 27 insertions(+), 30 deletions(-)

New commits:
commit 5fc6d68e9e125b00dc16600543e516bd15fb3a64
Author: Xisco Fauli 
AuthorDate: Wed Dec 15 11:50:47 2021 +0100
Commit: Xisco Fauli 
CommitDate: Wed Dec 15 13:26:36 2021 +0100

uitest: simplify code

Change-Id: Id3355be0e763217a4915b53d0c30536415e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126852
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/autofilter/colorfilter.py 
b/sc/qa/uitest/autofilter/colorfilter.py
index 176c627f3339..58f39227ee3d 100644
--- a/sc/qa/uitest/autofilter/colorfilter.py
+++ b/sc/qa/uitest/autofilter/colorfilter.py
@@ -8,7 +8,7 @@
 #
 
 from uitest.framework import UITestCase
-from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file, 
select_pos
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file, 
select_pos, select_by_text
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from libreoffice.calc.document import is_row_hidden
 
@@ -117,9 +117,7 @@ class ColorFilterTest(UITestCase):
 
 self.assertEqual("Another", 
get_state_as_dict(xField1)['DisplayText'])
 
-props = {"TEXT": "Background color"}
-actionProps = mkPropertyValues(props)
-xCond1.executeAction("SELECT", actionProps)
+select_by_text(xCond1, "Background color")
 self.assertEqual("Background color", 
get_state_as_dict(xCond1)['DisplayText'])
 
 xColor1 = xDialog.getChild("color1")
diff --git a/sc/qa/uitest/calc_tests/CellDropDownItems.py 
b/sc/qa/uitest/calc_tests/CellDropDownItems.py
index 3f16e0376470..86fceeca2f9a 100644
--- a/sc/qa/uitest/calc_tests/CellDropDownItems.py
+++ b/sc/qa/uitest/calc_tests/CellDropDownItems.py
@@ -9,6 +9,7 @@
 from uitest.framework import UITestCase
 from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import select_pos
 
 class CellDropDownItems(UITestCase):
 
@@ -27,7 +28,7 @@ class CellDropDownItems(UITestCase):
 
 #Select List option
 xallow = xDialog.getChild("allow")
-xallow.executeAction("SELECT", mkPropertyValues({"POS": "6"}))
+select_pos(xallow, "6")
 
 #Add items to the List
 xminlist = xDialog.getChild("minlist")
diff --git a/sc/qa/uitest/conditional_format/tdf105466.py 
b/sc/qa/uitest/conditional_format/tdf105466.py
index 27e7c1f40359..ead8a19313bb 100644
--- a/sc/qa/uitest/conditional_format/tdf105466.py
+++ b/sc/qa/uitest/conditional_format/tdf105466.py
@@ -9,6 +9,7 @@
 
 from uitest.framework import UITestCase
 from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import select_pos
 
 import unittest
 
@@ -24,6 +25,6 @@ class tdf105466(UITestCase):
 for i in range(0,4):
 with self.subTest(i = i):
 xTypeLstBox = xCondFormatDlg.getChild("type")
-xTypeLstBox.executeAction("SELECT", 
mkPropertyValues({"POS": str(i)}))
+select_pos(xTypeLstBox, str(i))
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/csv_dialog/tdf92503.py 
b/sc/qa/uitest/csv_dialog/tdf92503.py
index 679c76586130..9774b03c35e3 100644
--- a/sc/qa/uitest/csv_dialog/tdf92503.py
+++ b/sc/qa/uitest/csv_dialog/tdf92503.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, select_by_text
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from libreoffice.calc.document import get_cell_by_position
 from libreoffice.calc.csv_dialog import load_csv_file
@@ -28,7 +28,7 @@ class Tdf92503(UITestCase):
 
 self.assertEqual('true', get_state_as_dict(xColumnType)['Enabled'])
 
-xColumnType.executeAction("SELECT", mkPropertyValues({"TEXT": 
"Date (DMY)"}))
+select_by_text(xColumnType, "Date (DMY)")
 
 self.assertEqual('Date (DMY)', 

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests/mergedRowsColumns.py|1 -
 sc/qa/uitest/calc_tests7/tdf117987.py   |2 ++
 sc/qa/uitest/calc_tests8/navigator.py   |1 +
 sc/qa/uitest/calc_tests9/tdf113571.py   |1 +
 sc/qa/uitest/calc_tests9/tdf121949.py   |2 --
 sc/qa/uitest/calc_tests9/tdf125440.py   |1 +
 sc/qa/uitest/calc_tests9/tdf95554.py|2 ++
 sc/qa/uitest/chart2/tdf131715.py|2 +-
 sc/qa/uitest/conditional_format/tdf105466.py|3 ---
 sc/qa/uitest/pasteSpecial/tdf114710.py  |1 -
 sc/qa/uitest/pasteSpecial/tdf118308.py  |1 -
 sc/qa/uitest/pasteSpecial/tdf65856.py   |1 -
 sc/qa/uitest/pasteSpecial/tdf69450.py   |1 -
 sc/qa/uitest/search_replace/replace.py  |3 +--
 sd/qa/uitest/impress_tests/tdf137637.py |1 +
 sw/qa/uitest/chart/tdf138556.py |1 +
 sw/qa/uitest/sidebar/tdf133189.py   |2 --
 sw/qa/uitest/sidebar/tdf135590.py   |2 --
 sw/qa/uitest/sidebar/tdf99711.py|1 -
 sw/qa/uitest/table/sheetToTable.py  |2 ++
 sw/qa/uitest/table/tdf109083.py |2 +-
 sw/qa/uitest/table/tdf115573.py |1 -
 sw/qa/uitest/table/tdf51352.py  |2 +-
 sw/qa/uitest/table/tdf93068.py  |1 +
 sw/qa/uitest/writer_tests/comments.py   |2 --
 sw/qa/uitest/writer_tests2/deleteAllComments.py |3 +--
 sw/qa/uitest/writer_tests3/goToPage.py  |1 +
 sw/qa/uitest/writer_tests4/insertPageHeader.py  |2 +-
 sw/qa/uitest/writer_tests4/spellDialog.py   |1 +
 sw/qa/uitest/writer_tests6/tdf126226.py |2 +-
 sw/qa/uitest/writer_tests7/tdf132169.py |1 -
 sw/qa/uitest/writer_tests7/tdf133348.py |2 --
 sw/qa/uitest/writer_tests7/tdf134243.py |1 -
 sw/qa/uitest/writer_tests7/tdf139301.py |2 --
 sw/qa/uitest/writer_tests7/tdf140731.py |1 -
 35 files changed, 21 insertions(+), 34 deletions(-)

New commits:
commit f1512321581e0e605582018395ab91f04a2da8fe
Author: Xisco Fauli 
AuthorDate: Wed Dec 1 17:38:52 2021 +0100
Commit: Xisco Fauli 
CommitDate: Wed Dec 1 21:08:46 2021 +0100

uitest: fix consistency of footers

According to TEMPLATE.SOURCECODE.HEADER

Change-Id: I50b9d5e65c5da654914ba42d0688a2acbda1d2cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126187
Reviewed-by: Michael Meeks 
Tested-by: Jenkins

diff --git a/sc/qa/uitest/calc_tests/mergedRowsColumns.py 
b/sc/qa/uitest/calc_tests/mergedRowsColumns.py
index f9cf0cf33741..386aa1ca8eb0 100644
--- a/sc/qa/uitest/calc_tests/mergedRowsColumns.py
+++ b/sc/qa/uitest/calc_tests/mergedRowsColumns.py
@@ -175,4 +175,3 @@ class mergedRowsColumns(UITestCase):
 self.assertEqual(get_state_as_dict(gridwin)["CurrentRow"], "0")
 #position A1
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
-
diff --git a/sc/qa/uitest/calc_tests7/tdf117987.py 
b/sc/qa/uitest/calc_tests7/tdf117987.py
index 8331b7a4f045..2a15dedcb808 100644
--- a/sc/qa/uitest/calc_tests7/tdf117987.py
+++ b/sc/qa/uitest/calc_tests7/tdf117987.py
@@ -25,3 +25,5 @@ class tdf117987(UITestCase):
 self.xUITest.executeCommandWithParameters(".uno:BackgroundColor", 
colorProperty)
 
 self.assertEqual(get_cell_by_position(document, 0, 0, 
1).CellBackColor, 16776960)
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
diff --git a/sc/qa/uitest/calc_tests8/navigator.py 
b/sc/qa/uitest/calc_tests8/navigator.py
index 2944ab3dcb04..226e54749a02 100644
--- a/sc/qa/uitest/calc_tests8/navigator.py
+++ b/sc/qa/uitest/calc_tests8/navigator.py
@@ -169,3 +169,4 @@ class navigator(UITestCase):
 
 self.xUITest.executeCommand(".uno:Sidebar")
 
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
diff --git a/sc/qa/uitest/calc_tests9/tdf113571.py 
b/sc/qa/uitest/calc_tests9/tdf113571.py
index 9772a36aaf4f..0dc337ca64c6 100644
--- a/sc/qa/uitest/calc_tests9/tdf113571.py
+++ b/sc/qa/uitest/calc_tests9/tdf113571.py
@@ -35,3 +35,4 @@ class Tdf113571(UITestCase):
 self.assertEqual('\n\n 
 world\n',
 writer_document.Text.String)
 
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
diff --git a/sc/qa/uitest/calc_tests9/tdf121949.py 
b/sc/qa/uitest/calc_tests9/tdf121949.py
index 1c41d5f2ac0f..03e50123433d 100644
--- a/sc/qa/uitest/calc_tests9/tdf121949.py
+++ b/sc/qa/uitest/calc_tests9/tdf121949.py
@@ -24,6 +24,4 @@ class tdf121949 (UITestCase):
 with self.ui_test.execute_dialog_through_command(".uno:Copy"):
 pass
 
-
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
-
diff --git a/sc/qa/uitest/calc_tests9/tdf125440.py 
b/sc/qa/uitest/calc_tests9/tdf125440.py
index 348b0f98983b..a6ce59d271dd 100644
--- 

[Libreoffice-commits] core.git: sc/qa sd/qa sw/qa uitest/demo_ui uitest/impress_tests uitest/math_tests writerperfect/qa

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/autofilter/autofilter.py|2 ++
 sc/qa/uitest/autofilter/autofilterBugs.py|3 +++
 sc/qa/uitest/autofilter/colorfilter.py   |2 ++
 sc/qa/uitest/autofilter2/tdf101165.py|2 ++
 sc/qa/uitest/autofilter2/tdf117276.py|2 ++
 sc/qa/uitest/autofilter2/tdf117276_autofilter_reset.py   |2 ++
 sc/qa/uitest/autofilter2/tdf122260.py|2 ++
 sc/qa/uitest/autofilter2/tdf126306.py|2 ++
 sc/qa/uitest/autofilter2/tdf130070.py|2 ++
 sc/qa/uitest/autofilter2/tdf140754.py|2 ++
 sc/qa/uitest/autofilter2/tdf141559.py|2 ++
 sc/qa/uitest/autofilter2/tdf141946.py|2 ++
 sc/qa/uitest/autofilter2/tdf46062.py |2 ++
 sc/qa/uitest/autofilter2/tdf46184.py |2 ++
 sc/qa/uitest/autofilter2/tdf48025.py |2 ++
 sc/qa/uitest/autofilter2/tdf68113.py |2 ++
 sc/qa/uitest/autofilter2/tdf92767.py |2 ++
 sc/qa/uitest/autofilter2/tdf97340.py |2 ++
 sc/qa/uitest/calc_dialogs/openDialogs.py |2 ++
 sc/qa/uitest/calc_tests/CalcPasteOnly.py |2 ++
 sc/qa/uitest/calc_tests/CellDropDownItems.py |2 ++
 sc/qa/uitest/calc_tests/Comments.py  |2 ++
 sc/qa/uitest/calc_tests/autofill.py  |2 ++
 sc/qa/uitest/calc_tests/autosum.py   |2 ++
 sc/qa/uitest/calc_tests/calcSheetDelete.py   |2 ++
 sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py   |2 ++
 sc/qa/uitest/calc_tests/columns.py   |2 ++
 sc/qa/uitest/calc_tests/fillRandomNumber.py  |2 ++
 sc/qa/uitest/calc_tests/formatCells.py   |2 ++
 sc/qa/uitest/calc_tests/mergedRowsColumns.py |2 ++
 sc/qa/uitest/calc_tests/printRange.py|2 ++
 sc/qa/uitest/calc_tests/rows.py  |2 ++
 sc/qa/uitest/calc_tests/sheetRename.py   |2 ++
 sc/qa/uitest/calc_tests/tdf133855.py |2 ++
 sc/qa/uitest/calc_tests/zoom.py  |2 ++
 sc/qa/uitest/calc_tests2/consolidate.py  |2 ++
 sc/qa/uitest/calc_tests2/dataform.py |2 ++
 sc/qa/uitest/calc_tests2/standardFilter.py   |2 ++
 sc/qa/uitest/calc_tests2/tdf104117.py|2 ++
 sc/qa/uitest/calc_tests2/tdf114992.py|2 ++
 sc/qa/uitest/calc_tests2/tdf117367.py|2 ++
 sc/qa/uitest/calc_tests2/tdf120174.py|2 ++
 sc/qa/uitest/calc_tests2/tdf126577.py|2 ++
 sc/qa/uitest/calc_tests2/tdf37623.py |2 ++
 sc/qa/uitest/calc_tests2/tdf46138.py |2 ++
 sc/qa/uitest/calc_tests3/clearCells.py   |2 ++
 sc/qa/uitest/calc_tests3/insertQrCodeGen.py  |3 +++
 sc/qa/uitest/calc_tests3/tdf63805.py |2 ++
 sc/qa/uitest/calc_tests3/tdf77509.py |2 ++
 sc/qa/uitest/calc_tests3/tdf79983.py |2 ++
 sc/qa/uitest/calc_tests3/tdf80693.py |2 ++
 sc/qa/uitest/calc_tests4/exportToPDF.py  |3 +++
 sc/qa/uitest/calc_tests4/saveToCSV.py|3 +++
 sc/qa/uitest/calc_tests4/tdf131170.py|2 ++
 sc/qa/uitest/calc_tests4/tdf138089.py|2 ++
 sc/qa/uitest/calc_tests4/tdf141547.py|2 ++
 sc/qa/uitest/calc_tests4/tdf88999.py |2 ++
 sc/qa/uitest/calc_tests4/tdf89958.py |2 ++
 sc/qa/uitest/calc_tests4/tdf94208.py |2 ++
 sc/qa/uitest/calc_tests4/tdf99386.py |2 ++
 sc/qa/uitest/calc_tests4/trackedChanges.py   |4 
 sc/qa/uitest/calc_tests6/autoFormat.py   |2 ++
 sc/qa/uitest/calc_tests6/autocorrectOptions.py   |3 +++
 sc/qa/uitest/calc_tests6/hideShowSheet.py|2 ++
 sc/qa/uitest/calc_tests6/moveCopySheet.py|2 ++
 sc/qa/uitest/calc_tests6/multipleOperations.py 

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests3/clearCells.py |5 -
 sc/qa/uitest/search_replace/tdf39959.py|1 -
 sc/qa/uitest/textToColumns/textToColumns.py|4 
 sc/qa/uitest/validity/validity.py  |1 -
 sd/qa/uitest/impress_tests/customSlideShow.py  |2 --
 sw/qa/uitest/classification/classification.py  |4 
 sw/qa/uitest/findReplace/tdf106099.py  |1 -
 sw/qa/uitest/styleInspector/styleInspector.py  |1 -
 sw/qa/uitest/writer_tests2/fontworks.py|1 -
 sw/qa/uitest/writer_tests5/titlePageWizard2.py |2 --
 10 files changed, 22 deletions(-)

New commits:
commit 84f8613cdd9d494c7f376420520e186b4d4ea8a1
Author: Xisco Fauli 
AuthorDate: Wed Nov 24 16:39:18 2021 +0100
Commit: Xisco Fauli 
CommitDate: Wed Nov 24 19:40:15 2021 +0100

uitest: remove print leftovers

Change-Id: I9b0cef7a8a536a8db7d0b840dfe69714fdbf2cd4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125779
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests3/clearCells.py 
b/sc/qa/uitest/calc_tests3/clearCells.py
index 179111eb6469..e4c9d5fe162f 100644
--- a/sc/qa/uitest/calc_tests3/clearCells.py
+++ b/sc/qa/uitest/calc_tests3/clearCells.py
@@ -215,13 +215,8 @@ class clearCells(UITestCase):
 select_pos(xTabs, "1")  #tab Font
 
 xstylelb = xDialog.getChild("weststylelb-cjk")
-print(get_state_as_dict(xstylelb))
-
-
 self.assertEqual(get_state_as_dict(xstylelb)["Text"], 
"Regular")
 
-
-
 def test_clear_cells_all(self):
 with self.ui_test.create_doc_in_start_center("calc") as document:
 xCalcDoc = self.xUITest.getTopFocusWindow()
diff --git a/sc/qa/uitest/search_replace/tdf39959.py 
b/sc/qa/uitest/search_replace/tdf39959.py
index f9280614b436..042096f39146 100644
--- a/sc/qa/uitest/search_replace/tdf39959.py
+++ b/sc/qa/uitest/search_replace/tdf39959.py
@@ -36,7 +36,6 @@ class tdf39959(UITestCase):
 allsheets.executeAction("CLICK", tuple())
 replaceall = xDialog.getChild("replaceall")
 replaceall.executeAction("CLICK", tuple())
-# print(xDialog.getChildren())
 
 #verify Sheet2.A1 = "bbb"
 self.assertEqual(get_cell_by_position(calc_doc, 1, 0, 
0).getString(), "bbb ")
diff --git a/sc/qa/uitest/textToColumns/textToColumns.py 
b/sc/qa/uitest/textToColumns/textToColumns.py
index e31c0d99dcc5..a5ddd72477a4 100644
--- a/sc/qa/uitest/textToColumns/textToColumns.py
+++ b/sc/qa/uitest/textToColumns/textToColumns.py
@@ -27,10 +27,8 @@ class CalcTextToColumns(UITestCase):
 xWriterGeneralEntry = xWriterEntry.getChild('0')
 xWriterGeneralEntry.executeAction("SELECT", tuple())  
#General / replwarncb
 xreplwarncb = xDialogOpt.getChild("replwarncb")
-print(get_state_as_dict(xreplwarncb)["Selected"])
 if (get_state_as_dict(xreplwarncb)["Selected"]) == "false":
 xreplwarncb.executeAction("CLICK", tuple())
-print(get_state_as_dict(xreplwarncb)["Selected"])
 
 #Select A1:A5 on Sheet 'Dot_as_Separator'
 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": 
"A1:A5"}))
@@ -117,10 +115,8 @@ class CalcTextToColumns(UITestCase):
 xWriterGeneralEntry = xWriterEntry.getChild('0')
 xWriterGeneralEntry.executeAction("SELECT", tuple())  
#General / replwarncb
 xreplwarncb = xDialogOpt.getChild("replwarncb")
-print(get_state_as_dict(xreplwarncb)["Selected"])
 if (get_state_as_dict(xreplwarncb)["Selected"]) == "false":
 xreplwarncb.executeAction("CLICK", tuple())
-print(get_state_as_dict(xreplwarncb)["Selected"])
 
 # Select A1:A5
 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": 
"A1:A5"}))
diff --git a/sc/qa/uitest/validity/validity.py 
b/sc/qa/uitest/validity/validity.py
index 7d1315fdd016..e92821079ea0 100644
--- a/sc/qa/uitest/validity/validity.py
+++ b/sc/qa/uitest/validity/validity.py
@@ -71,7 +71,6 @@ class validity(UITestCase):
 xtsbhelp = xDialog.getChild("tsbhelp")
 xtitle = xDialog.getChild("title")
 xinputhelp = xDialog.getChild("inputhelp")
-# print(get_state_as_dict(xtsbhelp))
 select_pos(xTabs, "1")
 self.assertEqual(get_state_as_dict(xtsbhelp)["Selected"], 
"true")
 self.assertEqual(get_state_as_dict(xtitle)["Text"], "A")
diff --git a/sd/qa/uitest/impress_tests/customSlideShow.py 
b/sd/qa/uitest/impress_tests/customSlideShow.py
index 4915dce68800..de7a17d70c35 100644
--- a/sd/qa/uitest/impress_tests/customSlideShow.py
+++ b/sd/qa/uitest/impress_tests/customSlideShow.py
@@ -37,11 +37,9 @@ class customSlideShow(UITestCase):
 

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests7/save_readonly_with_password.py |   10 +-
 sd/qa/uitest/impress_tests/tdf141297.py |   10 +-
 sw/qa/uitest/writer_tests7/tdf90401.py  |   10 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit f8790b1d586b3865cfdc56e8f4cdab55a8617769
Author: Xisco Fauli 
AuthorDate: Fri Nov 19 17:25:06 2021 +0100
Commit: Xisco Fauli 
CommitDate: Fri Nov 19 18:25:28 2021 +0100

uitest: better use execute_dialog_through_action in these cases

Change-Id: Ic2317db908afc12973624034f29c1de6f4efd60c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125561
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests7/save_readonly_with_password.py 
b/sc/qa/uitest/calc_tests7/save_readonly_with_password.py
index c930b3ece9cd..9552da9695a1 100644
--- a/sc/qa/uitest/calc_tests7/save_readonly_with_password.py
+++ b/sc/qa/uitest/calc_tests7/save_readonly_with_password.py
@@ -31,7 +31,7 @@ class save_readonly_with_password(UITestCase):
 xPasswordCheckButton.executeAction("CLICK", tuple())
 xOpen = xSaveDialog.getChild("open")
 
-with self.ui_test.execute_dialog_through_action(xOpen, 
"CLICK") as xPasswordDialog:
+with self.ui_test.execute_dialog_through_action(xOpen, 
"CLICK", close_button="") as xPasswordDialog:
 xReadonly = xPasswordDialog.getChild("readonly")
 xReadonly.executeAction("CLICK", tuple())
 xNewPassword = 
xPasswordDialog.getChild("newpassroEntry")
@@ -39,10 +39,10 @@ class save_readonly_with_password(UITestCase):
 xConfirmPassword = 
xPasswordDialog.getChild("confirmropassEntry")
 xConfirmPassword.executeAction("TYPE", 
mkPropertyValues({"TEXT": "password"}))
 
-# XLSX confirmation dialog is displayed
-xWarnDialog = self.xUITest.getTopFocusWindow()
-xSave = xWarnDialog.getChild("save")
-self.ui_test.close_dialog_through_button(xSave)
+xOk = xPasswordDialog.getChild("ok")
+# XLSX confirmation dialog is displayed
+with self.ui_test.execute_dialog_through_action(xOk, 
"CLICK", close_button="save"):
+pass
 
 with self.ui_test.load_file(systemPathToFileUrl(xFilePath)) as 
document:
 
diff --git a/sd/qa/uitest/impress_tests/tdf141297.py 
b/sd/qa/uitest/impress_tests/tdf141297.py
index 1af3465238d9..41fde2ba835d 100644
--- a/sd/qa/uitest/impress_tests/tdf141297.py
+++ b/sd/qa/uitest/impress_tests/tdf141297.py
@@ -23,7 +23,7 @@ class tdf141297(UITestCase):
 xCancelBtn = xTemplateDlg.getChild("close")
 self.ui_test.close_dialog_through_button(xCancelBtn)
 
-with 
self.ui_test.execute_dialog_through_command(".uno:InsertGraphic", 
close_button="open") as xOpenDialog:
+with 
self.ui_test.execute_dialog_through_command(".uno:InsertGraphic", 
close_button="") as xOpenDialog:
 
 xFileName = xOpenDialog.getChild("file_name")
 xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": 
get_url_for_data_file("LibreOffice.jpg")}))
@@ -33,10 +33,10 @@ class tdf141297(UITestCase):
 
 xLink.executeAction("CLICK", tuple())
 
-#Confirmation dialog is displayed
-xWarnDialog = self.xUITest.getTopFocusWindow()
-xOK = xWarnDialog.getChild("ok")
-self.ui_test.close_dialog_through_button(xOK)
+xOpen = xOpenDialog.getChild("open")
+#Confirmation dialog is displayed
+with self.ui_test.execute_dialog_through_action(xOpen, 
"CLICK"):
+pass
 
 with 
self.ui_test.execute_dialog_through_command(".uno:ManageLinks", 
close_button="close") as xDialog:
 
diff --git a/sw/qa/uitest/writer_tests7/tdf90401.py 
b/sw/qa/uitest/writer_tests7/tdf90401.py
index df71127feb04..7303b7c31e3e 100644
--- a/sw/qa/uitest/writer_tests7/tdf90401.py
+++ b/sw/qa/uitest/writer_tests7/tdf90401.py
@@ -120,16 +120,16 @@ class tdf90401(UITestCase):
 xOkBtn.executeAction('CLICK', tuple())
 
 # Save Copy as
-with 
self.ui_test.execute_dialog_through_command('.uno:SaveAs', close_button="open") 
as xDialog:
+with 
self.ui_test.execute_dialog_through_command('.uno:SaveAs', close_button="") as 
xDialog:
 xFileName = xDialog.getChild('file_name')
 xFileName.executeAction('TYPE', 
mkPropertyValues({'KEYCODE':'CTRL+A'}))
 xFileName.executeAction('TYPE', 
mkPropertyValues({'KEYCODE':'BACKSPACE'}))
 xFileName.executeAction('TYPE', 

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/conditional_format/tdf117899.py |   45 ++---
 sd/qa/uitest/impress_tests/tdf141297.py  |   94 +--
 sw/qa/uitest/writer_tests6/tdf144374.py  |   26 +--
 sw/qa/uitest/writer_tests7/tdf119661.py  |   84 +-
 sw/qa/uitest/writer_tests7/tdf90401.py   |  216 ---
 5 files changed, 218 insertions(+), 247 deletions(-)

New commits:
commit 1b6839f59b5aa9bf01674862aa320259ee488f63
Author: Xisco Fauli 
AuthorDate: Tue Oct 26 12:18:17 2021 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 26 14:44:14 2021 +0200

uitest: rearrange tests to avoid "close_doc: no active frame"

Change-Id: I92bf81801797821c9ec4aa73c005f1d6c6f6da62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124182
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/conditional_format/tdf117899.py 
b/sc/qa/uitest/conditional_format/tdf117899.py
index 20c3a71e5264..b22b99494c3c 100644
--- a/sc/qa/uitest/conditional_format/tdf117899.py
+++ b/sc/qa/uitest/conditional_format/tdf117899.py
@@ -25,40 +25,39 @@ class Tdf117899(UITestCase):
 
 
   def test_tdf117899(self):
-with self.ui_test.load_file(get_url_for_data_file("tdf117899.ods")):
+with TemporaryDirectory() as tempdir:
+xFilePath = os.path.join(tempdir, "tdf117899-temp.ods")
 
-self.execute_conditional_format_manager_dialog()
+with self.ui_test.load_file(get_url_for_data_file("tdf117899.ods")):
 
-self.xUITest.executeCommand(".uno:SelectAll")
+self.execute_conditional_format_manager_dialog()
 
-self.xUITest.executeCommand(".uno:Copy")
+self.xUITest.executeCommand(".uno:SelectAll")
 
-with TemporaryDirectory() as tempdir:
-xFilePath = os.path.join(tempdir, "tdf117899-temp.ods")
+self.xUITest.executeCommand(".uno:Copy")
 
-with self.ui_test.load_empty_file("writer"):
+with self.ui_test.load_empty_file("writer"):
 
-self.xUITest.getTopFocusWindow()
+self.xUITest.getTopFocusWindow()
 
-# Paste as an OLE spreadsheet
-formatProperty = mkPropertyValues({"SelectedFormat": 85})
-
self.xUITest.executeCommandWithParameters(".uno:ClipboardFormatItems", 
formatProperty)
+# Paste as an OLE spreadsheet
+formatProperty = mkPropertyValues({"SelectedFormat": 85})
+
self.xUITest.executeCommandWithParameters(".uno:ClipboardFormatItems", 
formatProperty)
 
-# Save Copy as
-with 
self.ui_test.execute_dialog_through_command(".uno:ObjectMenue?VerbID:short=-8", 
close_button="open") as xDialog:
+# Save Copy as
+with 
self.ui_test.execute_dialog_through_command(".uno:ObjectMenue?VerbID:short=-8", 
close_button="open") as xDialog:
 
-xFileName = xDialog.getChild("file_name")
-xFileName.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
-xFileName.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
-xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": 
xFilePath}))
+xFileName = xDialog.getChild("file_name")
+xFileName.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
+xFileName.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": 
xFilePath}))
 
+with self.ui_test.load_file(systemPathToFileUrl(xFilePath)):
 
-with self.ui_test.load_file(systemPathToFileUrl(xFilePath)):
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
 
-xCalcDoc = self.xUITest.getTopFocusWindow()
-gridwin = xCalcDoc.getChild("grid_window")
-
-# Without the fix in place, this test would have failed here
-self.execute_conditional_format_manager_dialog()
+# Without the fix in place, this test would have failed here
+self.execute_conditional_format_manager_dialog()
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sd/qa/uitest/impress_tests/tdf141297.py 
b/sd/qa/uitest/impress_tests/tdf141297.py
index 19956e9bcb73..1af3465238d9 100644
--- a/sd/qa/uitest/impress_tests/tdf141297.py
+++ b/sd/qa/uitest/impress_tests/tdf141297.py
@@ -14,73 +14,65 @@ import os.path
 class tdf141297(UITestCase):
 
 def test_tdf141297(self):
+with TemporaryDirectory() as tempdir:
+xFilePath = os.path.join(tempdir, "tdf141297-tmp.odp")
 
-with self.ui_test.create_doc_in_start_center("impress"):
+with self.ui_test.create_doc_in_start_center("impress"):
 
-xTemplateDlg = self.xUITest.getTopFocusWindow()
-xCancelBtn = xTemplateDlg.getChild("close")
-

[Libreoffice-commits] core.git: sc/qa sd/qa sw/qa uitest/demo_ui uitest/uitest

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/autofilter/autofilter.py|6 +--
 sc/qa/uitest/calc_tests/fillRandomNumber.py  |4 +-
 sc/qa/uitest/calc_tests/printRange.py|   10 ++---
 sc/qa/uitest/calc_tests2/consolidate.py  |6 +--
 sc/qa/uitest/calc_tests2/standardFilter.py   |   44 +++
 sc/qa/uitest/calc_tests2/tdf104117.py|2 -
 sc/qa/uitest/calc_tests3/tdf77509.py |2 -
 sc/qa/uitest/calc_tests3/tdf80693.py |2 -
 sc/qa/uitest/calc_tests4/tdf138089.py|2 -
 sc/qa/uitest/calc_tests4/tdf141547.py|2 -
 sc/qa/uitest/calc_tests4/tdf89958.py |2 -
 sc/qa/uitest/calc_tests4/trackedChanges.py   |   12 +++---
 sc/qa/uitest/calc_tests6/multipleOperations.py   |4 +-
 sc/qa/uitest/calc_tests9/forms.py|2 -
 sc/qa/uitest/conditional_format/tdf105351.py |4 +-
 sc/qa/uitest/conditional_format/tdf105411.py |2 -
 sc/qa/uitest/conditional_format/tdf105466.py |2 -
 sc/qa/uitest/function_wizard/function_wizard.py  |2 -
 sc/qa/uitest/function_wizard/tdf123479.py|2 -
 sc/qa/uitest/function_wizard/tdf132173.py|2 -
 sc/qa/uitest/goalSeek/goalSeek.py|2 -
 sc/qa/uitest/goalSeek/tdf37341.py|2 -
 sc/qa/uitest/goalSeek/tdf43693.py|2 -
 sc/qa/uitest/manual_tests/calc.py|4 +-
 sc/qa/uitest/range_name/create_range_name.py |4 +-
 sc/qa/uitest/range_name/tdf119954.py |6 +--
 sc/qa/uitest/range_name/tdf138822.py |4 +-
 sc/qa/uitest/range_name/tdf86214.py  |2 -
 sc/qa/uitest/search_replace/replace.py   |2 -
 sc/qa/uitest/search_replace/tdf132097.py |2 -
 sc/qa/uitest/search_replace/tdf132783.py |2 -
 sc/qa/uitest/search_replace/tdf143759.py |2 -
 sc/qa/uitest/search_replace/tdf35020.py  |2 -
 sc/qa/uitest/search_replace/tdf39917.py  |2 -
 sc/qa/uitest/search_replace/tdf39959.py  |2 -
 sc/qa/uitest/search_replace/tdf44398.py  |4 +-
 sc/qa/uitest/search_replace/tdf44861.py  |2 -
 sc/qa/uitest/search_replace/tdf57523.py  |2 -
 sc/qa/uitest/solver/solver.py|2 -
 sc/qa/uitest/statistics/anova.py |4 +-
 sc/qa/uitest/statistics/chiSquare.py |4 +-
 sc/qa/uitest/statistics/correlation.py   |6 +--
 sc/qa/uitest/statistics/covariance.py|6 +--
 sc/qa/uitest/statistics/descriptiveStatistics.py |4 +-
 sc/qa/uitest/statistics/exponentialSmoothing.py  |6 +--
 sc/qa/uitest/statistics/fTest.py |4 +-
 sc/qa/uitest/statistics/movingAverage.py |6 +--
 sc/qa/uitest/statistics/regression.py|4 +-
 sc/qa/uitest/statistics/sampling.py  |4 +-
 sc/qa/uitest/statistics/tTest.py |4 +-
 sc/qa/uitest/statistics/tdf76731.py  |2 -
 sc/qa/uitest/statistics/zTest.py |4 +-
 sd/qa/uitest/findReplace/findReplace.py  |   10 ++---
 sw/qa/uitest/findReplace/findReplace.py  |   12 +++---
 sw/qa/uitest/findReplace/findSimilarity.py   |2 -
 sw/qa/uitest/findReplace/tdf106099.py|2 -
 sw/qa/uitest/findReplace/tdf118208.py|2 -
 sw/qa/uitest/findReplace/tdf119462.py|2 -
 sw/qa/uitest/findReplace/tdf126627.py|4 +-
 sw/qa/uitest/findReplace/tdf144089.py|2 -
 sw/qa/uitest/findReplace/tdf44837.py |2 -
 sw/qa/uitest/macro_tests/tdf64690.py |2 -
 sw/qa/uitest/ui/index/index.py   |2 -
 sw/qa/uitest/writer_tests/compareDocuments.py|4 +-
 sw/qa/uitest/writer_tests/trackedChanges.py  |   14 +++
 sw/qa/uitest/writer_tests/wordCount.py   |   20 +-
 sw/qa/uitest/writer_tests2/asianPhoneticGuide.py |2 -
 sw/qa/uitest/writer_tests4/spellDialog.py|4 +-
 sw/qa/uitest/writer_tests4/tdf122449.py  |2 -
 sw/qa/uitest/writer_tests6/tdf126017.py  |2 -
 sw/qa/uitest/writer_tests7/forms.py  |   16 
 sw/qa/uitest/writer_tests7/tdf140731.py  |2 -
 sw/qa/uitest/writer_tests7/tdf90401.py   |4 +-
 uitest/demo_ui/combobox.py   |2 -
 uitest/demo_ui/edit.py   |4 +-
 uitest/demo_ui/tabcontrol.py |2 -
 uitest/demo_ui/treelist.py   |2 -
 uitest/uitest/test.py|   16 
 78 files changed, 173 insertions(+), 187 deletions(-)

New commits:
commit f75bae7082322a2e79997d041ce5f8afd3910107
Author: Xisco Fauli 
AuthorDate: Sun Sep 12 21:16:40 2021 +0200
Commit: Xisco Fauli 
CommitDate: Mon Sep 13 10:38:27 2021 +0200

uitest: combine 

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests8/tdf126248.py|4 
 sd/qa/uitest/impress_tests/autocorrectOptions.py |  153 +++
 sd/qa/uitest/impress_tests/customSlideShow.py|   74 ---
 sd/qa/uitest/impress_tests/masterElements.py |   38 ++---
 sd/qa/uitest/impress_tests/masterSlides.py   |9 -
 sd/qa/uitest/impress_tests/renameSlide.py|   33 +---
 sd/qa/uitest/impress_tests/slideShowSettings.py  |   70 --
 sd/qa/uitest/impress_tests/tdf125449.py  |   17 +-
 sd/qa/uitest/impress_tests/tdf134734.py  |   75 ---
 sd/qa/uitest/impress_tests/tdf137729.py  |   17 +-
 sd/qa/uitest/impress_tests/tdf139511.py  |   21 +--
 sd/qa/uitest/impress_tests/tdf141297.py  |   55 +++-
 sd/qa/uitest/impress_tests/tdf91762.py   |9 -
 sd/qa/uitest/impress_tests/textColumnsDialog.py  |4 
 sw/qa/uitest/writer_tests2/fontworks.py  |4 
 uitest/uitest/test.py|   10 +
 uitest/uitest/uihelper/guarded.py|   10 -
 17 files changed, 269 insertions(+), 334 deletions(-)

New commits:
commit beeb10a097cdb44af931b92d2849a7e4d09414c0
Author: Xisco Fauli 
AuthorDate: Mon Jun 28 10:43:26 2021 +0200
Commit: Xisco Fauli 
CommitDate: Tue Jun 29 13:24:24 2021 +0200

uitest: guard execute_dialog_through_command in sd

Mostly done with a script
for motivation, see 89aaa17a0a4413f07da2bc5084b0164f15dc01ac
< UITest: introduce guarded context managers >

Change-Id: I162dcf802474a27580cfbe9349d1a48d3a111c9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117999
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests8/tdf126248.py 
b/sc/qa/uitest/calc_tests8/tdf126248.py
index 27482acd0cde..1609a43cb2bf 100644
--- a/sc/qa/uitest/calc_tests8/tdf126248.py
+++ b/sc/qa/uitest/calc_tests8/tdf126248.py
@@ -31,7 +31,7 @@ class tdf126248(UITestCase):
 self.xUITest.executeCommand(".uno:Sidebar")
 
 def changeLocalSetting(self, language):
-with guarded.execute_dialog_through_command(self, 
".uno:OptionsTreeDialog") as xDialog:
+with 
self.ui_test.execute_dialog_through_command_guarded(".uno:OptionsTreeDialog") 
as xDialog:
 xPages = xDialog.getChild("pages")
 xLanguageEntry = xPages.getChild('2')
 xLanguageEntry.executeAction("EXPAND", tuple())
@@ -53,7 +53,7 @@ class tdf126248(UITestCase):
 
 self.changeLocalSetting("Chinese (traditional)")
 
-with guarded.execute_dialog_through_command(self, 
".uno:FormatCellDialog") as xDialog:
+with 
self.ui_test.execute_dialog_through_command_guarded(".uno:FormatCellDialog") as 
xDialog:
 xTabs = xDialog.getChild("tabcontrol")
 select_pos(xTabs, "1")
 
diff --git a/sd/qa/uitest/impress_tests/autocorrectOptions.py 
b/sd/qa/uitest/impress_tests/autocorrectOptions.py
index d386aa8b189c..d4bc3c5392a9 100644
--- a/sd/qa/uitest/impress_tests/autocorrectOptions.py
+++ b/sd/qa/uitest/impress_tests/autocorrectOptions.py
@@ -20,84 +20,81 @@ class autocorrectOptions(UITestCase):
 self.ui_test.close_dialog_through_button(xCancelBtn)
 document = self.ui_test.get_component()
 
-self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg")
-xDialog = self.xUITest.getTopFocusWindow()
-xTabs = xDialog.getChild("tabcontrol")
-select_pos(xTabs, "0")   #tab replace
-origtext = xDialog.getChild("origtext")
-newtext = xDialog.getChild("newtext")
-xnew = xDialog.getChild("new")
-xdelete = xDialog.getChild("delete")
-xtabview = xDialog.getChild("tabview")
-xreset = xDialog.getChild("reset")
-nrRows = get_state_as_dict(xtabview)["VisibleCount"]
-
-self.assertTrue(int(nrRows) > 0)
-
-#add new rule
-origtext.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
-origtext.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
-origtext.executeAction("TYPE", mkPropertyValues({"TEXT":""}))
-newtext.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
-newtext.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
-newtext.executeAction("TYPE", mkPropertyValues({"TEXT":"dvojtecky"}))
-xnew.executeAction("CLICK", tuple())
-nrRowsNew = get_state_as_dict(xtabview)["VisibleCount"]
-nrRowsDiff = int(nrRowsNew) - int(nrRows)
-self.assertEqual(nrRowsDiff, 1)  #we have +1 rule
-#delete rule
-origtext.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
-origtext.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
-origtext.executeAction("TYPE", mkPropertyValues({"TEXT":""}))
-newtext.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
-

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/autofilter/autofilterBugs.py   |   17 
 sc/qa/uitest/autofilter/tdf101165.py|3 
 sc/qa/uitest/autofilter/tdf117276.py|1 
 sc/qa/uitest/autofilter/tdf130070.py|1 
 sc/qa/uitest/autofilter/tdf140754.py|   32 
 sc/qa/uitest/autofilter/tdf92767.py |1 
 sc/qa/uitest/autofilter/tdf97340.py |1 
 sc/qa/uitest/calc_tests/autofill.py |   85 -
 sc/qa/uitest/calc_tests/autosum.py  |  177 +---
 sc/qa/uitest/calc_tests/tdf133855.py|5 
 sc/qa/uitest/calc_tests2/consolidate.py |   65 -
 sc/qa/uitest/calc_tests2/standardFilter.py  |   39 
 sc/qa/uitest/calc_tests2/tdf114992.py   |5 
 sc/qa/uitest/calc_tests2/tdf37623.py|   11 
 sc/qa/uitest/calc_tests3/tdf57274.py|5 
 sc/qa/uitest/calc_tests3/tdf62267.py|1 
 sc/qa/uitest/calc_tests3/tdf63805.py|   45 -
 sc/qa/uitest/calc_tests3/tdf65856.py|   72 -
 sc/qa/uitest/calc_tests3/tdf69981.py|   43 -
 sc/qa/uitest/calc_tests3/tdf77509.py|   41 
 sc/qa/uitest/calc_tests4/tdf85403.py|3 
 sc/qa/uitest/calc_tests4/tdf85979.py|   33 
 sc/qa/uitest/calc_tests4/tdf86253.py|1 
 sc/qa/uitest/calc_tests4/tdf89958.py|1 
 sc/qa/uitest/calc_tests4/tdf99386.py|3 
 sc/qa/uitest/calc_tests4/textToColumns.py   |  426 
--
 sc/qa/uitest/calc_tests6/tdf107267.py   |   13 
 sc/qa/uitest/calc_tests6/tdf107869.py   |   51 -
 sc/qa/uitest/calc_tests6/tdf118638.py   |   13 
 sc/qa/uitest/calc_tests7/tdf122509.py   |3 
 sc/qa/uitest/calc_tests7/tdf124818.py   |3 
 sc/qa/uitest/calc_tests7/tdf124896.py   |3 
 sc/qa/uitest/calc_tests7/tdf31805.py|   11 
 sc/qa/uitest/calc_tests7/tdf91425.py|7 
 sc/qa/uitest/calc_tests8/tdf114710.py   |1 
 sc/qa/uitest/calc_tests8/tdf119343.py   |7 
 sc/qa/uitest/calc_tests8/tdf124829.py   |3 
 sc/qa/uitest/calc_tests9/tdf126673.py   |1 
 sc/qa/uitest/calc_tests9/tdf130371.py   |1 
 sc/qa/uitest/calc_tests9/tdf91217.py|7 
 sc/qa/uitest/chart/chartArea.py |3 
 sc/qa/uitest/chart/chartAxes.py |1 
 sc/qa/uitest/chart/chartDataLabels.py   |   13 
 sc/qa/uitest/chart/chartGrid.py |1 
 sc/qa/uitest/chart/chartGrids.py|1 
 sc/qa/uitest/chart/chartLegend.py   |1 
 sc/qa/uitest/chart/chartTitles.py   |   15 
 sc/qa/uitest/chart/chartWall.py |3 
 sc/qa/uitest/chart/chartXAxis.py|1 
 sc/qa/uitest/chart/chartYAxis.py|1 
 sc/qa/uitest/chart/copyPaste.py |3 
 sc/qa/uitest/chart/formatDataSeries.py  |1 
 sc/qa/uitest/chart/tdf101894.py |5 
 sc/qa/uitest/chart/tdf107097.py |3 
 sc/qa/uitest/chart/tdf120348.py |3 
 sc/qa/uitest/chart/tdf122398.py |1 
 sc/qa/uitest/chart/tdf123013.py |1 
 sc/qa/uitest/chart/tdf123231.py |1 
 sc/qa/uitest/chart/tdf123520.py |1 
 sc/qa/uitest/chart/tdf124111.py |1 
 sc/qa/uitest/chart/tdf129587.py |5 
 sc/qa/uitest/chart/tdf133630.py |3 
 sc/qa/uitest/chart/tdf134059.py |1 
 sc/qa/uitest/chart/tdf136011.py |1 
 sc/qa/uitest/chart/tdf142851.py |1 
 sc/qa/uitest/chart/tdf43175.py  |4 
 sc/qa/uitest/chart/tdf62057.py  |5 
 sc/qa/uitest/chart/tdf62349.py  |3 
 

[Libreoffice-commits] core.git: sc/qa sd/qa sw/qa uitest/uitest writerperfect/qa

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests/sheetRename.py   |9 +---
 sc/qa/uitest/calc_tests3/tdf57274.py |8 +--
 sc/qa/uitest/calc_tests3/tdf69981.py |7 ---
 sc/qa/uitest/calc_tests4/tdf131170.py|   12 +
 sc/qa/uitest/calc_tests4/textToColumns.py|   46 +++-
 sc/qa/uitest/calc_tests6/tdf116996.py|   16 +--
 sc/qa/uitest/calc_tests6/tdf91726.py |   27 +---
 sc/qa/uitest/calc_tests8/tdf125051.py|8 ---
 sc/qa/uitest/calc_tests9/pivotTable.py   |   32 +-
 sc/qa/uitest/calc_tests9/tdf117879.py|   10 ++--
 sc/qa/uitest/calc_tests9/tdf141244.py|   11 +---
 sc/qa/uitest/chart/chartDataLabels.py|   42 ++
 sc/qa/uitest/goalSeek/goalSeek.py|8 ---
 sc/qa/uitest/goalSeek/tdf37341.py|   10 +---
 sc/qa/uitest/goalSeek/tdf43693.py|8 +--
 sc/qa/uitest/manual_tests/calc.py|6 +-
 sc/qa/uitest/options/tdf122977.py|7 ---
 sc/qa/uitest/solver/solver.py|9 +---
 sd/qa/uitest/impress_tests/customSlideShow.py|   13 -
 sd/qa/uitest/impress_tests/tdf141297.py  |5 +-
 sw/qa/uitest/chapterNumbering/tdf140528.py   |8 ---
 sw/qa/uitest/findReplace/findReplace.py  |8 ---
 sw/qa/uitest/findReplace/tdf106099.py|6 --
 sw/qa/uitest/findReplace/tdf118208.py|7 ---
 sw/qa/uitest/findReplace/tdf119462.py|7 ---
 sw/qa/uitest/findSimilarity/findSimilarity.py|   14 --
 sw/qa/uitest/macro_tests/tdf64690.py |8 ---
 sw/qa/uitest/options/optionsDialog.py|6 --
 sw/qa/uitest/options/tdf131581.py|8 ---
 sw/qa/uitest/ui/index/index.py   |   18 +++-
 sw/qa/uitest/writer_tests2/bookmark.py   |8 ---
 sw/qa/uitest/writer_tests2/documentProperties.py |   16 +--
 sw/qa/uitest/writer_tests3/autoredactDialog.py   |   42 +-
 sw/qa/uitest/writer_tests3/customizeDialog.py|9 +---
 sw/qa/uitest/writer_tests3/hyperlinkdialog.py|5 +-
 sw/qa/uitest/writer_tests4/spellDialog.py|   17 ---
 sw/qa/uitest/writer_tests4/tdf113252.py  |   11 
 sw/qa/uitest/writer_tests7/tdf119661.py  |5 +-
 sw/qa/uitest/writer_tests7/tdf90401.py   |9 +---
 uitest/uitest/test.py|   26 +--
 writerperfect/qa/uitest/epubexport/epubexport.py |   51 +++
 41 files changed, 187 insertions(+), 396 deletions(-)

New commits:
commit 8298aa62726312eee6f8fbb64a9fc9b12680447f
Author: Xisco Fauli 
AuthorDate: Thu Jun 17 17:01:23 2021 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jun 21 10:29:40 2021 +0200

uitest: guard execute_blocking_action

so even if an assert fails, the dialog is closed afterwards
for motivation, see 89aaa17a0a4413f07da2bc5084b0164f15dc01ac
< UITest: introduce guarded context managers >

Change-Id: I9a3adb52546238d960eeaaaf03b6bdbbd5718cf8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117392
Tested-by: Jenkins
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests/sheetRename.py 
b/sc/qa/uitest/calc_tests/sheetRename.py
index 2e6ffc6fb740..0f8478b8454b 100644
--- a/sc/qa/uitest/calc_tests/sheetRename.py
+++ b/sc/qa/uitest/calc_tests/sheetRename.py
@@ -41,13 +41,10 @@ class sheetRename(UITestCase):
 nameVal = get_state_as_dict(xname_entry)["Text"]
 xname_entry.executeAction("TYPE", 
mkPropertyValues({"TEXT":"NewName**"}))
 xOKBtn = xDialog.getChild("ok")
-def handle_warn_dlg(dialog):
-#show warning
-xok = dialog.getChild("ok")
-self.ui_test.close_dialog_through_button(xok)
 
-self.ui_test.execute_blocking_action(xOKBtn.executeAction, 
args=('CLICK', ()),
-dialog_handler=handle_warn_dlg)
+with self.ui_test.execute_blocking_action(xOKBtn.executeAction, 
args=('CLICK', ())):
+pass
+
 xCancelBtn = xDialog.getChild("cancel")
 self.ui_test.close_dialog_through_button(xCancelBtn)
 
diff --git a/sc/qa/uitest/calc_tests3/tdf57274.py 
b/sc/qa/uitest/calc_tests3/tdf57274.py
index 9465d9bee5db..be5b0abcb760 100644
--- a/sc/qa/uitest/calc_tests3/tdf57274.py
+++ b/sc/qa/uitest/calc_tests3/tdf57274.py
@@ -30,12 +30,10 @@ class tdf57274(UITestCase):
 xLink.executeAction("CLICK", tuple())
 xOkBtn = xDialog.getChild("ok")
 # self.ui_test.close_dialog_through_button(xOkBtn)
-def handle_confirm_dlg(dialog):
-xOKBtn = dialog.getChild("yes")
-self.ui_test.close_dialog_through_button(xOKBtn)
 
-self.ui_test.execute_blocking_action(xOkBtn.executeAction, 
args=('CLICK', ()),
-

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

[merttumer (via logerrit)]

 sc/qa/unit/tiledrendering/tiledrendering.cxx   |   52 +
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |   59 +
 sw/qa/extras/tiledrendering/tiledrendering.cxx |  860 +
 3 files changed, 571 insertions(+), 400 deletions(-)

New commits:
commit 67277595902dd22c68d9db1f7cf94f53447b237a
Author: merttumer 
AuthorDate: Thu May 13 11:21:11 2021 +0300
Commit: Mert Tumer 
CommitDate: Fri Jun 4 10:39:05 2021 +0200

Unit tests for .uno:MoveShapeHandle command

Change-Id: Ia1049325bf26fbe6a3c8ac77c873d1af010d3581
Signed-off-by: merttumer 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115541
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116297
Tested-by: Jenkins

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 092dcf8cb863..08cc5d724dcd 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -116,6 +116,7 @@ public:
 void testSortAscendingDescending();
 void testAutoInputStringBlock();
 void testAutoInputExactMatch();
+void testMoveShapeHandle();
 
 
 CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
@@ -167,6 +168,7 @@ public:
 CPPUNIT_TEST(testSortAscendingDescending);
 CPPUNIT_TEST(testAutoInputStringBlock);
 CPPUNIT_TEST(testAutoInputExactMatch);
+CPPUNIT_TEST(testMoveShapeHandle);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -444,6 +446,7 @@ public:
 boost::property_tree::ptree m_aCommentCallbackResult;
 OString m_sInvalidateHeader;
 OString m_sInvalidateSheetGeometry;
+OString m_ShapeSelection;
 
 ViewCallback(bool bDeleteListenerOnDestruct=true)
 : m_bOwnCursorInvalidated(false),
@@ -506,6 +509,7 @@ public:
 case LOK_CALLBACK_GRAPHIC_SELECTION:
 {
 m_bGraphicSelection = true;
+m_ShapeSelection = OString(pPayload);
 }
 break;
 case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION:
@@ -666,6 +670,54 @@ void ScTiledRenderingTest::testViewLock()
 CPPUNIT_ASSERT(!aView1.m_bViewLock);
 }
 
+void lcl_extractHandleParameters(const OString& selection, int& id, int& x, 
int& y)
+{
+OString extraInfo = selection.copy(selection.indexOf("{"));
+std::stringstream aStream(extraInfo.getStr());
+boost::property_tree::ptree aTree;
+boost::property_tree::read_json(aStream, aTree);
+boost::property_tree::ptree
+handle0 = aTree
+.get_child("handles")
+.get_child("kinds")
+.get_child("rectangle")
+.get_child("1")
+.begin()->second;
+id = handle0.get_child("id").get_value();
+x = handle0.get_child("point").get_child("x").get_value();
+y = handle0.get_child("point").get_child("y").get_value();
+}
+
+void ScTiledRenderingTest::testMoveShapeHandle()
+{
+comphelper::LibreOfficeKit::setActive();
+ScModelObj* pModelObj = createDoc("shape.ods");
+ViewCallback aView1;
+pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, /*x=*/ 1,/*y=*/ 
1,/*count=*/ 1, /*buttons=*/ 1, /*modifier=*/0);
+pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, /*x=*/ 1, /*y=*/ 
1, /*count=*/ 1, /*buttons=*/ 1, /*modifier=*/0);
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
+{
+int id, x, y;
+lcl_extractHandleParameters(aView1.m_ShapeSelection, id, x ,y);
+int oldX = x;
+int oldY = y;
+uno::Sequence 
aPropertyValues(comphelper::InitPropertySequence(
+{
+{"HandleNum", uno::makeAny(id)},
+{"NewPosX", uno::makeAny(x+1)},
+{"NewPosY", uno::makeAny(y+1)}
+}));
+comphelper::dispatchCommand(".uno:MoveShapeHandle", aPropertyValues);
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
+lcl_extractHandleParameters(aView1.m_ShapeSelection, id, x ,y);
+CPPUNIT_ASSERT_EQUAL(x-1, oldX);
+CPPUNIT_ASSERT_EQUAL(y-1, oldY);
+}
+}
+
 void ScTiledRenderingTest::testColRowResize()
 {
 comphelper::LibreOfficeKit::setActive();
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index de5e8d9133d9..4b33a9c45b46 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -131,6 +131,7 @@ public:
 void testInsertDeletePageInvalidation();
 void testSpellOnlineRenderParameter();
 void testSlideDuplicateUndo();
+void testMoveShapeHandle();
 
 CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
 CPPUNIT_TEST(testCreateDestroy);
@@ -186,6 +187,7 @@ public:
 CPPUNIT_TEST(testInsertDeletePageInvalidation);
 CPPUNIT_TEST(testSpellOnlineRenderParameter);
 CPPUNIT_TEST(testSlideDuplicateUndo);
+CPPUNIT_TEST(testMoveShapeHandle);
 
 CPPUNIT_TEST_SUITE_END();
 

[Libreoffice-commits] core.git: sc/qa sd/qa sw/qa uitest/demo_ui vcl/source

[Noel Grandin (via logerrit)]

 sc/qa/uitest/calc_tests/formatCells.py  |8 ---
 sc/qa/uitest/calc_tests6/tdf107267.py   |   12 -
 sc/qa/uitest/calc_tests8/tdf126248.py   |1 
 sd/qa/uitest/impress_tests/customSlideShow.py   |1 
 sw/qa/uitest/findReplace/findReplace.py |1 
 sw/qa/uitest/writer_tests2/deleteAllComments.py |1 
 sw/qa/uitest/writer_tests2/formatParagraph.py   |1 
 uitest/demo_ui/listbox.py   |9 
 uitest/demo_ui/spinfield.py |6 --
 uitest/demo_ui/tabdialog.py |6 --
 vcl/source/uitest/uiobject.cxx  |   50 
 11 files changed, 25 insertions(+), 71 deletions(-)

New commits:
commit f1cc5d2229956e3698fd40a4d900fe45e7f8e160
Author: Noel Grandin 
AuthorDate: Sun Mar 14 14:37:19 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Mar 17 12:30:41 2021 +0100

throw exception for errors in uitest actions

so we abort early when a uitest goes wrong,
instead of letting tests become fragile
because it looks like its passing, but the code
is just accidentally working

Remove code in python uitests that was not actually
doing anything (and now crashes because we throw an exception
for actions that don't mean anything)

Change-Id: I9c52f9fdc06f1c01e9b93b58a5200f9c3684db1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112471
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/qa/uitest/calc_tests/formatCells.py 
b/sc/qa/uitest/calc_tests/formatCells.py
index 3bb78348fac2..62c1e55c7e9c 100644
--- a/sc/qa/uitest/calc_tests/formatCells.py
+++ b/sc/qa/uitest/calc_tests/formatCells.py
@@ -41,14 +41,6 @@ class formatCell(UITestCase):
 props3 = {"TEXT": "English (USA)"}
 actionProps3 = mkPropertyValues(props3)
 xlanguagelb.executeAction("SELECT", actionProps3)
-#set Number
-props = {"TEXT": "Number"}
-actionProps = mkPropertyValues(props)
-xliststore1.executeAction("SELECT", actionProps)
-#set Standard
-props2 = {"TEXT": "Standard"}
-actionProps2 = mkPropertyValues(props2)
-xliststore2.executeAction("SELECT", actionProps2)
 #other properties
 xdecimalsed.executeAction("UP", tuple())
 xleadzerosed.executeAction("UP", tuple())
diff --git a/sc/qa/uitest/calc_tests6/tdf107267.py 
b/sc/qa/uitest/calc_tests6/tdf107267.py
index ec39c7b4b366..70350a15e127 100644
--- a/sc/qa/uitest/calc_tests6/tdf107267.py
+++ b/sc/qa/uitest/calc_tests6/tdf107267.py
@@ -40,10 +40,6 @@ class Subtotals(UITestCase):
 #x6Entry = xTreeList.getChild("5")
 #xFirstEntry.executeAction("CLICK", tuple())
 #use the Max function
-xfunctions = xDialog.getChild("functions")
-propsF = {"TEXT": "Max"}
-actionPropsF = mkPropertyValues(propsF)
-xfunctions.executeAction("SELECT", actionPropsF)
 
 #= 2nd group =5. Group by "Person Number", select "shipping time" and 
use the Min function.
 select_pos(xTabs, "1")
@@ -57,10 +53,6 @@ class Subtotals(UITestCase):
 #x6Entry = xTreeList.getChild("5")
 #xFirstEntry.executeAction("CLICK", tuple())
 #use the Min function
-xfunctions = xDialog.getChild("functions")
-propsF2 = {"TEXT": "Min"}
-actionPropsF2 = mkPropertyValues(propsF2)
-xfunctions.executeAction("SELECT", actionPropsF2)
 
 #= 3rd group = Group by "Person Number", select "shipping time" and 
use the Average function.
 select_pos(xTabs, "2")
@@ -74,10 +66,6 @@ class Subtotals(UITestCase):
 #x6Entry = xTreeList.getChild("5")
 #xFirstEntry.executeAction("CLICK", tuple())
 #use the Average function
-xfunctions = xDialog.getChild("functions")
-propsF3 = {"TEXT": "Average"}
-actionPropsF3 = mkPropertyValues(propsF3)
-xfunctions.executeAction("SELECT", actionPropsF3)
 
 # 5. Click OK
 xOKBtn = xDialog.getChild("ok")
diff --git a/sc/qa/uitest/calc_tests8/tdf126248.py 
b/sc/qa/uitest/calc_tests8/tdf126248.py
index 967e5c027c3e..f633bf9bcf41 100644
--- a/sc/qa/uitest/calc_tests8/tdf126248.py
+++ b/sc/qa/uitest/calc_tests8/tdf126248.py
@@ -59,7 +59,6 @@ class tdf126248(UITestCase):
 
 self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog")
 xCellsDlg = self.xUITest.getTopFocusWindow()
-select_pos(xCellsDlg, "2")
 
 # Get current font names from the Format Cell dialog
 westFontName = 
get_state_as_dict(xCellsDlg.getChild("westfontnamelb-cjk"))['Text']
diff --git a/sd/qa/uitest/impress_tests/customSlideShow.py 
b/sd/qa/uitest/impress_tests/customSlideShow.py
index 9feef4a12a81..9f491d9a5141 100644
--- a/sd/qa/uitest/impress_tests/customSlideShow.py
+++ b/sd/qa/uitest/impress_tests/customSlideShow.py
@@ -41,7 +41,6 @@ class customSlideShow(UITestCase):
 edit = 

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

[Ashod Nakashian (via logerrit)]

 sc/qa/unit/tiledrendering/tiledrendering.cxx   |2 
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |2 
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   69 -
 3 files changed, 37 insertions(+), 36 deletions(-)

New commits:
commit 02cb3f9f9c651d23de3fd80b04380e3d7314250e
Author: Ashod Nakashian 
AuthorDate: Sat Aug 1 16:09:00 2020 -0400
Commit: Tor Lillqvist 
CommitDate: Fri Nov 20 14:49:58 2020 +0100

lok: minor cleanup of ViewCallback in tiledrendering tests

Change-Id: I39b964a7aa7d181083a153283f38c1a5bc64de58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99973
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106222
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 8c03a19902d5..bb34928fef7d 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -452,7 +452,7 @@ void ScTiledRenderingTest::testEmptyColumnSelection()
 }
 
 /// A view callback tracks callbacks invoked on one specific view.
-class ViewCallback
+class ViewCallback final
 {
 SfxViewShell* mpViewShell;
 int mnView;
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index d03e1be8341e..1aba4c65a77a 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -842,7 +842,7 @@ void SdTiledRenderingTest::testResizeTableColumn()
 namespace {
 
 /// A view callback tracks callbacks invoked on one specific view.
-class ViewCallback
+class ViewCallback final
 {
 SfxViewShell* mpViewShell;
 int mnView;
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 9f8f074a4568..7b497ae8c600 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -760,7 +760,7 @@ void SwTiledRenderingTest::testPartHash()
 namespace {
 
 /// A view callback tracks callbacks invoked on one specific view.
-class ViewCallback
+class ViewCallback final
 {
 SfxViewShell* mpViewShell;
 int mnView;
@@ -788,7 +788,7 @@ public:
 /// Post-it / annotation payload.
 boost::property_tree::ptree m_aComment;
 
-ViewCallback(SfxViewShell* pViewShell, std::function 
const & rBeforeInstallFunc = {})
+ViewCallback(SfxViewShell* pViewShell = nullptr, 
std::function const & rBeforeInstallFunc = {})
 : m_bOwnCursorInvalidated(false),
   m_nOwnCursorInvalidatedBy(-1),
   m_bOwnCursorAtOrigin(false),
@@ -806,7 +806,7 @@ public:
 if (rBeforeInstallFunc)
 rBeforeInstallFunc(*this);
 
-mpViewShell = pViewShell;
+mpViewShell = pViewShell ? pViewShell : SfxViewShell::Current();
 
mpViewShell->registerLibreOfficeKitViewCallback(::callback, this);
 mnView = SfxLokHelper::getView();
 }
@@ -974,10 +974,10 @@ void SwTiledRenderingTest::testMissingInvalidation()
 {
 // Create two views.
 SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
-ViewCallback aView1(SfxViewShell::Current());
+ViewCallback aView1;
 int nView1 = SfxLokHelper::getView();
 SfxLokHelper::createView();
-ViewCallback aView2(SfxViewShell::Current());
+ViewCallback aView2;
 int nView2 = SfxLokHelper::getView();
 
 // First view: put the cursor into the first word.
@@ -1005,9 +1005,10 @@ void SwTiledRenderingTest::testMissingInvalidation()
 void SwTiledRenderingTest::testViewCursors()
 {
 SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
-ViewCallback aView1(SfxViewShell::Current());
+ViewCallback aView1;
 SfxLokHelper::createView();
-ViewCallback aView2(SfxViewShell::Current());
+ViewCallback aView2;
+
 CPPUNIT_ASSERT(aView1.m_bOwnCursorInvalidated);
 CPPUNIT_ASSERT(aView1.m_bViewCursorInvalidated);
 CPPUNIT_ASSERT(aView2.m_bOwnCursorInvalidated);
@@ -1041,10 +1042,10 @@ void SwTiledRenderingTest::testShapeViewCursors()
 {
 // Load a document and create a view, so we have 2 ones.
 SwXTextDocument* pXTextDocument = createDoc("shape.fodt");
-ViewCallback aView1(SfxViewShell::Current());
+ViewCallback aView1;
 SfxLokHelper::createView();
 
pXTextDocument->initializeForTiledRendering(uno::Sequence());
-ViewCallback aView2(SfxViewShell::Current());
+ViewCallback aView2;
 SwWrtShell* pWrtShell2 = pXTextDocument->GetDocShell()->GetWrtShell();
 
 // Start shape text in the second view.
@@ -1078,10 +1079,10 @@ void SwTiledRenderingTest::testViewCursorVisibility()
 {
 // Load a document that has a shape and create two views.
 SwXTextDocument* pXTextDocument = createDoc("shape.fodt");
-ViewCallback aView1(SfxViewShell::Current());
+ViewCallback aView1;
 

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests6/autocorrectOptions.py   |   20 ++--
 sd/qa/uitest/impress_tests/autocorrectOptions.py |   20 ++--
 sw/qa/uitest/writer_tests5/autocorrectOptions.py |   20 ++--
 3 files changed, 42 insertions(+), 18 deletions(-)

New commits:
commit c7d258d6e8b0ca78003b172806928443e9634416
Author: Xisco Fauli 
AuthorDate: Fri Nov 6 10:43:58 2020 +0100
Commit: Xisco Fauli 
CommitDate: Fri Nov 6 14:57:23 2020 +0100

tdf#137908: uitest: Add asserts to check there is at least 1 element

Change-Id: I7e259043ad493d7e9c4ca34d64a4ca1ed1cf8db5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105391
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests6/autocorrectOptions.py 
b/sc/qa/uitest/calc_tests6/autocorrectOptions.py
index 146e3300f64a..aa425b38a6e8 100644
--- a/sc/qa/uitest/calc_tests6/autocorrectOptions.py
+++ b/sc/qa/uitest/calc_tests6/autocorrectOptions.py
@@ -31,6 +31,8 @@ class autocorrectOptions(UITestCase):
 xreset = xDialog.getChild("reset")
 nrRows = get_state_as_dict(xtabview)["VisibleCount"]
 
+self.assertTrue(int(nrRows) > 0)
+
 #add new rule
 origtext.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
 origtext.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
@@ -59,16 +61,19 @@ class autocorrectOptions(UITestCase):
 delabbrev = xDialog.getChild("delabbrev")
 abbrevlist = xDialog.getChild("abbrevlist")
 
-nrRowsAbb = get_state_as_dict(abbrevlist)["Children"]
+nrRowsAbb = get_state_as_dict(abbrevlist)["VisibleCount"]
+
+self.assertTrue(int(nrRowsAbb) > 0)
+
 abbrev.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
 abbrev.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
 abbrev.executeAction("TYPE", mkPropertyValues({"TEXT":"q"}))
 newabbrev.executeAction("CLICK", tuple())
-nrRowsAbbNew = get_state_as_dict(abbrevlist)["Children"]
+nrRowsAbbNew = get_state_as_dict(abbrevlist)["VisibleCount"]
 nrRowsAbbDiff = int(nrRowsAbbNew) - int(nrRowsAbb)
 self.assertEqual(nrRowsAbbDiff, 1)  #we have +1 rule
 delabbrev.executeAction("CLICK", tuple())
-self.assertEqual(get_state_as_dict(abbrevlist)["Children"], nrRowsAbb) 
  #we have default nr of rules
+self.assertEqual(get_state_as_dict(abbrevlist)["VisibleCount"], 
nrRowsAbb)   #we have default nr of rules
 
 #words with two initial capitals
 double = xDialog.getChild("double")
@@ -76,16 +81,19 @@ class autocorrectOptions(UITestCase):
 deldouble = xDialog.getChild("deldouble")
 doublelist = xDialog.getChild("doublelist")
 
-nrRowsDouble = get_state_as_dict(doublelist)["Children"]
+nrRowsDouble = get_state_as_dict(doublelist)["VisibleCount"]
+
+self.assertTrue(int(nrRowsDouble) > 0)
+
 double.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
 double.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
 double.executeAction("TYPE", mkPropertyValues({"TEXT":"QQqqq"}))
 newdouble.executeAction("CLICK", tuple())
-nrRowsDoubleNew = get_state_as_dict(doublelist)["Children"]
+nrRowsDoubleNew = get_state_as_dict(doublelist)["VisibleCount"]
 nrRowsDoubleDiff = int(nrRowsDoubleNew) - int(nrRowsDouble) #convert 
string and
 self.assertEqual(nrRowsDoubleDiff, 1)  #we have +1 rule
 deldouble.executeAction("CLICK", tuple())
-self.assertEqual(get_state_as_dict(doublelist)["Children"], 
nrRowsDouble)   #we have default nr of rules
+self.assertEqual(get_state_as_dict(doublelist)["VisibleCount"], 
nrRowsDouble)   #we have default nr of rules
 
 xCancelButton = xDialog.getChild("cancel")
 xCancelButton.executeAction("CLICK", tuple())
diff --git a/sd/qa/uitest/impress_tests/autocorrectOptions.py 
b/sd/qa/uitest/impress_tests/autocorrectOptions.py
index 759304e01071..feeabe5435b2 100644
--- a/sd/qa/uitest/impress_tests/autocorrectOptions.py
+++ b/sd/qa/uitest/impress_tests/autocorrectOptions.py
@@ -32,6 +32,8 @@ class autocorrectOptions(UITestCase):
 xreset = xDialog.getChild("reset")
 nrRows = get_state_as_dict(xtabview)["VisibleCount"]
 
+self.assertTrue(int(nrRows) > 0)
+
 #add new rule
 origtext.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
 origtext.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
@@ -60,16 +62,19 @@ class autocorrectOptions(UITestCase):
 delabbrev = xDialog.getChild("delabbrev")
 abbrevlist = xDialog.getChild("abbrevlist")
 
-nrRowsAbb = get_state_as_dict(abbrevlist)["Children"]
+nrRowsAbb = get_state_as_dict(abbrevlist)["VisibleCount"]
+
+self.assertTrue(int(nrRowsAbb) > 0)
+
 

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

[Stephan Bergmann (via logerrit)]

 sc/qa/uitest/calc_tests6/autocorrectOptions.py   |3 +--
 sd/qa/uitest/impress_tests/autocorrectOptions.py |3 +--
 sw/qa/uitest/writer_tests5/autocorrectOptions.py |3 +--
 uitest/uitest/test.py|8 ++--
 4 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 953d2704025ef31198f5546ad95cc54401b592a9
Author: Stephan Bergmann 
AuthorDate: Mon May 25 13:34:47 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon May 25 15:14:04 2020 +0200

Do not time out execute_dialog_through_command

If something goes wrong, better keep the testing Python and the tested 
soffice
process in a state in which the actual problem can (hopefully) be debugged
better.

I happened to run into a hung UITest_options on Linux, where soffice.bin was
still at

> Thread 1 (Thread 0x7fa6371d9fc0 (LWP 1210042)):
> #0  futex_abstimed_wait_cancelable (private=0, abstime=0x7fa633a17f80, 
clockid=, expected=0, futex_word=0x60e24e88) at 
/usr/src/debug/glibc-2.31-17-gab029a2801/sysdeps/nptl/futex-internal.h:320
> #1  __pthread_cond_wait_common (abstime=0x7fa633a17f80, 
clockid=, mutex=0x60e24e38, cond=0x60e24e60) at 
/usr/src/debug/glibc-2.31-17-gab029a2801/nptl/pthread_cond_wait.c:520
> #2  __pthread_cond_clockwait (abstime=0x7fa633a17f80, clockid=, mutex=0x60e24e38, cond=0x60e24e60) at 
/usr/src/debug/glibc-2.31-17-gab029a2801/nptl/pthread_cond_wait.c:677
> #3  __pthread_cond_clockwait (cond=0x60e24e60, mutex=0x60e24e38, 
clockid=, abstime=0x7fa633a17f80) at 
/usr/src/debug/glibc-2.31-17-gab029a2801/nptl/pthread_cond_wait.c:665
> #4  0x7fa66899be08 in 
std::condition_variable::__wait_until_impl > >(std::unique_lock&, 
std::chrono::time_point > > const&) 
(this=0x60e24e60, __lock=..., __atime=...) at 
include/c++/10.0.1/condition_variable:210
> #5  0x7fa66899b895 in 
std::condition_variable::wait_until > >(std::unique_lock&, 
std::chrono::time_point > > const&) 
(this=0x60e24e60, __lock=..., __atime=...) at 
include/c++/10.0.1/condition_variable:120
> #6  0x7fa668997505 in 
std::condition_variable::wait_until >, 
SvpSalInstance::DoYield(bool, bool)::$_2>(std::unique_lock&, 
std::chrono::time_point > > const&, 
SvpSalInstance::DoYield(bool, bool)::$_2) (this=0x60e24e60, __lock=..., 
__atime=..., __p=...) at include/c++/10.0.1/condition_variable:159
> #7  0x7fa668995460 in std::condition_variable::wait_for, SvpSalInstance::DoYield(bool, 
bool)::$_2>(std::unique_lock&, std::chrono::duration > const&, SvpSalInstance::DoYield(bool, bool)::$_2) 
(this=0x60e24e60, __lock=..., __rtime=..., __p=...) at 
include/c++/10.0.1/condition_variable:186
> #8  0x7fa66899408e in SvpSalInstance::DoYield(bool, bool) 
(this=0x61101bc0, bWait=true, bHandleAllCurrentEvents=false) at 
vcl/headless/svpinst.cxx:497
> #9  0x7fa667e7114d in ImplYield(bool, bool) (i_bWait=true, 
i_bAllEvents=false) at vcl/source/app/svapp.cxx:455
> #10 0x7fa667e70708 in Application::Yield() () at 
vcl/source/app/svapp.cxx:519
> #11 0x7fa66498f6cd in Dialog::Execute() (this=0x618003c16480) at 
vcl/source/window/dialog.cxx:1030
> #12 0x7fa667a93812 in SalInstanceDialog::run() (this=0x616000575780) 
at vcl/source/app/salvtables.cxx:1482
> #13 0x7fa2e8711b8d in weld::DialogController::run() 
(this=0x60c004e70d80) at include/vcl/weld.hxx:2289
> #14 0x7fa2e98a6cbc in OfaTreeOptionsDialog::run() 
(this=0x60c004e70d80) at cui/source/options/treeopt.cxx:1937
> #15 0x7fa2e90c4d15 in CuiAbstractController_Impl::Execute() 
(this=0x60300187b4f0) at cui/source/factory/dlgfact.cxx:103
> #16 0x7fa688bc9b2d in SfxApplication::OfaExec_Impl(SfxRequest&) 
(this=0x604006f2fe10, rReq=...) at sfx2/source/appl/appserv.cxx:1311
> #17 0x7fa688b17655 in SfxStubSfxApplicationOfaExec_Impl(SfxShell*, 
SfxRequest&) (pShell=0x604006f2fe10, rReq=...) at 
workdir/SdiTarget/sfx2/sdi/sfxslots.hxx:1270
> #18 0x7fa6892521f6 in SfxShell::CallExec(void (*)(SfxShell*, 
SfxRequest&), SfxRequest&) (this=0x604006f2fe10, pFunc=0x7fa688b17530 
, rReq=...) at 
include/sfx2/shell.hxx:197
> #19 0x7fa6891dbb1f in SfxDispatcher::Call_Impl(SfxShell&, SfxSlot 
const&, SfxRequest&, bool) (this=0x6020013430b0, rShell=..., rSlot=..., 
rReq=..., bRecord=true) at sfx2/source/control/dispatch.cxx:252
> #20 0x7fa6891defd6 in 
SfxDispatcher::PostMsgHandler(std::unique_ptr >) (this=0x6020013430b0, 
pReq=std::unique_ptr = {...}) at 
sfx2/source/control/dispatch.cxx:989
[...]

but the Python process was already at

> Traceback (most recent call first):
>   
>   File "instdir/program/python-core-3.7.7/lib/subprocess.py", line 1611, 
in _try_wait
> (pid, sts) = os.waitpid(self.pid, wait_flags)
>   File "instdir/program/python-core-3.7.7/lib/subprocess.py", line 1653, 
in _wait
> (pid, sts) = 

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

[Stephan Bergmann (via logerrit)]

 sc/qa/uitest/calc_tests6/autocorrectOptions.py   |2 +-
 sd/qa/uitest/impress_tests/autocorrectOptions.py |2 +-
 sw/qa/uitest/writer_tests5/autocorrectOptions.py |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4126a0bfd6a02ac1ba45434963cbbe94f6df6cdb
Author: Stephan Bergmann 
AuthorDate: Tue Mar 26 09:40:45 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Mar 26 10:42:30 2019 +0100

 still timed out

...so lets see whether increasing maxWait even more helps (or whether the
problem is not a too-short timeout after all)

Change-Id: I847904aec1b0ddc9bbf9783f5698f3a239883900
Reviewed-on: https://gerrit.libreoffice.org/69729
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sc/qa/uitest/calc_tests6/autocorrectOptions.py 
b/sc/qa/uitest/calc_tests6/autocorrectOptions.py
index 905f51dcb1da..5ceed8779a56 100644
--- a/sc/qa/uitest/calc_tests6/autocorrectOptions.py
+++ b/sc/qa/uitest/calc_tests6/autocorrectOptions.py
@@ -20,7 +20,7 @@ class autocorrectOptions(UITestCase):
 gridwin = xCalcDoc.getChild("grid_window")
 document = self.ui_test.get_component()
 
-self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", 
maxWait=2*MAX_WAIT)
+self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", 
maxWait=10*MAX_WAIT)
 xDialog = self.xUITest.getTopFocusWindow()
 xTabs = xDialog.getChild("tabcontrol")
 select_pos(xTabs, "0")   #tab replace
diff --git a/sd/qa/uitest/impress_tests/autocorrectOptions.py 
b/sd/qa/uitest/impress_tests/autocorrectOptions.py
index 498daae982dc..d291b67969af 100644
--- a/sd/qa/uitest/impress_tests/autocorrectOptions.py
+++ b/sd/qa/uitest/impress_tests/autocorrectOptions.py
@@ -21,7 +21,7 @@ class autocorrectOptions(UITestCase):
 self.ui_test.close_dialog_through_button(xCancelBtn)
 document = self.ui_test.get_component()
 
-self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", 
maxWait=2*MAX_WAIT)
+self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", 
maxWait=10*MAX_WAIT)
 xDialog = self.xUITest.getTopFocusWindow()
 xTabs = xDialog.getChild("tabcontrol")
 select_pos(xTabs, "0")   #tab replace
diff --git a/sw/qa/uitest/writer_tests5/autocorrectOptions.py 
b/sw/qa/uitest/writer_tests5/autocorrectOptions.py
index 042694b22f68..99a53f789de1 100644
--- a/sw/qa/uitest/writer_tests5/autocorrectOptions.py
+++ b/sw/qa/uitest/writer_tests5/autocorrectOptions.py
@@ -20,7 +20,7 @@ class autocorrectOptions(UITestCase):
 xWriterDoc = self.xUITest.getTopFocusWindow()
 xWriterEdit = xWriterDoc.getChild("writer_edit")
 
-self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", 
maxWait=2*MAX_WAIT)
+self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", 
maxWait=10*MAX_WAIT)
 xDialog = self.xUITest.getTopFocusWindow()
 xTabs = xDialog.getChild("tabcontrol")
 select_pos(xTabs, "0")   #tab replace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sc/qa/uitest/calc_tests6/autocorrectOptions.py   |3 ++-
 sd/qa/uitest/impress_tests/autocorrectOptions.py |3 ++-
 sw/qa/uitest/writer_tests5/autocorrectOptions.py |3 ++-
 uitest/uitest/test.py|4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 87f262dadbbdc1808c5e617003d125ee8df0c501
Author: Stephan Bergmann 
AuthorDate: Sun Mar 24 17:47:02 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Sun Mar 24 18:40:02 2019 +0100

Extend timeout for .uno:AutoCorrectDlg UITests

...which often timed out for the ASan+UBSan Jenkins build, so lets hope 
that it
was just an issue with a too short timeout there

Change-Id: Ie50eb1cc16e9444d1392c95ef5c6d810b9e4bd17
Reviewed-on: https://gerrit.libreoffice.org/69599
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sc/qa/uitest/calc_tests6/autocorrectOptions.py 
b/sc/qa/uitest/calc_tests6/autocorrectOptions.py
index 146e3300f64a..905f51dcb1da 100644
--- a/sc/qa/uitest/calc_tests6/autocorrectOptions.py
+++ b/sc/qa/uitest/calc_tests6/autocorrectOptions.py
@@ -8,6 +8,7 @@ from uitest.framework import UITestCase
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.common import get_state_as_dict
 import time
+from uitest.config import MAX_WAIT
 from uitest.debug import sleep
 from uitest.uihelper.common import select_pos
 
@@ -19,7 +20,7 @@ class autocorrectOptions(UITestCase):
 gridwin = xCalcDoc.getChild("grid_window")
 document = self.ui_test.get_component()
 
-self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg")
+self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", 
maxWait=2*MAX_WAIT)
 xDialog = self.xUITest.getTopFocusWindow()
 xTabs = xDialog.getChild("tabcontrol")
 select_pos(xTabs, "0")   #tab replace
diff --git a/sd/qa/uitest/impress_tests/autocorrectOptions.py 
b/sd/qa/uitest/impress_tests/autocorrectOptions.py
index 759304e01071..498daae982dc 100644
--- a/sd/qa/uitest/impress_tests/autocorrectOptions.py
+++ b/sd/qa/uitest/impress_tests/autocorrectOptions.py
@@ -8,6 +8,7 @@ from uitest.framework import UITestCase
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.common import get_state_as_dict
 import time
+from uitest.config import MAX_WAIT
 from uitest.debug import sleep
 from uitest.uihelper.common import select_pos
 
@@ -20,7 +21,7 @@ class autocorrectOptions(UITestCase):
 self.ui_test.close_dialog_through_button(xCancelBtn)
 document = self.ui_test.get_component()
 
-self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg")
+self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", 
maxWait=2*MAX_WAIT)
 xDialog = self.xUITest.getTopFocusWindow()
 xTabs = xDialog.getChild("tabcontrol")
 select_pos(xTabs, "0")   #tab replace
diff --git a/sw/qa/uitest/writer_tests5/autocorrectOptions.py 
b/sw/qa/uitest/writer_tests5/autocorrectOptions.py
index 925cbb59b293..042694b22f68 100644
--- a/sw/qa/uitest/writer_tests5/autocorrectOptions.py
+++ b/sw/qa/uitest/writer_tests5/autocorrectOptions.py
@@ -8,6 +8,7 @@ from uitest.framework import UITestCase
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.common import get_state_as_dict
 import time
+from uitest.config import MAX_WAIT
 from uitest.debug import sleep
 from uitest.uihelper.common import select_pos
 
@@ -19,7 +20,7 @@ class autocorrectOptions(UITestCase):
 xWriterDoc = self.xUITest.getTopFocusWindow()
 xWriterEdit = xWriterDoc.getChild("writer_edit")
 
-self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg")
+self.ui_test.execute_dialog_through_command(".uno:AutoCorrectDlg", 
maxWait=2*MAX_WAIT)
 xDialog = self.xUITest.getTopFocusWindow()
 xTabs = xDialog.getChild("tabcontrol")
 select_pos(xTabs, "0")   #tab replace
diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py
index 0855a9d4efc5..72b2a810c380 100644
--- a/uitest/uitest/test.py
+++ b/uitest/uitest/test.py
@@ -68,12 +68,12 @@ class UITest(object):
 time_ += DEFAULT_SLEEP
 time.sleep(DEFAULT_SLEEP)
 
-def execute_dialog_through_command(self, command, printNames=False):
+def execute_dialog_through_command(self, command, printNames=False, 
maxWait=MAX_WAIT):
 with EventListener(self._xContext, "DialogExecute", 
printNames=printNames) as event:
 if not self._xUITest.executeDialog(command):
 raise DialogNotExecutedException(command)
 time_ = 0
-while time_ < MAX_WAIT:
+while time_ < maxWait:
 if event.executed:
 time.sleep(DEFAULT_SLEEP)
 return
___
Libreoffice-commits mailing list

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

[László Németh]

 sc/qa/unit/data/xlsx/open-as-read-only.xlsx  |binary
 sc/qa/unit/subsequent_export-test.cxx|   12 
 sd/qa/unit/data/pptx/open-as-read-only.pptx  |binary
 sd/qa/unit/export-tests-ooxml2.cxx   |   12 
 sw/qa/extras/ooxmlexport/data/open-as-read-only.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |7 +++
 6 files changed, 31 insertions(+)

New commits:
commit bbdb6cb8ed0d77eeb2e413b38f29d2084bd8257b
Author: László Németh 
Date:   Tue Jun 26 15:01:05 2018 +0200

tdf#107690 DOCX, XLSX and PPTX unit tests for "Open as read-only"

ie. OOXML export/import of "_MarkAsFinal" MSO document property.

Change-Id: I01f0702d5467e78eb93ce8dce8ba25874839c3e3
Reviewed-on: https://gerrit.libreoffice.org/56475
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sc/qa/unit/data/xlsx/open-as-read-only.xlsx 
b/sc/qa/unit/data/xlsx/open-as-read-only.xlsx
new file mode 100644
index ..e871a95d3997
Binary files /dev/null and b/sc/qa/unit/data/xlsx/open-as-read-only.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 046ce15783d8..105852550b6c 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -207,6 +207,7 @@ public:
 
 void testHiddenRepeatedRowsODS();
 void testHyperlinkTargetFrameODS();
+void testOpenDocumentAsReadOnly();
 
 CPPUNIT_TEST_SUITE(ScExportTest);
 CPPUNIT_TEST(test);
@@ -313,6 +314,7 @@ public:
 
 CPPUNIT_TEST(testHiddenRepeatedRowsODS);
 CPPUNIT_TEST(testHyperlinkTargetFrameODS);
+CPPUNIT_TEST(testOpenDocumentAsReadOnly);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -4023,6 +4025,16 @@ void ScExportTest::testHyperlinkTargetFrameODS()
 CPPUNIT_ASSERT_EQUAL(OUString("_blank"), aTargetFrameExport);
 }
 
+void ScExportTest::testOpenDocumentAsReadOnly()
+{
+ScDocShellRef xDocSh = loadDoc("open-as-read-only.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh->IsSecurityOptOpenReadOnly());
+ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh2->IsSecurityOptOpenReadOnly());
+xDocSh->DoClose();
+xDocSh2->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/qa/unit/data/pptx/open-as-read-only.pptx 
b/sd/qa/unit/data/pptx/open-as-read-only.pptx
new file mode 100644
index ..57a4d32de7f4
Binary files /dev/null and b/sd/qa/unit/data/pptx/open-as-read-only.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index 01ca434b33b3..6ca55d72a4e3 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -145,6 +145,7 @@ public:
 void testTdf90627();
 void testTdf104786();
 void testTdf104789();
+void testOpenDocumentAsReadOnly();
 
 CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
 
@@ -211,6 +212,7 @@ public:
 CPPUNIT_TEST(testTdf90627);
 CPPUNIT_TEST(testTdf104786);
 CPPUNIT_TEST(testTdf104789);
+CPPUNIT_TEST(testOpenDocumentAsReadOnly);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1682,6 +1684,16 @@ void SdOOXMLExportTest2::testTdf104789()
 xDocShRef->DoClose();
 }
 
+void SdOOXMLExportTest2::testOpenDocumentAsReadOnly()
+{
+::sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/open-as-read-only.pptx"),
 PPTX);
+CPPUNIT_ASSERT(xDocShRef->IsSecurityOptOpenReadOnly());
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, );
+CPPUNIT_ASSERT(xDocShRef->IsSecurityOptOpenReadOnly());
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/ooxmlexport/data/open-as-read-only.docx 
b/sw/qa/extras/ooxmlexport/data/open-as-read-only.docx
new file mode 100644
index ..057c67ff6dfe
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/open-as-read-only.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 730765a8c9ff..3e1c80d23ace 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -408,6 +408,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf107969, "tdf107969.docx")
 // SAXParseException: '[word/document.xml line 2]: Extra content at the 
end of the document', Stream 'word/document.xml'.
 }
 
+DECLARE_OOXMLEXPORT_TEST(testOpenDocumentAsReadOnly, "open-as-read-only.docx")
+{
+SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+CPPUNIT_ASSERT(pTextDoc->GetDocShell()->IsSecurityOptOpenReadOnly());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

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

[Ashod Nakashian]

 sc/qa/unit/data/xlsx/customxml.xlsx   |binary
 sc/qa/unit/helper/xpath.cxx   |7 ++-
 sc/qa/unit/helper/xpath.hxx   |6 ++
 sc/qa/unit/subsequent_export-test.cxx |   17 +
 sd/qa/unit/data/pptx/customxml.pptx   |binary
 sd/qa/unit/export-tests-ooxml1.cxx|   23 +++
 sd/qa/unit/sdmodeltestbase.hxx|   21 +
 sw/qa/extras/inc/swmodeltestbase.hxx  |   11 +--
 8 files changed, 74 insertions(+), 11 deletions(-)

New commits:
commit 4de1c0223ceb76556ff1c2b4ea95bfc1d2a0
Author: Ashod Nakashian 
Date:   Mon Feb 26 07:46:09 2018 -0500

oox: unit-tests for custom package preservation

Change-Id: I69d0d7d6bdc8804d0e56be19cd86a699200fc85f
Reviewed-on: https://gerrit.libreoffice.org/50855
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/sc/qa/unit/data/xlsx/customxml.xlsx 
b/sc/qa/unit/data/xlsx/customxml.xlsx
new file mode 100644
index ..53619ae4af30
Binary files /dev/null and b/sc/qa/unit/data/xlsx/customxml.xlsx differ
diff --git a/sc/qa/unit/helper/xpath.cxx b/sc/qa/unit/helper/xpath.cxx
index 2d047b60bf61..562facc84f1e 100644
--- a/sc/qa/unit/helper/xpath.cxx
+++ b/sc/qa/unit/helper/xpath.cxx
@@ -25,14 +25,19 @@ xmlDocPtr XPathHelper::parseExport(ScDocShell& rShell, 
uno::Reference const & 
pTempFile, uno::Reference const & xSFactory, const 
OUString& rFile)
+std::shared_ptr 
XPathHelper::parseExportStream(std::shared_ptr const & 
pTempFile, uno::Reference const & xSFactory, const 
OUString& rFile)
 {
 // Read the XML stream we're interested in.
 uno::Reference xNameAccess = 
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(xSFactory),
 pTempFile->GetURL());
 uno::Reference 
xInputStream(xNameAccess->getByName(rFile), uno::UNO_QUERY);
 CPPUNIT_ASSERT(xInputStream.is());
 std::shared_ptr 
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
+return pStream;
+}
 
+xmlDocPtr XPathHelper::parseExport(std::shared_ptr const & 
pTempFile, uno::Reference const & xSFactory, const 
OUString& rFile)
+{
+std::shared_ptr pStream = parseExportStream(pTempFile, 
xSFactory, rFile);
 return XmlTestTools::parseXmlStream(pStream.get());
 }
 
diff --git a/sc/qa/unit/helper/xpath.hxx b/sc/qa/unit/helper/xpath.hxx
index 6f8c8aa3c170..ddffd31a4585 100644
--- a/sc/qa/unit/helper/xpath.hxx
+++ b/sc/qa/unit/helper/xpath.hxx
@@ -48,6 +48,12 @@ namespace XPathHelper
 const OUString& rFile, sal_Int32 nFormat);
 
 /**
+ * Tries to parse the specified file in the temp file zip container as a 
binary file.
+ */
+SCQAHELPER_DLLPUBLIC std::shared_ptr 
parseExportStream(std::shared_ptr const & pTempFile,
+uno::Reference const & xSFactory, 
const OUString& rFile);
+
+/**
  * Tries to parse the specified file in the temp file zip container as an 
xml file.
  *
  * Should be used when the same exported file is used for testing 
different files in
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 44831588ee0a..595e563dc301 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -162,6 +162,7 @@ public:
 void testCeilingFloorXLS();
 void testCeilingFloorODS();
 
+void testCustomXml();
 
 #if !defined _WIN32
 void testRelativePathsODS();
@@ -268,6 +269,7 @@ public:
 CPPUNIT_TEST(testCeilingFloorODSToXLSX);
 CPPUNIT_TEST(testCeilingFloorXLS);
 CPPUNIT_TEST(testCeilingFloorODS);
+CPPUNIT_TEST(testCustomXml);
 #if !defined(_WIN32)
 CPPUNIT_TEST(testRelativePathsODS);
 #endif
@@ -3041,6 +3043,21 @@ void ScExportTest::testCeilingFloorODS()
 testCeilingFloor(FORMAT_ODS);
 }
 
+void ScExportTest::testCustomXml()
+{
+// Load document and export it to a temporary file
+ScDocShellRef xShell = loadDoc("customxml.", FORMAT_XLSX);
+CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.is());
+
+std::shared_ptr pXPathFile = 
ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+xmlDocPtr pXmlDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"customXml/item1.xml");
+CPPUNIT_ASSERT(pXmlDoc);
+xmlDocPtr pRelsDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"customXml/_rels/item1.xml.rels");
+CPPUNIT_ASSERT(pRelsDoc);
+
+std::shared_ptr pStream = 
XPathHelper::parseExportStream(pXPathFile, m_xSFactory, "ddp/ddpfile.xen");
+CPPUNIT_ASSERT(pStream);
+}
 
 #if !defined _WIN32
 void ScExportTest::testRelativePathsODS()
diff --git a/sd/qa/unit/data/pptx/customxml.pptx 
b/sd/qa/unit/data/pptx/customxml.pptx
new file mode 100644
index ..ca9e8fe70d8f
Binary files /dev/null and b/sd/qa/unit/data/pptx/customxml.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx 
b/sd/qa/unit/export-tests-ooxml1.cxx
index 

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

[Andrea Gelmini]

 sc/qa/unit/tiledrendering/tiledrendering.cxx   |2 +-
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |2 +-
 sw/qa/extras/tiledrendering/tiledrendering.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6d4764af32aeed6d193340dc629ef70c98feef10
Author: Andrea Gelmini 
Date:   Thu Feb 8 10:24:38 2018 +0100

Fix typos

Change-Id: I5d222807706e44d245507484b302ab1b9b2e482c
Reviewed-on: https://gerrit.libreoffice.org/49412
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index e70ec8b519a5..d306b32afd46 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1581,7 +1581,7 @@ void ScTiledRenderingTest::testIMESupport()
 CPPUNIT_ASSERT(pView);
 
 pView->SetCursor(0, 0);
-// sequence of chineese IME compositions when 'nihao' is typed in an IME
+// sequence of chinese IME compositions when 'nihao' is typed in an IME
 const std::vector aUtf8Inputs{ "年", "你", "你好", "你哈", "你好", "你好" };
 std::vector aInputs;
 std::transform(aUtf8Inputs.begin(), aUtf8Inputs.end(),
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index c32e9876971c..6990b25ae3ce 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1957,7 +1957,7 @@ void SdTiledRenderingTest::testIMESupport()
 pViewShell->GetViewFrame()->GetDispatcher()->ExecuteList(SID_ATTR_CHAR,
  
SfxCallMode::SYNCHRON, {  });
 
-// sequence of chineese IME compositions when 'nihao' is typed in an IME
+// sequence of chinese IME compositions when 'nihao' is typed in an IME
 const std::vector aUtf8Inputs{ "年", "你", "你好", "你哈", "你好", "你好" };
 std::vector aInputs;
 std::transform(aUtf8Inputs.begin(), aUtf8Inputs.end(),
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index cfd5fab7dc2f..7848a877cf41 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -2098,7 +2098,7 @@ void SwTiledRenderingTest::testIMESupport()
 SwView* pView = dynamic_cast(SfxViewShell::Current());
 SwWrtShell* pWrtShell = pView->GetWrtShellPtr();
 
-// sequence of chineese IME compositions when 'nihao' is typed in an IME
+// sequence of chinese IME compositions when 'nihao' is typed in an IME
 const std::vector aUtf8Inputs{ "年", "你", "你好", "你哈", "你好", "你好" };
 std::vector aInputs;
 std::transform(aUtf8Inputs.begin(), aUtf8Inputs.end(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/qa/unit/tiledrendering/tiledrendering.cxx   |9 ++---
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |   15 +--
 sw/qa/extras/tiledrendering/tiledrendering.cxx |5 +++--
 3 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit 6209fcbdc694ca0ef22f157d3f5c5b74ed8c76c8
Author: Caolán McNamara 
Date:   Wed Jul 5 10:40:05 2017 +0100

coverity#1414486 Unchecked dynamic_cast

and

coverity#1414482 Unchecked dynamic_cast
coverity#1414480 Unchecked dynamic_cast
coverity#1414479 Unchecked dynamic_cast

Change-Id: Ia33e4cfa5c13beeae5dfa46411f526433d87ea99
Reviewed-on: https://gerrit.libreoffice.org/39568
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index c90032a8c0ca..521735ebd4fc 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1389,7 +1389,9 @@ void ScTiledRenderingTest::testDisableUndoRepair()
 CPPUNIT_ASSERT(dynamic_cast< const SfxStringItem* 
>(aSet1.GetItem(SID_UNDO)));
 CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aSet2.GetItemState(SID_UNDO));
 CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item* 
>(aSet2.GetItem(SID_UNDO)));
-CPPUNIT_ASSERT_EQUAL(static_cast< sal_uInt32 >(SID_REPAIRPACKAGE), 
dynamic_cast< const SfxUInt32Item* >(aSet2.GetItem(SID_UNDO))->GetValue());
+const SfxUInt32Item* pUInt32Item = dynamic_cast(aSet2.GetItem(SID_UNDO));
+CPPUNIT_ASSERT(pUInt32Item);
+CPPUNIT_ASSERT_EQUAL(static_cast< sal_uInt32 >(SID_REPAIRPACKAGE), 
pUInt32Item->GetValue());
 }
 
 // text edit a cell in view #2
@@ -1407,8 +1409,9 @@ void ScTiledRenderingTest::testDisableUndoRepair()
 pView1->GetSlotState(SID_UNDO, nullptr, );
 pView2->GetSlotState(SID_UNDO, nullptr, );
 CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aSet1.GetItemState(SID_UNDO));
-CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item* 
>(aSet1.GetItem(SID_UNDO)));
-CPPUNIT_ASSERT_EQUAL(static_cast< sal_uInt32 >(SID_REPAIRPACKAGE), 
dynamic_cast< const SfxUInt32Item* >(aSet1.GetItem(SID_UNDO))->GetValue());
+const SfxUInt32Item* pUInt32Item = dynamic_cast(aSet1.GetItem(SID_UNDO));
+CPPUNIT_ASSERT(pUInt32Item);
+CPPUNIT_ASSERT_EQUAL(static_cast< sal_uInt32 >(SID_REPAIRPACKAGE), 
pUInt32Item->GetValue());
 CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aSet2.GetItemState(SID_UNDO));
 CPPUNIT_ASSERT(dynamic_cast< const SfxStringItem* 
>(aSet2.GetItem(SID_UNDO)));
 }
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 0ff3e16717c1..715b444e5262 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1196,8 +1196,9 @@ void SdTiledRenderingTest::testUndoLimiting()
 SfxRequest aReq2(SID_UNDO, SfxCallMode::SLOT, 
pXImpressDocument->GetDocShell()->GetDoc()->GetPool());
 aReq2.AppendItem(SfxUInt16Item(SID_UNDO, 1));
 pViewShell2->ExecuteSlot(aReq2);
-CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item* 
>(aReq2.GetReturnValue()));
-CPPUNIT_ASSERT_EQUAL(static_cast< sal_uInt32 >(SID_REPAIRPACKAGE), 
dynamic_cast< const SfxUInt32Item * >(aReq2.GetReturnValue())->GetValue());
+const SfxUInt32Item* pUInt32Item = dynamic_cast(aReq2.GetReturnValue());
+CPPUNIT_ASSERT(pUInt32Item);
+CPPUNIT_ASSERT_EQUAL(static_cast< sal_uInt32 >(SID_REPAIRPACKAGE), 
pUInt32Item->GetValue());
 }
 
 // Now check view1 can undo action
@@ -1800,8 +1801,9 @@ void SdTiledRenderingTest::testDisableUndoRepair()
 pView1->GetViewFrame()->GetBindings().QueryState(SID_UNDO, pItem1);
 pView2->GetViewFrame()->GetBindings().QueryState(SID_UNDO, pItem2);
 CPPUNIT_ASSERT(!dynamic_cast< const SfxUInt32Item* >(pItem1.get()));
-CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item* >(pItem2.get()));
-CPPUNIT_ASSERT_EQUAL(static_cast(SID_REPAIRPACKAGE), 
dynamic_cast< const SfxUInt32Item * >(pItem2.get())->GetValue());
+const SfxUInt32Item* pUInt32Item = dynamic_cast(pItem2.get());
+CPPUNIT_ASSERT(pUInt32Item);
+CPPUNIT_ASSERT_EQUAL(static_cast(SID_REPAIRPACKAGE), 
pUInt32Item->GetValue());
 }
 
 // Insert a character in the second view.
@@ -1818,8 +1820,9 @@ void SdTiledRenderingTest::testDisableUndoRepair()
 pView1->GetViewFrame()->GetBindings().QueryState(SID_UNDO, pItem1);
 pView2->GetViewFrame()->GetBindings().QueryState(SID_UNDO, pItem2);
 CPPUNIT_ASSERT(!dynamic_cast< const SfxUInt32Item* >(pItem2.get()));
-CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item* >(pItem1.get()));
-

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

[Noel Grandin]

 sc/qa/unit/tiledrendering/tiledrendering.cxx   |2 +-
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |2 +-
 sw/qa/extras/tiledrendering/tiledrendering.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0b67b1229a92adf68b614fe53f84bb19780553bf
Author: Noel Grandin 
Date:   Fri Mar 24 10:58:19 2017 +0200

fix tb71 build

after commit 7916487cf4d9603cdbe4c7ffbe9bb3f28b51ce4e
"convert ViewShellId to o3tl::strong_int"

Change-Id: Ie7b8ac51a94c3b9e6d39e397aa3dd5cb42acc6d0
Reviewed-on: https://gerrit.libreoffice.org/35623
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 3de85d2bc6fc..6186ab9964ce 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -42,7 +42,7 @@ using namespace css;
 
 std::ostream& operator<<(std::ostream& os, ViewShellId const & id)
 {
-os << (int)id; return os;
+os << (sal_Int32)id; return os;
 }
 
 namespace
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 4e99d3498006..ca40ef641a99 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -54,7 +54,7 @@ static const char* const DATA_DIRECTORY = 
"/sd/qa/unit/tiledrendering/data/";
 
 static std::ostream& operator<<(std::ostream& os, ViewShellId id)
 {
-os << (int)id; return os;
+os << (sal_Int32)id; return os;
 }
 
 class SdTiledRenderingTest : public SdModelTestBase, public XmlTestTools
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index f1da81e6b193..195cde9c31fc 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -38,7 +38,7 @@ static const char* const DATA_DIRECTORY = 
"/sw/qa/extras/tiledrendering/data/";
 
 static std::ostream& operator<<(std::ostream& os, ViewShellId id)
 {
-os << (int)id; return os;
+os << (sal_Int32)id; return os;
 }
 
 /// Testsuite for the SwXTextDocument methods implementing the 
vcl::ITiledRenderable interface.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/qa/unit/screenshots/screenshots.cxx |3 +++
 sd/qa/unit/dialogs-test.cxx|7 +++
 sw/qa/unit/sw-dialogs-test.cxx |8 
 3 files changed, 18 insertions(+)

New commits:
commit 14af38f429f84a75a9dae60d74d41c57efd709f6
Author: Stephan Bergmann 
Date:   Fri Nov 18 17:29:20 2016 +0100

Missing XComponent.dispose calls in screenshot tests

Change-Id: I5df25a16303719593d40f08d1e7c15e4636a2d02

diff --git a/sc/qa/unit/screenshots/screenshots.cxx 
b/sc/qa/unit/screenshots/screenshots.cxx
index 870f774..0f1e5a2 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -282,6 +282,9 @@ void ScScreenshotTest::testOpeningModalDialogs()
 
 /// process input file containing the UXMLDescriptions of the dialogs to 
dump
 processDialogBatchFile("sc/qa/unit/screenshots/data/screenshots.txt");
+
+mxComponent->dispose();
+mxComponent.clear();
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScScreenshotTest);
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 37104a4..66a4fd6 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -101,6 +101,8 @@ public:
 
 virtual void setUp() override;
 
+void tearDown() override;
+
 // try to open a dialog
 void openAnyDialog();
 
@@ -138,6 +140,11 @@ void SdDialogsTest::setUp()
 CPPUNIT_ASSERT(mpImpressDocument);
 }
 
+void SdDialogsTest::tearDown()
+{
+mxComponent->dispose();
+ScreenshotTest::tearDown();
+}
 
 SdAbstractDialogFactory* SdDialogsTest::getSdAbstractDialogFactory()
 {
diff --git a/sw/qa/unit/sw-dialogs-test.cxx b/sw/qa/unit/sw-dialogs-test.cxx
index 1fb4f7b..a6f96d9 100644
--- a/sw/qa/unit/sw-dialogs-test.cxx
+++ b/sw/qa/unit/sw-dialogs-test.cxx
@@ -43,6 +43,8 @@ public:
 
 void setUp() override;
 
+void tearDown() override;
+
 // try to open a dialog
 void openAnyDialog();
 
@@ -78,6 +80,12 @@ void SwDialogsTest::setUp()
 (*fn)();
 }
 
+void SwDialogsTest::tearDown()
+{
+component_->dispose();
+ScreenshotTest::tearDown();
+}
+
 void SwDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
 // fill map of known dialogs
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sc/qa/unit/tiledrendering/tiledrendering.cxx   |1 +
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |1 +
 sw/qa/extras/tiledrendering/tiledrendering.cxx |1 +
 3 files changed, 3 insertions(+)

New commits:
commit c3c5635b9bbd3de65760409c7f4e72b295b749be
Author: Miklos Vajna 
Date:   Tue Aug 16 13:58:50 2016 +0200

LOK unit tests: document what is a view callback

Change-Id: Ic605ca12cebfb6fd8239829942bbc6a70f45ac06
Reviewed-on: https://gerrit.libreoffice.org/28168
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index d5258c2..8dec1ac 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -370,6 +370,7 @@ void ScTiledRenderingTest::testEmptyColumnSelection()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+/// A view callback tracks callbacks invoked on one specific view.
 class ViewCallback
 {
 public:
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index d3bcd88f..391366a 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -855,6 +855,7 @@ void SdTiledRenderingTest::testResizeTableColumn()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+/// A view callback tracks callbacks invoked on one specific view.
 class ViewCallback
 {
 public:
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index a87359b..d1837c7 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -571,6 +571,7 @@ void SwTiledRenderingTest::testPartHash()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+/// A view callback tracks callbacks invoked on one specific view.
 class ViewCallback
 {
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 sc/qa/unit/subsequent_export-test.cxx  |5 ++---
 sd/qa/unit/export-tests.cxx|4 ++--
 sw/qa/extras/globalfilter/globalfilter.cxx |   16 +++-
 3 files changed, 7 insertions(+), 18 deletions(-)

New commits:
commit e284d7f2526bb01a3dc4b6297ba61b04a0613eff
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Nov 7 12:28:51 2014 +0100

Make these tests weaker to fix build.

Image loss indicator is the empty URL.

Change-Id: I0f8b037dc23bae3d7342d73cfafa4ecc55090ab6

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index cdc7532..7c1de6b 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -2304,8 +2304,7 @@ void ScExportTest::testSwappedOutImageExport()
 {
 OUString sURL;
 XPropSet-getPropertyValue(GraphicURL) = sURL;
-CPPUNIT_ASSERT_EQUAL_MESSAGE(
-sFailedMessage.getStr(), 
OUString(vnd.sun.star.GraphicObject:1262017D9F4CD7A2), sURL);
+CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != 
OUString(vnd.sun.star.GraphicObject:));
 }
 // Check size
 {
@@ -2323,7 +2322,7 @@ void ScExportTest::testSwappedOutImageExport()
 {
 OUString sURL;
 XPropSet-getPropertyValue(GraphicURL) = sURL;
-CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
OUString(vnd.sun.star.GraphicObject:138402580A24B597), sURL);
+CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != 
OUString(vnd.sun.star.GraphicObject:));
 }
 // Check size
 {
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 08f8547..e907e47 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -539,7 +539,7 @@ void SdExportTest::testSwappedOutImageExport()
 {
 OUString sURL;
 XPropSet-getPropertyValue(GraphicURL) = sURL;
-CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
OUString(vnd.sun.star.GraphicObject:1262017D9F4CD7A2), sURL);
+CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != 
OUString(vnd.sun.star.GraphicObject:));
 }
 // Check size
 {
@@ -559,7 +559,7 @@ void SdExportTest::testSwappedOutImageExport()
 {
 OUString sURL;
 XPropSet-getPropertyValue(GraphicURL) = sURL;
-CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
OUString(vnd.sun.star.GraphicObject:138402580A24B597), sURL);
+CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != 
OUString(vnd.sun.star.GraphicObject:));
 }
 // Check size
 {
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx 
b/sw/qa/extras/globalfilter/globalfilter.cxx
index 1fd4331..6a28692 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -81,8 +81,7 @@ void Test::testSwappedOutImageExport()
 {
 OUString sURL;
 XPropSet-getPropertyValue(GraphicURL) = sURL;
-CPPUNIT_ASSERT_EQUAL_MESSAGE(
-sFailedMessage.getStr(), 
OUString(vnd.sun.star.GraphicObject:1262017D9F4CD7A2), sURL);
+CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != 
OUString(vnd.sun.star.GraphicObject:));
 }
 // Check size
 {
@@ -101,17 +100,8 @@ void Test::testSwappedOutImageExport()
 {
 OUString sURL;
 XPropSet-getPropertyValue(GraphicURL) = sURL;
-// HTML filter changes the name, but the real indicater here is 
the null URL.
-if( aFilterNames[nFilter] == HTML (StarWriter) )
-{
-CPPUNIT_ASSERT_MESSAGE(
-sFailedMessage.getStr(), sURL != 
OUString(vnd.sun.star.GraphicObject:));
-}
-else
-{
-CPPUNIT_ASSERT_EQUAL_MESSAGE(
-sFailedMessage.getStr(), 
OUString(vnd.sun.star.GraphicObject:138402580A24B597), sURL);
-}
+CPPUNIT_ASSERT_MESSAGE(
+sFailedMessage.getStr(), sURL != 
OUString(vnd.sun.star.GraphicObject:));
 }
 // Check size
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 sc/qa/unit/subsequent_export-test.cxx  |4 ++--
 sd/qa/unit/export-tests.cxx|8 
 sw/qa/extras/globalfilter/globalfilter.cxx |4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit aeebbec4e8fb77a24b231362844d5a3f0f05e3c2
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Nov 7 15:16:59 2014 +0100

Build fix: back to C++98

Change-Id: I5aa74c17f3274a130f76a25fc7bbb184b3f5c69b

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 7c1de6b..2d74ed5 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -2265,7 +2265,7 @@ void ScExportTest::testFunctionsExcel2010ODS()
 
 void ScExportTest::testSwappedOutImageExport()
 {
-std::vectorOUString aFilterNames = {
+const OUString aFilterNames[] = {
 calc8,
 MS Excel 97,
 Calc Office Open XML,
@@ -2277,7 +2277,7 @@ void ScExportTest::testSwappedOutImageExport()
 
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
 xBatch);
 xBatch-commit();
 
-for( size_t nFilter = 0; nFilter  aFilterNames.size(); ++nFilter )
+for( size_t nFilter = 0; nFilter  4; ++nFilter )
 {
 // Check whether the export code swaps in the image which was swapped 
out before.
 ScDocShellRef xDocSh = loadDoc(document_with_two_images., ODS);
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index e907e47..c1caa46 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -498,7 +498,7 @@ void SdExportTest::testFdo79731()
 void SdExportTest::testSwappedOutImageExport()
 {
 // Problem was with the swapped out images, which were not swapped in 
during export.
-static const std::vectorsal_Int32 vFormats = {
+const sal_Int32 vFormats[] = {
 ODP,
 PPT,
 PPTX,
@@ -509,17 +509,17 @@ void SdExportTest::testSwappedOutImageExport()
 
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
 xBatch);
 xBatch-commit();
 
-for( size_t nExportFormat = 0; nExportFormat  vFormats.size(); 
++nExportFormat )
+for( size_t nExportFormat = 0; nExportFormat  3; ++nExportFormat )
 {
 // Load the original file with one image
 ::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc(/sd/qa/unit/data/odp/document_with_two_images.odp), 
ODP);
-const OString sFailedMessage = OString(Failed on filter: ) + 
OString(aFileFormats[nExportFormat].pFilterName);
+const OString sFailedMessage = OString(Failed on filter: ) + 
OString(aFileFormats[nExportFormat]].pFilterName);
 
 // Export the document and import again for a check
 uno::Reference lang::XComponent  xComponent(xDocShRef-GetModel(), 
uno::UNO_QUERY);
 uno::Referenceframe::XStorable xStorable(xComponent, uno::UNO_QUERY);
 utl::MediaDescriptor aMediaDescriptor;
-aMediaDescriptor[FilterName] = 
OStringToOUString(OString(aFileFormats[nExportFormat].pFilterName), 
RTL_TEXTENCODING_UTF8);
+aMediaDescriptor[FilterName] = 
OStringToOUString(OString(aFileFormats[vFormats[nExportFormat]].pFilterName), 
RTL_TEXTENCODING_UTF8);
 
 utl::TempFile aTempFile;
 aTempFile.EnableKillingFile();
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx 
b/sw/qa/extras/globalfilter/globalfilter.cxx
index 6a28692..af5b2fa 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -33,14 +33,14 @@ public:
 
 void Test::testSwappedOutImageExport()
 {
-std::vectorOUString aFilterNames = {
+const OUString aFilterNames[] = {
 writer8,
 Rich Text Format,
 MS Word 97,
 Office Open XML Text,
 };
 
-for( size_t nFilter = 0; nFilter  aFilterNames.size(); ++nFilter )
+for( size_t nFilter = 0; nFilter  4; ++nFilter )
 {
 // Check whether the export code swaps in the image which was swapped 
out before by auto mechanism
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 sc/qa/unit/subsequent_export-test.cxx  |2 +-
 sd/qa/unit/export-tests.cxx|2 +-
 sw/qa/extras/globalfilter/globalfilter.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b6a41916f351fd2d6c8934a9f35ec72159ee5009
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Nov 7 17:01:08 2014 +0100

Use SAL_N_ELEMENTS

Change-Id: I3d26823a93fd0925ef5e71affd941cd51219ab9e

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 2d74ed5..87a5f21 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -2277,7 +2277,7 @@ void ScExportTest::testSwappedOutImageExport()
 
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
 xBatch);
 xBatch-commit();
 
-for( size_t nFilter = 0; nFilter  4; ++nFilter )
+for( size_t nFilter = 0; nFilter  SAL_N_ELEMENTS(aFilterNames); ++nFilter 
)
 {
 // Check whether the export code swaps in the image which was swapped 
out before.
 ScDocShellRef xDocSh = loadDoc(document_with_two_images., ODS);
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 244c4e8..dfa2edc 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -509,7 +509,7 @@ void SdExportTest::testSwappedOutImageExport()
 
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
 xBatch);
 xBatch-commit();
 
-for( size_t nExportFormat = 0; nExportFormat  3; ++nExportFormat )
+for( size_t nExportFormat = 0; nExportFormat  SAL_N_ELEMENTS(vFormats); 
++nExportFormat )
 {
 // Load the original file with one image
 ::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc(/sd/qa/unit/data/odp/document_with_two_images.odp), 
ODP);
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx 
b/sw/qa/extras/globalfilter/globalfilter.cxx
index af5b2fa..9f7d603 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -40,7 +40,7 @@ void Test::testSwappedOutImageExport()
 Office Open XML Text,
 };
 
-for( size_t nFilter = 0; nFilter  4; ++nFilter )
+for( size_t nFilter = 0; nFilter  SAL_N_ELEMENTS(aFilterNames); ++nFilter 
)
 {
 // Check whether the export code swaps in the image which was swapped 
out before by auto mechanism
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits