sw/qa/uitest/writer_tests4/start.py | 27 ---------------------------
uitest/Module_uitest.mk | 8 --------
uitest/UITest_writer_demo1.mk | 20 --------------------
uitest/UITest_writer_demo2.mk | 20 --------------------
uitest/UITest_writer_demo3.mk | 20 --------------------
uitest/UITest_writer_demo4.mk | 20 --------------------
uitest/UITest_writer_demo5.mk | 20 --------------------
uitest/UITest_writer_demo6.mk | 20 --------------------
uitest/UITest_writer_demo7.mk | 20 --------------------
uitest/UITest_writer_demo8.mk | 20 --------------------
10 files changed, 195 deletions(-)
New commits:
commit 5711858e00f542f1770d7ff3c035e8a2fdb72266
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Oct 26 16:07:20 2020 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Oct 26 19:51:23 2020 +0100
uitest: move all writer tests to sw/qa/uitest
remove a few duplicated ones
Change-Id: I25b031c8fe11ae28f55978f8a25528c307a908e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104814
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/uitest/writer_tests/data/3pages.odt b/sw/qa/uitest/data/3pages.odt
similarity index 100%
rename from uitest/writer_tests/data/3pages.odt
rename to sw/qa/uitest/data/3pages.odt
diff --git a/uitest/writer_tests4/insertTableDialog.py
b/sw/qa/uitest/table/insertTableDialog.py
similarity index 100%
rename from uitest/writer_tests4/insertTableDialog.py
rename to sw/qa/uitest/table/insertTableDialog.py
diff --git a/uitest/writer_tests7/autoredactDialog.py
b/sw/qa/uitest/writer_tests3/autoredactDialog.py
similarity index 100%
rename from uitest/writer_tests7/autoredactDialog.py
rename to sw/qa/uitest/writer_tests3/autoredactDialog.py
diff --git a/uitest/writer_tests8/customizeDialog.py
b/sw/qa/uitest/writer_tests3/customizeDialog.py
similarity index 100%
rename from uitest/writer_tests8/customizeDialog.py
rename to sw/qa/uitest/writer_tests3/customizeDialog.py
diff --git a/uitest/writer_tests7/goToPage.py
b/sw/qa/uitest/writer_tests3/goToPage.py
similarity index 100%
rename from uitest/writer_tests7/goToPage.py
rename to sw/qa/uitest/writer_tests3/goToPage.py
diff --git a/uitest/writer_tests8/tdf79236.py
b/sw/qa/uitest/writer_tests3/tdf79236.py
similarity index 100%
rename from uitest/writer_tests8/tdf79236.py
rename to sw/qa/uitest/writer_tests3/tdf79236.py
diff --git a/uitest/writer_tests6/insertBreakDialog.py
b/sw/qa/uitest/writer_tests4/insertBreakDialog.py
similarity index 100%
rename from uitest/writer_tests6/insertBreakDialog.py
rename to sw/qa/uitest/writer_tests4/insertBreakDialog.py
diff --git a/uitest/writer_tests6/insertPageHeader.py
b/sw/qa/uitest/writer_tests4/insertPageHeader.py
similarity index 100%
rename from uitest/writer_tests6/insertPageHeader.py
rename to sw/qa/uitest/writer_tests4/insertPageHeader.py
diff --git a/uitest/writer_tests5/spellDialog.py
b/sw/qa/uitest/writer_tests4/spellDialog.py
similarity index 100%
rename from uitest/writer_tests5/spellDialog.py
rename to sw/qa/uitest/writer_tests4/spellDialog.py
diff --git a/uitest/writer_tests4/start.py b/sw/qa/uitest/writer_tests4/start.py
similarity index 64%
rename from uitest/writer_tests4/start.py
rename to sw/qa/uitest/writer_tests4/start.py
index 5851e8eff7c9..c514d39d8c52 100644
--- a/uitest/writer_tests4/start.py
+++ b/sw/qa/uitest/writer_tests4/start.py
@@ -10,8 +10,6 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
from uitest.uihelper.common import get_state_as_dict, type_text
-import time
-
class SimpleWriterTest(UITestCase):
def test_start_writer(self):
@@ -26,17 +24,6 @@ class SimpleWriterTest(UITestCase):
self.ui_test.close_doc()
- def test_type_text(self):
-
- self.ui_test.create_doc_in_start_center("writer")
-
- xWriterDoc = self.xUITest.getTopFocusWindow()
- xWriterEdit = xWriterDoc.getChild("writer_edit")
-
- type_text(xWriterEdit, "This is my first writer text written through
the UI testing")
-
- self.ui_test.close_doc()
-
def test_goto_first_page(self):
self.ui_test.create_doc_in_start_center("writer")
@@ -53,18 +40,4 @@ class SimpleWriterTest(UITestCase):
self.ui_test.close_doc()
-
- def test_select_text(self):
-
- self.ui_test.create_doc_in_start_center("writer")
-
- xWriterDoc = self.xUITest.getTopFocusWindow()
- xWriterEdit = xWriterDoc.getChild("writer_edit")
-
- type_text(xWriterEdit, "This is my first writer text written through
the UI testing")
-
- xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS":
"0", "END_POS": "4"}))
-
- self.ui_test.close_doc()
-
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/writer_tests2/tdf92611.py
b/sw/qa/uitest/writer_tests4/tdf92611.py
similarity index 100%
rename from uitest/writer_tests2/tdf92611.py
rename to sw/qa/uitest/writer_tests4/tdf92611.py
diff --git a/uitest/Module_uitest.mk b/uitest/Module_uitest.mk
index bd65a088e301..647dd574f1fd 100644
--- a/uitest/Module_uitest.mk
+++ b/uitest/Module_uitest.mk
@@ -12,14 +12,6 @@ $(eval $(call gb_Module_Module,uitest))
$(eval $(call gb_Module_add_uicheck_targets,uitest,\
UITest_calc_demo \
- UITest_writer_demo1 \
- UITest_writer_demo2 \
- UITest_writer_demo3 \
- UITest_writer_demo4 \
- UITest_writer_demo5 \
- UITest_writer_demo6 \
- UITest_writer_demo7 \
- UITest_writer_demo8 \
UITest_impress_demo \
UITest_demo_ui \
UITest_math_demo \
diff --git a/uitest/UITest_writer_demo1.mk b/uitest/UITest_writer_demo1.mk
deleted file mode 100644
index e951e4ad2b9d..000000000000
--- a/uitest/UITest_writer_demo1.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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_demo1))
-
-$(eval $(call gb_UITest_add_modules,writer_demo1,$(SRCDIR)/uitest,\
- writer_tests1/ \
-))
-
-$(eval $(call gb_UITest_set_defs,writer_demo1, \
- TDOC="$(SRCDIR)/uitest/writer_tests/data" \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/uitest/UITest_writer_demo2.mk b/uitest/UITest_writer_demo2.mk
deleted file mode 100644
index 6f74f97ab75a..000000000000
--- a/uitest/UITest_writer_demo2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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_demo2))
-
-$(eval $(call gb_UITest_add_modules,writer_demo2,$(SRCDIR)/uitest,\
- writer_tests2/ \
-))
-
-$(eval $(call gb_UITest_set_defs,writer_demo2, \
- TDOC="$(SRCDIR)/uitest/writer_tests/data" \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/uitest/UITest_writer_demo3.mk b/uitest/UITest_writer_demo3.mk
deleted file mode 100644
index 9f6302670493..000000000000
--- a/uitest/UITest_writer_demo3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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_demo3))
-
-$(eval $(call gb_UITest_add_modules,writer_demo3,$(SRCDIR)/uitest,\
- writer_tests3/ \
-))
-
-$(eval $(call gb_UITest_set_defs,writer_demo3, \
- TDOC="$(SRCDIR)/uitest/writer_tests/data" \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/uitest/UITest_writer_demo4.mk b/uitest/UITest_writer_demo4.mk
deleted file mode 100644
index 5ad99203efd5..000000000000
--- a/uitest/UITest_writer_demo4.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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_demo4))
-
-$(eval $(call gb_UITest_add_modules,writer_demo4,$(SRCDIR)/uitest,\
- writer_tests4/ \
-))
-
-$(eval $(call gb_UITest_set_defs,writer_demo4, \
- TDOC="$(SRCDIR)/uitest/writer_tests/data" \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/uitest/UITest_writer_demo5.mk b/uitest/UITest_writer_demo5.mk
deleted file mode 100644
index 1f44c66660e8..000000000000
--- a/uitest/UITest_writer_demo5.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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_demo5))
-
-$(eval $(call gb_UITest_add_modules,writer_demo5,$(SRCDIR)/uitest,\
- writer_tests5/ \
-))
-
-$(eval $(call gb_UITest_set_defs,writer_demo5, \
- TDOC="$(SRCDIR)/uitest/writer_tests/data" \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/uitest/UITest_writer_demo6.mk b/uitest/UITest_writer_demo6.mk
deleted file mode 100644
index 9c1e040a0d24..000000000000
--- a/uitest/UITest_writer_demo6.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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_demo6))
-
-$(eval $(call gb_UITest_add_modules,writer_demo6,$(SRCDIR)/uitest,\
- writer_tests6/ \
-))
-
-$(eval $(call gb_UITest_set_defs,writer_demo6, \
- TDOC="$(SRCDIR)/uitest/writer_tests/data" \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/uitest/UITest_writer_demo7.mk b/uitest/UITest_writer_demo7.mk
deleted file mode 100644
index 10fc45008562..000000000000
--- a/uitest/UITest_writer_demo7.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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_demo7))
-
-$(eval $(call gb_UITest_add_modules,writer_demo7,$(SRCDIR)/uitest,\
- writer_tests7/ \
-))
-
-$(eval $(call gb_UITest_set_defs,writer_demo7, \
- TDOC="$(SRCDIR)/uitest/writer_tests/data" \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/uitest/UITest_writer_demo8.mk b/uitest/UITest_writer_demo8.mk
deleted file mode 100644
index 7c9eabceb9bf..000000000000
--- a/uitest/UITest_writer_demo8.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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_demo8))
-
-$(eval $(call gb_UITest_add_modules,writer_demo8,$(SRCDIR)/uitest,\
- writer_tests8/ \
-))
-
-$(eval $(call gb_UITest_set_defs,writer_demo8, \
- TDOC="$(SRCDIR)/uitest/writer_tests/data" \
-))
-
-# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
