uitest: Combine all table tests in one file

Change-Id: Ief374a02eabed4587874cb6182742ae86c084d62
Reviewed-on: https://gerrit.libreoffice.org/38474
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

5 files changed, 121 insertions, 178 deletions

diff --git a/uitest/writer_tests/insertTableDialog.py b/uitest/writer_tests/insertTableDialog.py
new file mode 100644
index 000000000000..60bd9d3342a6
--- /dev/null
+++ b/uitest/writer_tests/insertTableDialog.py
@@ -0,0 +1,121 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+class WriterInsertTableDialog(UITestCase):
+
+    def insert_table(self, name, rows, cols):
+
+        self.ui_test.create_doc_in_start_center("writer")
+
+        self.ui_test.execute_dialog_through_command(".uno:InsertTable")
+        xDialog = self.xUITest.getTopFocusWindow()
+
+        xNameEdit = xDialog.getChild("nameedit")
+
+        xNameEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+        xNameEdit.executeAction("TYPE", mkPropertyValues({"TEXT": name}))
+
+        xColSpin = xDialog.getChild("colspin")
+        xColSpin.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+        xColSpin.executeAction("TYPE", mkPropertyValues({"TEXT": str(cols)}))
+
+        xRowSpin = xDialog.getChild("rowspin")
+        xRowSpin.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+        xRowSpin.executeAction("TYPE", mkPropertyValues({"TEXT": str(rows)}))
+
+        xOkBtn = xDialog.getChild("ok")
+        xOkBtn.executeAction("CLICK", tuple())
+
+        document = self.ui_test.get_component()
+
+        tables = document.getTextTables()
+
+        self.assertEqual(tables[0].getName(), name)
+        self.assertEqual(len(tables[0].getRows()), rows)
+        self.assertEqual(len(tables[0].getColumns()), cols)
+
+    def insertTextIntoCell(self, table, cellName, text ):
+        tableText = table.getCellByName( cellName )
+        tableText.setString( text )
+
+    def test_tdf80663(self):
+
+        self.insert_table("Test1", 2, 2)
+
+        document = self.ui_test.get_component()
+
+        tables = document.getTextTables()
+        self.xUITest.executeCommand(".uno:DeleteRows")
+
+        self.assertEqual(len(tables[0].getRows()), 1)
+        self.assertEqual(len(tables[0].getColumns()), 2)
+
+        self.xUITest.executeCommand(".uno:Undo")
+
+        self.assertEqual(len(tables[0].getRows()), 2)
+        self.assertEqual(len(tables[0].getColumns()), 2)
+
+        self.ui_test.close_doc()
+
+    def test_tdf96067(self):
+
+        self.insert_table("Test2", 3, 3)
+
+        self.xUITest.executeCommand(".uno:SelectTable")
+        self.xUITest.executeCommand(".uno:InsertRowsBefore")
+
+        document = self.ui_test.get_component()
+        tables = document.getTextTables()
+        self.assertEqual(len(tables[0].getRows()), 6)
+        self.assertEqual(len(tables[0].getColumns()), 3)
+
+        self.xUITest.executeCommand(".uno:Undo")
+
+        self.ui_test.close_doc()
+
+    def test_tdf104158(self):
+
+        self.insert_table("Test3", 2, 2)
+
+        self.ui_test.execute_dialog_through_command(".uno:TableNumberFormatDialog")
+
+        xNumberFormatDlg = self.xUITest.getTopFocusWindow()
+
+        xOkBtn = xNumberFormatDlg.getChild("ok")
+        xOkBtn.executeAction("CLICK", tuple())
+
+        self.ui_test.close_doc()
+
+    def test_tdf87199(self):
+
+        self.insert_table("Test4", 2, 1)
+
+        document = self.ui_test.get_component()
+        tables = document.getTextTables()
+        self.insertTextIntoCell(tables[0], "A1", "test" )
+        self.insertTextIntoCell(tables[0], "A2", "test" )
+
+        cursor = tables[0].getCellByName( "A1" ).createTextCursor()
+
+        self.xUITest.executeCommand(".uno:EntireColumn")
+
+        self.xUITest.executeCommand(".uno:MergeCells")
+
+        tables = document.getTextTables()
+        self.assertEqual(len(tables[0].getRows()), 1)
+        self.assertEqual(len(tables[0].getColumns()), 1)
+
+        self.xUITest.executeCommand(".uno:Undo")
+
+        self.assertEqual(len(tables[0].getRows()), 2)
+        self.assertEqual(len(tables[0].getColumns()), 1)
+
+        self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/writer_tests/tdf104158.py b/uitest/writer_tests/tdf104158.py
deleted file mode 100644
index 8c0f1bdc5166..000000000000
--- a/uitest/writer_tests/tdf104158.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-from uitest.framework import UITestCase
-
-class tdf104158(UITestCase):
-
-    def test_number_format_dialog(self):
-
-        self.ui_test.create_doc_in_start_center("writer")
-
-        self.ui_test.execute_dialog_through_command(".uno:InsertTable")
-
-        xInsertDlg = self.xUITest.getTopFocusWindow()
-
-        xOkBtn = xInsertDlg.getChild("ok")
-        xOkBtn.executeAction("CLICK", tuple())
-
-        document = self.ui_test.get_component()
-
-        tables = document.getTextTables()
-        self.assertEqual(len(tables[0].getRows()), 2)
-        self.assertEqual(len(tables[0].getColumns()), 2)
-
-        self.ui_test.execute_dialog_through_command(".uno:TableNumberFormatDialog")
-
-        xNumberFormatDlg = self.xUITest.getTopFocusWindow()
-
-        xOkBtn = xNumberFormatDlg.getChild("ok")
-        xOkBtn.executeAction("CLICK", tuple())
-
-        self.ui_test.close_doc()
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/writer_tests/tdf80663.py b/uitest/writer_tests/tdf80663.py
deleted file mode 100644
index 916a49b33ba3..000000000000
--- a/uitest/writer_tests/tdf80663.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-from uitest.framework import UITestCase
-
-class tdf80663(UITestCase):
-
-    def test_delete_row_and_undo(self):
-
-        self.ui_test.create_doc_in_start_center("writer")
-
-        self.ui_test.execute_dialog_through_command(".uno:InsertTable")
-
-        xInsertDlg = self.xUITest.getTopFocusWindow()
-
-        xOkBtn = xInsertDlg.getChild("ok")
-        xOkBtn.executeAction("CLICK", tuple())
-
-        document = self.ui_test.get_component()
-
-        tables = document.getTextTables()
-        self.assertEqual(len(tables[0].getRows()), 2)
-        self.assertEqual(len(tables[0].getColumns()), 2)
-
-        self.xUITest.executeCommand(".uno:DeleteRows")
-
-        self.assertEqual(len(tables[0].getRows()), 1)
-        self.assertEqual(len(tables[0].getColumns()), 2)
-
-        self.xUITest.executeCommand(".uno:Undo")
-
-        self.assertEqual(len(tables[0].getRows()), 2)
-        self.assertEqual(len(tables[0].getColumns()), 2)
-
-        self.ui_test.close_doc()
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/writer_tests/tdf87199.py b/uitest/writer_tests/tdf87199.py
deleted file mode 100644
index d98761de29c1..000000000000
--- a/uitest/writer_tests/tdf87199.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-from uitest.framework import UITestCase
-
-class tdf87199(UITestCase):
-
-    def insertTextIntoCell(self, table, cellName, text ):
-        tableText = table.getCellByName( cellName )
-        tableText.setString( text )
-
-    def test_merge_column(self):
-
-        self.ui_test.create_doc_in_start_center("writer")
-
-        self.ui_test.execute_dialog_through_command(".uno:InsertTable")
-
-        xInsertDlg = self.xUITest.getTopFocusWindow()
-
-
-        xColSpin = xInsertDlg.getChild("colspin")
-        xColSpin.executeAction("DOWN", tuple())
-
-        xOkBtn = xInsertDlg.getChild("ok")
-        xOkBtn.executeAction("CLICK", tuple())
-
-        document = self.ui_test.get_component()
-
-        tables = document.getTextTables()
-        self.assertEqual(len(tables[0].getRows()), 2)
-        self.assertEqual(len(tables[0].getColumns()), 1)
-
-        self.insertTextIntoCell(tables[0], "A1", "test" )
-        self.insertTextIntoCell(tables[0], "A2", "test" )
-
-        cursor = tables[0].getCellByName( "A1" ).createTextCursor()
-
-        self.xUITest.executeCommand(".uno:EntireColumn")
-
-        self.xUITest.executeCommand(".uno:MergeCells")
-
-        tables = document.getTextTables()
-        self.assertEqual(len(tables[0].getRows()), 1)
-        self.assertEqual(len(tables[0].getColumns()), 1)
-
-        self.xUITest.executeCommand(".uno:Undo")
-
-        self.assertEqual(len(tables[0].getRows()), 2)
-        self.assertEqual(len(tables[0].getColumns()), 1)
-
-        self.ui_test.close_doc()
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/writer_tests/tdf96067.py b/uitest/writer_tests/tdf96067.py
deleted file mode 100644
index 12c32776b55a..000000000000
--- a/uitest/writer_tests/tdf96067.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-from uitest.framework import UITestCase
-
-class tdf96067(UITestCase):
-
-    def test_insert_row_and_undo(self):
-
-        self.ui_test.create_doc_in_start_center("writer")
-
-        self.ui_test.execute_dialog_through_command(".uno:InsertTable")
-
-        xInsertDlg = self.xUITest.getTopFocusWindow()
-
-        xRowSpin = xInsertDlg.getChild("rowspin")
-        xRowSpin.executeAction("UP", tuple())
-
-        xColSpin = xInsertDlg.getChild("colspin")
-        xColSpin.executeAction("UP", tuple())
-
-        xOkBtn = xInsertDlg.getChild("ok")
-        xOkBtn.executeAction("CLICK", tuple())
-
-        document = self.ui_test.get_component()
-
-        tables = document.getTextTables()
-        self.assertEqual(len(tables[0].getRows()), 3)
-        self.assertEqual(len(tables[0].getColumns()), 3)
-
-        self.xUITest.executeCommand(".uno:SelectTable")
-        self.xUITest.executeCommand(".uno:InsertRowsBefore")
-
-        tables = document.getTextTables()
-        self.assertEqual(len(tables[0].getRows()), 6)
-        self.assertEqual(len(tables[0].getColumns()), 3)
-
-        self.xUITest.executeCommand(".uno:Undo")
-
-        self.ui_test.close_doc()
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab: