[Libreoffice-commits] core.git: sw/Module_sw.mk sw/qa sw/UITest_writer_tests3.mk sw/UITest_writer_tests4.mk
Miklos Vajna
vmiklos at collabora.co.uk
Tue Jul 3 17:35:03 UTC 2018
sw/Module_sw.mk | 2
sw/UITest_writer_tests3.mk | 16 ++++++
sw/UITest_writer_tests4.mk | 16 ++++++
sw/qa/uitest/writer_tests/insertCaption.py | 76 -----------------------------
4 files changed, 34 insertions(+), 76 deletions(-)
New commits:
commit 457acbfa304ac8bda0755c9ca8f1e1e22e490ac8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Jul 3 17:18:55 2018 +0200
UITest_writer_tests: split this into 4 parts
Before: make -sr -j2 UITest_writer_tests UITest_writer_tests2 -> 5m9,863s
After: make -sr -j4 UITest_writer_tests UITest_writer_tests2 UITest_writer_tests3 UITest_writer_tests4 -> 2m21,734s
Again just assuming that each .py file means the same amount of CPU cost
(which may not be true exactly).
Change-Id: I9c4144c40eb1116d4b999bbba68e2fbef440af7b
Reviewed-on: https://gerrit.libreoffice.org/56880
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index a05c310abdb9..0d94ec50b513 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -135,6 +135,8 @@ $(eval $(call gb_Module_add_screenshot_targets,sw,\
$(eval $(call gb_Module_add_uicheck_targets,sw,\
UITest_writer_tests \
UITest_writer_tests2 \
+ UITest_writer_tests3 \
+ UITest_writer_tests4 \
))
endif
diff --git a/sw/UITest_writer_tests3.mk b/sw/UITest_writer_tests3.mk
new file mode 100644
index 000000000000..ec1b47e9b344
--- /dev/null
+++ b/sw/UITest_writer_tests3.mk
@@ -0,0 +1,16 @@
+# This file is part of the LibreOffice project.
+#
+# 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/.
+#
+
+$(eval $(call gb_UITest_UITest,writer_tests3))
+
+$(eval $(call gb_UITest_add_modules,writer_tests3,$(SRCDIR)/sw/qa/uitest,\
+ writer_tests3/ \
+))
+
+$(eval $(call gb_UITest_set_defs,writer_tests3, \
+ TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
+))
diff --git a/sw/UITest_writer_tests4.mk b/sw/UITest_writer_tests4.mk
new file mode 100644
index 000000000000..8b4b5285e2d4
--- /dev/null
+++ b/sw/UITest_writer_tests4.mk
@@ -0,0 +1,16 @@
+# This file is part of the LibreOffice project.
+#
+# 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/.
+#
+
+$(eval $(call gb_UITest_UITest,writer_tests4))
+
+$(eval $(call gb_UITest_add_modules,writer_tests4,$(SRCDIR)/sw/qa/uitest,\
+ writer_tests4/ \
+))
+
+$(eval $(call gb_UITest_set_defs,writer_tests4, \
+ TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
+))
diff --git a/sw/qa/uitest/writer_tests/insertCaption.py b/sw/qa/uitest/writer_tests/insertCaption.py
deleted file mode 100644
index 6cf30022cf64..000000000000
--- a/sw/qa/uitest/writer_tests/insertCaption.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from uitest.framework import UITestCase
-from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import get_state_as_dict
-import time
-from uitest.debug import sleep
-from uitest.uihelper.common import select_pos
-
-class insertCaption(UITestCase):
-
- def test_insert_caption(self):
- self.ui_test.create_doc_in_start_center("writer")
- document = self.ui_test.get_component()
- self.ui_test.execute_dialog_through_command(".uno:InsertFrame") # insert frame
- xDialogFr = self.xUITest.getTopFocusWindow()
-
- xWidth = xDialogFr.getChild("width")
- xWidth.executeAction("UP", tuple())
- xWidth.executeAction("UP", tuple())
-
- xHeight = xDialogFr.getChild("height")
- xHeight.executeAction("UP", tuple())
- xHeight.executeAction("UP", tuple())
-
- xOkBtn=xDialogFr.getChild("ok")
- xOkBtn.executeAction("CLICK", tuple())
-
- self.assertEqual(document.TextFrames.getCount(), 1)
-
- self.ui_test.execute_dialog_through_command(".uno:InsertCaptionDialog") # caption
- xDialogCaption = self.xUITest.getTopFocusWindow()
-
- xCapt = xDialogCaption.getChild("caption_edit")
- xCapt.executeAction("TYPE", mkPropertyValues({"TEXT":"Caption"}))
-
- xOkBtn=xDialogCaption.getChild("ok")
- xOkBtn.executeAction("CLICK", tuple())
-
- xFrame = document.TextFrames.getByIndex(0)
-
- self.assertEqual(document.TextFrames.getByIndex(0).Text.String, "\nText 1: Caption")
-
- self.ui_test.execute_dialog_through_command(".uno:InsertCaptionDialog") # 2nd caption
- xDialogCaption = self.xUITest.getTopFocusWindow()
- xCapt = xDialogCaption.getChild("caption_edit")
- xCapt.executeAction("TYPE", mkPropertyValues({"TEXT":"Caption2"}))
- xSep = xDialogCaption.getChild("separator_edit")
- xSep.executeAction("TYPE", mkPropertyValues({"TEXT":"-"}))
-
- xOkBtn=xDialogCaption.getChild("ok")
- xOkBtn.executeAction("CLICK", tuple())
-
- self.assertEqual(document.TextFrames.getByIndex(0).Text.String, "\nText 1: Caption\nText 2-: Caption2")
-
- self.ui_test.execute_dialog_through_command(".uno:InsertCaptionDialog") # 3. caption
- xDialogCaption = self.xUITest.getTopFocusWindow()
- xCapt = xDialogCaption.getChild("caption_edit")
- xCapt.executeAction("TYPE", mkPropertyValues({"TEXT":"Caption3"}))
- xSep = xDialogCaption.getChild("separator_edit")
- xSep.executeAction("TYPE", mkPropertyValues({"TEXT":"-"}))
- xPos = xDialogCaption.getChild("position")
- select_pos(xPos, "1")
-
- xOkBtn=xDialogCaption.getChild("ok")
- xOkBtn.executeAction("CLICK", tuple())
-
- self.assertEqual(document.TextFrames.getByIndex(0).Text.String, "\nText 1: Caption\nText 2-: Caption2\nText 3--: Caption3")
-
- self.ui_test.close_doc()
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
diff --git a/sw/qa/uitest/writer_tests/deleteAllComments.py b/sw/qa/uitest/writer_tests/writer_tests2
similarity index 100%
rename from sw/qa/uitest/writer_tests/deleteAllComments.py
rename to sw/qa/uitest/writer_tests/writer_tests2
diff --git a/sw/qa/uitest/writer_tests/asianPhoneticGuide.py b/sw/qa/uitest/writer_tests2/asianPhoneticGuide.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/asianPhoneticGuide.py
rename to sw/qa/uitest/writer_tests2/asianPhoneticGuide.py
diff --git a/sw/qa/uitest/writer_tests/bookmark.py b/sw/qa/uitest/writer_tests2/bookmark.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/bookmark.py
rename to sw/qa/uitest/writer_tests2/bookmark.py
diff --git a/sw/qa/uitest/writer_tests/documentProperties.py b/sw/qa/uitest/writer_tests2/documentProperties.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/documentProperties.py
rename to sw/qa/uitest/writer_tests2/documentProperties.py
diff --git a/sw/qa/uitest/writer_tests/exchangeDatabase.py b/sw/qa/uitest/writer_tests2/exchangeDatabase.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/exchangeDatabase.py
rename to sw/qa/uitest/writer_tests2/exchangeDatabase.py
diff --git a/sw/qa/uitest/writer_tests/formatBulletsNumbering.py b/sw/qa/uitest/writer_tests2/formatBulletsNumbering.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/formatBulletsNumbering.py
rename to sw/qa/uitest/writer_tests2/formatBulletsNumbering.py
diff --git a/sw/qa/uitest/writer_tests/formatCharacter.py b/sw/qa/uitest/writer_tests2/formatCharacter.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/formatCharacter.py
rename to sw/qa/uitest/writer_tests2/formatCharacter.py
diff --git a/sw/qa/uitest/writer_tests/formatParagraph.py b/sw/qa/uitest/writer_tests2/formatParagraph.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/formatParagraph.py
rename to sw/qa/uitest/writer_tests2/formatParagraph.py
diff --git a/sw/qa/uitest/writer_tests/horizontalLine.py b/sw/qa/uitest/writer_tests2/horizontalLine.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/horizontalLine.py
rename to sw/qa/uitest/writer_tests2/horizontalLine.py
diff --git a/sw/qa/uitest/writer_tests/insertFootnote.py b/sw/qa/uitest/writer_tests2/insertFootnote.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/insertFootnote.py
rename to sw/qa/uitest/writer_tests2/insertFootnote.py
diff --git a/sw/qa/uitest/writer_tests/insertEndnote.py b/sw/qa/uitest/writer_tests3/insertEndnote.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/insertEndnote.py
rename to sw/qa/uitest/writer_tests3/insertEndnote.py
diff --git a/sw/qa/uitest/writer_tests/insertEnvelope.py b/sw/qa/uitest/writer_tests3/insertEnvelope.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/insertEnvelope.py
rename to sw/qa/uitest/writer_tests3/insertEnvelope.py
diff --git a/sw/qa/uitest/writer_tests/insertFootEndnote.py b/sw/qa/uitest/writer_tests3/insertFootEndnote.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/insertFootEndnote.py
rename to sw/qa/uitest/writer_tests3/insertFootEndnote.py
diff --git a/sw/qa/uitest/writer_tests/insertPageFooter.py b/sw/qa/uitest/writer_tests3/insertPageFooter.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/insertPageFooter.py
rename to sw/qa/uitest/writer_tests3/insertPageFooter.py
diff --git a/sw/qa/uitest/writer_tests/insertSignatureLine.py b/sw/qa/uitest/writer_tests3/insertSignatureLine.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/insertSignatureLine.py
rename to sw/qa/uitest/writer_tests3/insertSignatureLine.py
diff --git a/sw/qa/uitest/writer_tests/lineNumbering.py b/sw/qa/uitest/writer_tests3/lineNumbering.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/lineNumbering.py
rename to sw/qa/uitest/writer_tests3/lineNumbering.py
diff --git a/sw/qa/uitest/writer_tests/sort.py b/sw/qa/uitest/writer_tests3/sort.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/sort.py
rename to sw/qa/uitest/writer_tests3/sort.py
diff --git a/sw/qa/uitest/writer_tests/specialCharacter.py b/sw/qa/uitest/writer_tests3/specialCharacter.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/specialCharacter.py
rename to sw/qa/uitest/writer_tests3/specialCharacter.py
diff --git a/sw/qa/uitest/writer_tests/tdf106746.py b/sw/qa/uitest/writer_tests4/tdf106746.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/tdf106746.py
rename to sw/qa/uitest/writer_tests4/tdf106746.py
diff --git a/sw/qa/uitest/writer_tests/tdf108124.py b/sw/qa/uitest/writer_tests4/tdf108124.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/tdf108124.py
rename to sw/qa/uitest/writer_tests4/tdf108124.py
diff --git a/sw/qa/uitest/writer_tests/tdf113252.py b/sw/qa/uitest/writer_tests4/tdf113252.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/tdf113252.py
rename to sw/qa/uitest/writer_tests4/tdf113252.py
diff --git a/sw/qa/uitest/writer_tests/tdf113284.py b/sw/qa/uitest/writer_tests4/tdf113284.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/tdf113284.py
rename to sw/qa/uitest/writer_tests4/tdf113284.py
diff --git a/sw/qa/uitest/writer_tests/tdf115088.py b/sw/qa/uitest/writer_tests4/tdf115088.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/tdf115088.py
rename to sw/qa/uitest/writer_tests4/tdf115088.py
diff --git a/sw/qa/uitest/writer_tests/tdf115572.py b/sw/qa/uitest/writer_tests4/tdf115572.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/tdf115572.py
rename to sw/qa/uitest/writer_tests4/tdf115572.py
diff --git a/sw/qa/uitest/writer_tests/tdf115573.py b/sw/qa/uitest/writer_tests4/tdf115573.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/tdf115573.py
rename to sw/qa/uitest/writer_tests4/tdf115573.py
diff --git a/sw/qa/uitest/writer_tests/tdf49683.py b/sw/qa/uitest/writer_tests4/tdf49683.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/tdf49683.py
rename to sw/qa/uitest/writer_tests4/tdf49683.py
diff --git a/sw/qa/uitest/writer_tests/tdf51352.py b/sw/qa/uitest/writer_tests4/tdf51352.py
similarity index 100%
rename from sw/qa/uitest/writer_tests/tdf51352.py
rename to sw/qa/uitest/writer_tests4/tdf51352.py
More information about the Libreoffice-commits
mailing list