uitest: Combine all table tests in one file

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

uitest/writer_tests/tdf87199.py → uitest/writer_tests/insertTableDialog.py

@@ -5,34 +5,99 @@
 #
 
 from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
 
-class tdf87199(UITestCase):
+class WriterInsertTableDialog(UITestCase):
 
-    def insertTextIntoCell(self, table, cellName, text ):
-        tableText = table.getCellByName( cellName )
-        tableText.setString( text )
-
-    def test_merge_column(self):
+    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")
 
-        xInsertDlg = self.xUITest.getTopFocusWindow()
+        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)}))
 
-        xColSpin = xInsertDlg.getChild("colspin")
-        xColSpin.executeAction("DOWN", tuple())
+        xRowSpin = xDialog.getChild("rowspin")
+        xRowSpin.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+        xRowSpin.executeAction("TYPE", mkPropertyValues({"TEXT": str(rows)}))
 
-        xOkBtn = xInsertDlg.getChild("ok")
+        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()), 1)
+        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" )
 

uitest/writer_tests/tdf104158.py

-#
-# 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:

uitest/writer_tests/tdf80663.py

-#
-# 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:

uitest/writer_tests/tdf96067.py

-#
-# 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: