Increase unit tests

Author: HelioGuilherme66

src/robotide/editor/contentassist.py

@@ -19,6 +19,7 @@
 from wx.lib.filebrowsebutton import FileBrowseButton
 from os.path import relpath, dirname, isdir
 
+from .gridbase import GridEditor
 from .. import context, utils
 from ..context import IS_MAC, IS_WINDOWS, IS_WX_410_OR_HIGHER
 from ..namespace.suggesters import SuggestionSource
@@ -74,6 +75,8 @@ def __init__(self, suggestion_source, language='En', **kw):
     @staticmethod
     def _get_auto_suggestion_config():
         from robotide.context import APP
+        if not APP:
+            return True
         settings = APP.settings['Grid']
         return settings.get(_AUTO_SUGGESTION_CFG_KEY, False)
 
@@ -540,7 +543,8 @@ def content_assist_for(self, value, row=None):
         self._choices = self._suggestions.get_for(value, row=row)
         if not self._choices:
             self._list.ClearAll()
-            self._parent.hide()
+            if not isinstance(self._parent, GridEditor):
+                self._parent.hide()
             return False
         self._choices = list(set([c for c in self._choices if c is not None]))
         print(f"DEBUG: contentassist.py ContentAssistPopup content_assist_for CALL POPULATE Choices={self._choices}")

src/robotide/editor/texteditor.py

@@ -609,7 +609,10 @@ def _apply_txt_changes_to_model(self):
         return True
 
     def is_focused(self):
-        return self.notebook.current_page_title == self.title
+        try:
+            return self.notebook.current_page_title == self.title
+        except AttributeError:
+            return self._editor.is_focused()
 
 
 class DummyController(WithStepsController):
@@ -1223,8 +1226,12 @@ def on_content_assist(self, event):
         """
         self.store_position()
         selected = self.source_editor.get_selected_or_near_text()
-        print(f"DEBUG: texteditor.py SourceEditor SELECTION selected = {selected}  is type={type(selected)}")
+        # print(f"DEBUG: texteditor.py SourceEditor SELECTION selected = {selected}  is type={type(selected)}")
         self.set_editor_caret_position()
+        # Next is for the unit tests when the did not used open to get data:
+        if not self._suggestions:
+            self._controller_for_context = DummyController(self._data.wrapper_data, self._data.wrapper_data)
+            self._suggestions = SuggestionSource(self.plugin, self._controller_for_context)
         self._suggestions.update_from_local(self.words_cache(self.source_editor.GetLineCount()), self.language)
         sugs = set()
         if selected:
@@ -1239,7 +1246,7 @@ def on_content_assist(self, event):
                     else:
                         found.append(s)
                 sugs.update(found)
-            print(f"DEBUG: texteditor.py SourceEditor on_content_assist FIRST SUGGESTION suggestions = {sugs}\n")
+            # print(f"DEBUG: texteditor.py SourceEditor on_content_assist FIRST SUGGESTION suggestions = {sugs}\n")
             # DEBUG: Here, if sugs is still [], then we can get all words from line and repeat suggestions
             # In another evolution, we can use database of words by frequency (considering future by project db)
         sel = [s for s in selected] if selected else ['']
@@ -1249,7 +1256,7 @@ def on_content_assist(self, event):
         # if sel[0] == '':
         # The case when we call Ctl+Space in empty line o always add suggestions
         # for start in sel:
-        print(f"DEBUG: texteditor.py SourceEditor on_content_assist selection = {sel}")
+        # print(f"DEBUG: texteditor.py SourceEditor on_content_assist selection = {sel}")
         if sel[0] == '':
             found = []
             for s in self._suggestions.get_suggestions(''):
@@ -1277,15 +1284,15 @@ def on_content_assist(self, event):
                             else:
                                 found.append(s)
             sugs.update(found)
-            print(f"DEBUG: texteditor.py SourceEditor on_content_assist VARIABLES SEARCH selection = {sel}\n"
-                  f"sugs={sugs}")
+            # print(f"DEBUG: texteditor.py SourceEditor on_content_assist VARIABLES SEARCH selection = {sel}\n"
+            #       f"sugs={sugs}")
         if len(sugs) > 0:
             # sugs = [s for s in sugs if s != '']
             if '' in sugs:
                 sugs.remove('')
         suggestions=";".join(sorted(sugs))
-        print(f"DEBUG: texteditor.py SourceEditor on_content_assist BEFORE SHOW LIST suggestions = {suggestions}\n"
-              f" size={len(suggestions)} cache size={len(self._words_cache)}")
+        # print(f"DEBUG: texteditor.py SourceEditor on_content_assist BEFORE SHOW LIST suggestions = {suggestions}\n"
+        #       f" size={len(suggestions)} cache size={len(self._words_cache)}")
         if len(suggestions) > 0:  # Consider using contentassist as in Grid Editor
             self.source_editor.AutoCompSetDropRestOfWord(False)
             self.source_editor.AutoCompSetFillUps('=')
@@ -1307,17 +1314,24 @@ def on_content_assist(self, event):
     def open(self, data):
         self.reset()
         self._data = data
-        if self._data._doc_language is not None and len(self._data._doc_language) > 0:
+        if hasattr(self._data, '_doc_language') and self._data._doc_language is not None and len(self._data._doc_language) > 0:
             self.language = self._data._doc_language
+        elif hasattr(self._data, '_language') and self._data._language is not None and len(self._data._language) > 0:
+            self.language = self._data._language
         else:
             self.language = ['en']
         # print(f"DEBUG: texteditor.py SourceEditor open ENTER language={self.language}")
         try:
-            if isinstance(self._data.wrapper_data, ResourceFileController):
-                self._controller_for_context = DummyController(self._data.wrapper_data, self._data.wrapper_data)
-                self._suggestions = SuggestionSource(self.plugin, self._controller_for_context)
+            if hasattr(self._data, 'wrapper_data'):
+                if isinstance(self._data.wrapper_data, ResourceFileController):
+                    self._controller_for_context = DummyController(self._data.wrapper_data, self._data.wrapper_data)
+                else:
+                    self._controller_for_context = self._data.wrapper_data.tests[0]
+            elif isinstance(self._data, ResourceFileController):
+                self._controller_for_context = self._data
             else:
-                self._suggestions = SuggestionSource(self.plugin, self._data.wrapper_data.tests[0])
+                self._controller_for_context = self._data.tests[0]
+            self._suggestions = SuggestionSource(self.plugin, self._controller_for_context)
         except IndexError:  # It is a new project, no content yet
             self._controller_for_context = DummyController(self._data.wrapper_data, self._data.wrapper_data)
             self._suggestions = SuggestionSource(self.plugin, self._controller_for_context)
@@ -1330,7 +1344,8 @@ def open(self, data):
             self._create_editor_text_control(text=self._stored_text, language=self.language)
         else:
             self.source_editor.set_language(self.language)
-            self.source_editor.set_text(self._data.content)
+            if hasattr(self._data, 'content'):  # Special case for unit test
+                self.source_editor.set_text(self._data.content)
             self.set_editor_caret_position()
         self._words_cache.clear()
         self._suggestions.update_from_local(self.words_cache(self.source_editor.GetLineCount()), self.language)
@@ -1472,7 +1487,7 @@ def write_ident(self):
         self.source_editor.WriteText(spaces)
 
     def reset(self):
-        if self._data and not self._data.wrapper_data.is_dirty:
+        if self._data and (hasattr(self._data, 'wrapper_data') and not self._data.wrapper_data.is_dirty):
             self.mark_file_dirty(False)
 
     def content_save(self, **args):

src/robotide/lib/robot/utils/normalizing.py

@@ -22,11 +22,13 @@
 from .robottypes import is_dict_like, is_unicode
 
 
-def normalize(string, ignore=(), caseless=True, spaceless=True):
+def normalize(string, ignore=(), caseless=True, spaceless=True, suffixless=False):
     """Normalizes given string according to given spec.
 
     By default, string is turned to lower case and all whitespace is removed.
     Additional characters can be removed by giving them in ``ignore`` list.
+    :param
+      suffixless: the end char is removed if is a symbol
     """
     if not string or string == '':
         return ''
@@ -44,6 +46,9 @@ def normalize(string, ignore=(), caseless=True, spaceless=True):
         for ign in ignore:
             if ign in string:
                 string = string.replace(ign, empty)
+    if suffixless:
+        while len(string) > 1 and string[-1] in "=}])":
+            string = string[:-1]
     return string
 
 

src/robotide/namespace/namespace.py

@@ -135,10 +135,12 @@ def _get_default_keywords(self):
         return self._lib_cache.get_default_keywords()
 
     def get_suggestions_for(self, controller, start):
+        if not controller:
+            return []
         datafile = controller.datafile
         ctx = self._context_factory.ctx_for_controller(controller)
         sugs = set()  # self._words_cache or
-        print(f"DEBUG: namespace.py Namespace get_suggestions_for ENTER start={start} {datafile=} {ctx=} {sugs=}")
+        # print(f"DEBUG: namespace.py Namespace get_suggestions_for ENTER start={start} {datafile=} {ctx=} {sugs=}")
         while start and start[-1] in [']', '}', '=', ',']:
             start = start[:-1]
         sugs.update(self._get_suggestions_from_hooks(datafile, start))
@@ -147,16 +149,16 @@ def get_suggestions_for(self, controller, start):
             sugs.update(self._keyword_suggestions(datafile, start, ctx))
         else:
             sugs.update(self._variable_suggestions(controller, start, ctx))
-        print(f"DEBUG: namespace.py Namespace get_suggestions_for BEFORE CONTENT start={start} {sugs=}")
+        # print(f"DEBUG: namespace.py Namespace get_suggestions_for BEFORE CONTENT start={start} {sugs=}")
         if not self._looks_like_variable(start):  # Search in content
             for v in ['${', '@{', '&{', '%{', '$']:
                 sugs.update(self._content_suggestions(f'{v}{utils.normalize(start)}'))
         else:
-            sugs.update(self._content_suggestions(start))
-        print(f"DEBUG: namespace.py Namespace get_suggestions_for FROM CONTENT start={start} {sugs=}")
+            sugs.update(self._content_suggestions(f'{utils.normalize(start, suffixless=True)}'))
+        # print(f"DEBUG: namespace.py Namespace get_suggestions_for FROM CONTENT start={start} {sugs=}")
         sugs_list = list(sugs)
         sugs_list.sort()
-        print(f"DEBUG: namespace.py Namespace get_suggestions_for RETURN {sugs_list=}")
+        # print(f"DEBUG: namespace.py Namespace get_suggestions_for RETURN {sugs_list=}")
         return sugs_list
 
     def _get_suggestions_from_hooks(self, datafile, start):
@@ -194,12 +196,12 @@ def _content_suggestions(self, start):
                     sugs.add(v.name)
             elif isinstance(v, (VariableInfo, ArgumentInfo)):
                 if v.name_matches(start):
-                    print(f"DEBUG: namespace.py Namespace _content_suggestions SUGGESTION from VARIABLE {v.name=}")
+                    # print(f"DEBUG: namespace.py Namespace _content_suggestions SUGGESTION from VARIABLE {v.name=}")
                     sugs.add(v.name)
             elif (v.lower().startswith(start.lower()) or v.strip('$&@%{[()]}=').lower()
                     .startswith(start.strip('$&@%{[()]}=').lower())):
-                print(f"DEBUG: namespace.py Namespace _content_suggestions SUGGESTION from STRING {v=}"
-                      f"\n v.lower().startswith(start.lower() ={v.lower().startswith(start.lower())}")
+                # print(f"DEBUG: namespace.py Namespace _content_suggestions SUGGESTION from STRING {v=}"
+                #       f"\n v.lower().startswith(start.lower() ={v.lower().startswith(start.lower())}")
                 sugs.add(v)
         return sugs
 
@@ -424,8 +426,8 @@ class Dummy:
             vars_from_file = VariableFileSetter(store)
             resulting_vars = vars_from_file._import_if_needed(varfile_path, args)
         except (robotapi.DataError, Exception) as e:
-            print(f"namespace._VariableStash.set_from_file: unexpected DataError: variable_path {varfile_path} "
-                  f"args {args}")
+            # print(f"namespace._VariableStash.set_from_file: unexpected DataError: variable_path {varfile_path} "
+            #       f"args {args}")
             raise e
         for name, value in resulting_vars:
             self.set(name, value, varfile_path)

src/robotide/namespace/suggesters.py

@@ -39,9 +39,13 @@ def get_suggestions(self, value, row=None):
                 try:
                     sugs.update(self._controller.get_local_namespace_for_row(row).get_suggestions(initial))
                 except AttributeError:
-                    sugs.update(self._controller.get_local_namespace.get_suggestions(initial))
+                    try:
+                      sugs.update(self._controller.get_local_namespace.get_suggestions(initial))
+                    except AttributeError:  # For example TestCaseFileController
+                        pass
                 # return list(sugs)
-            sugs.update(self._plugin.content_assist_values(initial))  # DEBUG: Remove old functionality when no more needed
+            if self._plugin:
+                sugs.update(self._plugin.content_assist_values(initial))  # DEBUG: Remove old functionality when no more needed
             print(f"DEBUG: suggesters.py SuggestionSource get_suggestions IN LOOP initial ={initial} len sugs={len(sugs)}")
         return list(sugs)
 

src/robotide/pluginapi/plugin.py

@@ -307,7 +307,10 @@ def get_selected_item(self):
         """
         if not self.tree:
             return
-        return self.tree.get_selected_item()
+        if hasattr(self, 'model'):
+            return self.tree.get_selected_item() or self.model
+        else:
+            return self.tree.get_selected_item()
 
     def content_assist_values(self, value=''):
         """Returns content assist values for currently selected item."""

utest/editor/test_contentassist.py

@@ -14,7 +14,7 @@
 #  limitations under the License.
 
 import unittest
-from robotide.editor.contentassist import Suggestions
+from robotide.editor.contentassist import Suggestions, obtain_bdd_prefixes
 from robotide.namespace.suggesters import SuggestionSource, HistorySuggester
 
 class TestSuggestionSources(unittest.TestCase):
@@ -85,6 +85,21 @@ def test_suggestions_for_duplicates(self):
         choices = suggestions.get_for('a')
         self.assertEqual(choices, ['aarnio', 'fo.aaatio', 'bA.AAATIO'])
 
+    def test_bdd_suggestions_en(self):
+        choices = obtain_bdd_prefixes('En')
+        self.assertEqual(choices.sort(), ['Given', 'When', 'Then', 'And', 'But'].sort())
+
+    def test_bdd_suggestions_pt(self):
+        choices = obtain_bdd_prefixes('Portuguese')
+        self.assertEqual(choices.sort(), ['Dado', 'Quando', 'Então', 'E', 'Mas'].sort())
+
+    def test_bdd_suggestions_fr(self):
+        choices = obtain_bdd_prefixes('Fr')
+        self.assertEqual(choices.sort(), ['Soit', 'Sachant', 'Sachant que', "Sachant qu'",
+                                          'Étant donné', 'Étant donné que', "Etant donné qu'",
+                                          'Quand', 'Lorsque', "Lorsqu'", 'Alors', 'Donc', 'Et',
+                                          'Et que', "Et qu'", 'Mais', 'Mais que', "Mais qu'"].sort())
+
     def _create_mock_source(self):
         mock_source = lambda:0
         mock_source.request_count = 0