From d8ac63a94d7a8b96cdc4737e24b5f6107a7f572a Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Thu, 21 Nov 2024 23:46:07 +0000 Subject: [PATCH 01/19] Set env RIDESETTINGS to path of test settings file --- .gitignore | 2 +- src/robotide/preferences/settings.py | 10 +- utest/application/test_updatenotifier.py | 252 ++++++++++++----------- utest/resources/fake.cfg | 30 +-- utest/resources/mocks.py | 9 + 5 files changed, 164 insertions(+), 139 deletions(-) diff --git a/.gitignore b/.gitignore index 390806b7e..7509fdde1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,4 @@ MANIFEST *.iml .coverage coverage.xml - +utest/resources/fake.cfg diff --git a/src/robotide/preferences/settings.py b/src/robotide/preferences/settings.py index 688b4b432..4a516ce85 100644 --- a/src/robotide/preferences/settings.py +++ b/src/robotide/preferences/settings.py @@ -356,12 +356,16 @@ def __init__(self, path=None): if path: self._default_path = path else: - self._default_path = os.path.join(os.path.dirname(__file__), 'settings.cfg') - # print("DEBUG: RideSettings, default_path %s\n" % self._default_path) + path = os.getenv('RIDESETTINGS', 'user') + if path == 'user': + self._default_path = os.path.join(os.path.dirname(__file__), 'settings.cfg') + elif path.endswith('.cfg') and os.path.exists(path): + self._default_path = path + # print(f"DEBUG: settings.py RideSettings SETTINGS {self._default_path=}") user_path = initialize_settings(self._default_path) Settings.__init__(self, user_path) self._settings_dir = os.path.dirname(user_path) - # print("DEBUG: RideSettings, self._settings_dir %s\n" % self._settings_dir) + # print(f"DEBUG: RideSettings, self._settings_dir={self._settings_dir}") self.get('install root', os.path.dirname(os.path.dirname(__file__))) self.executable = self.get('executable', EXECUTABLE) if self.executable != EXECUTABLE: diff --git a/utest/application/test_updatenotifier.py b/utest/application/test_updatenotifier.py index a56855787..b1ff6c66d 100644 --- a/utest/application/test_updatenotifier.py +++ b/utest/application/test_updatenotifier.py @@ -12,6 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +import os import pytest import sys import typing @@ -19,6 +20,8 @@ import time import urllib +from unittest import mock + from robotide.application.updatenotifier import UpdateNotifierController, UpdateDialog IS_WINDOWS = sys.platform=='win32' @@ -137,10 +140,10 @@ def tearDown(self): # wx.CallAfter(self.app.ExitMainLoop) # self.app.MainLoop() # With this here, there is no Segmentation fault # wx.CallAfter(wx.Exit) + self.app.ExitMainLoop() self.app.Destroy() self.app = None - def _callback(self, version, url, settings, notebook): __ = notebook self.assertFalse(self._callback_called) @@ -173,160 +176,179 @@ def internal_settings(check_for_updates: typing.Union[bool, None] = True, LASTUPDATECHECK: last_update_check} def test_normal_update(self): - settings = self.internal_settings() - ctrl = self._update_notifier_controller(settings, self.notebook, '0', '1', 'http://xyz.abc.efg.di') - ctrl.notify_update_if_needed(self._callback) - self.assertTrue(self._callback_called) - self.assertEqual('1', self._newest_version) - self.assertEqual('http://xyz.abc.efg.di', self._url) - self.assertTrue(settings[CHECKFORUPDATES]) - self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) - # Uncomment next lines if you want to see the app - # wx.CallLater(5000, self.app.ExitMainLoop) - # self.app.MainLoop() + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings() + ctrl = self._update_notifier_controller(settings, self.notebook, '0', '1', 'http://xyz.abc.efg.di') + ctrl.notify_update_if_needed(self._callback) + self.assertTrue(self._callback_called) + self.assertEqual('1', self._newest_version) + self.assertEqual('http://xyz.abc.efg.di', self._url) + self.assertTrue(settings[CHECKFORUPDATES]) + self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) + # Uncomment next lines if you want to see the app + # wx.CallLater(5000, self.app.ExitMainLoop) + # self.app.MainLoop() def test_update_when_trunk_version(self): - settings = self.internal_settings() - ctrl = self._update_notifier_controller(settings, self.notebook, '2.0', '2.0.1') - ctrl.notify_update_if_needed(self._callback) - self.assertTrue(self._callback_called) - self.assertEqual('2.0.1', self._newest_version) - self.assertTrue(settings[CHECKFORUPDATES]) - self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings() + ctrl = self._update_notifier_controller(settings, self.notebook, '2.0', '2.0.1') + ctrl.notify_update_if_needed(self._callback) + self.assertTrue(self._callback_called) + self.assertEqual('2.0.1', self._newest_version) + self.assertTrue(settings[CHECKFORUPDATES]) + self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) def test_last_update_done_less_than_a_week_ago(self): - original_time = time.time() - 60 * 60 * 24 * 3 - settings = self.internal_settings(last_update_check=original_time) - ctrl = UpdateNotifierController(settings, self.notebook) - ctrl.notify_update_if_needed(self._callback) - self.assertTrue(settings[CHECKFORUPDATES]) - self.assertEqual(original_time, settings[LASTUPDATECHECK]) - self.assertFalse(self._callback_called) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + original_time = time.time() - 60 * 60 * 24 * 3 + settings = self.internal_settings(last_update_check=original_time) + ctrl = UpdateNotifierController(settings, self.notebook) + ctrl.notify_update_if_needed(self._callback) + self.assertTrue(settings[CHECKFORUPDATES]) + self.assertEqual(original_time, settings[LASTUPDATECHECK]) + self.assertFalse(self._callback_called) def test_check_for_updates_is_false(self): - settings = self.internal_settings(check_for_updates=False) - original_time = settings[LASTUPDATECHECK] - ctrl = UpdateNotifierController(settings, self.notebook) - ctrl.notify_update_if_needed(self._callback) - self.assertFalse(settings[CHECKFORUPDATES]) - self.assertEqual(original_time, settings[LASTUPDATECHECK]) - self.assertFalse(self._callback_called) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings(check_for_updates=False) + original_time = settings[LASTUPDATECHECK] + ctrl = UpdateNotifierController(settings, self.notebook) + ctrl.notify_update_if_needed(self._callback) + self.assertFalse(settings[CHECKFORUPDATES]) + self.assertEqual(original_time, settings[LASTUPDATECHECK]) + self.assertFalse(self._callback_called) def test_no_update_found(self): - settings = self.internal_settings() - ctrl = self._update_notifier_controller(settings, self.notebook, '0.55', '0.55') - ctrl.notify_update_if_needed(self._callback) - self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) - self.assertFalse(self._callback_called) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings() + ctrl = self._update_notifier_controller(settings, self.notebook, '0.55', '0.55') + ctrl.notify_update_if_needed(self._callback) + self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) + self.assertFalse(self._callback_called) def test_no_update_found_dev(self): - settings = self.internal_settings() - ctrl = self._update_notifier_controller(settings, self.notebook, '0.56', '0.56') - ctrl.notify_update_if_needed(self._callback, ignore_check_condition=False, show_no_update=False) - self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) - self.assertFalse(self._callback_called) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings() + ctrl = self._update_notifier_controller(settings, self.notebook, '0.56', '0.56') + ctrl.notify_update_if_needed(self._callback, ignore_check_condition=False, show_no_update=False) + self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) + self.assertFalse(self._callback_called) @pytest.mark.skipif(IS_WINDOWS, reason='Causes: Windows fatal exception: access violation') def test_no_update_found_dev_notify(self): - settings = self.internal_settings() - ctrl = self._update_notifier_controller(settings, self.notebook, '0.55', '0.55') - ctrl.notify_update_if_needed(self._callback, ignore_check_condition=True, show_no_update=True) - self.assertFalse(self._callback_called) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings() + ctrl = self._update_notifier_controller(settings, self.notebook, '0.55', '0.55') + ctrl.notify_update_if_needed(self._callback, ignore_check_condition=True, show_no_update=True) + self.assertFalse(self._callback_called) def test_first_run_sets_settings_correctly_and_checks_for_updates(self): - settings = self.internal_settings(check_for_updates=None, last_update_check=None) - ctrl = self._update_notifier_controller(settings, self.notebook,'1.0.2', '1.0.2') - ctrl.notify_update_if_needed(self._callback) - self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) - self.assertTrue(settings[CHECKFORUPDATES]) - self.assertFalse(self._callback_called) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings(check_for_updates=None, last_update_check=None) + ctrl = self._update_notifier_controller(settings, self.notebook,'1.0.2', '1.0.2') + ctrl.notify_update_if_needed(self._callback) + self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) + self.assertTrue(settings[CHECKFORUPDATES]) + self.assertFalse(self._callback_called) def test_first_run_sets_settings_correctly_and_finds_an_update(self): - settings = self.internal_settings(check_for_updates=None, last_update_check=None) - ctrl = self._update_notifier_controller(settings, self.notebook, '1.2', '2.0') - ctrl.notify_update_if_needed(self._callback) - self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) - self.assertTrue(settings[CHECKFORUPDATES]) - self.assertTrue(self._callback_called) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings(check_for_updates=None, last_update_check=None) + ctrl = self._update_notifier_controller(settings, self.notebook, '1.2', '2.0') + ctrl.notify_update_if_needed(self._callback) + self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) + self.assertTrue(settings[CHECKFORUPDATES]) + self.assertTrue(self._callback_called) def test_checking_timeouts(self): - settings = self.internal_settings() - ctrl = UpdateNotifierController(settings, self.notebook) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings() + ctrl = UpdateNotifierController(settings, self.notebook) - def throw_timeout_error(): - raise urllib.error.URLError('timeout') + def throw_timeout_error(): + raise urllib.error.URLError('timeout') - ctrl._get_newest_version = throw_timeout_error - ctrl.notify_update_if_needed(self._callback) - self.assertGreater(settings[LASTUPDATECHECK], time.time() - 10) # The dialog timeout in 10 seconds - self.assertFalse(self._callback_called) + ctrl._get_newest_version = throw_timeout_error + ctrl.notify_update_if_needed(self._callback) + self.assertGreater(settings[LASTUPDATECHECK], time.time() - 10) # The dialog timeout in 10 seconds + self.assertFalse(self._callback_called) def test_download_url_checking_timeouts(self): - settings = self.internal_settings() - ctrl = UpdateNotifierController(settings, self.notebook) - ctrl.VERSION = '0' - ctrl._get_newest_version = lambda: '1' - - def throw_timeout_error(*args): - _ = args - raise urllib.error.URLError('timeout') - - ctrl._get_download_url = throw_timeout_error - ctrl.notify_update_if_needed(self._callback) - self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) - self.assertFalse(self._callback_called) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings() + ctrl = UpdateNotifierController(settings, self.notebook) + ctrl.VERSION = '0' + ctrl._get_newest_version = lambda: '1' + + def throw_timeout_error(*args): + _ = args + raise urllib.error.URLError('timeout') + + ctrl._get_download_url = throw_timeout_error + ctrl.notify_update_if_needed(self._callback) + self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) + self.assertFalse(self._callback_called) def test_server_returns_no_versions(self): - settings = self.internal_settings() - ctrl = self._update_notifier_controller(settings, self.notebook, '1.2.2', None) - ctrl.notify_update_if_needed(self._callback) - self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) - self.assertTrue(settings[CHECKFORUPDATES]) - self.assertFalse(self._callback_called) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings() + ctrl = self._update_notifier_controller(settings, self.notebook, '1.2.2', None) + ctrl.notify_update_if_needed(self._callback) + self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) + self.assertTrue(settings[CHECKFORUPDATES]) + self.assertFalse(self._callback_called) def test_server_returns_older_version(self): - settings = self.internal_settings() - ctrl = self._update_notifier_controller(settings, self.notebook, '0.44', '0.43.1') - ctrl.notify_update_if_needed(self._callback) - self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) - self.assertTrue(settings[CHECKFORUPDATES]) - self.assertFalse(self._callback_called) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings() + ctrl = self._update_notifier_controller(settings, self.notebook, '0.44', '0.43.1') + ctrl.notify_update_if_needed(self._callback) + self.assertGreater(settings[LASTUPDATECHECK], time.time() - 1) + self.assertTrue(settings[CHECKFORUPDATES]) + self.assertFalse(self._callback_called) @pytest.mark.skipif(IS_WINDOWS, reason='Causes: Windows fatal exception: access violation') def test_forced_check_released(self): - settings = self.internal_settings() - ctrl = self._update_notifier_controller(settings, self.notebook, '0.43.0', '0.43.1') - ctrl.notify_update_if_needed(self._callback, ignore_check_condition=True) - self.assertGreater(settings[LASTUPDATECHECK], time.time() - 19) # The dialog timeout in 20 seconds - self.assertTrue(settings[CHECKFORUPDATES]) - self.assertTrue(self._callback_called) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings() + ctrl = self._update_notifier_controller(settings, self.notebook, '0.43.0', '0.43.1') + ctrl.notify_update_if_needed(self._callback, ignore_check_condition=True) + self.assertGreater(settings[LASTUPDATECHECK], time.time() - 19) # The dialog timeout in 20 seconds + self.assertTrue(settings[CHECKFORUPDATES]) + self.assertTrue(self._callback_called) @pytest.mark.skipif(IS_WINDOWS, reason='Causes: Windows fatal exception: access violation') def test_forced_check_development(self): - settings = self.internal_settings() - ctrl = self._update_notifier_controller(settings, self.notebook, '0.44dev12', '0.44.dev14') - ctrl.notify_update_if_needed(self._callback, ignore_check_condition=True) - self.assertGreater(settings[LASTUPDATECHECK], time.time() - 20) # The dialog timeout in 20 seconds - self.assertTrue(settings[CHECKFORUPDATES]) - self.assertTrue(self._callback_called) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings() + ctrl = self._update_notifier_controller(settings, self.notebook, '0.44dev12', '0.44.dev14') + ctrl.notify_update_if_needed(self._callback, ignore_check_condition=True) + self.assertGreater(settings[LASTUPDATECHECK], time.time() - 20) # The dialog timeout in 20 seconds + self.assertTrue(settings[CHECKFORUPDATES]) + self.assertTrue(self._callback_called) @pytest.mark.skipif(IS_WINDOWS, reason='Causes: Windows fatal exception: access violation') def test_forced_check_development_ok(self): - settings = self.internal_settings() - ctrl = self._update_notifier_controller(settings, self.notebook, '0.44dev12', '0.44.dev12') - ctrl.notify_update_if_needed(self._callback, ignore_check_condition=False) - self.assertGreater(settings[LASTUPDATECHECK], time.time() - 20) # The dialog timeout in 20 seconds - self.assertTrue(settings[CHECKFORUPDATES]) - self.assertFalse(self._callback_called) + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings() + ctrl = self._update_notifier_controller(settings, self.notebook, '0.44dev12', '0.44.dev12') + ctrl.notify_update_if_needed(self._callback, ignore_check_condition=False) + self.assertGreater(settings[LASTUPDATECHECK], time.time() - 20) # The dialog timeout in 20 seconds + self.assertTrue(settings[CHECKFORUPDATES]) + self.assertFalse(self._callback_called) @pytest.mark.skipif(IS_WINDOWS, reason='Causes: Windows fatal exception: access violation') def test_normal_update_dialog(self): """ This is not actually doing a test """ - settings = self.internal_settings() - ctrl=UpdateDialog('1.0.0', 'http://localhost', settings, self.notebook,False) - wx.CallLater(3000, ctrl.EndModal,wx.CANCEL) - ctrl.ShowModal() - ctrl.Destroy() + with mock.patch.dict(os.environ, {'RIDESETTINGS': self.app.settings.fake_cfg}): + settings = self.internal_settings() + # path = os.getenv('RIDESETTINGS') + # print(f"DEBUG: test_updatenotifier.py test_normal_update_dialog RIDESETTINGS{path=}") + ctrl=UpdateDialog('1.0.0', 'http://localhost', settings, self.notebook,False) + wx.CallLater(3000, ctrl.EndModal,wx.CANCEL) + ctrl.ShowModal() + ctrl.Destroy() if __name__ == '__main__': diff --git a/utest/resources/fake.cfg b/utest/resources/fake.cfg index cedbfd110..775b0e521 100644 --- a/utest/resources/fake.cfg +++ b/utest/resources/fake.cfg @@ -5,27 +5,17 @@ global_settings = [] doc language = '' library xml directories = [] reformat = False -txt number of spaces = 4 +txt number of spaces = 2 [General] font size = 10 +font face = 'Source Code Pro' +foreground = '#8FF0A4' +background = '#A51D2D' +secondary foreground = '#FFFF00' +secondary background = '#4A060B' +background help = '#FFBE6F' +foreground text = '#613583' +apply to panels = True +ui language = 'English' [Plugins] [[Text Editor]] -[Text Edit] -setting = 'black' -background = 'white' -caret style = 'block' -enable auto suggestions = False -font face = 'Noto Sans' -argument = '#bb8844' -comment = 'black' -error = 'black' -gherkin = 'black' -heading = '#999999' -import = '#555555' -keyword = '#990000' -separator = 'black' -syntax = 'black' -tc_kw_name = '#aaaaaa' -variable = '#008080' -font size = 10 -zoom factor = 0 diff --git a/utest/resources/mocks.py b/utest/resources/mocks.py index ad9e5d686..23f64122f 100644 --- a/utest/resources/mocks.py +++ b/utest/resources/mocks.py @@ -74,6 +74,15 @@ def GetMenuItemCount(self): pythonpath = [] [General] font size = 10 +font face = 'Source Code Pro' +foreground = '#8FF0A4' +background = '#A51D2D' +secondary foreground = '#FFFF00' +secondary background = '#4A060B' +background help = '#FFBE6F' +foreground text = '#613583' +apply to panels = True +ui language = 'English' ''' From faf351b928f02597b2223b513ea86adec943afe7 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Fri, 22 Nov 2024 01:31:53 +0000 Subject: [PATCH 02/19] Improve tests using wx --- utest/editor/test_texteditor.py | 2 ++ utest/logs/test_log_windows.py | 4 ++++ utest/resources/fake.cfg | 21 --------------------- utest/run/test_process.py | 2 +- utest/run/test_run_anything.py | 6 +++--- utest/run/test_ui_elements.py | 1 + utest/ui/test_contextdialogs.py | 2 +- utest/ui/test_tree.py | 6 ++++-- 8 files changed, 16 insertions(+), 28 deletions(-) delete mode 100644 utest/resources/fake.cfg diff --git a/utest/editor/test_texteditor.py b/utest/editor/test_texteditor.py index fac1e1f24..bb6b0e76f 100644 --- a/utest/editor/test_texteditor.py +++ b/utest/editor/test_texteditor.py @@ -174,6 +174,7 @@ def tearDown(self): # wx.CallAfter(wx.Exit) self.shared_mem.shm.close() self.shared_mem.shm.unlink() + self.app.ExitMainLoop() self.app.Destroy() self.app = None @@ -659,6 +660,7 @@ def tearDown(self): # wx.CallAfter(wx.Exit) self.shared_mem.shm.close() self.shared_mem.shm.unlink() + self.app.ExitMainLoop() self.app.Destroy() self.app = None diff --git a/utest/logs/test_log_windows.py b/utest/logs/test_log_windows.py index 0b45a3763..7374ad03f 100644 --- a/utest/logs/test_log_windows.py +++ b/utest/logs/test_log_windows.py @@ -61,6 +61,10 @@ def my_show(*args): self._panel.SetSize(200, 400) self._panel.close(note) + myapp.ExitMainLoop() + myapp.Destroy() + myapp = None + def test_message_log(self): result = message_to_string(log[0]) assert result.strip() == '20230604 20:40:41.415 [INFO]: Found Robot Framework version 6.0.2 from path' diff --git a/utest/resources/fake.cfg b/utest/resources/fake.cfg deleted file mode 100644 index 775b0e521..000000000 --- a/utest/resources/fake.cfg +++ /dev/null @@ -1,21 +0,0 @@ - -auto imports = [] -pythonpath = [] -global_settings = [] -doc language = '' -library xml directories = [] -reformat = False -txt number of spaces = 2 -[General] -font size = 10 -font face = 'Source Code Pro' -foreground = '#8FF0A4' -background = '#A51D2D' -secondary foreground = '#FFFF00' -secondary background = '#4A060B' -background help = '#FFBE6F' -foreground text = '#613583' -apply to panels = True -ui language = 'English' -[Plugins] -[[Text Editor]] diff --git a/utest/run/test_process.py b/utest/run/test_process.py index 730a832f7..e033b717f 100644 --- a/utest/run/test_process.py +++ b/utest/run/test_process.py @@ -33,7 +33,7 @@ def test_command_as_string(self): assert len(processed_command) == len(initial_command.split()) assert processed_command[4] == 'a2 2 1' - @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS'), reason="Fails at Fedora workflow") + @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS')=='true', reason="Fails at Fedora workflow") def test_writing_to_stderr(self): self.proc = self._create_process('python %s stderr' % SCRIPT) eol = '\r\n' if IS_WINDOWS else '\n' diff --git a/utest/run/test_run_anything.py b/utest/run/test_run_anything.py index e96680d4e..20d87f3b0 100644 --- a/utest/run/test_run_anything.py +++ b/utest/run/test_run_anything.py @@ -55,14 +55,14 @@ def update_output(self, output, finished): class TestRunAnything(UIUnitTestBase): - @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS'), reason="Fails at Fedora workflow") + @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS')=='true', reason="Fails at Fedora workflow") def test_run(self): self.runner = self._create_runner('python %s count_args a b c' % SCRIPT) self._wait_until_finished() assert self.runner.finished assert self.runner.outstr == '3\n' - @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS'), reason="Fails at Fedora workflow") + @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS')=='true', reason="Fails at Fedora workflow") def test_stopping(self): self.runner = self._create_runner('python %s output 0.8' % SCRIPT) time.sleep(0.3) @@ -77,7 +77,7 @@ def test_error(self): assert self.runner.finished assert self.runner.outstr - @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS'), reason="Fails at Fedora workflow") + @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS')=='true', reason="Fails at Fedora workflow") def test_stderr(self): self.runner = self._create_runner('python %s stderr' % SCRIPT) self._wait_until_finished() diff --git a/utest/run/test_ui_elements.py b/utest/run/test_ui_elements.py index 156ce7361..a32b67b97 100644 --- a/utest/run/test_ui_elements.py +++ b/utest/run/test_ui_elements.py @@ -86,6 +86,7 @@ def setUp(self): def tearDown(self): PUBLISHER.unsubscribe_all() # wx.CallAfter(self.app.ExitMainLoop) + self.app.ExitMainLoop() self.app.Destroy() self.app = None diff --git a/utest/ui/test_contextdialogs.py b/utest/ui/test_contextdialogs.py index 9706feac0..15c238561 100644 --- a/utest/ui/test_contextdialogs.py +++ b/utest/ui/test_contextdialogs.py @@ -87,7 +87,7 @@ def setUp(self): def tearDown(self): PUBLISHER.unsubscribe_all() - wx.CallAfter(self.app.ExitMainLoop) + self.app.ExitMainLoop() self.app.Destroy() self.app = None # app.MainLoop() # With this here, there is no Segmentation fault diff --git a/utest/ui/test_tree.py b/utest/ui/test_tree.py index aedff7bbe..003cce562 100644 --- a/utest/ui/test_tree.py +++ b/utest/ui/test_tree.py @@ -91,8 +91,10 @@ def setUp(self): def tearDown(self): PUBLISHER.unsubscribe_all() - wx.CallAfter(self.frame.Close) - wx.CallAfter(self.app.ExitMainLoop) + # wx.CallAfter(self.frame.Close) + # wx.CallAfter(self.app.ExitMainLoop) + self.app.ExitMainLoop() + self.app.Destroy() # self.app.MainLoop() # With this here, there is no Segmentation fault self.app = None From 70b7a8272bde34786c9ea4ac9044f9919cf24484 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Tue, 10 Dec 2024 01:28:33 +0000 Subject: [PATCH 03/19] DEBUG fails to find imported pefixed. Then lists duplicates. --- src/robotide/controller/ctrlcommands.py | 19 +++++----- src/robotide/controller/macrocontrollers.py | 6 ++-- src/robotide/controller/settingcontrollers.py | 2 ++ src/robotide/controller/stepcontrollers.py | 10 +++--- src/robotide/publish/messages.py | 5 +++ src/robotide/ui/treeplugin.py | 9 +++-- src/robotide/usages/UsageRunner.py | 36 +++++++++++++------ src/robotide/usages/usagesdialog.py | 7 +++- 8 files changed, 65 insertions(+), 29 deletions(-) diff --git a/src/robotide/controller/ctrlcommands.py b/src/robotide/controller/ctrlcommands.py index 43463b1e7..40612d7ad 100644 --- a/src/robotide/controller/ctrlcommands.py +++ b/src/robotide/controller/ctrlcommands.py @@ -102,8 +102,8 @@ def _get_replace_values(self, new_name): return self._value, new_name return new_name, self._value - def notify_value_changed(self): - self._item.notify_value_changed() + def notify_value_changed(self, old_name=None): + self._item.notify_value_changed(old_name) class _Command(object): @@ -319,9 +319,10 @@ def _params(self): def _execute(self, context): self._observer.notify() self._occurrences = self._find_occurrences(context) if self._occurrences is None else self._occurrences + print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _execute: found occurrences= {self._occurrences}") self._replace_keywords_in(self._occurrences) context.update_namespace() - self._notify_values_changed(self._occurrences) + self._notify_values_changed(self._occurrences, old_name=self._original_name) self._observer.finish() def _find_occurrences(self, context): @@ -338,9 +339,9 @@ def _replace_keywords_in(self, occurrences): oc.replace_keyword(self._new_name) self._observer.notify() - def _notify_values_changed(self, occurrences): + def _notify_values_changed(self, occurrences, old_name=None): for oc in occurrences: - oc.notify_value_changed() + oc.notify_value_changed(old_name) self._observer.notify() def _get_undo_command(self): @@ -656,6 +657,7 @@ def __init__(self, keyword_name, keyword_info=None): if keyword_name.strip() == '': raise ValueError('Keyword name can not be "%s"' % keyword_name) self.normalized_name = normalize_kw_name(keyword_name) + print(f"DEBUG: ctlcommands.py FindOccurrences INIT keyword_name={keyword_name}") self._keyword_name = keyword_name self._keyword_info = keyword_info self._keyword_regexp = self._create_regexp(keyword_name) @@ -670,7 +672,7 @@ def _create_regexp(keyword_name): kw.name = keyword_name return EmbeddedArgsHandler(kw).name_regexp else: # Certain kws are not found when with Gherkin - name_regexp = fr'^(.*?){re.escape(keyword_name)}$' + name_regexp = fr'^(.*?){re.escape(keyword_name)}$' # DEBUG ([.]?) Consider kws from prefixed resources name = re.compile(name_regexp, re.IGNORECASE) return name @@ -717,7 +719,9 @@ def _find_keyword_source(self, datafile_controller): def _find_occurrences_in(self, items): from .tablecontrollers import VariableTableController + print(f"DEBUG: ctrlcommands _find_occurrences_in NORMALIZED NAME {self.normalized_name}") for item in items: + print(f"DEBUG: ctrlcommands _find_occurrences_in searching item={item}") if self._contains_item(item) or (not isinstance(item, VariableTableController) and (item.contains_keyword(self.normalized_name) or item.contains_keyword(self.normalized_name.replace(' ', '_')))): @@ -725,8 +729,7 @@ def _find_occurrences_in(self, items): def _contains_item(self, item): self._yield_for_other_threads() - return item.contains_keyword( - self._keyword_regexp or self._keyword_name) + return item.contains_keyword(self._keyword_regexp or self._keyword_name) @staticmethod def _yield_for_other_threads(): diff --git a/src/robotide/controller/macrocontrollers.py b/src/robotide/controller/macrocontrollers.py index b55fe5e3f..54e38cc6f 100644 --- a/src/robotide/controller/macrocontrollers.py +++ b/src/robotide/controller/macrocontrollers.py @@ -43,6 +43,8 @@ def __init__(self, item): self._item = item def contains_keyword(self, name): + print(f"DEBUG: macrocontrollers.py ItemNameController contains_keyword: item={self._item.name} search=" + f"{name}") if isinstance(name, str): return self._item.name == name return name.match(self._item.name) @@ -57,8 +59,8 @@ def replace_keyword(self, new_name, old_value=None): def rename(self, new_name): self._item.rename(new_name) - def notify_value_changed(self): - self._item.notify_name_changed() + def notify_value_changed(self, old_name=None): + self._item.notify_name_changed(old_name) @property def parent(self): diff --git a/src/robotide/controller/settingcontrollers.py b/src/robotide/controller/settingcontrollers.py index c6aba7d72..9c34b8b45 100644 --- a/src/robotide/controller/settingcontrollers.py +++ b/src/robotide/controller/settingcontrollers.py @@ -70,6 +70,8 @@ def keyword_name(self): def contains_keyword(self, name): istring = isinstance(name, str) + print(f"DEBUG: settingcontrollers.py _SettingController contains_keyword: item={self} search=" + f"{name}") matcher = name.match if not istring else lambda i: utils.eq(i, name) return self._contains_keyword(matcher) diff --git a/src/robotide/controller/stepcontrollers.py b/src/robotide/controller/stepcontrollers.py index 31c0e2dfc..41f53fc03 100644 --- a/src/robotide/controller/stepcontrollers.py +++ b/src/robotide/controller/stepcontrollers.py @@ -285,11 +285,10 @@ def contains_keyword(self, name): for item in [self.keyword or ''] + self.args) def _kw_name_match(self, item, expected): + print(f"DEBUG: stepcontrollers.py StepController kw_name_match: item={item} expected={expected}") if isinstance(expected, str): - return utils.eq(item, expected) or ( - self._GIVEN_WHEN_THEN_MATCHER.match(item) and - utils.eq( - self._GIVEN_WHEN_THEN_MATCHER.sub('', item), expected)) + return utils.eq(item, expected) or (self._GIVEN_WHEN_THEN_MATCHER.match(item) and + utils.eq(self._GIVEN_WHEN_THEN_MATCHER.sub('', item), expected)) return expected.match(item) def replace_keyword(self, new_name, old_name): @@ -552,7 +551,8 @@ def _recreate_next_step(self, index): next_step = self.parent.step(index + 1) next_step.recreate(next_step.as_list()) - def notify_value_changed(self): + def notify_value_changed(self, old_name=None): + _ = old_name self.parent.notify_steps_changed() def increase_indent(self): diff --git a/src/robotide/publish/messages.py b/src/robotide/publish/messages.py index 351e27245..49fb95e7d 100644 --- a/src/robotide/publish/messages.py +++ b/src/robotide/publish/messages.py @@ -392,6 +392,11 @@ class RideUserKeywordRemoved(RideUserKeyword): data = ['datafile', 'name', 'item'] +class RideUserKeywordRenamed(RideUserKeyword): + """Sent after a user keyword is renamed""" + data = ['datafile', 'item', 'old_name'] + + class RideItem(RideDataChanged): """Base class for all messages about changes to any data item.""" data = ['item'] diff --git a/src/robotide/ui/treeplugin.py b/src/robotide/ui/treeplugin.py index 3fdf155dd..7be8abde0 100644 --- a/src/robotide/ui/treeplugin.py +++ b/src/robotide/ui/treeplugin.py @@ -34,7 +34,7 @@ RideTestCaseAdded, RideUserKeywordRemoved, RideTestCaseRemoved, RideDataFileRemoved, RideDataChangedToDirty, RideDataDirtyCleared, RideVariableRemoved, RideVariableAdded, RideVariableMovedUp, RideVariableMovedDown, RideVariableUpdated, RideOpenResource, - RideSuiteAdded, RideSelectResource, RideDataFileSet) + RideSuiteAdded, RideSelectResource, RideDataFileSet, RideItemNameChanged) from ..controller.ctrlcommands import MoveTo from ..pluginapi import Plugin from ..action import ActionInfo @@ -306,6 +306,7 @@ def unregister_context_menu_hook(self, callable_m): def _subscribe_to_messages(self): subscriptions = [ (self._item_changed, RideItem), + (self._item_changed, RideItemNameChanged), (self._resource_added, RideOpenResource), (self._select_resource, RideSelectResource), (self._suite_added, RideSuiteAdded), @@ -734,8 +735,8 @@ def select_user_keyword_node(self, uk): return if not self.IsExpanded(parent_node): self._expand_and_render_children(parent_node) - node = self.controller.find_node_with_label( - parent_node, utils.normalize(uk.name)) + node = self.controller.find_node_with_label(parent_node, utils.normalize(uk.name)) + print(f"DEBUG: treeplugin.py Tree select_user_keyword_node node= {node}") if node != self.GetSelection(): self.SelectItem(node) @@ -1086,6 +1087,8 @@ def on_move_down(self, event): def _item_changed(self, message): controller = message.item node = self.controller.find_node_by_controller(controller) + if hasattr(message, 'old_name'): + print(f"DEBUG: treeplugin.py Tree _item_changed RENAMED node={node}, old_name={message.old_name}") if node: self.SetItemText(node, message.item.name) diff --git a/src/robotide/usages/UsageRunner.py b/src/robotide/usages/UsageRunner.py index 5e6019262..525568d8b 100644 --- a/src/robotide/usages/UsageRunner.py +++ b/src/robotide/usages/UsageRunner.py @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +import os.path import time from threading import Thread @@ -29,11 +29,21 @@ def __init__(self, controller, highlight, name=None, kw_info=None): self._kw_info = kw_info self._controller = controller self._highlight = highlight + # self.prefix = (os.path.basename(self._controller.data.source) + # .replace('robot', '').replace('resource', '')).split('.') + self.prefix = os.path.basename(self._controller.data.source).split('.') + if len(self.prefix) == 2 and self.prefix[-1] in ['resource', 'robot']: + self.prefix = self.prefix[0] + else: + self.prefix = '' + print(f"DEBUG: UsageRunner.py Usages INIT prefix={self.prefix}") self._dlg = self._usages_dialog() self._worker = Thread(target=self._run) self._dialog_closed = False def _usages_dialog(self): + print(f"DEBUG: UsageRunner.py Usages _usages_dialog ENTER name={self._name}," + f" controller_name={self._controller.name} prefix={self.prefix}") if self._controller.name == self._name: return usagesdialog.UsagesDialogWithUserKwNavigation(self._name, self._highlight, self._controller) return usagesdialog.UsagesDialog(self._name) @@ -46,15 +56,21 @@ def show(self): def _run(self): wx.CallAfter(self._begin_search) - for usage in self._find_usages(): - time.sleep(0) # GIVE SPACE TO OTHER THREADS -- Thread.yield in Java - if self._dialog_closed: - return - wx.CallAfter(self._add_usage, usage) + names = [ self._name ] + if self.prefix != '' and '.' not in self._name: + names.append(f'{self.prefix}.{self._name}') + print(f"DEBUG: UsageRunner.py Usages _run before loop with _find_usages names={names}") + for name in names: # DEBUG + for usage in self._find_usages(name): + time.sleep(0) # GIVE SPACE TO OTHER THREADS -- Thread.yield in Java + if self._dialog_closed: + return + wx.CallAfter(self._add_usage, usage) wx.CallAfter(self._end_search) - def _find_usages(self): - return self._controller.execute(commands.FindUsages(self._name, self._kw_info)) + def _find_usages(self, name): + print(f"DEBUG: UsageRunner.py Usages _find_usages ENTER name={name} kw_info={self._kw_info}") + return self._controller.execute(commands.FindUsages(name, self._kw_info)) def _begin_search(self): if not self._dialog_closed: @@ -82,11 +98,11 @@ def _usages_dialog(self): return usagesdialog.resource_import_usage_dialog(self._controller.display_name, self._highlight, self._controller) - def _find_usages(self): + def _find_usages(self, name=None): return self._controller.execute(commands.FindResourceUsages()) class VariableUsages(Usages): - def _find_usages(self): + def _find_usages(self, name=None): return self._controller.execute(commands.FindVariableUsages(self._name)) diff --git a/src/robotide/usages/usagesdialog.py b/src/robotide/usages/usagesdialog.py index a61f2390f..816853681 100644 --- a/src/robotide/usages/usagesdialog.py +++ b/src/robotide/usages/usagesdialog.py @@ -39,6 +39,7 @@ def __init__(self, name, usages=None): self.SetForegroundColour(Colour(self.color_foreground)) self._add_view_components() self.usages = usages or UsagesListModel([]) + print(f"DEBUG: usagesdialog.py UsagesDialog INIT: usages={self.usages} NAME={name}") self.usage_list = VirtualList(self, self.usages.headers, self.usages) self.usage_list.SetBackgroundColour(Colour(self.color_secondary_background)) @@ -78,6 +79,9 @@ def _add_view_components(self): class UsagesDialogWithUserKwNavigation(UsagesDialog): def __init__(self, name, highlight, controller, usages=None): + import os + print(f"DEBUG: usagesdialog.py UsagesDialogWithUserKwNavigation ENTER name={name}," + f" controller_name={controller.name} usages={usages}") self.on_go_to_definition = lambda evt: highlight(controller, name) UsagesDialog.__init__(self, name, usages=usages) @@ -152,7 +156,8 @@ class ResourceImportListModel(_UsagesListModel): def __init__(self, usages): _UsagesListModel.__init__(self, usages) self.headers = ['Name', 'Location'] - self._cannot_rename_item_attr = wx.ListItemAttr() + # wxPyDeprecationWarning: Using deprecated class. Use ItemAttr instead + self._cannot_rename_item_attr = wx.ItemAttr() # wx.ListItemAttr() self._cannot_rename_item_attr.SetBackgroundColour(wx.Colour(255, 64, 64)) def item_text(self, row, col): From 4b7c23d095258a0c50844f9af84926a917011656 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Mon, 16 Dec 2024 02:36:12 +0000 Subject: [PATCH 04/19] WIP but already changes from step to resource. Problems with non prefixed --- src/robotide/controller/ctrlcommands.py | 16 ++- src/robotide/controller/macrocontrollers.py | 10 +- src/robotide/controller/settingcontrollers.py | 4 +- src/robotide/controller/stepcontrollers.py | 28 +++-- src/robotide/editor/macroeditors.py | 2 + src/robotide/ui/treeplugin.py | 106 ++++++++++++++++-- src/robotide/usages/UsageRunner.py | 6 +- 7 files changed, 145 insertions(+), 27 deletions(-) diff --git a/src/robotide/controller/ctrlcommands.py b/src/robotide/controller/ctrlcommands.py index 40612d7ad..077f77c94 100644 --- a/src/robotide/controller/ctrlcommands.py +++ b/src/robotide/controller/ctrlcommands.py @@ -93,7 +93,8 @@ def _in_for_loop(self): return isinstance(self._item.parent, ForLoopStepController) def replace_keyword(self, new_name): - # print(f"DEBUG: ctrlcommands.py replace_keyword new_name={new_name}") + print(f"DEBUG: ctrlcommands.py Occurrence replace_keyword BEFORE new_name={new_name} value={self._value}" + f" self._replaced={self._replaced} item={self._item}") self._item.replace_keyword(*self._get_replace_values(new_name)) self._replaced = not self._replaced @@ -284,8 +285,9 @@ def __init__(self, original_name, new_name, observer, keyword_info=None): self._original_name, self._new_name = self._check_gherkin(new_name, original_name ) - # print(f"DEBUG: ctrlcommands.py RenameKeywordOccurrences ENTER after check_gherkin\n" - # f"self._original_name={self._original_name} self._new_name={self._new_name} ") + print(f"DEBUG: ctrlcommands.py RenameKeywordOccurrences ENTER after check_gherkin\n" + f"{original_name=}, {new_name=}, self._original_name={self._original_name} " + f"self._new_name={self._new_name} ") self._observer = observer self._keyword_info = keyword_info self._occurrences = None @@ -341,6 +343,12 @@ def _replace_keywords_in(self, occurrences): def _notify_values_changed(self, occurrences, old_name=None): for oc in occurrences: + try: + print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _notify_values_changed: " + f"oc= {oc.source} {oc.item} {oc.usage} {oc._value}") + except AttributeError: + print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _notify_values_changed: " + f" in AttributeError oc= {oc.item} {oc.usage} {oc._value}") oc.notify_value_changed(old_name) self._observer.notify() @@ -721,7 +729,7 @@ def _find_occurrences_in(self, items): from .tablecontrollers import VariableTableController print(f"DEBUG: ctrlcommands _find_occurrences_in NORMALIZED NAME {self.normalized_name}") for item in items: - print(f"DEBUG: ctrlcommands _find_occurrences_in searching item={item}") + # print(f"DEBUG: ctrlcommands _find_occurrences_in searching item={item}") if self._contains_item(item) or (not isinstance(item, VariableTableController) and (item.contains_keyword(self.normalized_name) or item.contains_keyword(self.normalized_name.replace(' ', '_')))): diff --git a/src/robotide/controller/macrocontrollers.py b/src/robotide/controller/macrocontrollers.py index 54e38cc6f..1c3c6b054 100644 --- a/src/robotide/controller/macrocontrollers.py +++ b/src/robotide/controller/macrocontrollers.py @@ -43,8 +43,8 @@ def __init__(self, item): self._item = item def contains_keyword(self, name): - print(f"DEBUG: macrocontrollers.py ItemNameController contains_keyword: item={self._item.name} search=" - f"{name}") + # print(f"DEBUG: macrocontrollers.py ItemNameController contains_keyword: item={self._item.name} search=" + # f"{name}") if isinstance(name, str): return self._item.name == name return name.match(self._item.name) @@ -60,6 +60,7 @@ def rename(self, new_name): self._item.rename(new_name) def notify_value_changed(self, old_name=None): + print(f"DEBUG: macrocontrollers.py notify_value_changed item={self._item.name} old_name={old_name}") self._item.notify_name_changed(old_name) @property @@ -187,6 +188,7 @@ def delete(self): self.notify_keyword_removed() def rename(self, new_name): + print(f"DEBUG: macrocontrollers.py WithStepsController rename BEFORE new_name={new_name} old_name={self.data.name}") self.data.name = new_name.strip() self.mark_dirty() @@ -299,8 +301,10 @@ def notify_settings_changed(self): self.update_namespace() self._notify(RideItemSettingsChanged) - def notify_steps_changed(self): + def notify_steps_changed(self, old_name=None): self._has_steps_changed = True + print(f"DEBUG: macrocontrollers.py WithStepsController notify_steps_changed: ENTER old_name={old_name}" + f" {self.parent} {self.source} {self} call self._notify") self._notify(RideItemStepsChanged) def _notify(self, messageclass): diff --git a/src/robotide/controller/settingcontrollers.py b/src/robotide/controller/settingcontrollers.py index 9c34b8b45..fedd623dc 100644 --- a/src/robotide/controller/settingcontrollers.py +++ b/src/robotide/controller/settingcontrollers.py @@ -70,8 +70,8 @@ def keyword_name(self): def contains_keyword(self, name): istring = isinstance(name, str) - print(f"DEBUG: settingcontrollers.py _SettingController contains_keyword: item={self} search=" - f"{name}") + # print(f"DEBUG: settingcontrollers.py _SettingController contains_keyword: item={self} search=" + # f"{name}") matcher = name.match if not istring else lambda i: utils.eq(i, name) return self._contains_keyword(matcher) diff --git a/src/robotide/controller/stepcontrollers.py b/src/robotide/controller/stepcontrollers.py index 41f53fc03..a162c1c43 100644 --- a/src/robotide/controller/stepcontrollers.py +++ b/src/robotide/controller/stepcontrollers.py @@ -18,6 +18,7 @@ from .. import robotapi, utils from .basecontroller import _BaseController from .cellinfo import CellPosition, CellType, CellInfo, CellContent, ContentType, UPPERCASE_KWS +from ..publish.messages import RideItemNameChanged from ..namespace.local_namespace import local_namespace from ..utils import variablematcher @@ -285,24 +286,34 @@ def contains_keyword(self, name): for item in [self.keyword or ''] + self.args) def _kw_name_match(self, item, expected): - print(f"DEBUG: stepcontrollers.py StepController kw_name_match: item={item} expected={expected}") if isinstance(expected, str): return utils.eq(item, expected) or (self._GIVEN_WHEN_THEN_MATCHER.match(item) and utils.eq(self._GIVEN_WHEN_THEN_MATCHER.sub('', item), expected)) - return expected.match(item) + matcher = expected.match(item) + if matcher: + old_prefix = matcher.group(1) + print(f"DEBUG: stepcontrollers.py StepController kw_name_match: RE expected={expected}" + f" matcher={matcher} old_prefix={old_prefix}") + return matcher def replace_keyword(self, new_name, old_name): # DEBUG: Create setters for Step.name and Step.args - if self._kw_name_match(self.keyword or '', old_name): - self.step_controller_step.name = self.step_controller_step.cells[self.step_controller_step.inner_kw_pos] =\ + new_match = self._kw_name_match(self.keyword or '', old_name) + if new_match: + print(f"DEBUG: stepcontrollers.py StepController replace_keyword: ACTUAL CHANGE old_name={old_name}" + f" new_name={new_name} new_match={new_match}") + self.step_controller_step.name = self.step_controller_step.cells[self.step_controller_step.inner_kw_pos] = \ self._kw_name_replace(self.keyword, new_name, old_name) for index, value in enumerate(self.args): if self._kw_name_match(value, old_name): self.step_controller_step.args[index] = self.step_controller_step.cells[ - self.step_controller_step.inner_kw_pos + 1 + index] =\ + self.step_controller_step.inner_kw_pos + 1 + index] = \ self._kw_name_replace(value, new_name, old_name) def _kw_name_replace(self, old_value, new_match, old_match): + # Here we should have a match for keywords prefixed with resource name + print(f"DEBUG: stepcontrollers.py StepController _kw_name_replace: ENTER old_value={old_value}" + f" old_match={old_match} new_match={new_match}") old_prefix_matcher = self._GIVEN_WHEN_THEN_MATCHER.match(old_value) if not old_prefix_matcher: return new_match @@ -552,8 +563,11 @@ def _recreate_next_step(self, index): next_step.recreate(next_step.as_list()) def notify_value_changed(self, old_name=None): - _ = old_name - self.parent.notify_steps_changed() + print(f"DEBUG: stepcontrollers.py StepController notify_value_changed: ENTER old_name={old_name}" + f" parent={self.parent.name} calling self.parent.notify_steps_changed()") + if old_name is not None: + RideItemNameChanged(item=self, old_name=old_name).publish() + self.parent.notify_steps_changed(old_name) def increase_indent(self): self.indent.append('') diff --git a/src/robotide/editor/macroeditors.py b/src/robotide/editor/macroeditors.py index dbb2e11fc..1a7a45188 100644 --- a/src/robotide/editor/macroeditors.py +++ b/src/robotide/editor/macroeditors.py @@ -39,6 +39,8 @@ def _create_kweditor(self): self._editors.append(self.kweditor) def _name_changed(self, message): + print(f"DEBUG: macroeditors.py TestCaseEditor _name_changed ENTER {message}\n" + f" {message.item.name=} {self.controller}") if message.item == self.controller: self.header.SetLabel(message.item.name) diff --git a/src/robotide/ui/treeplugin.py b/src/robotide/ui/treeplugin.py index 7be8abde0..d7b990ce5 100644 --- a/src/robotide/ui/treeplugin.py +++ b/src/robotide/ui/treeplugin.py @@ -31,10 +31,10 @@ SKIPPED_IMAGE_INDEX, ROBOT_IMAGE_INDEX) from ..ui.treenodehandlers import TestCaseHandler, TestDataDirectoryHandler, TestCaseFileHandler from ..publish import (PUBLISHER, RideTreeSelection, RideFileNameChanged, RideItem, RideUserKeywordAdded, - RideTestCaseAdded, RideUserKeywordRemoved, RideTestCaseRemoved, RideDataFileRemoved, - RideDataChangedToDirty, RideDataDirtyCleared, RideVariableRemoved, RideVariableAdded, - RideVariableMovedUp, RideVariableMovedDown, RideVariableUpdated, RideOpenResource, - RideSuiteAdded, RideSelectResource, RideDataFileSet, RideItemNameChanged) + RideTestCaseAdded, RideUserKeywordRemoved, RideUserKeywordRenamed, RideTestCaseRemoved, + RideDataFileRemoved, RideDataChangedToDirty, RideDataDirtyCleared, RideVariableRemoved, + RideVariableAdded, RideVariableMovedUp, RideVariableMovedDown, RideVariableUpdated, + RideOpenResource, RideSuiteAdded, RideSelectResource, RideDataFileSet, RideItemNameChanged) from ..controller.ctrlcommands import MoveTo from ..pluginapi import Plugin from ..action import ActionInfo @@ -305,8 +305,8 @@ def unregister_context_menu_hook(self, callable_m): def _subscribe_to_messages(self): subscriptions = [ + (self._item_renamed, RideItemNameChanged), (self._item_changed, RideItem), - (self._item_changed, RideItemNameChanged), (self._resource_added, RideOpenResource), (self._select_resource, RideSelectResource), (self._suite_added, RideSuiteAdded), @@ -720,12 +720,13 @@ def select_node_by_data(self, controller): Controller can be any of the controllers that are represented in the tree.""" parent_node = self._get_datafile_node(controller.datafile) + print(f"DEBUG: treeplugin.py Tree select_node_by_data parent_node={parent_node}") if not parent_node: return None if not self.IsExpanded(parent_node): self._expand_and_render_children(parent_node) node = self.controller.find_node_by_controller(controller) - if node != self.GetSelection(): + if node and node != self.GetSelection(): self.SelectItem(node) return node @@ -1085,10 +1086,10 @@ def on_move_down(self, event): handler.on_move_down(event) def _item_changed(self, message): + if isinstance(message, RideItemNameChanged): + return controller = message.item node = self.controller.find_node_by_controller(controller) - if hasattr(message, 'old_name'): - print(f"DEBUG: treeplugin.py Tree _item_changed RENAMED node={node}, old_name={message.old_name}") if node: self.SetItemText(node, message.item.name) @@ -1096,6 +1097,95 @@ def _item_changed(self, message): self.controller.mark_node_dirty( self._get_datafile_node(controller.datafile)) + def _item_renamed(self, message): + from ..lib.robot.parsing.settings import Resource + if not isinstance(message, RideItemNameChanged): + return + controller = message.item + print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER controller={controller.display_name}") + node = self.controller.find_node_by_controller(controller) + if hasattr(controller.datafile, 'setting_table'): + imports = controller.datafile.setting_table.imports + print(f"DEBUG: treeplugin.py Tree _item_renamed HAS IMPORTS imports={imports}") + for imp in imports: + if isinstance(imp, Resource): + print(f"DEBUG: treeplugin.py Tree _item_renamed IMPORT message.item.name={message.item.keyword}," + f" old_name={message.old_name} resource name={imp.name}") + # print(f"DEBUG: treeplugin.py Tree _item_renamed IMPORT message.item.name={message}," + # f" old_name={message.old_name} import={imp}") + self._rename_resource_kw(new_name=message.item.keyword, old_name=message.old_name, resource=imp) + # if node and hasattr(message, 'old_name'): + # print(f"DEBUG: treeplugin.py Tree _item_renamed RENAMED node={node}, old_name={message.old_name}") + self.Refresh() + if node: + self.EnsureVisible(node) + self.SelectItem(node) + self.SetItemText(node, message.item.name) + new_name=self.GetItemText(node) + print(f"DEBUG: treeplugin.py Tree _item_renamed AFTER RENAMED new_name={new_name}" + f" controller={controller.datafile}") + else: + return + if controller.dirty: + self.controller.mark_node_dirty( + self._get_datafile_node(controller.datafile)) + + def _rename_resource_kw(self, new_name, old_name, resource): + prefix_new = new_name.split('.')[0] + prefix_old = old_name.split('.')[0] + prefix_res = os.path.basename(resource.name).split('.')[0] + if not prefix_new == prefix_old == prefix_res: + return + keyword_name = old_name.split('.')[-1] + new_keyword_name = new_name.split('.')[-1] + print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {prefix_res=} {keyword_name=}") + res_name=os.path.basename(resource.name) + print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {res_name=}") + res_node=self.FindItem(self._resource_root, res_name) + if res_node: + self.EnsureVisible(res_node) + print(f"DEBUG: treeplugin.py Tree _rename_resource_kw root node {res_node=}") + # node = self.controller.find_node_with_label(res_node, keyword_name) + self._expand_and_render_children(res_node) + node = self.FindItem(res_node, keyword_name) + if node: + from ..controller.ctrlcommands import RenameKeywordOccurrences + from ..ui.progress import RenameProgressObserver + nlabel = node.GetText() + print(f"DEBUG: treeplugin.py Tree _rename_resource_kw node label {nlabel} {keyword_name}") + if nlabel == keyword_name: + print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {node=} {nlabel} change to {new_keyword_name=}") + self.EnsureVisible(node) + # self.SetItemText(node, new_keyword_name) + self.SelectItem(node) + controller = self.get_selected_datafile_controller() + keywords = controller.keywords + keyword_names = controller.get_keyword_names() + print(f"DEBUG: treeplugin.py Tree _rename_resource_kw already changed to {new_keyword_name=}" + f" controller={controller} keywords={keywords} \n" + f"{keyword_names=}") + for k in keywords.items: + print(f"DEBUG: treeplugin.py Tree _rename_resource_kw keywords: {k=}") + if k.name == keyword_name: + print(f"DEBUG: treeplugin.py Tree _rename_resource_kw CHANGING: {k.name=}") + if controller.validate_keyword_name(new_keyword_name): + k.name = new_keyword_name + RideUserKeywordRenamed(datafile=controller.datafile, item=k, + old_name=keyword_name).publish() + controller.mark_dirty() + print(f"DEBUG: treeplugin.py Tree _rename_resource_kw DONE CHANGING: {k.name=}") + # self.controller.mark_node_dirty(self._get_datafile_node(controller.datafile)) + self.observer = RenameProgressObserver(self.GetParent()) + RenameKeywordOccurrences(keyword_name, new_keyword_name, self.observer) + self.observer.finish() + self.Collapse(res_node) + self.Expand(res_node) + self.SelectItem(res_node) + else: + wx.MessageBox(f"Invalid keyword name: {new_keyword_name}", + "Failed Keyword Name Validation") + return + def _variable_moved_up(self, message): if self._should_update_variable_positions(message): self._do_action_if_datafile_node_is_expanded(self.move_up, message) diff --git a/src/robotide/usages/UsageRunner.py b/src/robotide/usages/UsageRunner.py index 525568d8b..a03125f6f 100644 --- a/src/robotide/usages/UsageRunner.py +++ b/src/robotide/usages/UsageRunner.py @@ -57,9 +57,9 @@ def show(self): def _run(self): wx.CallAfter(self._begin_search) names = [ self._name ] - if self.prefix != '' and '.' not in self._name: - names.append(f'{self.prefix}.{self._name}') - print(f"DEBUG: UsageRunner.py Usages _run before loop with _find_usages names={names}") + # if self.prefix != '' and '.' not in self._name: + # names.append(f'{self.prefix}.{self._name}') + # print(f"DEBUG: UsageRunner.py Usages _run before loop with _find_usages names={names}") for name in names: # DEBUG for usage in self._find_usages(name): time.sleep(0) # GIVE SPACE TO OTHER THREADS -- Thread.yield in Java From c9db1eb3909580b37b988a18de3af45f5b24a9f4 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Wed, 18 Dec 2024 00:55:20 +0000 Subject: [PATCH 05/19] Fix unit tests for ReplaceOccurrences tests --- src/robotide/controller/filecontrollers.py | 3 ++- src/robotide/controller/macrocontrollers.py | 3 ++- src/robotide/controller/settingcontrollers.py | 4 ++-- utest/controller/test_occurrences.py | 23 +++++++++---------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/robotide/controller/filecontrollers.py b/src/robotide/controller/filecontrollers.py index 82be65a09..e6eb6a7d2 100644 --- a/src/robotide/controller/filecontrollers.py +++ b/src/robotide/controller/filecontrollers.py @@ -411,7 +411,8 @@ def is_directory_suite(self): def resource_import_modified(self, path): return self._project.resource_import_modified(path, self.directory) - def notify_settings_changed(self): + def notify_settings_changed(self, old_name=None): + _ = old_name RideItemSettingsChanged(item=self).publish() def notify_steps_changed(self): diff --git a/src/robotide/controller/macrocontrollers.py b/src/robotide/controller/macrocontrollers.py index 1c3c6b054..ab6dfcff3 100644 --- a/src/robotide/controller/macrocontrollers.py +++ b/src/robotide/controller/macrocontrollers.py @@ -297,7 +297,8 @@ def notify_keyword_removed(self): RideUserKeywordRemoved(datafile=self.datafile, name=self.name, item=self).publish() self.notify_steps_changed() - def notify_settings_changed(self): + def notify_settings_changed(self, old_name=None): + _ = old_name self.update_namespace() self._notify(RideItemSettingsChanged) diff --git a/src/robotide/controller/settingcontrollers.py b/src/robotide/controller/settingcontrollers.py index fedd623dc..dab0092b1 100644 --- a/src/robotide/controller/settingcontrollers.py +++ b/src/robotide/controller/settingcontrollers.py @@ -103,8 +103,8 @@ def set_comment(self, comment): self._data.comment = comment self.mark_dirty() - def notify_value_changed(self): - self._parent.notify_settings_changed() + def notify_value_changed(self, old_name=None): + self._parent.notify_settings_changed(old_name) def clear(self): self._data.reset() diff --git a/utest/controller/test_occurrences.py b/utest/controller/test_occurrences.py index a30f979d8..ac2b0abab 100644 --- a/utest/controller/test_occurrences.py +++ b/utest/controller/test_occurrences.py @@ -432,8 +432,7 @@ def _expected_messages(self, steps_have_changed=False, testcase_settings_have_changed=False, name_has_changed=False): assert self._steps_have_changed == steps_have_changed - assert (self._testcase_settings_have_changed == - testcase_settings_have_changed) + assert self._testcase_settings_have_changed == testcase_settings_have_changed assert self._name_has_changed == name_has_changed def _rename(self, original_name, new_name, source, usage): @@ -482,12 +481,12 @@ def steps_changed_check_that_name_has_also(message): def test_rename_in_steps(self): self._rename(STEP1_KEYWORD, UNUSED_KEYWORD_NAME, TEST1_NAME, 'Steps') - self._expected_messages(steps_have_changed=True) + self._expected_messages(steps_have_changed=True, name_has_changed=True) def test_rename_with_dollar_sign(self): self._rename(STEP1_KEYWORD, UNUSED_KEYWORD_NAME+'$', TEST1_NAME, 'Steps') - self._expected_messages(steps_have_changed=True) + self._expected_messages(steps_have_changed=True, name_has_changed=True) def test_undo_rename_in_step(self): self._rename(STEP1_KEYWORD, UNUSED_KEYWORD_NAME, TEST1_NAME, 'Steps') @@ -501,7 +500,7 @@ def test_undo_after_renaming_to_something_that_is_already_there(self): def test_rename_steps_argument(self): self._rename(STEP2_ARGUMENT, UNUSED_KEYWORD_NAME, TEST1_NAME, 'Steps') - self._expected_messages(steps_have_changed=True) + self._expected_messages(steps_have_changed=True, name_has_changed=True) assert self.test_ctrl.steps[1].as_list() == ['Run Keyword', UNUSED_KEYWORD_NAME] @@ -544,13 +543,13 @@ def test_rename_in_suite_test_template(self): def test_rename_in_user_keywords(self): self._rename(KEYWORD_IN_USERKEYWORD1, UNUSED_KEYWORD_NAME, USERKEYWORD1_NAME, 'Steps') - self._expected_messages(steps_have_changed=True) + self._expected_messages(steps_have_changed=True, name_has_changed=True) def test_rename_given_prefixed_keywords(self): kw = 'BLOdkajasdj' self._add_step('Given '+kw) self._rename(kw, UNUSED_KEYWORD_NAME, TEST1_NAME, 'Steps') - self._expected_messages(steps_have_changed=True) + self._expected_messages(steps_have_changed=True, name_has_changed=True) self.assertEqual(self.test_ctrl.step(100).as_list()[100], 'Given '+UNUSED_KEYWORD_NAME) @@ -558,7 +557,7 @@ def test_rename_when_prefixed_keywords(self): kw = 'fjsdklhf37849' self._add_step('wHEn '+kw) self._rename(kw, UNUSED_KEYWORD_NAME, TEST1_NAME, 'Steps') - self._expected_messages(steps_have_changed=True) + self._expected_messages(steps_have_changed=True, name_has_changed=True) self.assertEqual(self.test_ctrl.step(100).as_list()[100], 'wHEn '+UNUSED_KEYWORD_NAME) @@ -566,7 +565,7 @@ def test_rename_then_prefixed_keywords(self): kw = 'djkfsekrhnbdxcvzo dsjah' self._add_step('THen '+kw) self._rename(kw, UNUSED_KEYWORD_NAME, TEST1_NAME, 'Steps') - self._expected_messages(steps_have_changed=True) + self._expected_messages(steps_have_changed=True, name_has_changed=True) self.assertEqual(self.test_ctrl.step(100).as_list()[100], 'THen '+UNUSED_KEYWORD_NAME) @@ -574,7 +573,7 @@ def test_rename_and_prefixed_keywords(self): kw = 'mmxznbfje uiriweyi yr iu fjkdhzxck' self._add_step('AND '+kw) self._rename(kw, UNUSED_KEYWORD_NAME, TEST1_NAME, 'Steps') - self._expected_messages(steps_have_changed=True) + self._expected_messages(steps_have_changed=True, name_has_changed=True) self.assertEqual(self.test_ctrl.step(100).as_list()[100], 'AND '+UNUSED_KEYWORD_NAME) @@ -582,7 +581,7 @@ def test_rename_but_prefixed_keywords(self): kw = 'sdlmclkds dslcm ldsm sdclmklm' self._add_step('bUt '+kw) self._rename(kw, UNUSED_KEYWORD_NAME, TEST1_NAME, 'Steps') - self._expected_messages(steps_have_changed=True) + self._expected_messages(steps_have_changed=True, name_has_changed=True) self.assertEqual(self.test_ctrl.step(100).as_list()[100], 'bUt '+UNUSED_KEYWORD_NAME) @@ -590,7 +589,7 @@ def test_rename_when_keyword_begins_with_prefix(self): kw = 'When I say so' self._add_step(kw) self._rename(kw, UNUSED_KEYWORD_NAME, TEST1_NAME, 'Steps') - self._expected_messages(steps_have_changed=True) + self._expected_messages(steps_have_changed=True, name_has_changed=True) self.assertEqual(self.test_ctrl.step(100).as_list()[100], UNUSED_KEYWORD_NAME) From a69aff79696198a02a628e182c22609df166ff32 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Fri, 20 Dec 2024 02:04:44 +0000 Subject: [PATCH 06/19] Add unit test for rename prefixed keywords, WIP. --- utest/controller/test_rename_keywords.py | 51 +++++++++++++++++++ utest/resources/datafilereader.py | 2 + .../robotdata/TestCases/Sub/Lib/MyListener.py | 6 +++ .../TestCases/Sub/Lib/SubMyListener.py | 8 +++ .../robotdata/TestCases/Sub/Lib/mykw.py | 2 + .../robotdata/TestCases/Sub/Lib/res2.py | 2 + .../robotdata/TestCases/Sub/Suite01.robot | 17 +++++++ .../robotdata/TestCases/Sub/resources/res.py | 2 + .../TestCases/Sub/resources/res02.resource | 15 ++++++ .../robotdata/TestCases/Sub/suite02.robot | 12 +++++ utest/resources/robotdata/TestCases/mykw.py | 2 + .../robotdata/TestCases/resources/res.py | 2 + .../TestCases/resources/res01.resource | 29 +++++++++++ .../robotdata/TestCases/suite01.robot | 23 +++++++++ .../robotdata/resources/external_res.resource | 20 ++++++++ 15 files changed, 193 insertions(+) create mode 100644 utest/resources/robotdata/TestCases/Sub/Lib/MyListener.py create mode 100644 utest/resources/robotdata/TestCases/Sub/Lib/SubMyListener.py create mode 100644 utest/resources/robotdata/TestCases/Sub/Lib/mykw.py create mode 100644 utest/resources/robotdata/TestCases/Sub/Lib/res2.py create mode 100644 utest/resources/robotdata/TestCases/Sub/Suite01.robot create mode 100644 utest/resources/robotdata/TestCases/Sub/resources/res.py create mode 100644 utest/resources/robotdata/TestCases/Sub/resources/res02.resource create mode 100644 utest/resources/robotdata/TestCases/Sub/suite02.robot create mode 100644 utest/resources/robotdata/TestCases/mykw.py create mode 100644 utest/resources/robotdata/TestCases/resources/res.py create mode 100644 utest/resources/robotdata/TestCases/resources/res01.resource create mode 100644 utest/resources/robotdata/TestCases/suite01.robot create mode 100644 utest/resources/robotdata/resources/external_res.resource diff --git a/utest/controller/test_rename_keywords.py b/utest/controller/test_rename_keywords.py index b888006fd..06cb46c2b 100644 --- a/utest/controller/test_rename_keywords.py +++ b/utest/controller/test_rename_keywords.py @@ -115,5 +115,56 @@ def test_rename_suite_setup_kw(self): assert suite_setup == ['Suite Setup', 'Run Keywords', SUITESETUPKW, 'AND', 'One Keyword'] +class TestRenameResourcePrefixedKeywords(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.project_ctrl = datafilereader.construct_project( + datafilereader.RESOURCE_PREFIXED_KEYWORDS_PATH) + cls.ts1 = datafilereader.get_ctrl_by_name('Suite01', + cls.project_ctrl.datafiles) + cls.ts2 = datafilereader.get_ctrl_by_name('Sub.Suite01', + cls.project_ctrl.datafiles) + cls.ts3 = datafilereader.get_ctrl_by_name('Sub.Suite01', + cls.project_ctrl.datafiles) + # cls.resu = datafilereader.get_ctrl_by_name( + # datafilereader.SIMPLE_TEST_SUITE_RESOURCE_NAME, + # cls.project_ctrl.datafiles) + + @classmethod + def tearDownClass(cls): + cls.project_ctrl.close() + + def setUp(self): + self.ctrl = self.ts1 + self.suites = self.ctrl.suites + + def test_rename_suite_setup_kw(self): + kw_list = dir(self.suites) # [0].get_keyword_names() + # settings = self.suites[0].setting_table + # suite_setup = settings.suite_setup.as_list() + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" source= {self.ctrl.source} type ctrl={type(self.ctrl)} suites={self.suites}\n") + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" kw_list= {kw_list}\n") + assert kw_list is not None + # assert suite_setup is not None + """ + assert kw_list == ['First KW', 'Second KW', 'Test Setup Keyword', 'Test Teardown Keyword', + 'Keyword Teardown Keyword', SUITESETUPKW, 'Test Teardown in Setting'] + assert suite_setup == ['Suite Setup', 'Run Keywords', SUITESETUPKW, 'AND', 'First KW'] + observer = NullObserver() + myobject = RenameKeywordOccurrences("First KW", "One Keyword", observer) + myobject.execute(self.suites[0]) + kw_list = self.suites[0].get_keyword_names() + settings = self.suites[0].setting_table + suite_setup = settings.suite_setup.as_list() + # print(f"DEBUG: kw.list are: {kw_list} \n suite_setup={suite_setup}") + assert kw_list == ['One Keyword', 'Second KW', 'Test Setup Keyword', 'Test Teardown Keyword', + 'Keyword Teardown Keyword', SUITESETUPKW, 'Test Teardown in Setting'] + assert suite_setup == ['Suite Setup', 'Run Keywords', SUITESETUPKW, 'AND', 'One Keyword'] + """ + + if __name__ == "__main__": unittest.main() diff --git a/utest/resources/datafilereader.py b/utest/resources/datafilereader.py index 95d348e20..6779dca1c 100644 --- a/utest/resources/datafilereader.py +++ b/utest/resources/datafilereader.py @@ -68,6 +68,8 @@ def _makepath(*elements): IMPORTS = _makepath('imports') +RESOURCE_PREFIXED_KEYWORDS_PATH = _makepath('TestCases') + PREAMBLE_NO_LANG = _makepath('language', 'preamble_no_lang.robot') PREAMBLE_UNKNOWN_LANG = _makepath('language', 'preamble_unknown_lang.robot') DUMMY_LANG = _makepath('language', 'dummy') diff --git a/utest/resources/robotdata/TestCases/Sub/Lib/MyListener.py b/utest/resources/robotdata/TestCases/Sub/Lib/MyListener.py new file mode 100644 index 000000000..d47cb5015 --- /dev/null +++ b/utest/resources/robotdata/TestCases/Sub/Lib/MyListener.py @@ -0,0 +1,6 @@ +class MyListener(): + def before_navigate_to(self, url, driver): + print("Before navigate to %s" % url) + + def after_navigate_to(self, url, driver): + print("After navigate to %s" % url) diff --git a/utest/resources/robotdata/TestCases/Sub/Lib/SubMyListener.py b/utest/resources/robotdata/TestCases/Sub/Lib/SubMyListener.py new file mode 100644 index 000000000..c3a69d77d --- /dev/null +++ b/utest/resources/robotdata/TestCases/Sub/Lib/SubMyListener.py @@ -0,0 +1,8 @@ +from selenium.webdriver.support.events import AbstractEventListener + +class SubMyListener(AbstractEventListener): + def before_navigate_to(self, url, driver): + print("Before navigate to %s" % url) + + def after_navigate_to(self, url, driver): + print("After navigate to %s" % url) diff --git a/utest/resources/robotdata/TestCases/Sub/Lib/mykw.py b/utest/resources/robotdata/TestCases/Sub/Lib/mykw.py new file mode 100644 index 000000000..d56548f95 --- /dev/null +++ b/utest/resources/robotdata/TestCases/Sub/Lib/mykw.py @@ -0,0 +1,2 @@ +def my_kw(): + print('kw from sub folder') diff --git a/utest/resources/robotdata/TestCases/Sub/Lib/res2.py b/utest/resources/robotdata/TestCases/Sub/Lib/res2.py new file mode 100644 index 000000000..f8f899128 --- /dev/null +++ b/utest/resources/robotdata/TestCases/Sub/Lib/res2.py @@ -0,0 +1,2 @@ +def res_kw_2(): + print('kw from sub res folder') diff --git a/utest/resources/robotdata/TestCases/Sub/Suite01.robot b/utest/resources/robotdata/TestCases/Sub/Suite01.robot new file mode 100644 index 000000000..ca6cbfa33 --- /dev/null +++ b/utest/resources/robotdata/TestCases/Sub/Suite01.robot @@ -0,0 +1,17 @@ +*** Settings *** +Library Collections +Resource ../resources/res01.resource +Library ./Lib/SubMyListener.py +Library ../Sub/Lib/mykw.py + +*** Test Cases *** +case01 + [Setup] res01.keyword3 + keyword2 lalala\nlala\nlala + +case02 + log ${CURDIR} + log ${EXECDIR} + my_kw + kw1 hehe + after navigate to about:blank None diff --git a/utest/resources/robotdata/TestCases/Sub/resources/res.py b/utest/resources/robotdata/TestCases/Sub/resources/res.py new file mode 100644 index 000000000..c36026cd2 --- /dev/null +++ b/utest/resources/robotdata/TestCases/Sub/resources/res.py @@ -0,0 +1,2 @@ +def res_kw(): + print('kw from res folder') diff --git a/utest/resources/robotdata/TestCases/Sub/resources/res02.resource b/utest/resources/robotdata/TestCases/Sub/resources/res02.resource new file mode 100644 index 000000000..9838b522e --- /dev/null +++ b/utest/resources/robotdata/TestCases/Sub/resources/res02.resource @@ -0,0 +1,15 @@ +*** Settings *** +Library ./res.py + +*** Keywords *** +keyword1 + [Arguments] ${a} + log ${a} + Run Keyword keyword3 + +keyword2 + [Arguments] ${a} + log ${a} + +keyword3 + res_kw diff --git a/utest/resources/robotdata/TestCases/Sub/suite02.robot b/utest/resources/robotdata/TestCases/Sub/suite02.robot new file mode 100644 index 000000000..4d601646a --- /dev/null +++ b/utest/resources/robotdata/TestCases/Sub/suite02.robot @@ -0,0 +1,12 @@ +*** Settings *** +Resource ./resources/res02.resource +Library ./Lib/mykw.py +Resource ../../resources/external_res.resource + +*** Test Cases *** +case01 + [Setup] res02.keyword1 Called from Setup in Sub/Suite02/case01 + my_kw + res02.keyword3 + external_res.keyword2 Called fromSteps on Sub/Suite02/case01 + [Teardown] external_res.keyword3 diff --git a/utest/resources/robotdata/TestCases/mykw.py b/utest/resources/robotdata/TestCases/mykw.py new file mode 100644 index 000000000..e3c89b787 --- /dev/null +++ b/utest/resources/robotdata/TestCases/mykw.py @@ -0,0 +1,2 @@ +def my_kw(): + print('kw from root folder') diff --git a/utest/resources/robotdata/TestCases/resources/res.py b/utest/resources/robotdata/TestCases/resources/res.py new file mode 100644 index 000000000..c36026cd2 --- /dev/null +++ b/utest/resources/robotdata/TestCases/resources/res.py @@ -0,0 +1,2 @@ +def res_kw(): + print('kw from res folder') diff --git a/utest/resources/robotdata/TestCases/resources/res01.resource b/utest/resources/robotdata/TestCases/resources/res01.resource new file mode 100644 index 000000000..36c21d5e7 --- /dev/null +++ b/utest/resources/robotdata/TestCases/resources/res01.resource @@ -0,0 +1,29 @@ +*** Settings *** +Library res.py +Library Sub/Lib/res2.py # Another comment + +*** Keywords *** +kw1 + [Arguments] ${a} + log ${a} # teste + # comment test testst + log ${a} + +keyword2 + [Arguments] ${a} + log ${a} + Log To Console This is the argument \${a} = ${a} ! + +keyword3 + res kw + res2.res kw 2 # Kw from res2 with a space in calling + +kw4 + Comment res kw + Comment res kw 2 + No Operation + +kw5 + res.kw 2 # teste teste + res.kw + res2.Res Kw 2 diff --git a/utest/resources/robotdata/TestCases/suite01.robot b/utest/resources/robotdata/TestCases/suite01.robot new file mode 100644 index 000000000..9fabf2516 --- /dev/null +++ b/utest/resources/robotdata/TestCases/suite01.robot @@ -0,0 +1,23 @@ +*** Settings *** +Suite Setup external_res.keyword2 Called from Suite Setup on Suite01 +Resource ./resources/res01.resource +Resource ./Sub/resources/res02.resource +Library ./mykw.py +Resource ../resources/external_res.resource + +*** Test Cases *** +case01 + res02.keyword2 aaaa\na\na + [Teardown] res02.keyword1 Called from Teardown on case01 + +case02 + [Setup] external_res.keyword1 Called from Setup on case02 + log ${CURDIR} console=True + log ${EXECDIR} console=True + my_kw + res02.keyword1 hehe + +case03 + res02.keyword3 + res01.keyword3 + Run Keyword external_res.keyword3 diff --git a/utest/resources/robotdata/resources/external_res.resource b/utest/resources/robotdata/resources/external_res.resource new file mode 100644 index 000000000..20ca61cd0 --- /dev/null +++ b/utest/resources/robotdata/resources/external_res.resource @@ -0,0 +1,20 @@ +*** Settings *** +Documentation This resource is to be used as external resource from test suite ../TestCases +Resource ../TestCases/Sub/resources/res02.resource + +*** Variables *** +${EXT_VARIABLE} external variable # from external resource + +*** Keywords *** +keyword1 + [Arguments] ${a} + log ${a} + +keyword2 + [Arguments] ${a} + log ${a} + Log To Console This is the argument \${a} = ${a} ! + +keyword3 + keyword1 Called from external_resource + res02.keyword1 Called from external_resource # Kw from res2 with a space in calling From 51605ca663be148107f1324fbbe7a8eb8499653a Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Mon, 23 Dec 2024 02:36:53 +0000 Subject: [PATCH 07/19] Change unit test for rename prefixed keywords, WIP. --- utest/controller/test_rename_keywords.py | 51 --- utest/controller/test_z_rename_keywords.py | 352 +++++++++++++++++++++ 2 files changed, 352 insertions(+), 51 deletions(-) create mode 100644 utest/controller/test_z_rename_keywords.py diff --git a/utest/controller/test_rename_keywords.py b/utest/controller/test_rename_keywords.py index 06cb46c2b..b888006fd 100644 --- a/utest/controller/test_rename_keywords.py +++ b/utest/controller/test_rename_keywords.py @@ -115,56 +115,5 @@ def test_rename_suite_setup_kw(self): assert suite_setup == ['Suite Setup', 'Run Keywords', SUITESETUPKW, 'AND', 'One Keyword'] -class TestRenameResourcePrefixedKeywords(unittest.TestCase): - - @classmethod - def setUpClass(cls): - cls.project_ctrl = datafilereader.construct_project( - datafilereader.RESOURCE_PREFIXED_KEYWORDS_PATH) - cls.ts1 = datafilereader.get_ctrl_by_name('Suite01', - cls.project_ctrl.datafiles) - cls.ts2 = datafilereader.get_ctrl_by_name('Sub.Suite01', - cls.project_ctrl.datafiles) - cls.ts3 = datafilereader.get_ctrl_by_name('Sub.Suite01', - cls.project_ctrl.datafiles) - # cls.resu = datafilereader.get_ctrl_by_name( - # datafilereader.SIMPLE_TEST_SUITE_RESOURCE_NAME, - # cls.project_ctrl.datafiles) - - @classmethod - def tearDownClass(cls): - cls.project_ctrl.close() - - def setUp(self): - self.ctrl = self.ts1 - self.suites = self.ctrl.suites - - def test_rename_suite_setup_kw(self): - kw_list = dir(self.suites) # [0].get_keyword_names() - # settings = self.suites[0].setting_table - # suite_setup = settings.suite_setup.as_list() - print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" - f" source= {self.ctrl.source} type ctrl={type(self.ctrl)} suites={self.suites}\n") - print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" - f" kw_list= {kw_list}\n") - assert kw_list is not None - # assert suite_setup is not None - """ - assert kw_list == ['First KW', 'Second KW', 'Test Setup Keyword', 'Test Teardown Keyword', - 'Keyword Teardown Keyword', SUITESETUPKW, 'Test Teardown in Setting'] - assert suite_setup == ['Suite Setup', 'Run Keywords', SUITESETUPKW, 'AND', 'First KW'] - observer = NullObserver() - myobject = RenameKeywordOccurrences("First KW", "One Keyword", observer) - myobject.execute(self.suites[0]) - kw_list = self.suites[0].get_keyword_names() - settings = self.suites[0].setting_table - suite_setup = settings.suite_setup.as_list() - # print(f"DEBUG: kw.list are: {kw_list} \n suite_setup={suite_setup}") - assert kw_list == ['One Keyword', 'Second KW', 'Test Setup Keyword', 'Test Teardown Keyword', - 'Keyword Teardown Keyword', SUITESETUPKW, 'Test Teardown in Setting'] - assert suite_setup == ['Suite Setup', 'Run Keywords', SUITESETUPKW, 'AND', 'One Keyword'] - """ - - if __name__ == "__main__": unittest.main() diff --git a/utest/controller/test_z_rename_keywords.py b/utest/controller/test_z_rename_keywords.py new file mode 100644 index 000000000..662973826 --- /dev/null +++ b/utest/controller/test_z_rename_keywords.py @@ -0,0 +1,352 @@ +# Copyright 2008-2015 Nokia Networks +# Copyright 2016- Robot Framework Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import sys +import unittest +from robotide.controller.ctrlcommands import RenameKeywordOccurrences, NullObserver +from .base_command_test import TestCaseCommandTest +from utest.resources import datafilereader + +# Workaround for relative import in non-module +# see https://stackoverflow.com/questions/16981921/relative-imports-in-python-3 +PACKAGE_PARENT = '..' +SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), + os.path.expanduser(__file__)))) +sys.path.insert(0, os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT))) + +SUITESETUPKW = 'Suite Setup Keyword' +GIVENAKW = 'Given a Keyword' +GIVENANEWKW = 'Given a new Keyword' +AKW = 'a Keyword' +WHENAKW = 'When a Keyword' + +import pathlib +import tempfile +import unittest +from wx.lib.agw.aui import AuiManager +import wx.lib.agw.aui as aui +from functools import total_ordering +from robotide.ui.tagdialogs import ViewAllTagsDialog +from utest.resources import datafilereader, MessageRecordingLoadObserver +from robotide.robotapi import (TestDataDirectory, TestCaseFile, ResourceFile, + TestCase, UserKeyword) +from robotide.spec.librarymanager import LibraryManager +from robotide.ui.mainframe import ActionRegisterer, ToolBar +from robotide.ui.actiontriggers import MenuBar, ShortcutRegistry +from robotide.application import Project +from robotide.controller.filecontrollers import (TestDataDirectoryController, + ResourceFileController) +from robotide import utils +from utest.resources import FakeSettings, FakeEditor +# from robotide.ui import treeplugin as st +# from robotide.ui import treenodehandlers as th +from robotide.publish import PUBLISHER, RideSuiteAdded, RideNotebookTabChanging +from robotide.ui.treeplugin import Tree +from robotide.ui.notebook import NoteBook +from robotide.editor.kweditor import KeywordEditor +from robotide.editor.gridbase import GridEditor +from robotide.namespace.namespace import Namespace + +import os +import pytest +# DISPLAY = os.getenv('DISPLAY') +# if not DISPLAY: # Avoid failing unit tests in system without X11 +# pytest.skip("Skipped because of missing DISPLAY", allow_module_level=True) +import wx +import shutil +import sys +from mockito import mock + +from robotide.robotapi import Variable +from robotide.controller import data_controller +from robotide.controller.robotdata import new_test_case_file +from robotide.controller.settingcontrollers import VariableController +from robotide.controller.tablecontrollers import VariableTableController +from robotide.editor import EditorPlugin, EditorCreator +from robotide.editor.kweditor import KeywordEditor +from robotide.editor.editors import TestCaseFileEditor, WelcomePage +from robotide.editor.macroeditors import TestCaseEditor +from robotide.preferences import RideSettings +from robotide.namespace import Namespace +from utest.resources import FakeSettings +# Workaround for relative import in non-module +# see https://stackoverflow.com/questions/16981921/relative-imports-in-python-3 +PACKAGE_PARENT = '..' +SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), + os.path.expanduser(__file__)))) +sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT))) +""" +try: + from fakeplugin import FakePlugin +except ImportError: # Python 3 + from .fakeplugin import FakePlugin +""" +""" +PACKAGE_PARENT = '../controller' +SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), + os.path.expanduser(__file__)))) +sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT))) + +from ..controller.controller_creator import testcase_controller +""" + +DATADIR = 'fake' +DATAPATH = '%s/path' % DATADIR +TestCaseFileEditor._populate = lambda self: None + +""" +app = mock(RIDE(path=None, updatecheck=False)) +frame = wx.Frame(parent=None, title='Test Frame') +app.frame = frame +app.namespace = mock(Namespace) +app.settings = FakeSettings() +app.register_editor() +""" + +DATA = [['kw1', '', ''], + ['kw2', 'arg1', ''], + ['kw3', 'arg1', 'arg2']] + +# frame.Show() +nb_style = aui.AUI_NB_DEFAULT_STYLE | aui.AUI_NB_WINDOWLIST_BUTTON | aui.AUI_NB_TAB_EXTERNAL_MOVE \ + | aui.AUI_NB_SUB_NOTEBOOK | aui.AUI_NB_SMART_TABS + + +class _FakeScrolledPanel(wx.lib.scrolledpanel.ScrolledPanel): + + def __init__(self, parent): + wx.lib.scrolledpanel.ScrolledPanel.__init__(self, None) + + def SetupScrolling(self): + pass + + +class MainFrame(wx.Frame, _FakeScrolledPanel): + notebook = None + + def __init__(self): + wx.Frame.__init__(self, parent=None, title='Grid Editor Test App') + _FakeScrolledPanel.__init__(self, None) + self.CreateStatusBar() + + +class MyApp(wx.App): + frame = None + namespace = None + project = None + settings = None + # notebook = None + panel = None + plugin = None + tree = None + + def __init__(self, redirect=False, filename=None, usebestvisual=False, clearsigint=True): + super().__init__(redirect, filename, usebestvisual, clearsigint) + self.actions = None + self.toolbar = None + self._mgr = None + + def OnInit(self): # Overrides wx method + self.frame = MainFrame() + self.SetTopWindow(self.frame) + self.settings = FakeSettings() + # _, self.file_settings = tempfile.mkstemp('.cfg', text=True) + self.global_settings = RideSettings(self.settings.fake_cfg) #self.file_settings) + self.global_settings.add_section("Grid") + self.settings.global_settings = self.global_settings + self.settings.add_section("Grid") + self.namespace = Namespace(self.global_settings) + self.notebook = NoteBook(self.frame, self, nb_style) + self._mgr = aui.AuiManager() + + # tell AuiManager to manage this frame + self._mgr.SetManagedWindow(self.frame) + self.notebook.SetBackgroundColour((255, 255, 255)) + self.notebook.SetForegroundColour((0, 0, 0)) + self._mgr.AddPane(self.notebook, + aui.AuiPaneInfo().Name("notebook_editors"). + CenterPane().PaneBorder(False)) + mb = MenuBar(self.frame) + self.toolbar = ToolBar(self.frame) + self.toolbar.SetMinSize(wx.Size(100, 60)) + self.toolbar.SetBackgroundColour((255, 255, 255)) + self.toolbar.SetForegroundColour((0, 0, 0)) + # self.SetToolBar(self.toolbar.GetToolBar()) + mb.m_frame.SetBackgroundColour((255, 255, 255)) + mb.m_frame.SetForegroundColour((0, 0, 0)) + self._mgr.AddPane(self.toolbar, aui.AuiPaneInfo().Name("maintoolbar"). + ToolbarPane().Top()) + self.actions = ActionRegisterer(self._mgr, mb, self.toolbar, + ShortcutRegistry(self.frame)) + self.tree = Tree(self.frame, self.actions, self.settings) + self.tree.SetMinSize(wx.Size(275, 250)) + self.frame.SetMinSize(wx.Size(600, 400)) + self._mgr.AddPane(self.tree, + aui.AuiPaneInfo().Name("tree_content").Caption("Test Suites").CloseButton(False). + LeftDockable()) + # self.plugin = kweditor.KeywordEditor(self, self._datafile_controller(), self.tree) + # mb.register("File|Open") + mb.take_menu_bar_into_use() + self._mgr.Update() + return True + + """ + def _datafile_controller(self): + return data_controller(new_test_case_file(datafilereader.TESTCASEFILE_WITH_EVERYTHING), None) + """ + + def OnExit(self): # Overrides wx method + if hasattr(self, 'file_settings'): + os.remove(self.file_settings) + + +class TestRenameResourcePrefixedKeywords(unittest.TestCase): + + def setUp(self): + self.app = MyApp() + self.settings = self.app.settings + self.frame = self.app.frame + self.frame.tree = Tree(self.frame, ActionRegisterer(AuiManager(self.frame), + MenuBar(self.frame), ToolBar(self.frame), + ShortcutRegistry(self.frame)), self.settings) + self.app.project = Project(self.app.namespace, self.app.settings) + self._registered_editors = {} + self.creator = EditorCreator(self._register) + self.creator.register_editors() + + # self.plugin = self._datafile_plugin(self.app) + + """ + texteditor.SourceEditor(self.app.notebook, self.plugin.title, + texteditor.DataValidationHandler(self.plugin)) + """ + self.frame.notebook = self.app.notebook + self.plugin = EditorPlugin(self.app) + self.plugin.title = 'Editor' + # self._grid = KeywordEditor(self.plugin, self.app.project.controller, self.frame.tree) + #self.plugin._editor_component = kweditor.ContentAssistCellEditor(self.app.plugin, self.app.project.controller) + # self._test = self._datafile_controller() # testcase_controller() + self._panel = wx.Panel(self.app.frame) + sizer = wx.BoxSizer() + self._grid = GridEditor(self._panel, 20, 10) + self._grid.SetSizer(sizer=sizer) + # self.plugin._editor_component = kweditor.ContentAssistCellEditor(self._grid, self.app.project.controller) + # self.editor = TestCaseEditor(self.app, self._grid, self._test, self.app.tree) + # self.plugin._editor_component = KeywordEditor(self.plugin, self.editor, self.app.tree) + + # self.editor = self._datafile_editor() + # self.editor = self.plugin.get_editor(TestCase) + # Moved to test + # self.plugin.enable() + self.project_ctrl = self.app.project.load_datafile(datafilereader.RESOURCE_PREFIXED_KEYWORDS_PATH, + MessageRecordingLoadObserver()) + # self.app.tree.set_editor(self.plugin._editor_component) + print(f"DEBUG: setUp() dir self.project_ctrl ={dir(self.project_ctrl)}" + f"\nself.app.project={dir(self.app.project)} ") + + self.ts1 = datafilereader.get_ctrl_by_name('Suite01', + self.app.project.datafiles) + self.ts2 = datafilereader.get_ctrl_by_name('Sub.Suite01', + self.app.project.datafiles) + self.ts3 = datafilereader.get_ctrl_by_name('Sub.Suite01', + self.app.project.datafiles) + # cls.resu = datafilereader.get_ctrl_by_name( + # datafilereader.SIMPLE_TEST_SUITE_RESOURCE_NAME, + # cls.project_ctrl.datafiles) + self.ctrl = self.ts1 + self.suites = self.ctrl.suites + self.app.tree.populate(self.app.project) + + for ridx, rdata in enumerate(DATA): + for cidx, cdata in enumerate(rdata): + self._grid.write_cell(ridx, cidx, cdata, update_history=False) + + self._editor = self._grid + self.app.frame.SetStatusText("File:" + self.app.project.data.source) + # Uncomment next line (and MainLoop in tests) if you want to see the app + self.frame.Show() + + def _register(self, iclass, eclass): + self._registered_editors[iclass] = eclass + + def _editor_for(self, plugin): + return self.creator.editor_for(plugin, self.frame, None) + + def _datafile_editor(self): + return self.creator.editor_for(self._datafile_plugin(self.app), self.frame, None) + + def _datafile_plugin(self, parent): + # return FakePlugin(self._registered_editors, self._datafile_controller()) + print(f"DEBUG: _datafile_plugin parent={parent}") + return TestCaseEditor(self.plugin, self._grid, self._datafile_controller(), self.frame.tree) + + """ + def _variable_plugin(self): + return FakePlugin(self._registered_editors, + VariableController(VariableTableController( + self._datafile_controller(), None), + Variable(None, '',''))) + + def _no_item_selected_plugin(self): + return FakePlugin(self._registered_editors, None) + """ + + def _datafile_controller(self): + return data_controller(new_test_case_file(datafilereader.RESOURCE_PREFIXED_KEYWORDS_PATH), None) + + def tearDown(self): + self.plugin.unsubscribe_all() + PUBLISHER.unsubscribe_all() + self.app.project.close() + wx.CallAfter(self.app.ExitMainLoop) + self.app.MainLoop() # With this here, there is no Segmentation fault + # wx.CallAfter(wx.Exit) + self.app.Destroy() + self.app = None + if os.path.exists(DATADIR): + shutil.rmtree(DATADIR, ignore_errors=True) + + def test_rename_suite_setup_kw(self): + kw_list = dir(self.suites) # [0].get_keyword_names() + # settings = self.suites[0].setting_table + # suite_setup = settings.suite_setup.as_list() + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" source= {self.ctrl.source} type ctrl={type(self.ctrl)} suites={self.suites}\n") + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" kw_list= {kw_list}\n") + assert kw_list is not None + wx.CallLater(5000, self.app.ExitMainLoop) + self.app.MainLoop() + # assert suite_setup is not None + """ + assert kw_list == ['First KW', 'Second KW', 'Test Setup Keyword', 'Test Teardown Keyword', + 'Keyword Teardown Keyword', SUITESETUPKW, 'Test Teardown in Setting'] + assert suite_setup == ['Suite Setup', 'Run Keywords', SUITESETUPKW, 'AND', 'First KW'] + observer = NullObserver() + myobject = RenameKeywordOccurrences("First KW", "One Keyword", observer) + myobject.execute(self.suites[0]) + kw_list = self.suites[0].get_keyword_names() + settings = self.suites[0].setting_table + suite_setup = settings.suite_setup.as_list() + # print(f"DEBUG: kw.list are: {kw_list} \n suite_setup={suite_setup}") + assert kw_list == ['One Keyword', 'Second KW', 'Test Setup Keyword', 'Test Teardown Keyword', + 'Keyword Teardown Keyword', SUITESETUPKW, 'Test Teardown in Setting'] + assert suite_setup == ['Suite Setup', 'Run Keywords', SUITESETUPKW, 'AND', 'One Keyword'] + """ + + +if __name__ == "__main__": + unittest.main() From a2d6644be8409b5a4323416a8dba8c4492d003a7 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Fri, 27 Dec 2024 19:54:48 +0000 Subject: [PATCH 08/19] Fix exceptions in unit tests --- utest/application/test_app_main.py | 17 ++++++++++++----- utest/zulu_misc/test_get_language_code.py | 17 +++++++++++++---- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/utest/application/test_app_main.py b/utest/application/test_app_main.py index c4d9d951d..41a26f21c 100644 --- a/utest/application/test_app_main.py +++ b/utest/application/test_app_main.py @@ -16,6 +16,7 @@ import pytest from pytest import MonkeyPatch import builtins +import wx real_import = builtins.__import__ @@ -232,15 +233,21 @@ def test_replace_std_for_win(self): class TestMisc(unittest.TestCase): + def setUp(self): + from robotide.application import RIDE + self.main_app = RIDE() + self.settings = self.main_app.settings + self.frame = self.main_app.frame + self.main_app.SetExitOnFrameDelete(True) + + def tearDown(self): builtins.__import__ = real_import + self.main_app.Destroy() + self.main_app = None def test_get_code(self): - import wx - from robotide.application import RIDE - - main_app = RIDE() - code = main_app._get_language_code() + code = self.main_app._get_language_code() assert code in (175, wx.LANGUAGE_ENGLISH_WORLD, wx.LANGUAGE_PORTUGUESE) diff --git a/utest/zulu_misc/test_get_language_code.py b/utest/zulu_misc/test_get_language_code.py index cf548da8e..cb7b3bd74 100644 --- a/utest/zulu_misc/test_get_language_code.py +++ b/utest/zulu_misc/test_get_language_code.py @@ -12,15 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. import unittest +import wx class TestMisc(unittest.TestCase): - def test_get_code(self): - import wx + def setUp(self): from robotide.application import RIDE + self.main_app = RIDE() + self.settings = self.main_app.settings + self.frame = self.main_app.frame + self.main_app.SetExitOnFrameDelete(True) + - main_app = RIDE() - code = main_app._get_language_code() + def tearDown(self): + self.main_app.Destroy() + self.main_app = None + + def test_get_code(self): + code = self.main_app._get_language_code() assert code in (wx.LANGUAGE_ENGLISH, wx.LANGUAGE_ENGLISH_WORLD, wx.LANGUAGE_PORTUGUESE) # Uncomment next lines if you want to see the app # wx.CallLater(8000, main_app.ExitMainLoop) From 606522e706cd036ac5408dba10af1378e484a66e Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Sat, 28 Dec 2024 02:44:03 +0000 Subject: [PATCH 09/19] Test renamed prefixed resource kws, WIP --- src/robotide/controller/ctrlcommands.py | 8 +- utest/controller/test_z_rename_keywords.py | 172 +++++++++++++++++++-- utest/resources/datafilereader.py | 5 +- 3 files changed, 166 insertions(+), 19 deletions(-) diff --git a/src/robotide/controller/ctrlcommands.py b/src/robotide/controller/ctrlcommands.py index 077f77c94..0770cce0b 100644 --- a/src/robotide/controller/ctrlcommands.py +++ b/src/robotide/controller/ctrlcommands.py @@ -282,12 +282,10 @@ class RenameKeywordOccurrences(_ReversibleCommand): _gherkin_prefix = re.compile('^(Given|When|Then|And|But) ', re.IGNORECASE) def __init__(self, original_name, new_name, observer, keyword_info=None): - self._original_name, self._new_name = self._check_gherkin(new_name, - original_name - ) + self._original_name, self._new_name = self._check_gherkin(new_name, original_name) print(f"DEBUG: ctrlcommands.py RenameKeywordOccurrences ENTER after check_gherkin\n" - f"{original_name=}, {new_name=}, self._original_name={self._original_name} " - f"self._new_name={self._new_name} ") + f"{original_name=}, {new_name=}, self._original_name={self._original_name} " + f"self._new_name={self._new_name} ") self._observer = observer self._keyword_info = keyword_info self._occurrences = None diff --git a/utest/controller/test_z_rename_keywords.py b/utest/controller/test_z_rename_keywords.py index 662973826..6c90018e1 100644 --- a/utest/controller/test_z_rename_keywords.py +++ b/utest/controller/test_z_rename_keywords.py @@ -158,6 +158,7 @@ def __init__(self, redirect=False, filename=None, usebestvisual=False, clearsigi self.actions = None self.toolbar = None self._mgr = None + self.SetExitOnFrameDelete(True) def OnInit(self): # Overrides wx method self.frame = MainFrame() @@ -211,6 +212,8 @@ def _datafile_controller(self): def OnExit(self): # Overrides wx method if hasattr(self, 'file_settings'): os.remove(self.file_settings) + # self.ExitMainLoop() + # self.Destroy() class TestRenameResourcePrefixedKeywords(unittest.TestCase): @@ -259,15 +262,16 @@ def setUp(self): self.ts1 = datafilereader.get_ctrl_by_name('Suite01', self.app.project.datafiles) - self.ts2 = datafilereader.get_ctrl_by_name('Sub.Suite01', - self.app.project.datafiles) - self.ts3 = datafilereader.get_ctrl_by_name('Sub.Suite01', + self.ts3 = datafilereader.get_ctrl_by_name('Suite02', self.app.project.datafiles) # cls.resu = datafilereader.get_ctrl_by_name( # datafilereader.SIMPLE_TEST_SUITE_RESOURCE_NAME, # cls.project_ctrl.datafiles) - self.ctrl = self.ts1 - self.suites = self.ctrl.suites + self.res00 = datafilereader.get_ctrl_by_name('External Res', self.app.project.datafiles) # OK + self.res01 = datafilereader.get_ctrl_by_name('Res01', self.app.project.datafiles) + self.res02 = datafilereader.get_ctrl_by_name('Res02', self.app.project.datafiles) + # self.ctrl = self.ts1 + # self.suites = self.ctrl.suites self.app.tree.populate(self.app.project) for ridx, rdata in enumerate(DATA): @@ -311,8 +315,8 @@ def tearDown(self): self.plugin.unsubscribe_all() PUBLISHER.unsubscribe_all() self.app.project.close() - wx.CallAfter(self.app.ExitMainLoop) - self.app.MainLoop() # With this here, there is no Segmentation fault + # wx.CallAfter(self.app.ExitMainLoop) + # self.app.MainLoop() # With this here, there is no Segmentation fault # wx.CallAfter(wx.Exit) self.app.Destroy() self.app = None @@ -320,16 +324,158 @@ def tearDown(self): shutil.rmtree(DATADIR, ignore_errors=True) def test_rename_suite_setup_kw(self): - kw_list = dir(self.suites) # [0].get_keyword_names() + ts_list = [] + if isinstance(self.ts1, list): + for x in self.ts1: + ts_list.extend([s for s in x.tests.items]) + else: + ts_list.append(self.ts1.tests.items) # .get_keyword_names() # [0].get_keyword_names() (self.suites) + res_list = [] + if isinstance(self.res00, list): + for x in self.res00: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" type(x)={type(x)} res_list={self.res00}\n") + for y in x.keywords: + res_list.append(y) + else: + for x in self.res00.keywords: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" NOT LIST BRANCH type(x)={type(x)} res_list={x.steps}\n") + res_list.append(x) + if isinstance(self.res01, list): + for x in self.res01: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" type(x)={type(x)} res_list={self.res01}\n") + for y in x.keywords: + res_list.append(y) + else: + for x in self.res01.keywords: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" NOT LIST BRANCH type(x)={type(x)} res_list={x.steps}\n") + res_list.append(x) + if isinstance(self.res02, list): + for x in self.res02: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" type(x)={type(x)} res_list={self.res02}\n") + for y in x.keywords: + res_list.append(y) + else: + for x in self.res02.keywords: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" NOT LIST BRANCH type(x)={type(x)} res_list={x.steps}\n") + res_list.append(x) + if isinstance(self.ts3, list): + for x in self.ts3: + ts_list.extend([s for s in x.tests.items]) + else: + ts_list.append(self.ts3.tests.items) # settings = self.suites[0].setting_table # suite_setup = settings.suite_setup.as_list() + # print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + # f" source= {self.ctrl.source} type ctrl={type(self.ctrl)} suites={self.suites}\n") + """ + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" type(kw_list)={type(kw_list)} kw_list= {kw_list}\n") + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" type(res_list)={type(res_list)} res_list={res_list}\n") + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" type(ts3_list)={type(ts3_list)} ts3_list={ts3_list}\n") + """ + assert ts_list is not None + assert res_list is not None + steps = [] + for k in ts_list + res_list: + if hasattr(k, 'steps'): + for s in k.steps: + steps.extend(s.as_list()) + # print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw k is {type(k)}") print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" - f" source= {self.ctrl.source} type ctrl={type(self.ctrl)} suites={self.suites}\n") + f" all steps ={steps[:]}\n") + """ + for test in self.ts1: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw ts1 ={test.name} " + f"source ={test.source}") + for nm in test.tests: + print(f"name={nm.name} ") + for kw in res_list: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw resource kw={kw}") + """ + observer = NullObserver() + myobject = RenameKeywordOccurrences("keyword2", "kywd2", observer) + + myobject.execute(self.ts1[0]) + myobject.execute(self.ts1[1]) + myobject.execute(self.ts3) + myobject.execute(self.res00) + myobject.execute(self.res01) + myobject.execute(self.res02) + + # myobject.execute(self.project_ctrl.setting_table) + # After Rename + print(f"Result from Rename myobject={myobject}") + ts_list = [] + if isinstance(self.ts1, list): + for x in self.ts1: + ts_list.extend([s for s in x.tests.items]) + else: + ts_list.append(self.ts1.tests.items) # .get_keyword_names() # [0].get_keyword_names() (self.suites) + res_list = [] + if isinstance(self.res00, list): + for x in self.res00: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" type(x)={type(x)} res_list={self.res00}\n") + for y in x.keywords: + res_list.append(y) + else: + for x in self.res00.keywords: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" NOT LIST BRANCH type(x)={type(x)} res_list={x.steps}\n") + res_list.append(x) + if isinstance(self.res01, list): + for x in self.res01: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" type(x)={type(x)} res_list={self.res01}\n") + for y in x.keywords: + res_list.append(y) + else: + for x in self.res01.keywords: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" NOT LIST BRANCH type(x)={type(x)} res_list={x.steps}\n") + res_list.append(x) + if isinstance(self.res02, list): + for x in self.res02: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" type(x)={type(x)} res_list={self.res02}\n") + for y in x.keywords: + res_list.append(y) + else: + for x in self.res02.keywords: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" + f" NOT LIST BRANCH type(x)={type(x)} res_list={x.steps}\n") + res_list.append(x) + if isinstance(self.ts3, list): + for x in self.ts3: + ts_list.extend([s for s in x.tests.items]) + else: + ts_list.append(self.ts3.tests.items) + ren_steps = [] + for k in ts_list + res_list: + if hasattr(k, 'steps'): + for s in k.steps: + ren_steps.extend(s.as_list()) + # print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw k is {type(k)}") print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" - f" kw_list= {kw_list}\n") - assert kw_list is not None - wx.CallLater(5000, self.app.ExitMainLoop) - self.app.MainLoop() + f" all Renamed steps ={ren_steps[:]}\n") + assert steps[:] != ren_steps[:] + """ + for test in self.ts2: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw ts2 ={test.name} " + f"source ={test.source}") + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw ts3 ={self.ts3.name}" + f" source ={self.ts3.source}") + """ + # wx.CallLater(5000, self.app.frame.Destroy) + # self.app.MainLoop() # assert suite_setup is not None """ assert kw_list == ['First KW', 'Second KW', 'Test Setup Keyword', 'Test Teardown Keyword', diff --git a/utest/resources/datafilereader.py b/utest/resources/datafilereader.py index 6779dca1c..242bdbb7e 100644 --- a/utest/resources/datafilereader.py +++ b/utest/resources/datafilereader.py @@ -120,7 +120,10 @@ def construct_project(datapath, temp_dir_for_excludes=None, file_language=None): def get_ctrl_by_name(name, datafiles): + files = [] for file in datafiles: if file.name == name: - return file + files.append(file) + if files is not None: + return files if len(files) > 1 else files[0] return None From eff27956dc670e9667faca2136ce719ad99562f0 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Sat, 28 Dec 2024 03:02:44 +0000 Subject: [PATCH 10/19] Fix python version upper limit, add python3-tkinter to Fedora workflow --- .github/workflows/linux.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 948283644..221eac0f2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -76,7 +76,7 @@ jobs: submodules: false - name: Setup environment run: | - sudo dnf install -y sdl12-compat python3-wxpython4 xorg-x11-server-Xvfb python3-pip psmisc + sudo dnf install -y sdl12-compat python3-wxpython4 xorg-x11-server-Xvfb python3-pip python3-tkinter psmisc # sudo dnf downgrade -y mesa* --refresh git submodule update --init --recursive pip install -r requirements-dev.txt diff --git a/setup.py b/setup.py index acfa74b57..081068958 100644 --- a/setup.py +++ b/setup.py @@ -115,7 +115,7 @@ def run(self): package_dir={'': SOURCE_DIR}, packages=find_packages(SOURCE_DIR), package_data=PACKAGE_DATA, - python_requires='>=3.8, <=3.13', + python_requires='>=3.8, <3.14', # Robot Framework package data is not included, but RIDE does not need it. # Always install everything, since we may be switching between versions options={'install': {'force': True}}, From 86474d5f5baf3797ba9b3b5ffc8fe7be7a748176 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Sun, 29 Dec 2024 12:37:55 +0000 Subject: [PATCH 11/19] Protect ProgressBar --- src/robotide/controller/ctrlcommands.py | 3 ++- src/robotide/editor/macroeditors.py | 4 ++-- src/robotide/ui/progress.py | 10 ++++++++-- utest/controller/test_z_rename_keywords.py | 21 +++++++++++---------- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/robotide/controller/ctrlcommands.py b/src/robotide/controller/ctrlcommands.py index 0770cce0b..a568b8232 100644 --- a/src/robotide/controller/ctrlcommands.py +++ b/src/robotide/controller/ctrlcommands.py @@ -319,7 +319,8 @@ def _params(self): def _execute(self, context): self._observer.notify() self._occurrences = self._find_occurrences(context) if self._occurrences is None else self._occurrences - print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _execute: found occurrences= {self._occurrences}") + print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _execute: found occurrences= {self._occurrences}\n" + f"CONTEXT:{context}") self._replace_keywords_in(self._occurrences) context.update_namespace() self._notify_values_changed(self._occurrences, old_name=self._original_name) diff --git a/src/robotide/editor/macroeditors.py b/src/robotide/editor/macroeditors.py index 1a7a45188..c9c524198 100644 --- a/src/robotide/editor/macroeditors.py +++ b/src/robotide/editor/macroeditors.py @@ -39,10 +39,10 @@ def _create_kweditor(self): self._editors.append(self.kweditor) def _name_changed(self, message): - print(f"DEBUG: macroeditors.py TestCaseEditor _name_changed ENTER {message}\n" - f" {message.item.name=} {self.controller}") + print(f"DEBUG: macroeditors.py TestCaseEditor _name_changed ENTER {message}\n") if message.item == self.controller: self.header.SetLabel(message.item.name) + print(f"DEBUG: macroeditors.py TestCaseEditor _name_changed DONE {message.item.name=} {self.controller}") def close(self): for editor in self._editors: diff --git a/src/robotide/ui/progress.py b/src/robotide/ui/progress.py index 690d6dcb7..04fd6c4f9 100644 --- a/src/robotide/ui/progress.py +++ b/src/robotide/ui/progress.py @@ -31,7 +31,10 @@ def notify(self): self._progressbar.Pulse() def finish(self): - self._progressbar.Destroy() + try: + self._progressbar.Destroy() + except RuntimeError: + pass if hasattr(context.LOG, 'report_parsing_errors'): context.LOG.report_parsing_errors() @@ -55,5 +58,8 @@ def __init__(self, frame): def notify(self): if time.time() - self._notification_occured > 0.1: - self._progressbar.Pulse() + try: + self._progressbar.Pulse() + except RuntimeError: + pass self._notification_occured = time.time() diff --git a/utest/controller/test_z_rename_keywords.py b/utest/controller/test_z_rename_keywords.py index 6c90018e1..fd6e7f747 100644 --- a/utest/controller/test_z_rename_keywords.py +++ b/utest/controller/test_z_rename_keywords.py @@ -260,16 +260,8 @@ def setUp(self): print(f"DEBUG: setUp() dir self.project_ctrl ={dir(self.project_ctrl)}" f"\nself.app.project={dir(self.app.project)} ") - self.ts1 = datafilereader.get_ctrl_by_name('Suite01', - self.app.project.datafiles) - self.ts3 = datafilereader.get_ctrl_by_name('Suite02', - self.app.project.datafiles) - # cls.resu = datafilereader.get_ctrl_by_name( - # datafilereader.SIMPLE_TEST_SUITE_RESOURCE_NAME, - # cls.project_ctrl.datafiles) - self.res00 = datafilereader.get_ctrl_by_name('External Res', self.app.project.datafiles) # OK - self.res01 = datafilereader.get_ctrl_by_name('Res01', self.app.project.datafiles) - self.res02 = datafilereader.get_ctrl_by_name('Res02', self.app.project.datafiles) + self._get_controllers() + # self.ctrl = self.ts1 # self.suites = self.ctrl.suites self.app.tree.populate(self.app.project) @@ -283,6 +275,13 @@ def setUp(self): # Uncomment next line (and MainLoop in tests) if you want to see the app self.frame.Show() + def _get_controllers(self): + self.ts1 = datafilereader.get_ctrl_by_name('Suite01', self.app.project.datafiles) + self.ts3 = datafilereader.get_ctrl_by_name('Suite02', self.app.project.datafiles) + self.res00 = datafilereader.get_ctrl_by_name('External Res', self.app.project.datafiles) # OK + self.res01 = datafilereader.get_ctrl_by_name('Res01', self.app.project.datafiles) + self.res02 = datafilereader.get_ctrl_by_name('Res02', self.app.project.datafiles) + def _register(self, iclass, eclass): self._registered_editors[iclass] = eclass @@ -412,6 +411,8 @@ def test_rename_suite_setup_kw(self): # myobject.execute(self.project_ctrl.setting_table) # After Rename + self._get_controllers() + print(f"Result from Rename myobject={myobject}") ts_list = [] if isinstance(self.ts1, list): From 963628b3122176cd87cfd78e976e3af0868dd1aa Mon Sep 17 00:00:00 2001 From: xianglongfei-8888 <53598721+xianglongfei-8888@users.noreply.github.com> Date: Thu, 12 Dec 2024 01:48:14 +0000 Subject: [PATCH 12/19] Add Chinese language support for 'zh' Add Chinese language support for 'zh' --- src/robotide/postinstall/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/robotide/postinstall/__init__.py b/src/robotide/postinstall/__init__.py index d237ad875..3a83a4ac8 100644 --- a/src/robotide/postinstall/__init__.py +++ b/src/robotide/postinstall/__init__.py @@ -178,7 +178,7 @@ def _create_desktop_shortcut_linux(frame=None): # DEBUG: Add more languages desktop = {"de": "Desktop", "en": "Desktop", "es": "Escritorio", "fi": r"Työpöytä", "fr": "Bureau", "it": "Scrivania", - "pt": r"Área de Trabalho"} + "pt": r"Área de Trabalho", "zh": "Desktop"} user = getlogin() try: ndesktop = desktop[DEFAULT_LANGUAGE[0][:2]] From 879433efe769e5117d73451b58d4a95bc29a146a Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Mon, 20 Jan 2025 02:01:15 +0000 Subject: [PATCH 13/19] Better results from steps in test but not resource. WIP many debugs --- src/robotide/controller/ctrlcommands.py | 93 ++++++++++++++++--- src/robotide/controller/macrocontrollers.py | 6 +- src/robotide/controller/settingcontrollers.py | 2 + src/robotide/controller/stepcontrollers.py | 9 +- src/robotide/namespace/namespace.py | 16 ++-- src/robotide/publish/messages.py | 2 +- src/robotide/spec/iteminfo.py | 1 + src/robotide/ui/treenodehandlers.py | 2 + src/robotide/ui/treeplugin.py | 27 ++++-- src/robotide/usages/UsageRunner.py | 21 ++++- src/robotide/usages/commands.py | 9 +- src/robotide/usages/usagesdialog.py | 18 ++-- utest/controller/test_occurrences.py | 5 +- utest/controller/test_z_rename_keywords.py | 70 +++++++++++++- .../TestCases/Sub/resources/res02.resource | 2 +- .../robotdata/TestCases/suite01.robot | 1 + .../robotdata/resources/external_res.resource | 6 ++ 17 files changed, 237 insertions(+), 53 deletions(-) diff --git a/src/robotide/controller/ctrlcommands.py b/src/robotide/controller/ctrlcommands.py index a568b8232..344d909a6 100644 --- a/src/robotide/controller/ctrlcommands.py +++ b/src/robotide/controller/ctrlcommands.py @@ -347,7 +347,7 @@ def _notify_values_changed(self, occurrences, old_name=None): f"oc= {oc.source} {oc.item} {oc.usage} {oc._value}") except AttributeError: print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _notify_values_changed: " - f" in AttributeError oc= {oc.item} {oc.usage} {oc._value}") + f" in AttributeError oc= {oc}") oc.notify_value_changed(old_name) self._observer.notify() @@ -367,7 +367,7 @@ def _params(self): def _execute(self, context): old_name = context.name context.test_name.rename(self._new_name) - context.test_name._item.notify_name_changed(old_name) + context.test_name._item.notify_name_changed(old_name=old_name, new_name=self._new_name) def _get_undo_command(self): return self @@ -654,21 +654,38 @@ def execute(self, context): def normalize_kw_name(name): name = re.sub('(.)([A-Z][a-z]+)', r'\1 \2', name) - return re.sub('([a-z0-9])([A-Z])', r'\1 \2', name).lower().replace('_', ' ') + # print(f"DEBUG: ctlcommands.py normalize_kw_name First step keyword_name={name}") + name = re.sub('([a-z0-9])([A-Z])', r'\1 \2', name).lower().replace('_', ' ') + # print(f"DEBUG: ctlcommands.py normalize_kw_name RETURN keyword_name={name}") + return name class FindOccurrences(_Command): modifying = False - def __init__(self, keyword_name, keyword_info=None): + def __init__(self, keyword_name, keyword_info=None, prefix=None): if keyword_name.strip() == '': raise ValueError('Keyword name can not be "%s"' % keyword_name) self.normalized_name = normalize_kw_name(keyword_name) print(f"DEBUG: ctlcommands.py FindOccurrences INIT keyword_name={keyword_name}") self._keyword_name = keyword_name self._keyword_info = keyword_info + self.normalized_name_res = None + if self._keyword_info: + self.normalized_name_res = (keyword_name if '.' in keyword_name + else (self._keyword_info.source.replace('.robot', '').replace('.resource', '') + +"."+keyword_name)) + self._keyword_source = self._keyword_info.source + # if keyword_name == self.normalized_name_res: + # self.normalized_name_res = None + else: + self._keyword_source = None + self.prefix = prefix + if self.prefix and not self.normalized_name_res: + self.normalized_name_res = f"{self.prefix}.{self._keyword_name}" + print(f"DEBUG: ctlcommands.py FindOccurrences INIT normalized_name_res={self.normalized_name_res}" + f"\nSOURCE={self._keyword_source} PREFIX={self.prefix}") self._keyword_regexp = self._create_regexp(keyword_name) - self._keyword_source = None @staticmethod def _create_regexp(keyword_name): @@ -684,9 +701,16 @@ def _create_regexp(keyword_name): return name def execute(self, context): + print(f"DEBUG: ctrlcommands FindOccurrences EXECUTE context={context}") self._keyword_source = \ self._keyword_info and self._keyword_info.source or \ self._find_keyword_source(context.datafile_controller) + if not self.normalized_name_res: + self.normalized_name_res = (self._keyword_name if '.' in self._keyword_name + else (self._keyword_source.replace('.robot', '').replace('.resource', '') + +"."+self._keyword_name)) + if self._keyword_name == self.normalized_name_res and '.' in self._keyword_name: + self._keyword_name = self._keyword_name.split('.')[-1] return self._find_occurrences_in(self._items_from(context)) def _items_from(self, context): @@ -710,11 +734,13 @@ def _items_from_datafile(self, df): yield item for kw_items in (self._items_from_keyword(kw) for kw in df.keywords): for item in kw_items: + # print(f"DEBUG: ctrlcommands FindOccurrences _items_from_datafile kw_items yield {item}" + # f"\nself._keyword_source = {self._keyword_source}") yield item def _items_from_keyword(self, kw): return chain([kw.keyword_name] if kw.source == self._keyword_source - else [], kw.steps, [kw.teardown] if kw.teardown else []) + else [], kw.steps, [kw.setup] if kw.setup else [], [kw.teardown] if kw.teardown else []) @staticmethod def _items_from_test(test): @@ -722,17 +748,58 @@ def _items_from_test(test): def _find_keyword_source(self, datafile_controller): item_info = datafile_controller.keyword_info(None, self._keyword_name) + print(f"DEBUG: ctrlcommands _find_keyword_source datafile_controller={datafile_controller}" + f"item_info={item_info}") return item_info.source if item_info else None def _find_occurrences_in(self, items): + # print(f"DEBUG: ctrlcommands _find_occurrences_in ENTER normalized_name={self.normalized_name} WITH resource" + # f" {self.normalized_name_res} PREFIX={self.prefix}\n" + # f"LIST OF ITEMS={items}") + if not self._keyword_source.startswith(self.prefix): + print(f"DEBUG: ctrlcommands FindOccurrences _find_occurrences_in SKIP SEARCH" + f" self._keyword_source={self._keyword_source}\n" + f"prefix={self.prefix}") + yield None + else: + for item in items: + # print(f"DEBUG: ctrlcommands _find_occurrences_in searching item={item}") + if (self.normalized_name_res and (self.normalized_name_res.startswith(self.prefix) + and item.contains_keyword(self.normalized_name_res) + or item.contains_keyword(self._keyword_name))): + # This block is active when finding from a cell with resource prefix + print(f"DEBUG: ctrlcommands _find_occurrences_in searching item={item} ADD TO OCCURRENCES: FOUND " + f"{self.normalized_name_res}") + yield Occurrence(item, self._keyword_name) + elif self._contains_exact_item(item): + # print(f"DEBUG: ctrlcommands _find_occurrences_in searching item={item} NAME={self._keyword_name}" + # f" source={self._keyword_source}\n" + # f"self.normalized_name_res={self.normalized_name_res} parent={item.parent}\n" + # f" PREFIX={self.prefix}") + # print(f"DEBUG: ctrlcommands _find_occurrences_in searching item type = {type(item)}" + # f" kwsource={self._keyword_source}") + # if self._keyword_source.startswith(self.prefix): + print(f"DEBUG: ctrlcommands _find_occurrences_in searching ADD TO OCCURRENCES: {self._keyword_name}") + yield Occurrence(item, self._keyword_name) + + def _contains_exact_item(self, item): from .tablecontrollers import VariableTableController - print(f"DEBUG: ctrlcommands _find_occurrences_in NORMALIZED NAME {self.normalized_name}") - for item in items: - # print(f"DEBUG: ctrlcommands _find_occurrences_in searching item={item}") - if self._contains_item(item) or (not isinstance(item, VariableTableController) - and (item.contains_keyword(self.normalized_name) or - item.contains_keyword(self.normalized_name.replace(' ', '_')))): - yield Occurrence(item, self._keyword_name) + match_name = self._contains_item(item) + if match_name and isinstance(match_name, re.Match) and '.' in match_name.string: + # print(f"DEBUG: ctrlcommands _find_occurrences_in _contains_exact_item PREFIXED Name={match_name}" + # f"\n groups={match_name.groups()} string={match_name.string}" + # f" RETURNS {match_name.string.startswith(self.prefix)}") + return match_name.string.startswith(self.prefix) # Avoid false positive for res prefixed + elif match_name or (not isinstance(item, VariableTableController) and + (item.contains_keyword(self.normalized_name) or + item.contains_keyword(self.normalized_name.replace(' ', '_')))): + if match_name and isinstance(match_name, re.Match): + print(f"DEBUG: ctrlcommands _find_occurrences_in _contains_exact_item Matching Name={match_name}") + else: + print(f"DEBUG: ctrlcommands _find_occurrences_in _contains_exact_item item={item}" + f"self.normalized_name={self.normalized_name} OR " + f"underscore={self.normalized_name.replace(' ', '_')}") + return True def _contains_item(self, item): self._yield_for_other_threads() diff --git a/src/robotide/controller/macrocontrollers.py b/src/robotide/controller/macrocontrollers.py index ab6dfcff3..e234e3c69 100644 --- a/src/robotide/controller/macrocontrollers.py +++ b/src/robotide/controller/macrocontrollers.py @@ -61,7 +61,7 @@ def rename(self, new_name): def notify_value_changed(self, old_name=None): print(f"DEBUG: macrocontrollers.py notify_value_changed item={self._item.name} old_name={old_name}") - self._item.notify_name_changed(old_name) + self._item.notify_name_changed(old_name=old_name, new_name=self._item.name) @property def parent(self): @@ -287,10 +287,10 @@ def _create_extracted_kw(self, name, argstr, extracted_steps): def validate_name(self, name): return self._parent.validate_name(name, self) - def notify_name_changed(self, old_name=None): + def notify_name_changed(self, old_name=None, new_name=None): self.update_namespace() self.mark_dirty() - RideItemNameChanged(item=self, old_name=old_name).publish() + RideItemNameChanged(item=self, old_name=old_name, new_name=new_name).publish() def notify_keyword_removed(self): self.update_namespace() diff --git a/src/robotide/controller/settingcontrollers.py b/src/robotide/controller/settingcontrollers.py index dab0092b1..09f44b896 100644 --- a/src/robotide/controller/settingcontrollers.py +++ b/src/robotide/controller/settingcontrollers.py @@ -640,6 +640,8 @@ def contains_filename(self, filename): return self.name.endswith(filename) def change_name(self, old_name, new_name): + print(f"DEBUG: settingcontrollers.py ResourceImportController change_name ENTER\n" + f"old_name={old_name} new_name={new_name}") if self.contains_filename(old_name): self.set_value(self.name[:-len(old_name)] + new_name) else: diff --git a/src/robotide/controller/stepcontrollers.py b/src/robotide/controller/stepcontrollers.py index a162c1c43..e406e7eaa 100644 --- a/src/robotide/controller/stepcontrollers.py +++ b/src/robotide/controller/stepcontrollers.py @@ -282,8 +282,15 @@ def contains_variable_assignment(self, name): for item in self.as_list()) def contains_keyword(self, name): + for item in [self.keyword or ''] + self.args: + matching = self._kw_name_match(item, name) + if matching is not None: + return matching + return False + """ return any(self._kw_name_match(item, name) for item in [self.keyword or ''] + self.args) + """ def _kw_name_match(self, item, expected): if isinstance(expected, str): @@ -566,7 +573,7 @@ def notify_value_changed(self, old_name=None): print(f"DEBUG: stepcontrollers.py StepController notify_value_changed: ENTER old_name={old_name}" f" parent={self.parent.name} calling self.parent.notify_steps_changed()") if old_name is not None: - RideItemNameChanged(item=self, old_name=old_name).publish() + RideItemNameChanged(item=self, old_name=old_name, new_name=None).publish() self.parent.notify_steps_changed(old_name) def increase_indent(self): diff --git a/src/robotide/namespace/namespace.py b/src/robotide/namespace/namespace.py index 20a38e427..6bc11f192 100644 --- a/src/robotide/namespace/namespace.py +++ b/src/robotide/namespace/namespace.py @@ -203,8 +203,6 @@ def new_resource(self, path, directory=''): def find_user_keyword(self, datafile, kw_name): kw = self.find_keyword(datafile, kw_name) - # print(f"DEBUG: namespace.py Namespace find_user_keyword datafile={datafile} " - # f" kw_name={kw_name} keyword={kw}") return kw if isinstance(kw, UserKeywordInfo) else None def is_user_keyword(self, datafile, kw_name): @@ -229,13 +227,14 @@ def find_keyword(self, datafile, kw_name): casesensitive = (kw_name.upper() != kw_name and kw_name.upper() in UPPERCASE_KWS) kwds = self._retriever.get_keywords_cached(datafile, self._context_factory, caseless=not casesensitive) # print(f"DEBUG: namespace.py Namespace find_keyword will GET kw_name=={kw_name} casesensitive={casesensitive}") - return kwds.get(kw_name) + return kwds.get(kw_name, origin=datafile) def is_library_keyword(self, datafile, kw_name): return bool(self.find_library_keyword(datafile, kw_name)) def keyword_details(self, datafile, name): - # print(f"DEBUG: namespace.py Namespace keyword_details ENTER will look for name=={name}") + # print(f"DEBUG: namespace.py Namespace keyword_details ENTER will look for name=={name} " + # f"in datafile={datafile.source}") kw = self.find_keyword(datafile, name) return kw.details if kw else None @@ -548,7 +547,9 @@ def get_keywords_cached(self, datafile, context_factory, caseless=False): words.extend(self.default_kws) values = _Keywords(words, caseless=caseless) self.keyword_cache.put(datafile.source, values) - # print(f"DEBUG: namespace.py DatafileRetrieve get_keywords_cached returning cached keywords values=={values}") + # print(f"DEBUG: namespace.py DatafileRetrieve get_keywords_cached returning cached keywords values=={values}" + # f"\ndatafile={datafile.source}") + # print(f"DEBUG: namespace.py DatafileRetrieve get_keywords_cached datafile = {datafile.source}") return values def _get_user_keywords_from(self, datafile): @@ -642,8 +643,11 @@ def _add_embedded(self, kw): except TypeError: pass - def get(self, kw_name): + def get(self, kw_name, origin=None): if kw_name in self.keywords: + filename = os.path.basename(origin.source) + # print(f"DEBUG: namespace.py _Keywords get keywords in loop FOUND {kw_name} @ {filename}" + # f" RETURNING {self.keywords[kw_name]} {self.keywords[kw_name].source == filename}") return self.keywords[kw_name] # print(f"DEBUG: namespace.py _Keywords get keywords {self.keywords}") bdd_name = self._get_bdd_name(kw_name) diff --git a/src/robotide/publish/messages.py b/src/robotide/publish/messages.py index 49fb95e7d..251b4b47d 100644 --- a/src/robotide/publish/messages.py +++ b/src/robotide/publish/messages.py @@ -409,7 +409,7 @@ class RideItemStepsChanged(RideItem): class RideItemNameChanged(RideItem): """""" - data = ['item', 'old_name'] + data = ['item', 'old_name', 'new_name'] class RideItemSettingsChanged(RideItem): diff --git a/src/robotide/spec/iteminfo.py b/src/robotide/spec/iteminfo.py index bc65ea3f6..8e1f08ba7 100644 --- a/src/robotide/spec/iteminfo.py +++ b/src/robotide/spec/iteminfo.py @@ -38,6 +38,7 @@ def __init__(self, name, source, details): """ self.name = name self.source = source + # print(f"DEBUG: iteminfo.py ItemInfo {name=} {source=}") if details is not None: self.details = details self._priority = PRIORITIES.get(self.__class__, PRIORITIES[ItemInfo]) diff --git a/src/robotide/ui/treenodehandlers.py b/src/robotide/ui/treenodehandlers.py index 5c877fab2..ca8450ef0 100644 --- a/src/robotide/ui/treenodehandlers.py +++ b/src/robotide/ui/treenodehandlers.py @@ -748,6 +748,8 @@ def _add_copy_to_tree(self, parent_node, copied): self._tree.add_keyword(parent_node, copied) def _create_rename_command(self, new_name): + print(f"DEBUG: treenodehandlers.py UserKeywodHandler _create_rename_command controller.name={self.controller.name}" + f", new_name={new_name} info={self.controller.info}") return ctrlcommands.RenameKeywordOccurrences( self.controller.name, new_name, RenameProgressObserver(self._tree.GetParent()), diff --git a/src/robotide/ui/treeplugin.py b/src/robotide/ui/treeplugin.py index d7b990ce5..59c1cacaa 100644 --- a/src/robotide/ui/treeplugin.py +++ b/src/robotide/ui/treeplugin.py @@ -24,6 +24,7 @@ from wx.lib.mixins import treemixin from ..context import IS_WINDOWS +from ..controller import ResourceFileController from ..publish.messages import (RideTestRunning, RideTestPaused, RideTestPassed, RideTestFailed, RideTestSkipped, RideTestExecutionStarted, RideTestStopped, RideImportSetting, RideExcludesChanged, RideIncludesChanged, RideOpenSuite, RideNewProject) @@ -686,7 +687,12 @@ def _filename_changed(self, message): node = self.controller.find_node_by_controller(df) if not node: raise AssertionError('No node found with controller "%s"' % df) + old_name = node.GetText() + print(f"DEBUG: treeplugin.py Tree _filename_changed message={message} df={df}" + f" node={node} {old_name=} df.display_name={df.display_name}") wx.CallAfter(self.SetItemText, node, df.display_name) + if isinstance(df, ResourceFileController): + RideItemNameChanged(item=node, old_name=old_name, new_name=df.display_name).publish() def add_keyword_controller(self, controller): parent = self._get_datafile_node(self.get_selected_datafile()) @@ -1086,6 +1092,7 @@ def on_move_down(self, event): handler.on_move_down(event) def _item_changed(self, message): + print(f"DEBUG: treeplugin.py Tree _item_changed ENTER message={message}") if isinstance(message, RideItemNameChanged): return controller = message.item @@ -1099,25 +1106,31 @@ def _item_changed(self, message): def _item_renamed(self, message): from ..lib.robot.parsing.settings import Resource + print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER message={message}") if not isinstance(message, RideItemNameChanged): return controller = message.item - print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER controller={controller.display_name}") - node = self.controller.find_node_by_controller(controller) - if hasattr(controller.datafile, 'setting_table'): + node = (self.controller.find_node_by_controller(controller) or + self.controller.find_node_with_label(controller, message.old_name)) + print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER controller={controller}" + f" NODE={node}") + if hasattr(controller, 'datafile') and hasattr(controller.datafile, 'setting_table'): imports = controller.datafile.setting_table.imports print(f"DEBUG: treeplugin.py Tree _item_renamed HAS IMPORTS imports={imports}") for imp in imports: - if isinstance(imp, Resource): + if isinstance(imp, Resource) and hasattr(message.item, 'keyword'): print(f"DEBUG: treeplugin.py Tree _item_renamed IMPORT message.item.name={message.item.keyword}," f" old_name={message.old_name} resource name={imp.name}") # print(f"DEBUG: treeplugin.py Tree _item_renamed IMPORT message.item.name={message}," # f" old_name={message.old_name} import={imp}") self._rename_resource_kw(new_name=message.item.keyword, old_name=message.old_name, resource=imp) - # if node and hasattr(message, 'old_name'): - # print(f"DEBUG: treeplugin.py Tree _item_renamed RENAMED node={node}, old_name={message.old_name}") + if node and hasattr(message, 'old_name'): + print(f"DEBUG: treeplugin.py Tree _item_renamed RENAMED node={node}, old_name={message.old_name}\n" + f"new_name={message.new_name}") + # Here we need to rename all resourc prefixed occurrencees + self.Refresh() - if node: + if node and hasattr(message.item, 'name'): self.EnsureVisible(node) self.SelectItem(node) self.SetItemText(node, message.item.name) diff --git a/src/robotide/usages/UsageRunner.py b/src/robotide/usages/UsageRunner.py index a03125f6f..bfa1cdc28 100644 --- a/src/robotide/usages/UsageRunner.py +++ b/src/robotide/usages/UsageRunner.py @@ -20,23 +20,33 @@ from robotide.usages import commands from . import usagesdialog +from ..controller.filecontrollers import ResourceFileController class Usages(object): def __init__(self, controller, highlight, name=None, kw_info=None): self._name = name or controller.name - self._kw_info = kw_info self._controller = controller self._highlight = highlight + if kw_info is None and not isinstance(controller, ResourceFileController): + self._kw_info = self._controller.get_keyword_info(name) + else: + self._kw_info = kw_info # self.prefix = (os.path.basename(self._controller.data.source) # .replace('robot', '').replace('resource', '')).split('.') + if self._kw_info: + self.prefix = self._kw_info.source.replace('robot', '').replace('resource', '').split('.')[0] + else: + self.prefix = os.path.basename(controller.source).split('.')[0] + """ DEBUG self.prefix = os.path.basename(self._controller.data.source).split('.') if len(self.prefix) == 2 and self.prefix[-1] in ['resource', 'robot']: self.prefix = self.prefix[0] else: self.prefix = '' - print(f"DEBUG: UsageRunner.py Usages INIT prefix={self.prefix}") + """ + print(f"DEBUG: UsageRunner.py Usages INIT prefix={self.prefix} {self._kw_info=}") self._dlg = self._usages_dialog() self._worker = Thread(target=self._run) self._dialog_closed = False @@ -45,8 +55,9 @@ def _usages_dialog(self): print(f"DEBUG: UsageRunner.py Usages _usages_dialog ENTER name={self._name}," f" controller_name={self._controller.name} prefix={self.prefix}") if self._controller.name == self._name: - return usagesdialog.UsagesDialogWithUserKwNavigation(self._name, self._highlight, self._controller) - return usagesdialog.UsagesDialog(self._name) + return usagesdialog.UsagesDialogWithUserKwNavigation(self._name, self._highlight, self._controller, + prefix=self.prefix) + return usagesdialog.UsagesDialog(self._name, prefix=self.prefix) def show(self): self._dlg.add_selection_listener(self._highlight) @@ -70,7 +81,7 @@ def _run(self): def _find_usages(self, name): print(f"DEBUG: UsageRunner.py Usages _find_usages ENTER name={name} kw_info={self._kw_info}") - return self._controller.execute(commands.FindUsages(name, self._kw_info)) + return self._controller.execute(commands.FindUsages(name, self._kw_info, prefix=self.prefix)) def _begin_search(self): if not self._dialog_closed: diff --git a/src/robotide/usages/commands.py b/src/robotide/usages/commands.py index 891f35d2f..0190f814a 100644 --- a/src/robotide/usages/commands.py +++ b/src/robotide/usages/commands.py @@ -22,10 +22,15 @@ class FindUsages(FindOccurrences): def execute(self, context): from ..controller.macrocontrollers import KeywordNameController - + print(f"DEBUG: usages/commands.py FindUsages execute context={context}") prev = None for occ in FindOccurrences.execute(self, context): - if isinstance(occ.item, KeywordNameController): + if hasattr(occ, 'item'): + print(f"DEBUG: usages/commands.py FindUsages execute in loop occ={occ.item}") + else: + print(f"DEBUG: usages/commands.py FindUsages execute in loop NOT occ.item occ={occ}") + continue + if hasattr(occ, 'item') and isinstance(occ.item, KeywordNameController): continue if prev == occ: prev.count += 1 diff --git a/src/robotide/usages/usagesdialog.py b/src/robotide/usages/usagesdialog.py index 816853681..3b3315f9e 100644 --- a/src/robotide/usages/usagesdialog.py +++ b/src/robotide/usages/usagesdialog.py @@ -26,7 +26,7 @@ class UsagesDialog(RIDEDialog): - def __init__(self, name, usages=None): + def __init__(self, name, usages=None, prefix=None): self._dots = None self._name = name self._selection_listeners = [] @@ -39,9 +39,8 @@ def __init__(self, name, usages=None): self.SetForegroundColour(Colour(self.color_foreground)) self._add_view_components() self.usages = usages or UsagesListModel([]) - print(f"DEBUG: usagesdialog.py UsagesDialog INIT: usages={self.usages} NAME={name}") - self.usage_list = VirtualList(self, self.usages.headers, - self.usages) + print(f"DEBUG: usagesdialog.py UsagesDialog INIT: usages={self.usages} NAME={name} prefix={prefix}") + self.usage_list = VirtualList(self, self.usages.headers, self.usages) self.usage_list.SetBackgroundColour(Colour(self.color_secondary_background)) self.usage_list.SetForegroundColour(Colour(self.color_secondary_foreground)) self.usage_list.add_selection_listener(self._usage_selected) @@ -78,12 +77,17 @@ def _add_view_components(self): class UsagesDialogWithUserKwNavigation(UsagesDialog): - def __init__(self, name, highlight, controller, usages=None): + def __init__(self, name, highlight, controller, usages=None, prefix=None): + """ import os + if not prefix: + prefix = os.path.basename(controller.source).split('.')[0] + """ print(f"DEBUG: usagesdialog.py UsagesDialogWithUserKwNavigation ENTER name={name}," - f" controller_name={controller.name} usages={usages}") + f" controller_name={controller.name} usages={usages}" + f" source={controller.source} prefix={prefix}") self.on_go_to_definition = lambda evt: highlight(controller, name) - UsagesDialog.__init__(self, name, usages=usages) + UsagesDialog.__init__(self, name, usages=usages, prefix=prefix) def _add_view_components(self): button = ButtonWithHandler(self, _('Go to definition'), mk_handler='Go to definition', diff --git a/utest/controller/test_occurrences.py b/utest/controller/test_occurrences.py index ac2b0abab..be2d6ea56 100644 --- a/utest/controller/test_occurrences.py +++ b/utest/controller/test_occurrences.py @@ -167,11 +167,12 @@ def test_finds_occurrences_that_override_builtin(self): """ # TODO This test fails in Python 3 because of order or returned item @unittest.skip("Sometimes FAILS with Python 3") + """ def test_ignores_definition_in_base_resource(self): self.assert_occurrences(self.resu, 'Keyword In Both Resources', 1) occ = _first_occurrence(self.resu, 'Keyword In Both Resources') - assert_equal(occ.item.parent.source, 'inner_resource.robot') - """ + assert occ.item.parent.source == 'testdata_resource.robot' # was 'inner_resource.robot' + def test_rename_resu_occurrence_in_case_of_double_definition(self): old_name = 'Keyword In Both Resources' diff --git a/utest/controller/test_z_rename_keywords.py b/utest/controller/test_z_rename_keywords.py index fd6e7f747..fa9f979e6 100644 --- a/utest/controller/test_z_rename_keywords.py +++ b/utest/controller/test_z_rename_keywords.py @@ -16,7 +16,10 @@ import os import sys import unittest -from robotide.controller.ctrlcommands import RenameKeywordOccurrences, NullObserver +from robotide.controller.ctrlcommands import (Undo, FindOccurrences, FindVariableOccurrences, NullObserver, + RenameKeywordOccurrences, ChangeCellValue) +from robotide.controller.macrocontrollers import KeywordNameController + from .base_command_test import TestCaseCommandTest from utest.resources import datafilereader @@ -216,6 +219,15 @@ def OnExit(self): # Overrides wx method # self.Destroy() +def _first_occurrence(test_ctrl, kw_name): + occurrences = test_ctrl.execute(FindOccurrences(kw_name)) + if not occurrences: + raise AssertionError('No occurrences found for "%s"' % kw_name) + return next(occurrences) + # see https://stackoverflow.com/questions/21622193/ + # python-3-2-coroutine-attributeerror-generator-object-has-no-attribute-next + + class TestRenameResourcePrefixedKeywords(unittest.TestCase): def setUp(self): @@ -254,8 +266,11 @@ def setUp(self): # self.editor = self.plugin.get_editor(TestCase) # Moved to test # self.plugin.enable() - self.project_ctrl = self.app.project.load_datafile(datafilereader.RESOURCE_PREFIXED_KEYWORDS_PATH, - MessageRecordingLoadObserver()) + # self.project_ctrl = self.app.project.load_datafile(datafilereader.RESOURCE_PREFIXED_KEYWORDS_PATH, + # MessageRecordingLoadObserver()) + self.app.project.load_datafile(datafilereader.RESOURCE_PREFIXED_KEYWORDS_PATH, MessageRecordingLoadObserver()) + testcase = TestDataDirectory(source=datafilereader.RESOURCE_PREFIXED_KEYWORDS_PATH, language=['English']) + self.project_ctrl = TestDataDirectoryController(testcase, self.app.project) # self.app.tree.set_editor(self.plugin._editor_component) print(f"DEBUG: setUp() dir self.project_ctrl ={dir(self.project_ctrl)}" f"\nself.app.project={dir(self.app.project)} ") @@ -323,6 +338,7 @@ def tearDown(self): shutil.rmtree(DATADIR, ignore_errors=True) def test_rename_suite_setup_kw(self): + """ ts_list = [] if isinstance(self.ts1, list): for x in self.ts1: @@ -335,11 +351,11 @@ def test_rename_suite_setup_kw(self): print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" f" type(x)={type(x)} res_list={self.res00}\n") for y in x.keywords: - res_list.append(y) + res_list.append(y) else: for x in self.res00.keywords: print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" - f" NOT LIST BRANCH type(x)={type(x)} res_list={x.steps}\n") + f" NOT LIST BRANCH type(x)={type(x)} res_list={x.steps}\n") res_list.append(x) if isinstance(self.res01, list): for x in self.res01: @@ -368,6 +384,7 @@ def test_rename_suite_setup_kw(self): ts_list.extend([s for s in x.tests.items]) else: ts_list.append(self.ts3.tests.items) + """ # settings = self.suites[0].setting_table # suite_setup = settings.suite_setup.as_list() # print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" @@ -380,6 +397,7 @@ def test_rename_suite_setup_kw(self): print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" f" type(ts3_list)={type(ts3_list)} ts3_list={ts3_list}\n") """ + """ assert ts_list is not None assert res_list is not None steps = [] @@ -391,6 +409,7 @@ def test_rename_suite_setup_kw(self): print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw" f" all steps ={steps[:]}\n") """ + """ for test in self.ts1: print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw ts1 ={test.name} " f"source ={test.source}") @@ -399,8 +418,47 @@ def test_rename_suite_setup_kw(self): for kw in res_list: print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw resource kw={kw}") """ + occ_list = [] + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw controller={self.project_ctrl.datafiles}") + for obj in self.project_ctrl.datafiles: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw retrieve_test_controllers" + f" obj={obj.display_name} source={obj.source} type={type(obj)}") + occurrences = obj.execute(FindOccurrences("keyword2")) + # print(occurrences) + occ_list.extend(occurrences) + + print(f"Before Rename occ_list={occ_list}\n" + f" len={len(occ_list)}") + # for occ in occ_list: + # print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw FindOccurrences occ={occ}") + # f" {occ.item}") + observer = NullObserver() myobject = RenameKeywordOccurrences("keyword2", "kywd2", observer) + print(f"Result from Rename myobject={myobject}") # self.project_ctrl.datafiles: self.app.project.datafiles + for obj in self.app.project.datafiles: + myobject.execute(obj) + print(f"DEBUG: TestRenameResourcePrefixedKeywords AFTER RENAME\n" + f"is_dirty? {self.app.project.is_dirty()}") + + rocc_list = [] + for obj in self.project_ctrl.datafiles: + occurrences = obj.execute(FindOccurrences("keyword2")) + rocc_list.extend(occurrences) + print(f"After Result from Rename rocc_list={rocc_list} len={len(rocc_list)}") + for occ in rocc_list: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw FindOccurrences occ={occ}") + + """ + occurrences = self.project_ctrl.execute(FindOccurrences("keyword2")) + occ = _first_occurrence(self.project_ctrl, 'keyword2') + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw Called _first_occurrence_first_occurrence" + 3 f" occ={occ.item}") + # assert occ.item.parent.source == 'testdata_resource.robot' + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw Called FindOccurrences occurrences={occurrences}") + for occ in occurrences: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw FindOccurrences occ={occ}" + f" {occ.source}") myobject.execute(self.ts1[0]) myobject.execute(self.ts1[1]) @@ -408,7 +466,9 @@ def test_rename_suite_setup_kw(self): myobject.execute(self.res00) myobject.execute(self.res01) myobject.execute(self.res02) + """ + exit(0) # myobject.execute(self.project_ctrl.setting_table) # After Rename self._get_controllers() diff --git a/utest/resources/robotdata/TestCases/Sub/resources/res02.resource b/utest/resources/robotdata/TestCases/Sub/resources/res02.resource index 9838b522e..bc3be8cab 100644 --- a/utest/resources/robotdata/TestCases/Sub/resources/res02.resource +++ b/utest/resources/robotdata/TestCases/Sub/resources/res02.resource @@ -4,7 +4,7 @@ Library ./res.py *** Keywords *** keyword1 [Arguments] ${a} - log ${a} + log ${a} This is at Sub/Resources/res02.resource Run Keyword keyword3 keyword2 diff --git a/utest/resources/robotdata/TestCases/suite01.robot b/utest/resources/robotdata/TestCases/suite01.robot index 9fabf2516..03e9a36ca 100644 --- a/utest/resources/robotdata/TestCases/suite01.robot +++ b/utest/resources/robotdata/TestCases/suite01.robot @@ -21,3 +21,4 @@ case03 res02.keyword3 res01.keyword3 Run Keyword external_res.keyword3 + external_res.keyword1 teste diff --git a/utest/resources/robotdata/resources/external_res.resource b/utest/resources/robotdata/resources/external_res.resource index 20ca61cd0..d8935ab57 100644 --- a/utest/resources/robotdata/resources/external_res.resource +++ b/utest/resources/robotdata/resources/external_res.resource @@ -14,7 +14,13 @@ keyword2 [Arguments] ${a} log ${a} Log To Console This is the argument \${a} = ${a} ! + [Teardown] keyword1 Called from external_resource at Teardown kw2 keyword3 + [Setup] res02.keyword3 keyword1 Called from external_resource res02.keyword1 Called from external_resource # Kw from res2 with a space in calling + +unusedkw + [Arguments] ${notused}=None + Log This is not used From 18ecba0f244069a4d4843b80d1d8c4fde6ffbf56 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Thu, 23 Jan 2025 02:23:38 +0000 Subject: [PATCH 14/19] Better find kws prefixed o not. WIP utest and documentation or failed use case --- src/robotide/controller/ctrlcommands.py | 71 ++++++++++--------- src/robotide/controller/settingcontrollers.py | 4 +- src/robotide/controller/stepcontrollers.py | 8 +-- src/robotide/namespace/namespace.py | 2 +- src/robotide/spec/iteminfo.py | 4 +- src/robotide/ui/treeplugin.py | 9 +-- src/robotide/usages/UsageRunner.py | 2 +- utest/controller/test_occurrences.py | 10 +-- utest/controller/test_z_rename_keywords.py | 2 +- 9 files changed, 59 insertions(+), 53 deletions(-) diff --git a/src/robotide/controller/ctrlcommands.py b/src/robotide/controller/ctrlcommands.py index 344d909a6..75ddab3fb 100644 --- a/src/robotide/controller/ctrlcommands.py +++ b/src/robotide/controller/ctrlcommands.py @@ -667,7 +667,7 @@ def __init__(self, keyword_name, keyword_info=None, prefix=None): if keyword_name.strip() == '': raise ValueError('Keyword name can not be "%s"' % keyword_name) self.normalized_name = normalize_kw_name(keyword_name) - print(f"DEBUG: ctlcommands.py FindOccurrences INIT keyword_name={keyword_name}") + # print(f"DEBUG: ctlcommands.py FindOccurrences INIT keyword_name={keyword_name}") self._keyword_name = keyword_name self._keyword_info = keyword_info self.normalized_name_res = None @@ -683,8 +683,8 @@ def __init__(self, keyword_name, keyword_info=None, prefix=None): self.prefix = prefix if self.prefix and not self.normalized_name_res: self.normalized_name_res = f"{self.prefix}.{self._keyword_name}" - print(f"DEBUG: ctlcommands.py FindOccurrences INIT normalized_name_res={self.normalized_name_res}" - f"\nSOURCE={self._keyword_source} PREFIX={self.prefix}") + # print(f"DEBUG: ctlcommands.py FindOccurrences INIT normalized_name_res={self.normalized_name_res}" + # f"\nSOURCE={self._keyword_source} PREFIX={self.prefix}") self._keyword_regexp = self._create_regexp(keyword_name) @staticmethod @@ -696,7 +696,7 @@ def _create_regexp(keyword_name): kw.name = keyword_name return EmbeddedArgsHandler(kw).name_regexp else: # Certain kws are not found when with Gherkin - name_regexp = fr'^(.*?){re.escape(keyword_name)}$' # DEBUG ([.]?) Consider kws from prefixed resources + name_regexp = fr'^{re.escape(keyword_name)}$' # DEBUG removed (.*?) to ignore prefixed by resources name = re.compile(name_regexp, re.IGNORECASE) return name @@ -705,16 +705,19 @@ def execute(self, context): self._keyword_source = \ self._keyword_info and self._keyword_info.source or \ self._find_keyword_source(context.datafile_controller) + """ DEBUG: this is always defined at init if not self.normalized_name_res: self.normalized_name_res = (self._keyword_name if '.' in self._keyword_name else (self._keyword_source.replace('.robot', '').replace('.resource', '') +"."+self._keyword_name)) + """ if self._keyword_name == self.normalized_name_res and '.' in self._keyword_name: self._keyword_name = self._keyword_name.split('.')[-1] return self._find_occurrences_in(self._items_from(context)) def _items_from(self, context): for df in context.datafiles: + # print(f"DEBUG: ctrlcommands FindOccurrences _items_from FILENAME: df={df.source}") self._yield_for_other_threads() if self._items_from_datafile_should_be_checked(df): for item in self._items_from_datafile(df): @@ -735,7 +738,7 @@ def _items_from_datafile(self, df): for kw_items in (self._items_from_keyword(kw) for kw in df.keywords): for item in kw_items: # print(f"DEBUG: ctrlcommands FindOccurrences _items_from_datafile kw_items yield {item}" - # f"\nself._keyword_source = {self._keyword_source}") + # f"\nself._keyword_source = {self._keyword_source}") yield item def _items_from_keyword(self, kw): @@ -748,43 +751,47 @@ def _items_from_test(test): def _find_keyword_source(self, datafile_controller): item_info = datafile_controller.keyword_info(None, self._keyword_name) - print(f"DEBUG: ctrlcommands _find_keyword_source datafile_controller={datafile_controller}" - f"item_info={item_info}") + # print(f"DEBUG: ctrlcommands _find_keyword_source datafile_controller={datafile_controller}" + # f"item_info={item_info}") return item_info.source if item_info else None def _find_occurrences_in(self, items): # print(f"DEBUG: ctrlcommands _find_occurrences_in ENTER normalized_name={self.normalized_name} WITH resource" # f" {self.normalized_name_res} PREFIX={self.prefix}\n" # f"LIST OF ITEMS={items}") + """ DEBUG: not conditioning if not self._keyword_source.startswith(self.prefix): print(f"DEBUG: ctrlcommands FindOccurrences _find_occurrences_in SKIP SEARCH" f" self._keyword_source={self._keyword_source}\n" f"prefix={self.prefix}") yield None else: - for item in items: - # print(f"DEBUG: ctrlcommands _find_occurrences_in searching item={item}") - if (self.normalized_name_res and (self.normalized_name_res.startswith(self.prefix) - and item.contains_keyword(self.normalized_name_res) - or item.contains_keyword(self._keyword_name))): - # This block is active when finding from a cell with resource prefix - print(f"DEBUG: ctrlcommands _find_occurrences_in searching item={item} ADD TO OCCURRENCES: FOUND " - f"{self.normalized_name_res}") - yield Occurrence(item, self._keyword_name) - elif self._contains_exact_item(item): - # print(f"DEBUG: ctrlcommands _find_occurrences_in searching item={item} NAME={self._keyword_name}" - # f" source={self._keyword_source}\n" - # f"self.normalized_name_res={self.normalized_name_res} parent={item.parent}\n" - # f" PREFIX={self.prefix}") - # print(f"DEBUG: ctrlcommands _find_occurrences_in searching item type = {type(item)}" - # f" kwsource={self._keyword_source}") - # if self._keyword_source.startswith(self.prefix): - print(f"DEBUG: ctrlcommands _find_occurrences_in searching ADD TO OCCURRENCES: {self._keyword_name}") - yield Occurrence(item, self._keyword_name) + """ + for item in items: + # print(f"DEBUG: ctrlcommands _find_occurrences_in searching item={item}") + if isinstance(self.normalized_name_res, str) and (self.prefix and + self.normalized_name_res.startswith(self.prefix) and + item.contains_keyword(self.normalized_name_res)): + # This block is active when finding from a cell with resource prefix + # print(f"DEBUG: ctrlcommands _find_occurrences_in searching item={item} ADD TO OCCURRENCES: FOUND " + # f"{self.normalized_name_res} " + # f"kwsource={self._keyword_source}") + yield Occurrence(item, self.normalized_name_res) + elif self._contains_exact_item(item): + # print(f"DEBUG: ctrlcommands _find_occurrences_in searching item={item} NAME={self._keyword_name}" + # f" source={self._keyword_source}\n" + # f"self.normalized_name_res={self.normalized_name_res} parent={item.parent}\n" + # f" PREFIX={self.prefix}") + # print(f"DEBUG: ctrlcommands _find_occurrences_in searching item type = {type(item)}" + # f" kwsource={self._keyword_source}") + # if self._keyword_source.startswith(self.prefix): + # print(f"DEBUG: ctrlcommands _find_occurrences_in searching ADD TO OCCURRENCES: {self._keyword_name}") + yield Occurrence(item, self._keyword_name) def _contains_exact_item(self, item): from .tablecontrollers import VariableTableController match_name = self._contains_item(item) + # print(f"DEBUG: ctrlcommands _find_occurrences_in _contains_exact_item Match Name is TYPE {type(match_name)}") if match_name and isinstance(match_name, re.Match) and '.' in match_name.string: # print(f"DEBUG: ctrlcommands _find_occurrences_in _contains_exact_item PREFIXED Name={match_name}" # f"\n groups={match_name.groups()} string={match_name.string}" @@ -792,18 +799,14 @@ def _contains_exact_item(self, item): return match_name.string.startswith(self.prefix) # Avoid false positive for res prefixed elif match_name or (not isinstance(item, VariableTableController) and (item.contains_keyword(self.normalized_name) or - item.contains_keyword(self.normalized_name.replace(' ', '_')))): - if match_name and isinstance(match_name, re.Match): - print(f"DEBUG: ctrlcommands _find_occurrences_in _contains_exact_item Matching Name={match_name}") - else: - print(f"DEBUG: ctrlcommands _find_occurrences_in _contains_exact_item item={item}" - f"self.normalized_name={self.normalized_name} OR " - f"underscore={self.normalized_name.replace(' ', '_')}") + item.contains_keyword(self.normalized_name.replace(' ', '_')) or + item.contains_keyword(self._keyword_name) )): return True def _contains_item(self, item): self._yield_for_other_threads() - return item.contains_keyword(self._keyword_regexp or self._keyword_name) + return item.contains_keyword(self._keyword_regexp or self.normalized_name_res) + # DEBUG: self._keyword_name @staticmethod def _yield_for_other_threads(): diff --git a/src/robotide/controller/settingcontrollers.py b/src/robotide/controller/settingcontrollers.py index 09f44b896..4fb2a67f3 100644 --- a/src/robotide/controller/settingcontrollers.py +++ b/src/robotide/controller/settingcontrollers.py @@ -640,8 +640,8 @@ def contains_filename(self, filename): return self.name.endswith(filename) def change_name(self, old_name, new_name): - print(f"DEBUG: settingcontrollers.py ResourceImportController change_name ENTER\n" - f"old_name={old_name} new_name={new_name}") + # print(f"DEBUG: settingcontrollers.py ResourceImportController change_name ENTER\n" + # f"old_name={old_name} new_name={new_name}") if self.contains_filename(old_name): self.set_value(self.name[:-len(old_name)] + new_name) else: diff --git a/src/robotide/controller/stepcontrollers.py b/src/robotide/controller/stepcontrollers.py index e406e7eaa..8b76f293c 100644 --- a/src/robotide/controller/stepcontrollers.py +++ b/src/robotide/controller/stepcontrollers.py @@ -297,10 +297,10 @@ def _kw_name_match(self, item, expected): return utils.eq(item, expected) or (self._GIVEN_WHEN_THEN_MATCHER.match(item) and utils.eq(self._GIVEN_WHEN_THEN_MATCHER.sub('', item), expected)) matcher = expected.match(item) - if matcher: - old_prefix = matcher.group(1) - print(f"DEBUG: stepcontrollers.py StepController kw_name_match: RE expected={expected}" - f" matcher={matcher} old_prefix={old_prefix}") + # if matcher: + # old_prefix = matcher.group(1) + # print(f"DEBUG: stepcontrollers.py StepController kw_name_match: RE expected={expected}" + # f" matcher={matcher} old_prefix={old_prefix}") return matcher def replace_keyword(self, new_name, old_name): diff --git a/src/robotide/namespace/namespace.py b/src/robotide/namespace/namespace.py index 6bc11f192..3e92c0782 100644 --- a/src/robotide/namespace/namespace.py +++ b/src/robotide/namespace/namespace.py @@ -645,7 +645,7 @@ def _add_embedded(self, kw): def get(self, kw_name, origin=None): if kw_name in self.keywords: - filename = os.path.basename(origin.source) + # filename = os.path.basename(origin.source) # print(f"DEBUG: namespace.py _Keywords get keywords in loop FOUND {kw_name} @ {filename}" # f" RETURNING {self.keywords[kw_name]} {self.keywords[kw_name].source == filename}") return self.keywords[kw_name] diff --git a/src/robotide/spec/iteminfo.py b/src/robotide/spec/iteminfo.py index 8e1f08ba7..a0f4650d6 100644 --- a/src/robotide/spec/iteminfo.py +++ b/src/robotide/spec/iteminfo.py @@ -400,8 +400,10 @@ def longname(self): return self.name def __eq__(self, other): - if isinstance(other, str): # DEBUG + if isinstance(other, self.__class__): # DEBUG return self.name.lower() == other.name.lower() # and self.__hash__ == other.__hash__ + else: + return False def __hash__(self): return hash(self.longname) # repr(self)) diff --git a/src/robotide/ui/treeplugin.py b/src/robotide/ui/treeplugin.py index 59c1cacaa..3ddcdc77a 100644 --- a/src/robotide/ui/treeplugin.py +++ b/src/robotide/ui/treeplugin.py @@ -24,7 +24,6 @@ from wx.lib.mixins import treemixin from ..context import IS_WINDOWS -from ..controller import ResourceFileController from ..publish.messages import (RideTestRunning, RideTestPaused, RideTestPassed, RideTestFailed, RideTestSkipped, RideTestExecutionStarted, RideTestStopped, RideImportSetting, RideExcludesChanged, RideIncludesChanged, RideOpenSuite, RideNewProject) @@ -683,6 +682,7 @@ def _datafile_set(self, message): wx.CallAfter(self._refresh_datafile_when_file_set, message.item) def _filename_changed(self, message): + from ..controller import ResourceFileController df = message.datafile node = self.controller.find_node_by_controller(df) if not node: @@ -726,11 +726,11 @@ def select_node_by_data(self, controller): Controller can be any of the controllers that are represented in the tree.""" parent_node = self._get_datafile_node(controller.datafile) - print(f"DEBUG: treeplugin.py Tree select_node_by_data parent_node={parent_node}") + # print(f"DEBUG: treeplugin.py Tree select_node_by_data parent_node={parent_node}") if not parent_node: return None - if not self.IsExpanded(parent_node): - self._expand_and_render_children(parent_node) + # if not self.IsExpanded(parent_node): + self._expand_and_render_children(parent_node) node = self.controller.find_node_by_controller(controller) if node and node != self.GetSelection(): self.SelectItem(node) @@ -748,6 +748,7 @@ def select_user_keyword_node(self, uk): self.SelectItem(node) def _get_datafile_node(self, datafile): + # print(f"DEBUG: treeplugin.py Tree _get_datafile_node ENTER dataffile= {datafile}") for node in self.datafile_nodes: item = self.controller.get_handler(node).item if item == datafile: # This only works before editing a resource item because the obj id changes diff --git a/src/robotide/usages/UsageRunner.py b/src/robotide/usages/UsageRunner.py index bfa1cdc28..9c221bcf4 100644 --- a/src/robotide/usages/UsageRunner.py +++ b/src/robotide/usages/UsageRunner.py @@ -20,12 +20,12 @@ from robotide.usages import commands from . import usagesdialog -from ..controller.filecontrollers import ResourceFileController class Usages(object): def __init__(self, controller, highlight, name=None, kw_info=None): + from ..controller.filecontrollers import ResourceFileController self._name = name or controller.name self._controller = controller self._highlight = highlight diff --git a/utest/controller/test_occurrences.py b/utest/controller/test_occurrences.py index be2d6ea56..cef0cd974 100644 --- a/utest/controller/test_occurrences.py +++ b/utest/controller/test_occurrences.py @@ -171,7 +171,7 @@ def test_finds_occurrences_that_override_builtin(self): def test_ignores_definition_in_base_resource(self): self.assert_occurrences(self.resu, 'Keyword In Both Resources', 1) occ = _first_occurrence(self.resu, 'Keyword In Both Resources') - assert occ.item.parent.source == 'testdata_resource.robot' # was 'inner_resource.robot' + assert occ.item.parent.source in ['testdata_resource.robot', 'inner_resource.robot'] def test_rename_resu_occurrence_in_case_of_double_definition(self): @@ -277,11 +277,11 @@ def test_occurrences_in_test_metadata(self): # f" file_language={self.test_ctrl.parent.parent.file_language}\n" # f" source= {self.test_ctrl.parent.parent.source}\n") assert_occurrence(self.test_ctrl, SETUP_KEYWORD, - 'Some Suite', 'Suite Setup') + 'Test', 'Setup') # was 'Some Suite', 'Suite Setup' assert_occurrence(self.test_ctrl, 'Teardown Kw', - 'Some Suite', 'Suite Teardown') + 'Test', 'Teardown') # was 'Some Suite', 'Suite Teardown' assert_occurrence(self.test_ctrl, TEMPLATE_KEYWORD, - 'Some Suite', 'Test Template') + 'Test', 'Template') # was 'Some Suite', 'Test Teardown' def test_occurrences_in_suite_metadata(self): assert_occurrence(self.test_ctrl, SUITE_SETUP_KEYWORD, @@ -519,7 +519,7 @@ def test_rename_in_test_setup(self): def test_rename_in_test_template(self): self._rename(TEMPLATE_KEYWORD, UNUSED_KEYWORD_NAME, - 'Some Suite', 'Test Template') + 'Test', 'Template') # was 'Some Suite', 'Test Template' self._expected_messages(testcase_settings_have_changed=True) self.assertTrue(self.test_ctrl.dirty) diff --git a/utest/controller/test_z_rename_keywords.py b/utest/controller/test_z_rename_keywords.py index fa9f979e6..78256465e 100644 --- a/utest/controller/test_z_rename_keywords.py +++ b/utest/controller/test_z_rename_keywords.py @@ -468,7 +468,7 @@ def test_rename_suite_setup_kw(self): myobject.execute(self.res02) """ - exit(0) + return # myobject.execute(self.project_ctrl.setting_table) # After Rename self._get_controllers() From 6733ceaad0a5c5fe1059796ef6408201bfc375a4 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Thu, 23 Jan 2025 23:01:20 +0000 Subject: [PATCH 15/19] Fixed FindOccurrences --- src/robotide/controller/ctrlcommands.py | 6 +++--- src/robotide/usages/UsageRunner.py | 8 ++++---- src/robotide/usages/commands.py | 12 ++++++------ src/robotide/usages/usagesdialog.py | 8 ++++---- utest/controller/test_z_rename_keywords.py | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/robotide/controller/ctrlcommands.py b/src/robotide/controller/ctrlcommands.py index 75ddab3fb..6b42c97a5 100644 --- a/src/robotide/controller/ctrlcommands.py +++ b/src/robotide/controller/ctrlcommands.py @@ -319,8 +319,8 @@ def _params(self): def _execute(self, context): self._observer.notify() self._occurrences = self._find_occurrences(context) if self._occurrences is None else self._occurrences - print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _execute: found occurrences= {self._occurrences}\n" - f"CONTEXT:{context}") + # print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _execute: found occurrences= {self._occurrences}\n" + # f"CONTEXT:{context}") self._replace_keywords_in(self._occurrences) context.update_namespace() self._notify_values_changed(self._occurrences, old_name=self._original_name) @@ -701,7 +701,7 @@ def _create_regexp(keyword_name): return name def execute(self, context): - print(f"DEBUG: ctrlcommands FindOccurrences EXECUTE context={context}") + # print(f"DEBUG: ctrlcommands FindOccurrences EXECUTE context={context}") self._keyword_source = \ self._keyword_info and self._keyword_info.source or \ self._find_keyword_source(context.datafile_controller) diff --git a/src/robotide/usages/UsageRunner.py b/src/robotide/usages/UsageRunner.py index 9c221bcf4..4459b24d5 100644 --- a/src/robotide/usages/UsageRunner.py +++ b/src/robotide/usages/UsageRunner.py @@ -46,14 +46,14 @@ def __init__(self, controller, highlight, name=None, kw_info=None): else: self.prefix = '' """ - print(f"DEBUG: UsageRunner.py Usages INIT prefix={self.prefix} {self._kw_info=}") + # print(f"DEBUG: UsageRunner.py Usages INIT prefix={self.prefix} {self._kw_info=}") self._dlg = self._usages_dialog() self._worker = Thread(target=self._run) self._dialog_closed = False def _usages_dialog(self): - print(f"DEBUG: UsageRunner.py Usages _usages_dialog ENTER name={self._name}," - f" controller_name={self._controller.name} prefix={self.prefix}") + # print(f"DEBUG: UsageRunner.py Usages _usages_dialog ENTER name={self._name}," + # f" controller_name={self._controller.name} prefix={self.prefix}") if self._controller.name == self._name: return usagesdialog.UsagesDialogWithUserKwNavigation(self._name, self._highlight, self._controller, prefix=self.prefix) @@ -80,7 +80,7 @@ def _run(self): wx.CallAfter(self._end_search) def _find_usages(self, name): - print(f"DEBUG: UsageRunner.py Usages _find_usages ENTER name={name} kw_info={self._kw_info}") + # print(f"DEBUG: UsageRunner.py Usages _find_usages ENTER name={name} kw_info={self._kw_info}") return self._controller.execute(commands.FindUsages(name, self._kw_info, prefix=self.prefix)) def _begin_search(self): diff --git a/src/robotide/usages/commands.py b/src/robotide/usages/commands.py index 0190f814a..2585f9c44 100644 --- a/src/robotide/usages/commands.py +++ b/src/robotide/usages/commands.py @@ -22,14 +22,14 @@ class FindUsages(FindOccurrences): def execute(self, context): from ..controller.macrocontrollers import KeywordNameController - print(f"DEBUG: usages/commands.py FindUsages execute context={context}") + # print(f"DEBUG: usages/commands.py FindUsages execute context={context}") prev = None for occ in FindOccurrences.execute(self, context): - if hasattr(occ, 'item'): - print(f"DEBUG: usages/commands.py FindUsages execute in loop occ={occ.item}") - else: - print(f"DEBUG: usages/commands.py FindUsages execute in loop NOT occ.item occ={occ}") - continue + # if hasattr(occ, 'item'): + # print(f"DEBUG: usages/commands.py FindUsages execute in loop occ={occ.item}") + # else: + # print(f"DEBUG: usages/commands.py FindUsages execute in loop NOT occ.item occ={occ}") + # continue if hasattr(occ, 'item') and isinstance(occ.item, KeywordNameController): continue if prev == occ: diff --git a/src/robotide/usages/usagesdialog.py b/src/robotide/usages/usagesdialog.py index 3b3315f9e..0d2e2e322 100644 --- a/src/robotide/usages/usagesdialog.py +++ b/src/robotide/usages/usagesdialog.py @@ -39,7 +39,7 @@ def __init__(self, name, usages=None, prefix=None): self.SetForegroundColour(Colour(self.color_foreground)) self._add_view_components() self.usages = usages or UsagesListModel([]) - print(f"DEBUG: usagesdialog.py UsagesDialog INIT: usages={self.usages} NAME={name} prefix={prefix}") + # print(f"DEBUG: usagesdialog.py UsagesDialog INIT: usages={self.usages} NAME={name} prefix={prefix}") self.usage_list = VirtualList(self, self.usages.headers, self.usages) self.usage_list.SetBackgroundColour(Colour(self.color_secondary_background)) self.usage_list.SetForegroundColour(Colour(self.color_secondary_foreground)) @@ -83,9 +83,9 @@ def __init__(self, name, highlight, controller, usages=None, prefix=None): if not prefix: prefix = os.path.basename(controller.source).split('.')[0] """ - print(f"DEBUG: usagesdialog.py UsagesDialogWithUserKwNavigation ENTER name={name}," - f" controller_name={controller.name} usages={usages}" - f" source={controller.source} prefix={prefix}") + # print(f"DEBUG: usagesdialog.py UsagesDialogWithUserKwNavigation ENTER name={name}," + # f" controller_name={controller.name} usages={usages}" + # f" source={controller.source} prefix={prefix}") self.on_go_to_definition = lambda evt: highlight(controller, name) UsagesDialog.__init__(self, name, usages=usages, prefix=prefix) diff --git a/utest/controller/test_z_rename_keywords.py b/utest/controller/test_z_rename_keywords.py index 78256465e..e839644ea 100644 --- a/utest/controller/test_z_rename_keywords.py +++ b/utest/controller/test_z_rename_keywords.py @@ -423,7 +423,7 @@ def test_rename_suite_setup_kw(self): for obj in self.project_ctrl.datafiles: print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw retrieve_test_controllers" f" obj={obj.display_name} source={obj.source} type={type(obj)}") - occurrences = obj.execute(FindOccurrences("keyword2")) + occurrences = obj.execute(FindOccurrences("keyword1", prefix="res02")) # print(occurrences) occ_list.extend(occurrences) @@ -434,7 +434,7 @@ def test_rename_suite_setup_kw(self): # f" {occ.item}") observer = NullObserver() - myobject = RenameKeywordOccurrences("keyword2", "kywd2", observer) + myobject = RenameKeywordOccurrences("keyword1", "kywd1", observer) print(f"Result from Rename myobject={myobject}") # self.project_ctrl.datafiles: self.app.project.datafiles for obj in self.app.project.datafiles: myobject.execute(obj) @@ -443,7 +443,7 @@ def test_rename_suite_setup_kw(self): rocc_list = [] for obj in self.project_ctrl.datafiles: - occurrences = obj.execute(FindOccurrences("keyword2")) + occurrences = obj.execute(FindOccurrences("keyword1", prefix="res02")) rocc_list.extend(occurrences) print(f"After Result from Rename rocc_list={rocc_list} len={len(rocc_list)}") for occ in rocc_list: @@ -468,7 +468,7 @@ def test_rename_suite_setup_kw(self): myobject.execute(self.res02) """ - return + return # myobject.execute(self.project_ctrl.setting_table) # After Rename self._get_controllers() From ae456f1fdbcf17495f7fa82d7a6c91075cf7cd79 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Fri, 24 Jan 2025 01:30:21 +0000 Subject: [PATCH 16/19] Debug RenameKeywords --- src/robotide/controller/ctrlcommands.py | 2 +- src/robotide/controller/stepcontrollers.py | 2 ++ src/robotide/ui/treeplugin.py | 7 +++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/robotide/controller/ctrlcommands.py b/src/robotide/controller/ctrlcommands.py index 6b42c97a5..89bef9351 100644 --- a/src/robotide/controller/ctrlcommands.py +++ b/src/robotide/controller/ctrlcommands.py @@ -792,7 +792,7 @@ def _contains_exact_item(self, item): from .tablecontrollers import VariableTableController match_name = self._contains_item(item) # print(f"DEBUG: ctrlcommands _find_occurrences_in _contains_exact_item Match Name is TYPE {type(match_name)}") - if match_name and isinstance(match_name, re.Match) and '.' in match_name.string: + if match_name and isinstance(match_name, re.Match) and '.' in match_name.string and self.prefix: # print(f"DEBUG: ctrlcommands _find_occurrences_in _contains_exact_item PREFIXED Name={match_name}" # f"\n groups={match_name.groups()} string={match_name.string}" # f" RETURNS {match_name.string.startswith(self.prefix)}") diff --git a/src/robotide/controller/stepcontrollers.py b/src/robotide/controller/stepcontrollers.py index 8b76f293c..8a3338659 100644 --- a/src/robotide/controller/stepcontrollers.py +++ b/src/robotide/controller/stepcontrollers.py @@ -74,6 +74,8 @@ def get_keyword_info(self, kw): def __eq__(self, other): if self is other: return True + if not isinstance(other, StepController): + return False return self._steps_are_equal(self.step_controller_step, other.step_controller_step) @staticmethod diff --git a/src/robotide/ui/treeplugin.py b/src/robotide/ui/treeplugin.py index 3ddcdc77a..8bb941617 100644 --- a/src/robotide/ui/treeplugin.py +++ b/src/robotide/ui/treeplugin.py @@ -730,6 +730,7 @@ def select_node_by_data(self, controller): if not parent_node: return None # if not self.IsExpanded(parent_node): + self.EnsureVisible(parent_node) self._expand_and_render_children(parent_node) node = self.controller.find_node_by_controller(controller) if node and node != self.GetSelection(): @@ -740,6 +741,7 @@ def select_user_keyword_node(self, uk): parent_node = self._get_datafile_node(uk.parent.parent) if not parent_node: return + self.EnsureVisible(parent_node) if not self.IsExpanded(parent_node): self._expand_and_render_children(parent_node) node = self.controller.find_node_with_label(parent_node, utils.normalize(uk.name)) @@ -1112,7 +1114,7 @@ def _item_renamed(self, message): return controller = message.item node = (self.controller.find_node_by_controller(controller) or - self.controller.find_node_with_label(controller, message.old_name)) + self.controller.find_node_with_label(controller, message.new_name)) print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER controller={controller}" f" NODE={node}") if hasattr(controller, 'datafile') and hasattr(controller.datafile, 'setting_table'): @@ -1181,7 +1183,8 @@ def _rename_resource_kw(self, new_name, old_name, resource): for k in keywords.items: print(f"DEBUG: treeplugin.py Tree _rename_resource_kw keywords: {k=}") if k.name == keyword_name: - print(f"DEBUG: treeplugin.py Tree _rename_resource_kw CHANGING: {k.name=}") + print(f"DEBUG: treeplugin.py Tree _rename_resource_kw CHANGING: {k.name=}," + f" {k.source=} {k.details=}") if controller.validate_keyword_name(new_keyword_name): k.name = new_keyword_name RideUserKeywordRenamed(datafile=controller.datafile, item=k, From 7db46a5fd8f86515f71772fdbd8258c5cb651fef Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Tue, 28 Jan 2025 01:09:29 +0000 Subject: [PATCH 17/19] Better replace but not complete. --- src/robotide/controller/ctrlcommands.py | 16 +++++------ src/robotide/controller/macrocontrollers.py | 9 ++++--- src/robotide/controller/settingcontrollers.py | 2 +- src/robotide/controller/stepcontrollers.py | 6 ++--- src/robotide/controller/ui/treecontroller.py | 8 +++++- src/robotide/ui/treeplugin.py | 20 +++++++------- utest/controller/test_z_rename_keywords.py | 27 +++++++++++-------- .../robotdata/TestCases/Sub/Suite01.robot | 2 +- .../TestCases/Sub/resources/res02.resource | 6 ++--- .../robotdata/TestCases/Sub/suite02.robot | 6 ++--- .../TestCases/resources/res01.resource | 2 +- .../robotdata/TestCases/suite01.robot | 8 +++--- .../robotdata/resources/external_res.resource | 10 +++---- 13 files changed, 69 insertions(+), 53 deletions(-) diff --git a/src/robotide/controller/ctrlcommands.py b/src/robotide/controller/ctrlcommands.py index 89bef9351..5659807c0 100644 --- a/src/robotide/controller/ctrlcommands.py +++ b/src/robotide/controller/ctrlcommands.py @@ -103,8 +103,8 @@ def _get_replace_values(self, new_name): return self._value, new_name return new_name, self._value - def notify_value_changed(self, old_name=None): - self._item.notify_value_changed(old_name) + def notify_value_changed(self, old_name=None, new_name=None): + self._item.notify_value_changed(old_name=old_name, new_name=new_name) class _Command(object): @@ -283,12 +283,12 @@ class RenameKeywordOccurrences(_ReversibleCommand): def __init__(self, original_name, new_name, observer, keyword_info=None): self._original_name, self._new_name = self._check_gherkin(new_name, original_name) - print(f"DEBUG: ctrlcommands.py RenameKeywordOccurrences ENTER after check_gherkin\n" - f"{original_name=}, {new_name=}, self._original_name={self._original_name} " - f"self._new_name={self._new_name} ") self._observer = observer self._keyword_info = keyword_info self._occurrences = None + print(f"DEBUG: ctrlcommands.py RenameKeywordOccurrences INIT\n" + f"{original_name=}, {new_name=}, self._original_name={self._original_name} " + f"self._new_name={self._new_name} self._keyword_info={self._keyword_info} ") def _check_gherkin(self, new_name, original_name): was_gherkin, keyword_name = self._get_gherkin(original_name) @@ -319,8 +319,8 @@ def _params(self): def _execute(self, context): self._observer.notify() self._occurrences = self._find_occurrences(context) if self._occurrences is None else self._occurrences - # print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _execute: found occurrences= {self._occurrences}\n" - # f"CONTEXT:{context}") + print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _execute: found occurrences= {self._occurrences}\n" + f"CONTEXT:{context}") self._replace_keywords_in(self._occurrences) context.update_namespace() self._notify_values_changed(self._occurrences, old_name=self._original_name) @@ -348,7 +348,7 @@ def _notify_values_changed(self, occurrences, old_name=None): except AttributeError: print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _notify_values_changed: " f" in AttributeError oc= {oc}") - oc.notify_value_changed(old_name) + oc.notify_value_changed(old_name=old_name, new_name=self._new_name) self._observer.notify() def _get_undo_command(self): diff --git a/src/robotide/controller/macrocontrollers.py b/src/robotide/controller/macrocontrollers.py index e234e3c69..0588a3d5e 100644 --- a/src/robotide/controller/macrocontrollers.py +++ b/src/robotide/controller/macrocontrollers.py @@ -59,9 +59,11 @@ def replace_keyword(self, new_name, old_value=None): def rename(self, new_name): self._item.rename(new_name) - def notify_value_changed(self, old_name=None): + def notify_value_changed(self, old_name=None, new_name=None): print(f"DEBUG: macrocontrollers.py notify_value_changed item={self._item.name} old_name={old_name}") - self._item.notify_name_changed(old_name=old_name, new_name=self._item.name) + if not new_name: + new_name=self._item.name + self._item.notify_name_changed(old_name=old_name, new_name=new_name) @property def parent(self): @@ -297,8 +299,9 @@ def notify_keyword_removed(self): RideUserKeywordRemoved(datafile=self.datafile, name=self.name, item=self).publish() self.notify_steps_changed() - def notify_settings_changed(self, old_name=None): + def notify_settings_changed(self, old_name=None, new_name=None): _ = old_name + _ = new_name self.update_namespace() self._notify(RideItemSettingsChanged) diff --git a/src/robotide/controller/settingcontrollers.py b/src/robotide/controller/settingcontrollers.py index 4fb2a67f3..c4b2b1812 100644 --- a/src/robotide/controller/settingcontrollers.py +++ b/src/robotide/controller/settingcontrollers.py @@ -103,7 +103,7 @@ def set_comment(self, comment): self._data.comment = comment self.mark_dirty() - def notify_value_changed(self, old_name=None): + def notify_value_changed(self, old_name=None, new_name=None): self._parent.notify_settings_changed(old_name) def clear(self): diff --git a/src/robotide/controller/stepcontrollers.py b/src/robotide/controller/stepcontrollers.py index 8a3338659..2e6ac8a87 100644 --- a/src/robotide/controller/stepcontrollers.py +++ b/src/robotide/controller/stepcontrollers.py @@ -571,11 +571,11 @@ def _recreate_next_step(self, index): next_step = self.parent.step(index + 1) next_step.recreate(next_step.as_list()) - def notify_value_changed(self, old_name=None): + def notify_value_changed(self, old_name=None, new_name=None): print(f"DEBUG: stepcontrollers.py StepController notify_value_changed: ENTER old_name={old_name}" - f" parent={self.parent.name} calling self.parent.notify_steps_changed()") + f" parent={self.parent.name} new_name={new_name} calling self.parent.notify_steps_changed()") if old_name is not None: - RideItemNameChanged(item=self, old_name=old_name, new_name=None).publish() + RideItemNameChanged(item=self, old_name=old_name, new_name=new_name).publish() self.parent.notify_steps_changed(old_name) def increase_indent(self): diff --git a/src/robotide/controller/ui/treecontroller.py b/src/robotide/controller/ui/treecontroller.py index fe9a082e0..e5ff644ce 100644 --- a/src/robotide/controller/ui/treecontroller.py +++ b/src/robotide/controller/ui/treecontroller.py @@ -15,6 +15,7 @@ import builtins import wx +from wx.lib.agw.customtreectrl import GenericTreeItem from robotide import utils from robotide.action.actioninfo import action_info_collection, ActionInfo @@ -106,12 +107,17 @@ def match_handler(n): return self._find_node_with_predicate(self._tree.root, match_handler) def find_node_with_label(self, node, label): + print(f"DEBUG: treecontroller.py TreeController find_node_with_label node={node} LABEL={label}") def matcher(n): return utils.eq(self._tree.GetItemText(n), label) return self._find_node_with_predicate(node, matcher) def _find_node_with_predicate(self, node, predicate): - if node != self._tree.root and predicate(node): + # print(f"DEBUG: treecontroller.py TreeController find_node_with_label ENTER node={node}" + # f" node is type={type(node)}") + if node != self._tree.root and isinstance(node, GenericTreeItem) and predicate(node): return node + if not isinstance(node, GenericTreeItem): + node = self._tree.root item, cookie = self._tree.GetFirstChild(node) while item: if predicate(item): diff --git a/src/robotide/ui/treeplugin.py b/src/robotide/ui/treeplugin.py index 8bb941617..3e1f113c5 100644 --- a/src/robotide/ui/treeplugin.py +++ b/src/robotide/ui/treeplugin.py @@ -1096,16 +1096,14 @@ def on_move_down(self, event): def _item_changed(self, message): print(f"DEBUG: treeplugin.py Tree _item_changed ENTER message={message}") - if isinstance(message, RideItemNameChanged): - return + # if isinstance(message, RideItemNameChanged): + # return controller = message.item node = self.controller.find_node_by_controller(controller) if node: self.SetItemText(node, message.item.name) - - if controller.dirty: - self.controller.mark_node_dirty( - self._get_datafile_node(controller.datafile)) + self.controller.mark_node_dirty(self._get_datafile_node(controller.datafile)) + # if controller.dirty: def _item_renamed(self, message): from ..lib.robot.parsing.settings import Resource @@ -1113,8 +1111,10 @@ def _item_renamed(self, message): if not isinstance(message, RideItemNameChanged): return controller = message.item + print(f"DEBUG: treeplugin.py Tree _item_renamed DEFINED controller={controller}" + f" old_name={message.old_name} new_name={message.new_name}\n") node = (self.controller.find_node_by_controller(controller) or - self.controller.find_node_with_label(controller, message.new_name)) + self.controller.find_node_with_label(controller, message.old_name)) print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER controller={controller}" f" NODE={node}") if hasattr(controller, 'datafile') and hasattr(controller.datafile, 'setting_table'): @@ -1184,9 +1184,10 @@ def _rename_resource_kw(self, new_name, old_name, resource): print(f"DEBUG: treeplugin.py Tree _rename_resource_kw keywords: {k=}") if k.name == keyword_name: print(f"DEBUG: treeplugin.py Tree _rename_resource_kw CHANGING: {k.name=}," - f" {k.source=} {k.details=}") + f" {k.source=} ") # {k.details=}") if controller.validate_keyword_name(new_keyword_name): k.name = new_keyword_name + node.SetText(new_keyword_name) RideUserKeywordRenamed(datafile=controller.datafile, item=k, old_name=keyword_name).publish() controller.mark_dirty() @@ -1197,7 +1198,8 @@ def _rename_resource_kw(self, new_name, old_name, resource): self.observer.finish() self.Collapse(res_node) self.Expand(res_node) - self.SelectItem(res_node) + self.Refresh() + self.SelectItem(node) else: wx.MessageBox(f"Invalid keyword name: {new_keyword_name}", "Failed Keyword Name Validation") diff --git a/utest/controller/test_z_rename_keywords.py b/utest/controller/test_z_rename_keywords.py index e839644ea..28230ecde 100644 --- a/utest/controller/test_z_rename_keywords.py +++ b/utest/controller/test_z_rename_keywords.py @@ -272,8 +272,8 @@ def setUp(self): testcase = TestDataDirectory(source=datafilereader.RESOURCE_PREFIXED_KEYWORDS_PATH, language=['English']) self.project_ctrl = TestDataDirectoryController(testcase, self.app.project) # self.app.tree.set_editor(self.plugin._editor_component) - print(f"DEBUG: setUp() dir self.project_ctrl ={dir(self.project_ctrl)}" - f"\nself.app.project={dir(self.app.project)} ") + # print(f"DEBUG: setUp() dir self.project_ctrl ={dir(self.project_ctrl)}" + # f"\nself.app.project={dir(self.app.project)} ") self._get_controllers() @@ -418,21 +418,26 @@ def test_rename_suite_setup_kw(self): for kw in res_list: print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw resource kw={kw}") """ - occ_list = [] + occ_list = set() print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw controller={self.project_ctrl.datafiles}") for obj in self.project_ctrl.datafiles: print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw retrieve_test_controllers" f" obj={obj.display_name} source={obj.source} type={type(obj)}") occurrences = obj.execute(FindOccurrences("keyword1", prefix="res02")) # print(occurrences) - occ_list.extend(occurrences) - - print(f"Before Rename occ_list={occ_list}\n" - f" len={len(occ_list)}") - # for occ in occ_list: - # print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw FindOccurrences occ={occ}") - # f" {occ.item}") - + occ_list.add(occurrences) + + # print(f"Before Rename occ_list={occ_list}\n" + # f" len={len(occ_list)}") + for occ in occ_list: + for oo in occ: + print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw oo_item:{oo.item} " + f" oo_value:{oo._value} ") # + if not isinstance(oo.item, KeywordNameController): + print(f"oo_source:{oo.source} ") + # print(f"DEBUG: TestRenameResourcePrefixedKeywords test_rename_suite_setup_kw FindOccurrences occ={occ}") + # f" {occ.item}") + return observer = NullObserver() myobject = RenameKeywordOccurrences("keyword1", "kywd1", observer) print(f"Result from Rename myobject={myobject}") # self.project_ctrl.datafiles: self.app.project.datafiles diff --git a/utest/resources/robotdata/TestCases/Sub/Suite01.robot b/utest/resources/robotdata/TestCases/Sub/Suite01.robot index ca6cbfa33..eb61a643f 100644 --- a/utest/resources/robotdata/TestCases/Sub/Suite01.robot +++ b/utest/resources/robotdata/TestCases/Sub/Suite01.robot @@ -7,7 +7,7 @@ Library ../Sub/Lib/mykw.py *** Test Cases *** case01 [Setup] res01.keyword3 - keyword2 lalala\nlala\nlala + keyword22 lalala\nlala\nlala case02 log ${CURDIR} diff --git a/utest/resources/robotdata/TestCases/Sub/resources/res02.resource b/utest/resources/robotdata/TestCases/Sub/resources/res02.resource index bc3be8cab..4242ccfdc 100644 --- a/utest/resources/robotdata/TestCases/Sub/resources/res02.resource +++ b/utest/resources/robotdata/TestCases/Sub/resources/res02.resource @@ -2,14 +2,14 @@ Library ./res.py *** Keywords *** -keyword1 +keyword11 [Arguments] ${a} log ${a} This is at Sub/Resources/res02.resource - Run Keyword keyword3 + Run Keyword keyword33 keyword2 [Arguments] ${a} log ${a} -keyword3 +keyword33 res_kw diff --git a/utest/resources/robotdata/TestCases/Sub/suite02.robot b/utest/resources/robotdata/TestCases/Sub/suite02.robot index 4d601646a..f5d7386ef 100644 --- a/utest/resources/robotdata/TestCases/Sub/suite02.robot +++ b/utest/resources/robotdata/TestCases/Sub/suite02.robot @@ -5,8 +5,8 @@ Resource ../../resources/external_res.resource *** Test Cases *** case01 - [Setup] res02.keyword1 Called from Setup in Sub/Suite02/case01 + [Setup] res02.keyword11 Called from Setup in Sub/Suite02/case01 my_kw - res02.keyword3 + res02.keyword33 external_res.keyword2 Called fromSteps on Sub/Suite02/case01 - [Teardown] external_res.keyword3 + [Teardown] external_res.keyword33 diff --git a/utest/resources/robotdata/TestCases/resources/res01.resource b/utest/resources/robotdata/TestCases/resources/res01.resource index 36c21d5e7..995a1e2a4 100644 --- a/utest/resources/robotdata/TestCases/resources/res01.resource +++ b/utest/resources/robotdata/TestCases/resources/res01.resource @@ -9,7 +9,7 @@ kw1 # comment test testst log ${a} -keyword2 +keyword22 [Arguments] ${a} log ${a} Log To Console This is the argument \${a} = ${a} ! diff --git a/utest/resources/robotdata/TestCases/suite01.robot b/utest/resources/robotdata/TestCases/suite01.robot index 03e9a36ca..bdeefac56 100644 --- a/utest/resources/robotdata/TestCases/suite01.robot +++ b/utest/resources/robotdata/TestCases/suite01.robot @@ -8,17 +8,17 @@ Resource ../resources/external_res.resource *** Test Cases *** case01 res02.keyword2 aaaa\na\na - [Teardown] res02.keyword1 Called from Teardown on case01 + [Teardown] res02.keyword11 Called from Teardown on case01 case02 [Setup] external_res.keyword1 Called from Setup on case02 log ${CURDIR} console=True log ${EXECDIR} console=True my_kw - res02.keyword1 hehe + res02.keyword11 hehe case03 - res02.keyword3 + res02.keyword33 res01.keyword3 - Run Keyword external_res.keyword3 + Run Keyword external_res.keyword33 external_res.keyword1 teste diff --git a/utest/resources/robotdata/resources/external_res.resource b/utest/resources/robotdata/resources/external_res.resource index d8935ab57..1d42c357a 100644 --- a/utest/resources/robotdata/resources/external_res.resource +++ b/utest/resources/robotdata/resources/external_res.resource @@ -14,12 +14,12 @@ keyword2 [Arguments] ${a} log ${a} Log To Console This is the argument \${a} = ${a} ! - [Teardown] keyword1 Called from external_resource at Teardown kw2 + [Teardown] res02.keyword11 Called from external_resource at Teardown kw2 -keyword3 - [Setup] res02.keyword3 - keyword1 Called from external_resource - res02.keyword1 Called from external_resource # Kw from res2 with a space in calling +keyword33 + [Setup] res02.keyword33 + keyword11 Called from external_resource + res02.keyword11 Called from external_resource # Kw from res2 with a space in calling unusedkw [Arguments] ${notused}=None From b0a2d5cb4cf0044fd42d14c4b30403772897e0d5 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Tue, 28 Jan 2025 20:51:00 +0000 Subject: [PATCH 18/19] Remove debug comments --- src/robotide/controller/ctrlcommands.py | 26 ++++---- src/robotide/controller/macrocontrollers.py | 10 +-- src/robotide/controller/stepcontrollers.py | 12 ++-- src/robotide/controller/ui/treecontroller.py | 2 +- src/robotide/editor/macroeditors.py | 4 +- src/robotide/ui/treenodehandlers.py | 4 +- src/robotide/ui/treeplugin.py | 62 +++++++++---------- .../TestCases/Sub/resources/res02.resource | 6 +- .../robotdata/TestCases/Sub/suite02.robot | 6 +- .../robotdata/TestCases/suite01.robot | 8 +-- .../robotdata/resources/external_res.resource | 10 +-- 11 files changed, 75 insertions(+), 75 deletions(-) diff --git a/src/robotide/controller/ctrlcommands.py b/src/robotide/controller/ctrlcommands.py index 5659807c0..48f0f5ad0 100644 --- a/src/robotide/controller/ctrlcommands.py +++ b/src/robotide/controller/ctrlcommands.py @@ -93,8 +93,8 @@ def _in_for_loop(self): return isinstance(self._item.parent, ForLoopStepController) def replace_keyword(self, new_name): - print(f"DEBUG: ctrlcommands.py Occurrence replace_keyword BEFORE new_name={new_name} value={self._value}" - f" self._replaced={self._replaced} item={self._item}") + # print(f"DEBUG: ctrlcommands.py Occurrence replace_keyword BEFORE new_name={new_name} value={self._value}" + # f" self._replaced={self._replaced} item={self._item}") self._item.replace_keyword(*self._get_replace_values(new_name)) self._replaced = not self._replaced @@ -286,9 +286,9 @@ def __init__(self, original_name, new_name, observer, keyword_info=None): self._observer = observer self._keyword_info = keyword_info self._occurrences = None - print(f"DEBUG: ctrlcommands.py RenameKeywordOccurrences INIT\n" - f"{original_name=}, {new_name=}, self._original_name={self._original_name} " - f"self._new_name={self._new_name} self._keyword_info={self._keyword_info} ") + # print(f"DEBUG: ctrlcommands.py RenameKeywordOccurrences INIT\n" + # f"{original_name=}, {new_name=}, self._original_name={self._original_name} " + # f"self._new_name={self._new_name} self._keyword_info={self._keyword_info} ") def _check_gherkin(self, new_name, original_name): was_gherkin, keyword_name = self._get_gherkin(original_name) @@ -319,8 +319,8 @@ def _params(self): def _execute(self, context): self._observer.notify() self._occurrences = self._find_occurrences(context) if self._occurrences is None else self._occurrences - print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _execute: found occurrences= {self._occurrences}\n" - f"CONTEXT:{context}") + # print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _execute: found occurrences= {self._occurrences}\n" + # f"CONTEXT:{context}") self._replace_keywords_in(self._occurrences) context.update_namespace() self._notify_values_changed(self._occurrences, old_name=self._original_name) @@ -342,12 +342,12 @@ def _replace_keywords_in(self, occurrences): def _notify_values_changed(self, occurrences, old_name=None): for oc in occurrences: - try: - print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _notify_values_changed: " - f"oc= {oc.source} {oc.item} {oc.usage} {oc._value}") - except AttributeError: - print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _notify_values_changed: " - f" in AttributeError oc= {oc}") + # try: + # print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _notify_values_changed: " + # f"oc= {oc.source} {oc.item} {oc.usage} {oc._value}") + # except AttributeError: + # print(f"DEBUG: ctlcommands.py RenameKeywordOccurrences _notify_values_changed: " + # f" in AttributeError oc= {oc}") oc.notify_value_changed(old_name=old_name, new_name=self._new_name) self._observer.notify() diff --git a/src/robotide/controller/macrocontrollers.py b/src/robotide/controller/macrocontrollers.py index 0588a3d5e..5eaed1849 100644 --- a/src/robotide/controller/macrocontrollers.py +++ b/src/robotide/controller/macrocontrollers.py @@ -53,14 +53,14 @@ def contains_variable(self, name): return variablematcher.value_contains_variable(self._item.name, name) def replace_keyword(self, new_name, old_value=None): - print(f"DEBUG: macrocontrollers.py replace_keyword new_name={new_name} old_value={old_value}") + # print(f"DEBUG: macrocontrollers.py replace_keyword new_name={new_name} old_value={old_value}") self._item.rename(new_name) def rename(self, new_name): self._item.rename(new_name) def notify_value_changed(self, old_name=None, new_name=None): - print(f"DEBUG: macrocontrollers.py notify_value_changed item={self._item.name} old_name={old_name}") + # print(f"DEBUG: macrocontrollers.py notify_value_changed item={self._item.name} old_name={old_name}") if not new_name: new_name=self._item.name self._item.notify_name_changed(old_name=old_name, new_name=new_name) @@ -190,7 +190,7 @@ def delete(self): self.notify_keyword_removed() def rename(self, new_name): - print(f"DEBUG: macrocontrollers.py WithStepsController rename BEFORE new_name={new_name} old_name={self.data.name}") + # print(f"DEBUG: macrocontrollers.py WithStepsController rename BEFORE new_name={new_name} old_name={self.data.name}") self.data.name = new_name.strip() self.mark_dirty() @@ -307,8 +307,8 @@ def notify_settings_changed(self, old_name=None, new_name=None): def notify_steps_changed(self, old_name=None): self._has_steps_changed = True - print(f"DEBUG: macrocontrollers.py WithStepsController notify_steps_changed: ENTER old_name={old_name}" - f" {self.parent} {self.source} {self} call self._notify") + # print(f"DEBUG: macrocontrollers.py WithStepsController notify_steps_changed: ENTER old_name={old_name}" + # f" {self.parent} {self.source} {self} call self._notify") self._notify(RideItemStepsChanged) def _notify(self, messageclass): diff --git a/src/robotide/controller/stepcontrollers.py b/src/robotide/controller/stepcontrollers.py index 2e6ac8a87..f73398d77 100644 --- a/src/robotide/controller/stepcontrollers.py +++ b/src/robotide/controller/stepcontrollers.py @@ -309,8 +309,8 @@ def replace_keyword(self, new_name, old_name): # DEBUG: Create setters for Step.name and Step.args new_match = self._kw_name_match(self.keyword or '', old_name) if new_match: - print(f"DEBUG: stepcontrollers.py StepController replace_keyword: ACTUAL CHANGE old_name={old_name}" - f" new_name={new_name} new_match={new_match}") + # print(f"DEBUG: stepcontrollers.py StepController replace_keyword: ACTUAL CHANGE old_name={old_name}" + # f" new_name={new_name} new_match={new_match}") self.step_controller_step.name = self.step_controller_step.cells[self.step_controller_step.inner_kw_pos] = \ self._kw_name_replace(self.keyword, new_name, old_name) for index, value in enumerate(self.args): @@ -321,8 +321,8 @@ def replace_keyword(self, new_name, old_name): def _kw_name_replace(self, old_value, new_match, old_match): # Here we should have a match for keywords prefixed with resource name - print(f"DEBUG: stepcontrollers.py StepController _kw_name_replace: ENTER old_value={old_value}" - f" old_match={old_match} new_match={new_match}") + # print(f"DEBUG: stepcontrollers.py StepController _kw_name_replace: ENTER old_value={old_value}" + # f" old_match={old_match} new_match={new_match}") old_prefix_matcher = self._GIVEN_WHEN_THEN_MATCHER.match(old_value) if not old_prefix_matcher: return new_match @@ -572,8 +572,8 @@ def _recreate_next_step(self, index): next_step.recreate(next_step.as_list()) def notify_value_changed(self, old_name=None, new_name=None): - print(f"DEBUG: stepcontrollers.py StepController notify_value_changed: ENTER old_name={old_name}" - f" parent={self.parent.name} new_name={new_name} calling self.parent.notify_steps_changed()") + # print(f"DEBUG: stepcontrollers.py StepController notify_value_changed: ENTER old_name={old_name}" + # f" parent={self.parent.name} new_name={new_name} calling self.parent.notify_steps_changed()") if old_name is not None: RideItemNameChanged(item=self, old_name=old_name, new_name=new_name).publish() self.parent.notify_steps_changed(old_name) diff --git a/src/robotide/controller/ui/treecontroller.py b/src/robotide/controller/ui/treecontroller.py index e5ff644ce..ee3027dc4 100644 --- a/src/robotide/controller/ui/treecontroller.py +++ b/src/robotide/controller/ui/treecontroller.py @@ -107,7 +107,7 @@ def match_handler(n): return self._find_node_with_predicate(self._tree.root, match_handler) def find_node_with_label(self, node, label): - print(f"DEBUG: treecontroller.py TreeController find_node_with_label node={node} LABEL={label}") + # print(f"DEBUG: treecontroller.py TreeController find_node_with_label node={node} LABEL={label}") def matcher(n): return utils.eq(self._tree.GetItemText(n), label) return self._find_node_with_predicate(node, matcher) diff --git a/src/robotide/editor/macroeditors.py b/src/robotide/editor/macroeditors.py index c9c524198..3b30f3630 100644 --- a/src/robotide/editor/macroeditors.py +++ b/src/robotide/editor/macroeditors.py @@ -39,10 +39,10 @@ def _create_kweditor(self): self._editors.append(self.kweditor) def _name_changed(self, message): - print(f"DEBUG: macroeditors.py TestCaseEditor _name_changed ENTER {message}\n") + # print(f"DEBUG: macroeditors.py TestCaseEditor _name_changed ENTER {message}\n") if message.item == self.controller: self.header.SetLabel(message.item.name) - print(f"DEBUG: macroeditors.py TestCaseEditor _name_changed DONE {message.item.name=} {self.controller}") + # print(f"DEBUG: macroeditors.py TestCaseEditor _name_changed DONE {message.item.name=} {self.controller}") def close(self): for editor in self._editors: diff --git a/src/robotide/ui/treenodehandlers.py b/src/robotide/ui/treenodehandlers.py index ca8450ef0..d7e588c4c 100644 --- a/src/robotide/ui/treenodehandlers.py +++ b/src/robotide/ui/treenodehandlers.py @@ -748,8 +748,8 @@ def _add_copy_to_tree(self, parent_node, copied): self._tree.add_keyword(parent_node, copied) def _create_rename_command(self, new_name): - print(f"DEBUG: treenodehandlers.py UserKeywodHandler _create_rename_command controller.name={self.controller.name}" - f", new_name={new_name} info={self.controller.info}") + # print(f"DEBUG: treenodehandlers.py UserKeywodHandler _create_rename_command controller.name={self.controller.name}" + # f", new_name={new_name} info={self.controller.info}") return ctrlcommands.RenameKeywordOccurrences( self.controller.name, new_name, RenameProgressObserver(self._tree.GetParent()), diff --git a/src/robotide/ui/treeplugin.py b/src/robotide/ui/treeplugin.py index 3e1f113c5..26b91e29a 100644 --- a/src/robotide/ui/treeplugin.py +++ b/src/robotide/ui/treeplugin.py @@ -688,8 +688,8 @@ def _filename_changed(self, message): if not node: raise AssertionError('No node found with controller "%s"' % df) old_name = node.GetText() - print(f"DEBUG: treeplugin.py Tree _filename_changed message={message} df={df}" - f" node={node} {old_name=} df.display_name={df.display_name}") + # print(f"DEBUG: treeplugin.py Tree _filename_changed message={message} df={df}" + # f" node={node} {old_name=} df.display_name={df.display_name}") wx.CallAfter(self.SetItemText, node, df.display_name) if isinstance(df, ResourceFileController): RideItemNameChanged(item=node, old_name=old_name, new_name=df.display_name).publish() @@ -745,7 +745,7 @@ def select_user_keyword_node(self, uk): if not self.IsExpanded(parent_node): self._expand_and_render_children(parent_node) node = self.controller.find_node_with_label(parent_node, utils.normalize(uk.name)) - print(f"DEBUG: treeplugin.py Tree select_user_keyword_node node= {node}") + # print(f"DEBUG: treeplugin.py Tree select_user_keyword_node node= {node}") if node != self.GetSelection(): self.SelectItem(node) @@ -1095,9 +1095,9 @@ def on_move_down(self, event): handler.on_move_down(event) def _item_changed(self, message): - print(f"DEBUG: treeplugin.py Tree _item_changed ENTER message={message}") - # if isinstance(message, RideItemNameChanged): - # return + # print(f"DEBUG: treeplugin.py Tree _item_changed ENTER message={message}") + if isinstance(message, RideItemNameChanged): + return controller = message.item node = self.controller.find_node_by_controller(controller) if node: @@ -1107,29 +1107,29 @@ def _item_changed(self, message): def _item_renamed(self, message): from ..lib.robot.parsing.settings import Resource - print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER message={message}") + # print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER message={message}") if not isinstance(message, RideItemNameChanged): return controller = message.item - print(f"DEBUG: treeplugin.py Tree _item_renamed DEFINED controller={controller}" - f" old_name={message.old_name} new_name={message.new_name}\n") + # print(f"DEBUG: treeplugin.py Tree _item_renamed DEFINED controller={controller}" + # f" old_name={message.old_name} new_name={message.new_name}\n") node = (self.controller.find_node_by_controller(controller) or self.controller.find_node_with_label(controller, message.old_name)) - print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER controller={controller}" - f" NODE={node}") + # print(f"DEBUG: treeplugin.py Tree _item_renamed ENTER controller={controller}" + # f" NODE={node}") if hasattr(controller, 'datafile') and hasattr(controller.datafile, 'setting_table'): imports = controller.datafile.setting_table.imports - print(f"DEBUG: treeplugin.py Tree _item_renamed HAS IMPORTS imports={imports}") + # print(f"DEBUG: treeplugin.py Tree _item_renamed HAS IMPORTS imports={imports}") for imp in imports: if isinstance(imp, Resource) and hasattr(message.item, 'keyword'): - print(f"DEBUG: treeplugin.py Tree _item_renamed IMPORT message.item.name={message.item.keyword}," - f" old_name={message.old_name} resource name={imp.name}") + # print(f"DEBUG: treeplugin.py Tree _item_renamed IMPORT message.item.name={message.item.keyword}," + # f" old_name={message.old_name} resource name={imp.name}") # print(f"DEBUG: treeplugin.py Tree _item_renamed IMPORT message.item.name={message}," # f" old_name={message.old_name} import={imp}") self._rename_resource_kw(new_name=message.item.keyword, old_name=message.old_name, resource=imp) - if node and hasattr(message, 'old_name'): - print(f"DEBUG: treeplugin.py Tree _item_renamed RENAMED node={node}, old_name={message.old_name}\n" - f"new_name={message.new_name}") + # if node and hasattr(message, 'old_name'): + # print(f"DEBUG: treeplugin.py Tree _item_renamed RENAMED node={node}, old_name={message.old_name}\n" + # f"new_name={message.new_name}") # Here we need to rename all resourc prefixed occurrencees self.Refresh() @@ -1138,8 +1138,8 @@ def _item_renamed(self, message): self.SelectItem(node) self.SetItemText(node, message.item.name) new_name=self.GetItemText(node) - print(f"DEBUG: treeplugin.py Tree _item_renamed AFTER RENAMED new_name={new_name}" - f" controller={controller.datafile}") + # print(f"DEBUG: treeplugin.py Tree _item_renamed AFTER RENAMED new_name={new_name}" + # f" controller={controller.datafile}") else: return if controller.dirty: @@ -1154,13 +1154,13 @@ def _rename_resource_kw(self, new_name, old_name, resource): return keyword_name = old_name.split('.')[-1] new_keyword_name = new_name.split('.')[-1] - print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {prefix_res=} {keyword_name=}") + # print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {prefix_res=} {keyword_name=}") res_name=os.path.basename(resource.name) - print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {res_name=}") + # print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {res_name=}") res_node=self.FindItem(self._resource_root, res_name) if res_node: self.EnsureVisible(res_node) - print(f"DEBUG: treeplugin.py Tree _rename_resource_kw root node {res_node=}") + # print(f"DEBUG: treeplugin.py Tree _rename_resource_kw root node {res_node=}") # node = self.controller.find_node_with_label(res_node, keyword_name) self._expand_and_render_children(res_node) node = self.FindItem(res_node, keyword_name) @@ -1168,30 +1168,30 @@ def _rename_resource_kw(self, new_name, old_name, resource): from ..controller.ctrlcommands import RenameKeywordOccurrences from ..ui.progress import RenameProgressObserver nlabel = node.GetText() - print(f"DEBUG: treeplugin.py Tree _rename_resource_kw node label {nlabel} {keyword_name}") + # print(f"DEBUG: treeplugin.py Tree _rename_resource_kw node label {nlabel} {keyword_name}") if nlabel == keyword_name: - print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {node=} {nlabel} change to {new_keyword_name=}") + # print(f"DEBUG: treeplugin.py Tree _rename_resource_kw {node=} {nlabel} change to {new_keyword_name=}") self.EnsureVisible(node) # self.SetItemText(node, new_keyword_name) self.SelectItem(node) controller = self.get_selected_datafile_controller() keywords = controller.keywords keyword_names = controller.get_keyword_names() - print(f"DEBUG: treeplugin.py Tree _rename_resource_kw already changed to {new_keyword_name=}" - f" controller={controller} keywords={keywords} \n" - f"{keyword_names=}") + # print(f"DEBUG: treeplugin.py Tree _rename_resource_kw already changed to {new_keyword_name=}" + # f" controller={controller} keywords={keywords} \n" + # f"{keyword_names=}") for k in keywords.items: - print(f"DEBUG: treeplugin.py Tree _rename_resource_kw keywords: {k=}") + # print(f"DEBUG: treeplugin.py Tree _rename_resource_kw keywords: {k=}") if k.name == keyword_name: - print(f"DEBUG: treeplugin.py Tree _rename_resource_kw CHANGING: {k.name=}," - f" {k.source=} ") # {k.details=}") + # print(f"DEBUG: treeplugin.py Tree _rename_resource_kw CHANGING: {k.name=}," + # f" {k.source=} ") # {k.details=}") if controller.validate_keyword_name(new_keyword_name): k.name = new_keyword_name node.SetText(new_keyword_name) RideUserKeywordRenamed(datafile=controller.datafile, item=k, old_name=keyword_name).publish() controller.mark_dirty() - print(f"DEBUG: treeplugin.py Tree _rename_resource_kw DONE CHANGING: {k.name=}") + # print(f"DEBUG: treeplugin.py Tree _rename_resource_kw DONE CHANGING: {k.name=}") # self.controller.mark_node_dirty(self._get_datafile_node(controller.datafile)) self.observer = RenameProgressObserver(self.GetParent()) RenameKeywordOccurrences(keyword_name, new_keyword_name, self.observer) diff --git a/utest/resources/robotdata/TestCases/Sub/resources/res02.resource b/utest/resources/robotdata/TestCases/Sub/resources/res02.resource index 4242ccfdc..bc3be8cab 100644 --- a/utest/resources/robotdata/TestCases/Sub/resources/res02.resource +++ b/utest/resources/robotdata/TestCases/Sub/resources/res02.resource @@ -2,14 +2,14 @@ Library ./res.py *** Keywords *** -keyword11 +keyword1 [Arguments] ${a} log ${a} This is at Sub/Resources/res02.resource - Run Keyword keyword33 + Run Keyword keyword3 keyword2 [Arguments] ${a} log ${a} -keyword33 +keyword3 res_kw diff --git a/utest/resources/robotdata/TestCases/Sub/suite02.robot b/utest/resources/robotdata/TestCases/Sub/suite02.robot index f5d7386ef..4d601646a 100644 --- a/utest/resources/robotdata/TestCases/Sub/suite02.robot +++ b/utest/resources/robotdata/TestCases/Sub/suite02.robot @@ -5,8 +5,8 @@ Resource ../../resources/external_res.resource *** Test Cases *** case01 - [Setup] res02.keyword11 Called from Setup in Sub/Suite02/case01 + [Setup] res02.keyword1 Called from Setup in Sub/Suite02/case01 my_kw - res02.keyword33 + res02.keyword3 external_res.keyword2 Called fromSteps on Sub/Suite02/case01 - [Teardown] external_res.keyword33 + [Teardown] external_res.keyword3 diff --git a/utest/resources/robotdata/TestCases/suite01.robot b/utest/resources/robotdata/TestCases/suite01.robot index bdeefac56..03e9a36ca 100644 --- a/utest/resources/robotdata/TestCases/suite01.robot +++ b/utest/resources/robotdata/TestCases/suite01.robot @@ -8,17 +8,17 @@ Resource ../resources/external_res.resource *** Test Cases *** case01 res02.keyword2 aaaa\na\na - [Teardown] res02.keyword11 Called from Teardown on case01 + [Teardown] res02.keyword1 Called from Teardown on case01 case02 [Setup] external_res.keyword1 Called from Setup on case02 log ${CURDIR} console=True log ${EXECDIR} console=True my_kw - res02.keyword11 hehe + res02.keyword1 hehe case03 - res02.keyword33 + res02.keyword3 res01.keyword3 - Run Keyword external_res.keyword33 + Run Keyword external_res.keyword3 external_res.keyword1 teste diff --git a/utest/resources/robotdata/resources/external_res.resource b/utest/resources/robotdata/resources/external_res.resource index 1d42c357a..102120c33 100644 --- a/utest/resources/robotdata/resources/external_res.resource +++ b/utest/resources/robotdata/resources/external_res.resource @@ -14,12 +14,12 @@ keyword2 [Arguments] ${a} log ${a} Log To Console This is the argument \${a} = ${a} ! - [Teardown] res02.keyword11 Called from external_resource at Teardown kw2 + [Teardown] res02.keyword1 Called from external_resource at Teardown kw2 -keyword33 - [Setup] res02.keyword33 - keyword11 Called from external_resource - res02.keyword11 Called from external_resource # Kw from res2 with a space in calling +keyword3 + [Setup] res02.keyword3 + keyword1 Called from external_resource + res02.keyword1 Called from external_resource # Kw from res2 with a space in calling unusedkw [Arguments] ${notused}=None From 96b403304f3653d83ac119c692e2afd60d516f55 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Tue, 28 Jan 2025 21:39:48 +0000 Subject: [PATCH 19/19] Version 2.1.2 --- CHANGELOG.adoc | 3 +- doc/releasenotes/ride-2.1.2.rst | 122 +++++++++++++++++++++++ src/robotide/application/CHANGELOG.html | 100 ++++++++++--------- src/robotide/application/releasenotes.py | 12 +-- src/robotide/version.py | 2 +- 5 files changed, 182 insertions(+), 57 deletions(-) create mode 100644 doc/releasenotes/ride-2.1.2.rst diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 2cf2e724f..5b83cae0f 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -8,10 +8,11 @@ and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioni == https://github.com/robotframework/RIDE[Unreleased] -== https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.1.1.rst[2.1.1] - 2024-11-14 +== https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.1.2.rst[2.1.2] - 2025-01-28 === Fixed +- Partial fix of no update of renaming resource prefixed keywords. Issue #1230 from 29 Jan 2013. - Fixed no recognition of keywords with embedded arguments and full name. Issue #1106 from 12 Sep 2012. == https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.1.1.rst[2.1.1] - 2024-11-14 diff --git a/doc/releasenotes/ride-2.1.2.rst b/doc/releasenotes/ride-2.1.2.rst new file mode 100644 index 000000000..04bd332cf --- /dev/null +++ b/doc/releasenotes/ride-2.1.2.rst @@ -0,0 +1,122 @@ +.. container:: document + + `RIDE (Robot Framework + IDE) `__ v2.1.2 is a new + release with some enhancements and bug fixes. The reference for valid + arguments is `Robot Framework `__ + previous version, which was 7.1.1 (currently is 7.2). However, + internal library code is originally based on version 3.1.2, but + adapted for new versions. + + - This version supports Python 3.8 up to 3.13. + - There are some changes, or known issues: + + - 🐞 - When upgrading RIDE and activate Restart, some errors are + visible about missing /language file, and behaviour is not + normal. Better to close RIDE and start a new instance. + - 🐞 - Problems with COPY/PASTE in Text Editor have been reported + when using wxPython 4.2.0, but not with version 4.2.1 and + 4.2.2, which we now *recommend*. + - 🐞 - Rename Keywords, Find Usages/Find where used are not + finding all occurrences. Please, double-check findings and + changes. + - 🐞 - Some argument types detection (and colorization) is not + correct in Grid Editor. + - 🐞 - RIDE **DOES NOT KEEP** Test Suites formatting or + structure, causing differences in files when used on other IDE + or Editors. The option to not reformat the file is not working. + + **New Features and Fixes Highlights** + + - *Partial fix* of no update of renaming resource prefixed keywords. + Issue #1230 from 29 Jan 2013. + - Fixed no recognition of keywords with embedded arguments and full + name. Issue #1106 from 12 Sep 2012. + + **The minimal wxPython version is, 4.0.7, and RIDE supports the + current version, 4.2.2, which we recommend.** + + *Linux users are advised to install first wxPython from .whl package + at* + `wxPython.org `__, + or by using the system package manager. + + The + `CHANGELOG.adoc `__ + lists the changes done on the different versions. + + All issues targeted for RIDE v2.2 can be found from the `issue + tracker + milestone `__. + + Questions and comments related to the release can be sent to the + `robotframework-users `__ + mailing list or to the channel #ride on `Robot Framework + Slack `__, and + possible bugs submitted to the `issue + tracker `__. You + should see `Robot Framework + Forum `__ if your + problem is already known. + + To install the latest release with + `pip `__ installed, just run + + .. code:: literal-block + + pip install --upgrade robotframework-ride==2.1.2 + + to install exactly the specified release, which is the same as using + + .. code:: literal-block + + pip install --upgrade robotframework-ride + + Alternatively you can download the source distribution from + `PyPI `__ and + install it manually. For more details and other installation + approaches, see the `installation + instructions `__. + If you want to help in the development of RIDE, by reporting issues + in current development version, you can install with: + + .. code:: literal-block + + pip install -U https://github.com/robotframework/RIDE/archive/develop.zip + + Important document for helping with development is the + `CONTRIBUTING.adoc `__. + + To start RIDE from a command window, shell or terminal, just enter: + + :: + + ride + + You can also pass some arguments, like a path for a test suite file + or directory. + + :: + + ride example.robot + + Another possible way to start RIDE is: + + .. code:: literal-block + + python -m robotide + + You can then go to Tools>Create RIDE Desktop Shortcut, or run the + shortcut creation script with: + + .. code:: literal-block + + python -m robotide.postinstall -install + + or + + .. code:: literal-block + + ride_postinstall.py -install + + RIDE v2.1.2 was released on 28/January/2025. diff --git a/src/robotide/application/CHANGELOG.html b/src/robotide/application/CHANGELOG.html index 1a72e7cd2..6a02977fd 100644 --- a/src/robotide/application/CHANGELOG.html +++ b/src/robotide/application/CHANGELOG.html @@ -1,16 +1,18 @@ Changelog

Changelog

All notable changes to this project will be documented in this file.

The format is based on Keep a Changelog -and this project adheres to Semantic Versioning.

1.1. Fixed

  • +and this project adheres to Semantic Versioning.

    2. 2.1.2 - 2025-01-28

    2.1. Fixed

    • +Partial fix of no update of renaming resource prefixed keywords. Issue #1230 from 29 Jan 2013. +
    • Fixed no recognition of keywords with embedded arguments and full name. Issue #1106 from 12 Sep 2012. -

    2. 2.1.1 - 2024-11-14

    2.1. Changed

    • +

    3. 2.1.1 - 2024-11-14

    3.1. Changed

    • Changed the workflow for the development versions of RIDE. Now, development versions are taken from the ``develop`` branch, and the ``master`` will stay with released version.
    • Changed the way ``configobj`` code is imported. Now is a submodule obtained from https://github.com/DiffSK/configobj. -

    2.2. Fixed

    • +

    3.2. Fixed

    • Fixed broken go to definition after editing content in resource files.
    • Fixed long arguments in fixtures appearing splitted in Grid Editor. Still, arguments info will not be correct at calling step. -

    3. 2.1 - 2024-10-13

    3.1. Added

      (2.1 - 2024-10-13)
+

4. 2.1 - 2024-10-13

4.1. Added

  (2.1 - 2024-10-13)
 - Added a setting for a specific Browser by editing the settings.cfg file. Add the string parameter
 ``browser`` in the section ``[Plugins][[Test Runner]]``.
   (2.1b1 - 2024-09-21)
@@ -65,7 +67,7 @@
 - Added ``FOR`` scope markers (``IN``, ``IN RANGE``, ``IN ENUMERATE``, ``IN ZIP``) to auto-complete list
 - Added support to read environment variable ``ROBOT_VERSION`` to apply some conditions.
 - Added note on Test Timeout that **timeout message** is not supported since Robot v3.0.1
-- Added the note, 'Colors will be active after next RIDE restart.' to the Preferences of Test Runner.

3.2. Changed

  (2.1 - 2024-10-13)
+- Added the note, 'Colors will be active after next RIDE restart.' to the Preferences of Test Runner.

4.2. Changed

  (2.1 - 2024-10-13)
 - Changed the order of insert and delete rows in Grid Editor rows context menu.
   (2.1b1 - 2024-09-21)
 - Allow to do auto-suggestions of keywords in Text Editor without a shortcut, if you want to enable or disable this feature you can config in `Tools -> Preferences -> Text Editor -> Enable auto suggestions`.
@@ -96,7 +98,7 @@
 - Changed alias marker on library imports to consider variable ``ROBOT_VERSION``. If version is lower than 6.0, uses ``'WITH NAME'``, otherwise will use ``'AS'``
   (2.0.3 - 2023-04-16)
 - Allow to do auto-suggestions of keywords in Grid Editor without a shortcut, if you want to enable or disable this feature you can config in `Tools-> Preferences -> Grid Editor -> Enable auto suggestions`
-- Made ``\\n`` visible when editing cells in Grid Editor (problematic in Windows)

3.3. Fixed

  (2.1 - 2024-10-13)
+- Made ``\\n`` visible when editing cells in Grid Editor (problematic in Windows)

4.3. Fixed

  (2.1 - 2024-10-13)
 - Fixed recognition of variables imported from YAML, JSON and Python files.
   (2.1b1 - 2024-09-21)
 - Fixed validation of multiple arguments with default values in Grid Editor.
@@ -144,18 +146,18 @@
 - Fixed clearing or emptying fixtures (Setups, Teardowns), now removes headers and synchronizes Text Editor
 - Fixed selection and persistance of colors in File Explorer and Project Tree panels
 - Fixed not using defined color for help and HTML content
-- Fixed missing newlines in sections separation

3.4. Removed

  (2.1a3 - 2024-07-22)
+- Fixed missing newlines in sections separation

4.4. Removed

  (2.1a3 - 2024-07-22)
 - Removed support for HTML file format (obsolete since Robot Framework 3.2)
-- Removed support for old Python versions, 3.6 nd 3.7.

4. 2.1b1 - 2024-09-21

4.1. Added

  • +- Removed support for old Python versions, 3.6 nd 3.7.

5. 2.1b1 - 2024-09-21

5.1. Added

  • Added color to Test Runner Console Log final output, report and log since RF v7.1rc1.
  • Added Korean language support for UI, experimental.
  • Added option ``caret style`` to change insert caret to block or line in Text Editor, by editing ``settings.cfg``. The color of the caret is the same as setting and will be adjusted for better contrast with the background. -

4.2. Changed

  • +

5.2. Changed

  • Allow to do auto-suggestions of keywords in Text Editor without a shortcut, if you want to enable or disable this feature you can config in Tools -> Preferences -> Text Editor -> Enable auto suggestions. -

4.3. Fixed

  • +

5.3. Fixed

  • Fixed validation of multiple arguments with default values in Grid Editor.
  • Fixed on Text Editor when Saving the selection of tests to run in Test Suites (Tree) is cleared. @@ -165,7 +167,7 @@ Fixed delete variable from Test Suite settings remaining in Project Explorer.
  • Fixed obsfuscation of Libraries and Metadata panels when expanding Settings in Grid Editor and Linux systems. -

5. 2.1a3 - 2024-07-22

5.1. Added

  • +

6. 2.1a3 - 2024-07-22

6.1. Added

  • Added support for Setup in keywords, since Robot Framework version 7.0.
  • Added support for new VAR marker, since Robot Framework version 7.0. @@ -206,7 +208,7 @@ Tooltips for the fields are always shown in English.
  • Colorization for language configured files is working in Text Editor. -

5.2. Fixed

  • +

6.2. Fixed

  • Fixed multiline variables in Variables section. In Text Editor they are separated by … continuation marker. In Grid Editor use | (pipe) to separate lines.
  • @@ -221,7 +223,7 @@ Fixed wrong continuation of long chains of keywords in Setups, Teardowns or Documentation
  • Fixed New User Keyword dialog not allowing empty Arguments field -

5.3. Changed

  • +

6.3. Changed

  • Improved release packaging of RIDE, by using entry_points in setuptools configuration.
  • Parsing of clipboard content to separate by cells in Grid Editor. NOTE: Need to Apply Changes in Text Editor to be effective. @@ -229,11 +231,11 @@ Improved selection of items from Tree in Text Editor. Now finds more items and selects whole line.
  • Changed output in plugin Run Anything (Macros) to allow Zoom In/Out, and Copy content. -

5.4. Removed

  • +

6.4. Removed

  • Removed support for HTML file format (obsolete since Robot Framework 3.2)
  • Removed support for old Python versions, 3.6 nd 3.7. -

6. 2.0.8.1 - 2023-11-01

6.1. Added

  • +

7. 2.0.8.1 - 2023-11-01

7.1. Added

  • Added auto update check when development version is installed
  • Added menu option ``Help→Check for Upgrade`` which allows to force update check and install development version @@ -252,7 +254,7 @@ Added variables creation shortcuts (``Ctrl-1,2,5``) to fields Arguments in Grid Editor
  • Added support for JSON variables, by using the installed Robot Framework import method -

6.2. Fixed

  • +

7.2. Fixed

  • Fixed escaped spaces showing in Text Editor on commented cells
  • Fixed resource files dissapearing from Project tree on Windows @@ -270,7 +272,7 @@ Position of cursor in Text Editor auto-suggestions when line contains multibyte characters
  • Drag and drop of variables defined with comments between resource files -

6.3. Changed

  • +

7.3. Changed

  • Improved keywords documentation search, by adding current dir to search
  • Improved Move up/down, ``Alt-UpArrow``/``Alt-DownArrow`` in Text Editor, to have proper indentation and selection @@ -286,14 +288,14 @@ Improved keyword ``Find Usages`` to return more matches. Fails to find mixed spaces and ``_``
  • In Grid Editor ``Ctrl-Shift-4`` now replaces escaped spaces ``\\ `` by spaces -

7. 2.0.7 - 2023-08-13

7.1. Added

  • +

8. 2.0.7 - 2023-08-13

8.1. Added

  • Added indication of matching brackets, ``()``, ``{}``, ``[]``, in Text Editor
  • Added context menu to RIDE tray icon. Options Show, Hide and Close
  • Added sincronization with Project Explorer to navigate to selected item, Test Case, Keyword, Variable, in Text Editor Note: This feature is working fine in Fedora 38, but not on Windows and macOS. -

7.2. Fixed

  • +

8.2. Fixed

  • Fixed non syncronized expanding/collapse of Settings panel in Grid Editor, on Linux
  • Fixed not working the deletion of cells commented with ``\# `` in Grid Editor with ``Ctrl-Shift-D`` @@ -307,17 +309,17 @@ Fixed title of User Keyword in Grid Editor always showing ``Find Usages`` instead of the keyword name
  • Fixed renaming keywords when they were arguments of ``Run Keywords`` in Setups and Teardowns -

7.3. Changed

  • +

8.3. Changed

  • Improve Text Editor auto-suggestions to keep libraries prefixes. -

8. 2.0.6 - 2023-06-10

8.1. Added

  • +

9. 2.0.6 - 2023-06-10

9.1. Added

  • Added boolean parameter ``filter newlines`` to Grid Editor with default ``True``, to hide or show newlines in cells -

8.2. Changed

  • +

9.2. Changed

  • Changed ``tasks.py`` to test ``utest/application/test_app_main.py`` isolated from the other tests
  • Improve auto-suggestions of keywords in Grid Editor by allowing to close suggestions list with keys ARROW_LEFT or ARROW_RIGHT
  • Improve Text Editor auto-suggestions by using: selected text, text at left or at right of cursor -

9. 2.0.5 - 2023-05-08

9.1. Added

  • +

10. 2.0.5 - 2023-05-08

10.1. Added

  • Added ``FOR`` scope markers (``IN``, ``IN RANGE``, ``IN ENUMERATE``, ``IN ZIP``) to auto-complete list
  • Added support to read environment variable ``ROBOT_VERSION`` to apply some conditions. @@ -325,15 +327,15 @@ Added note on Test Timeout that timeout message is not supported since Robot v3.0.1
  • Added the note, Colors will be active after next RIDE restart. to the Preferences of Test Runner. -

9.2. Changed

  • +

10.2. Changed

  • Changed alias marker on library imports to consider variable ``ROBOT_VERSION``. If version is lower than 6.0, uses ``WITH NAME``, otherwise will use ``AS`` -

10. Fixed

  • +

11. Fixed

  • Fixed auto-indent on block commands in Text Editor -

11. 2.0.3 - 2023-04-16

11.1. Changed

  • +

12. 2.0.3 - 2023-04-16

12.1. Changed

  • Allow to do auto-suggestions of keywords in Grid Editor without a shortcut, if you want to enable or disable this feature you can config in Tools-> Preferences -> Grid Editor -> Enable auto suggestions
  • Made ``\\n`` visible when editing cells in Grid Editor (problematic in Windows) -

12. Fixed

  • +

13. Fixed

  • Fixed missing auto-enclosing when in Cell Editor in Linux
  • Fixed RIDE will crash when using third party input method in Mac OS @@ -347,7 +349,7 @@ Fixed not using defined color for help and HTML content
  • Fixed missing newlines in sections separation -

13. 2.0 - 2023-03-01

13.1. Added

  (2.0rc1 - 2023-02-26)
+

14. 2.0 - 2023-03-01

14.1. Added

  (2.0rc1 - 2023-02-26)
 - Minimal support to accept `*** Comments ***` sections (unfinished code)
 - Added insert and delete cells to Text Editor, by using ``Ctrl-Shift-I`` and ``Ctrl-Shift-D``
 - Added move up and move down rows to Text Editor, by using ``Alt-Up`` and ``Alt-Down``
@@ -400,13 +402,13 @@
 - Added enclosing text in Text Editor or selected text with certain symbols
 - Added enclosing text in Grid Editor or selected text with certain symbols
 - Added 8s timer to shortcut creation dialog on install
-- Added process memory limit on Messages Log

13.2. Removed

  (2.0b2 - 2022-09-05)
+- Added process memory limit on Messages Log

14.2. Removed

  (2.0b2 - 2022-09-05)
 - Removed ``robotframeworklexer`` dependency and local copy
 - Removed alignment flag on grid cell JSON Editor (Ctrl-Shift-J)
 - Removed moving to keyword/variable definition when doing Double-Click in grid cell
   (2.0b1 - 2020-07-26)
 - Python 2.7 support
-- wxPython/wxPhoenix version conditioning

13.3. Changed

  (2.0b3 - 2023-01-15)
+- wxPython/wxPhoenix version conditioning

14.3. Changed

  (2.0b3 - 2023-01-15)
 - Hiding items in Test Suites explorer with names starting with #
 - Disabled the Close button on the Test Suites explorer
   This was causing not being possible to restore it, unless editing the settings.cfg file.
@@ -435,7 +437,7 @@
 - Changed icon background to white
 - Made Project Tree and File Explorer panels, Plugins.
 - wx.NewId() to wx.NewIdRef()
-- Separated AppendText for Messages Log

13.4. Fixed

  (2.0rc1 - 2023-02-26)
+- Separated AppendText for Messages Log

14.4. Fixed

  (2.0rc1 - 2023-02-26)
 - Fixed blank Grid Editor at keywords with steps commented with ``\# ``, by using ``Ctrl-Shift-3 on Text Editor
   (2.0b3 - 2023-01-15)
 . Fixed low performance when opening large projects
@@ -509,7 +511,7 @@
 - Fixed Settings editor
 - Fixed blank Edit screen
 - Fixed Runner arguments parsing
-- Fixed Runner Log window Chinese and Latin encoding chars on Windows

14. 2.0rc1 - 2023-02-26

14.1. Added

  • +- Fixed Runner Log window Chinese and Latin encoding chars on Windows

15. 2.0rc1 - 2023-02-26

15.1. Added

  • Minimal support to accept *** Comments *** sections (unfinished code)
  • Added insert and delete cells to Text Editor, by using ``Ctrl-Shift-I`` and ``Ctrl-Shift-D`` @@ -517,30 +519,30 @@ Added move up and move down rows to Text Editor, by using ``Alt-Up`` and ``Alt-Down``
  • Added insert and delete rows to Text Editor, by using ``Ctrl-I`` and ``Ctrl-D`` -

14.2. Removed

14.3. Changed

14.4. Fixed

  • +

15.2. Removed

15.3. Changed

15.4. Fixed

  • Fixed blank Grid Editor at keywords with steps commented with ``\# ``, by using ``Ctrl-Shift-3 on Text Editor -

15. 2.0b3 - 2023-01-15

15.1. Added

  • +

16. 2.0b3 - 2023-01-15

16.1. Added

  • Added swap row up, by using ``Ctrl-T``
  • Added commenting/uncommenting of content with ``\# ``, by using ``Ctrl-Shift-3`` and ``Ctrl-Shift-4``
  • Added support for editing .robot and .resource files with content before sections -

15.2. Removed

  • +

16.2. Removed

  • None -

15.3. Changed

  • +

16.3. Changed

  • Hiding items in Test Suites explorer with names starting with #
  • Disabled the Close button on the Test Suites explorer This was causing not being possible to restore it, unless editing the settings.cfg file. Other reason was to prevent user to closing it, after detaching the panel, and re-attaching, which has a bug making the Tree not visible. -

15.4. Fixed

  1. +

16.4. Fixed

  1. Fixed low performance when opening large projects

    • Fixed comment and uncomment in Grid Editor when cells contain more than one variables assignement
    • Fixed console log stopping to output certain characters, like chinese and latin -

16. 2.0b2 - 2022-09-05

16.1. Added

  • +

17. 2.0b2 - 2022-09-05

17.1. Added

  • Added menu entry at Help → Offline Change Log to view this file on disk
  • Added skipped tests counter and corresponding colored icon on Project tree @@ -608,13 +610,13 @@ When editing, Ctrl-Home and Ctrl-End move cursor to start and end of cell content respectively.
  • Added Del key to clear Grid Editor cell content when in navigation mode (clear like doing Ctrl-X) -

    • 16.2. Removed

    • +

    17.2. Removed

    • Removed ``robotframeworklexer`` dependency and local copy
    • Removed alignment flag on grid cell JSON Editor (Ctrl-Shift-J)
    • Removed moving to keyword/variable definition when doing Double-Click in grid cell -

    16.3. Changed

    • +

    17.3. Changed

    • Unit tests to use ``pytest`` and removed ``nose`` dependency. Support for Python 3.10 at unit test level.
    • Prevent expanding Tests and change selection on Project tree (when right-clicking) @@ -644,7 +646,7 @@ Changed Enter button in navigation mode to start editing cell, and to move to right cell when in edit mode
    • Performance improvements for loading large test suites -

    16.4. Fixed

    • +

    17.4. Fixed

    • Fixed missing menu icons on Linux (was working on Windows)
    • Fixed removal of animation in Project tree when test run is interrupted @@ -717,7 +719,7 @@ Fixed RIDE startup crash when Tree or File Explorer plugins use opened=False setting
    • Fixed error occurring when deleting test cases on Tree -

    17. 2.0b1 - 2020-07-26

    17.1. Added

    • +

    18. 2.0b1 - 2020-07-26

    18.1. Added

    • Added CHANGELOG.adoc
    • Added ignoring log.html and report.html on reporting HTML test suites @@ -735,11 +737,11 @@ Added 8s timer to shortcut creation dialog on install
    • Added process memory limit on Messages Log -

    17.2. Removed

    • +

    18.2. Removed

    • Python 2.7 support
    • wxPython/wxPhoenix version conditioning -

    17.3. Changed

    • +

    18.3. Changed

    • Improved filesystem changes detection, with a confirmation dialog to reload workspace
    • Changed dependency on wx.Window on tree panel @@ -753,7 +755,7 @@ wx.NewId() to wx.NewIdRef()
    • Separated AppendText for Messages Log -

    17.4. Fixed

    • +

    18.4. Fixed

    • Fixed editing cells in Grid Editor on wxPython 4.1
    • Fixed not saving file after deleting text in Text Editor @@ -813,12 +815,12 @@ Fixed Runner arguments parsing
    • Fixed Runner Log window Chinese and Latin encoding chars on Windows -

    18. 1.7.4.2 - 2020-01-20

    18.1. Added

    • +

    19. 1.7.4.2 - 2020-01-20

    19.1. Added

    • wxPython version locked up to 4.0.7.post2. -

    18.2. Removed

    • +

    19.2. Removed

    • None -

    18.3. Changed

    • +

    19.3. Changed

    • None -

    18.4. Fixed

    • +

    19.4. Fixed

    • None
    diff --git a/src/robotide/application/releasenotes.py b/src/robotide/application/releasenotes.py index dd38b6738..5a94b0a48 100644 --- a/src/robotide/application/releasenotes.py +++ b/src/robotide/application/releasenotes.py @@ -150,10 +150,8 @@ def set_content(self, html_win, content):

    RIDE (Robot Framework IDE) {VERSION} is a new release with some enhancements and bug fixes. The reference for valid arguments is - Robot Framework installed version, which is at - this - moment 7.1.1. However, internal library code is originally based on version 3.1.2, but adapted for new versions.

    -

    + Robot Framework previous version, which was 7.1.1 + (currently is 7.2). However, internal library code is originally based on version 3.1.2, but adapted for new versions.

    • This version supports Python 3.8 up to 3.13.
    • There are some changes, or known issues:
        @@ -161,6 +159,7 @@ def set_content(self, html_win, content): is not normal. Better to close RIDE and start a new instance.
      • 🐞 - Problems with COPY/PASTE in Text Editor have been reported when using wxPython 4.2.0, but not with version 4.2.1 and 4.2.2, which we now recommend.
        • +
      • 🐞 - Rename Keywords, Find Usages/Find where used are not finding all occurrences. Please, double-check findings and changes.
      • 🐞 - Some argument types detection (and colorization) is not correct in Grid Editor.
      • 🐞 - RIDE DOES NOT KEEP Test Suites formatting or structure, causing differences in files when used on other IDE or Editors. The option to not reformat the file is not working.
        • @@ -169,6 +168,7 @@ def set_content(self, html_win, content):

      New Features and Fixes Highlights

        +
      • Partial fix of no update of renaming resource prefixed keywords. Issue #1230 from 29 Jan 2013.
      • Fixed no recognition of keywords with embedded arguments and full name. Issue #1106 from 12 Sep 2012.