summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/Module_sc.mk2
-rw-r--r--sc/UITest_function_wizard.mk (renamed from uitest/UITest_calc_demo.mk)11
-rw-r--r--sc/UITest_manual_tests.mk (renamed from uitest/UITest_manual_tests.mk)4
-rw-r--r--sc/qa/uitest/calc_tests6/gridwin.py (renamed from uitest/calc_tests/gridwin.py)17
-rw-r--r--sc/qa/uitest/calc_tests7/tdf117987.py (renamed from uitest/calc_tests/tdf117987.py)0
-rw-r--r--sc/qa/uitest/chart/create_chart.py (renamed from uitest/calc_tests/create_chart.py)0
-rw-r--r--sc/qa/uitest/chart/edit_chart.py (renamed from uitest/calc_tests/edit_chart.py)0
-rw-r--r--sc/qa/uitest/data/cell_recalc.ods (renamed from uitest/manual_tests/data/cell_recalc.ods)bin34064 -> 34064 bytes
-rw-r--r--sc/qa/uitest/function_wizard/function_wizard.py (renamed from uitest/calc_tests/function_wizard.py)0
-rw-r--r--sc/qa/uitest/function_wizard/tdf123479.py (renamed from sc/qa/uitest/calc_tests7/tdf123479.py)0
-rw-r--r--sc/qa/uitest/function_wizard/tdf132173.py (renamed from sc/qa/uitest/calc_tests7/tdf132173.py)0
-rw-r--r--sc/qa/uitest/manual_tests/calc.py (renamed from uitest/manual_tests/calc.py)0
-rw-r--r--sc/qa/uitest/manual_tests/more_calc.py (renamed from uitest/manual_tests/more_calc.py)0
-rw-r--r--sc/qa/uitest/range_name/create_range_name.py (renamed from uitest/calc_tests/create_range_name.py)0
-rw-r--r--uitest/Module_uitest.mk2
-rw-r--r--uitest/calc_tests/__init__.py0
-rw-r--r--uitest/calc_tests/about_test.py25
-rw-r--r--uitest/calc_tests/gridwindow.py43
-rw-r--r--uitest/calc_tests/input_window.py33
-rw-r--r--uitest/manual_tests/__init__.py0
-rw-r--r--uitest/test_main.py1
21 files changed, 12 insertions, 126 deletions
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 4c8ba1e49eb2..bb378e8f378a 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -257,6 +257,8 @@ $(eval $(call gb_Module_add_uicheck_targets,sc,\
UITest_calc_tests8 \
UITest_calc_dialogs \
UITest_calc_tests9 \
+ UITest_function_wizard \
+ UITest_manual_tests \
))
endif
diff --git a/uitest/UITest_calc_demo.mk b/sc/UITest_function_wizard.mk
index 9869300a0675..220fa6d36e21 100644
--- a/uitest/UITest_calc_demo.mk
+++ b/sc/UITest_function_wizard.mk
@@ -7,9 +7,14 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UITest_UITest,calc_demo))
+$(eval $(call gb_UITest_UITest,function_wizard))
-$(eval $(call gb_UITest_add_modules,calc_demo,$(SRCDIR)/uitest,\
- calc_tests/ \
+$(eval $(call gb_UITest_add_modules,function_wizard,$(SRCDIR)/sc/qa/uitest,\
+ function_wizard/ \
))
+
+$(eval $(call gb_UITest_set_defs,function_wizard, \
+ TDOC="$(SRCDIR)/sc/qa/uitest/data" \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/uitest/UITest_manual_tests.mk b/sc/UITest_manual_tests.mk
index 187ab8317b5f..94089544d98e 100644
--- a/uitest/UITest_manual_tests.mk
+++ b/sc/UITest_manual_tests.mk
@@ -9,12 +9,12 @@
$(eval $(call gb_UITest_UITest,manual_tests))
-$(eval $(call gb_UITest_add_modules,manual_tests,$(SRCDIR)/uitest,\
+$(eval $(call gb_UITest_add_modules,manual_tests,$(SRCDIR)/sc/qa/uitest,\
manual_tests/ \
))
$(eval $(call gb_UITest_set_defs,manual_tests, \
- TDOC="$(SRCDIR)/uitest/manual_tests/data" \
+ TDOC="$(SRCDIR)/sc/qa/uitest/data" \
))
# vim: set noet sw=4 ts=4:
diff --git a/uitest/calc_tests/gridwin.py b/sc/qa/uitest/calc_tests6/gridwin.py
index 7c9c87de0b03..9a0f241989ec 100644
--- a/uitest/calc_tests/gridwin.py
+++ b/sc/qa/uitest/calc_tests6/gridwin.py
@@ -12,23 +12,6 @@ from uitest.framework import UITestCase
class GridWinTest(UITestCase):
- def test_select_object(self):
-
- self.ui_test.create_doc_in_start_center("calc")
- xCalcDoc = self.xUITest.getTopFocusWindow()
- xGridWindow = xCalcDoc.getChild("grid_window")
-
- selectProps = mkPropertyValues({"CELL": "B10"})
- xGridWindow.executeAction("SELECT", selectProps)
-
- xGridWindow.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
-
- xGridWindow.executeAction("ACTIVATE", tuple())
-
- xGridWindow.executeAction("DESELECT", tuple())
-
- self.ui_test.close_doc()
-
def test_select_sheet(self):
self.ui_test.create_doc_in_start_center("calc")
diff --git a/uitest/calc_tests/tdf117987.py b/sc/qa/uitest/calc_tests7/tdf117987.py
index 3de0b176ed01..3de0b176ed01 100644
--- a/uitest/calc_tests/tdf117987.py
+++ b/sc/qa/uitest/calc_tests7/tdf117987.py
diff --git a/uitest/calc_tests/create_chart.py b/sc/qa/uitest/chart/create_chart.py
index cced0ac63d37..cced0ac63d37 100644
--- a/uitest/calc_tests/create_chart.py
+++ b/sc/qa/uitest/chart/create_chart.py
diff --git a/uitest/calc_tests/edit_chart.py b/sc/qa/uitest/chart/edit_chart.py
index d74a8c2eced3..d74a8c2eced3 100644
--- a/uitest/calc_tests/edit_chart.py
+++ b/sc/qa/uitest/chart/edit_chart.py
diff --git a/uitest/manual_tests/data/cell_recalc.ods b/sc/qa/uitest/data/cell_recalc.ods
index 4b125fd2e2e6..4b125fd2e2e6 100644
--- a/uitest/manual_tests/data/cell_recalc.ods
+++ b/sc/qa/uitest/data/cell_recalc.ods
Binary files differ
diff --git a/uitest/calc_tests/function_wizard.py b/sc/qa/uitest/function_wizard/function_wizard.py
index 13b83350927f..13b83350927f 100644
--- a/uitest/calc_tests/function_wizard.py
+++ b/sc/qa/uitest/function_wizard/function_wizard.py
diff --git a/sc/qa/uitest/calc_tests7/tdf123479.py b/sc/qa/uitest/function_wizard/tdf123479.py
index 046bf83035a3..046bf83035a3 100644
--- a/sc/qa/uitest/calc_tests7/tdf123479.py
+++ b/sc/qa/uitest/function_wizard/tdf123479.py
diff --git a/sc/qa/uitest/calc_tests7/tdf132173.py b/sc/qa/uitest/function_wizard/tdf132173.py
index d74f7dc744ca..d74f7dc744ca 100644
--- a/sc/qa/uitest/calc_tests7/tdf132173.py
+++ b/sc/qa/uitest/function_wizard/tdf132173.py
diff --git a/uitest/manual_tests/calc.py b/sc/qa/uitest/manual_tests/calc.py
index 1b7897983a38..1b7897983a38 100644
--- a/uitest/manual_tests/calc.py
+++ b/sc/qa/uitest/manual_tests/calc.py
diff --git a/uitest/manual_tests/more_calc.py b/sc/qa/uitest/manual_tests/more_calc.py
index 08aeb654e449..08aeb654e449 100644
--- a/uitest/manual_tests/more_calc.py
+++ b/sc/qa/uitest/manual_tests/more_calc.py
diff --git a/uitest/calc_tests/create_range_name.py b/sc/qa/uitest/range_name/create_range_name.py
index 1babca7c0a58..1babca7c0a58 100644
--- a/uitest/calc_tests/create_range_name.py
+++ b/sc/qa/uitest/range_name/create_range_name.py
diff --git a/uitest/Module_uitest.mk b/uitest/Module_uitest.mk
index 647dd574f1fd..0ea8a94cfe30 100644
--- a/uitest/Module_uitest.mk
+++ b/uitest/Module_uitest.mk
@@ -11,9 +11,7 @@
$(eval $(call gb_Module_Module,uitest))
$(eval $(call gb_Module_add_uicheck_targets,uitest,\
- UITest_calc_demo \
UITest_impress_demo \
UITest_demo_ui \
UITest_math_demo \
- UITest_manual_tests \
))
diff --git a/uitest/calc_tests/__init__.py b/uitest/calc_tests/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/uitest/calc_tests/__init__.py
+++ /dev/null
diff --git a/uitest/calc_tests/about_test.py b/uitest/calc_tests/about_test.py
deleted file mode 100644
index c6dc75b939dc..000000000000
--- a/uitest/calc_tests/about_test.py
+++ /dev/null
@@ -1,25 +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
-
-class AboutDlgTest(UITestCase):
-
- def test_about_dlg(self):
-
- self.ui_test.create_doc_in_start_center("calc")
-
- self.ui_test.execute_dialog_through_command(".uno:About")
-
- xAboutDlg = self.xUITest.getTopFocusWindow()
-
- xCloseBtn = xAboutDlg.getChild("btnClose")
- self.ui_test.close_dialog_through_button(xCloseBtn)
-
- self.ui_test.close_doc()
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/calc_tests/gridwindow.py b/uitest/calc_tests/gridwindow.py
deleted file mode 100644
index 37afacd008e2..000000000000
--- a/uitest/calc_tests/gridwindow.py
+++ /dev/null
@@ -1,43 +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 libreoffice.uno.propertyvalue import mkPropertyValues
-
-from uitest.uihelper.calc import enter_text_to_cell
-
-from uitest.framework import UITestCase
-
-class GridWindowTest(UITestCase):
-
- def test_input(self):
-
- self.ui_test.create_doc_in_start_center("calc")
- xTopWindow = self.xUITest.getTopFocusWindow()
-
- xGridWindow = xTopWindow.getChild("grid_window")
-
- enter_text_to_cell(xGridWindow, "C3", "=A1")
- enter_text_to_cell(xGridWindow, "A1", "2")
-
- self.ui_test.close_doc()
-
- def test_special_keys(self):
-
- self.ui_test.create_doc_in_start_center("calc")
- xTopWindow = self.xUITest.getTopFocusWindow()
-
- xGridWindow = xTopWindow.getChild("grid_window")
-
- selectProps = mkPropertyValues({"CELL": "C3"})
- xGridWindow.executeAction("SELECT", selectProps)
-
- typeProps = mkPropertyValues({"KEYCODE": "CTRL+DOWN"})
- xGridWindow.executeAction("TYPE", typeProps)
-
- self.ui_test.close_doc()
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/calc_tests/input_window.py b/uitest/calc_tests/input_window.py
deleted file mode 100644
index eea8b53d950f..000000000000
--- a/uitest/calc_tests/input_window.py
+++ /dev/null
@@ -1,33 +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 uitest.uihelper.common import get_state_as_dict, type_text
-from libreoffice.uno.propertyvalue import mkPropertyValues
-
-from libreoffice.calc.document import get_cell_by_position
-
-import time
-
-class InputWindowTest(UITestCase):
-
- def test_input_window(self):
-
- self.ui_test.create_doc_in_start_center("calc")
-
- xCalcDoc = self.xUITest.getTopFocusWindow()
- document = self.ui_test.get_component()
-
- xInputWin = xCalcDoc.getChild("sc_input_window")
-
- type_text(xInputWin, "test")
- xInputWin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"}))
- self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), "test")
-
- self.ui_test.close_doc()
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/manual_tests/__init__.py b/uitest/manual_tests/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/uitest/manual_tests/__init__.py
+++ /dev/null
diff --git a/uitest/test_main.py b/uitest/test_main.py
index e1737947f536..3b2de433ca24 100644
--- a/uitest/test_main.py
+++ b/uitest/test_main.py
@@ -9,7 +9,6 @@ import sys
import getopt
import os
import unittest
-import calc_tests
import importlib
import importlib.machinery
generated by cgit (git 2.34.1) at 2024-07-18 20:02:55 +0000