Allow list search in CONTEXT - PR fixes

Author: lmcalvo

toolium/test/utils/test_dataset_map_param_context.py

@@ -19,7 +19,7 @@
 import pytest
 
 from toolium.utils import dataset
-from toolium.utils.dataset import get_attribute, map_param
+from toolium.utils.dataset import map_param
 
 
 def test_a_context_param():
@@ -305,9 +305,9 @@ class Context(object):
                                                                 {'id': 'ask-for-qa', 'text': 'QA no duplica'}]
 
 
-def test_a_context_param_list_default():
+def test_a_context_param_list_default_no_index():
     """
-    Verification of a list without index as CONTEXT (get the attribute of the first element in list)
+    Verification of a list without index as CONTEXT
     """
     class Context(object):
         pass
@@ -326,7 +326,10 @@ class Context(object):
         ]
     }
     dataset.behave_context = context
-    assert map_param("[CONTEXT:list.cmsScrollableActions.text]") == 'QA duplica'
+
+    with pytest.raises(Exception) as excinfo:
+        map_param("[CONTEXT:list.cmsScrollableActions.text]")
+    assert "the index 'text' must be a numeric index" == str(excinfo.value)
 
 
 def test_a_context_param_list_correct_index():
@@ -408,11 +411,11 @@ class Context(object):
 
     with pytest.raises(Exception) as excinfo:
         map_param("[CONTEXT:list.cmsScrollableActions.prueba.id]")
-    assert "the index 'prueba' must be a numeric index or a valid key" == str(excinfo.value)
+    assert "the index 'prueba' must be a numeric index" == str(excinfo.value)
 
     with pytest.raises(Exception) as excinfo:
         map_param("[CONTEXT:list.cmsScrollableActions.'36'.id]")
-    assert "the index ''36'' must be a numeric index or a valid key" == str(excinfo.value)
+    assert "the index ''36'' must be a numeric index" == str(excinfo.value)
 
 
 def test_a_context_param_class_no_numeric_index():
@@ -438,42 +441,8 @@ def __init__(self):
     print(context)
     with pytest.raises(Exception) as excinfo:
         map_param("[CONTEXT:list.cmsScrollableActions.prueba.id]")
-    assert "the index 'prueba' must be a numeric index or a valid key" == str(excinfo.value)
+    assert "the index 'prueba' must be a numeric index" == str(excinfo.value)
 
     with pytest.raises(Exception) as excinfo:
         map_param("[CONTEXT:list.cmsScrollableActions.'36'.id]")
-    assert "the index ''36'' must be a numeric index or a valid key" == str(excinfo.value)
-
-
-def test_get_attribute_class():
-    """
-    Verification of a get attribute given a class
-    """
-
-    class ExampleClass:
-        """
-        ExampleClass class
-        """
-
-        def __init__(self, url, text):
-            self.url = url
-            self.text = text
-
-    example = ExampleClass(url={'id': 'ask-for-duplicate'}, text="QA duplica")
-
-    assert get_attribute(example, "text") == 'QA duplica'
-
-
-def test_get_attribute_dict():
-    """
-    Verification of a get attribute given a dictionary
-    """
-
-    example = {
-        'url': {
-            'id': 'ask-for-duplicate'
-        },
-        'text': 'QA duplica'
-    }
-
-    assert get_attribute(example, "text") == 'QA duplica'
+    assert "the index ''36'' must be a numeric index" == str(excinfo.value)

toolium/utils/dataset.py

@@ -601,10 +601,10 @@ def get_value_from_context(param, context):
     for part in parts[1:]:
         if isinstance(value, dict) and part in value:
             value = value[part]
-        elif isinstance(value, list):
-            msg, value = get_value_in_list(value, part)
+        elif isinstance(value, list) and part.isdigit() and int(part) < len(value):
+            value = value[int(part)]
         elif hasattr(value, part):
-            value = get_attribute(value, part)
+            value = getattr(value, part)
         else:
             msg = get_value_context_errors(value, part)
         if msg:
@@ -613,44 +613,6 @@ def get_value_from_context(param, context):
     return value
 
 
-def get_value_in_list(value, part):
-    """
-    get the value updated with elements in list
-    update the value with the given list_index and the part
-
-    :param value: updated value of the CONTEXT dict
-    :param part: part to take in the value (index of the list)
-    :return: error msg and updated value
-    """
-    msg = None
-    if part.isdigit():
-        part = int(part)
-        if part >= len(value):
-            msg = f"Invalid index '{part}', list size is '{len(value)}'. {part} >= {len(value)}."
-        else:
-            value = value[part]
-    else:
-        try:
-            value = get_attribute(value[0], part)
-        except (KeyError, TypeError):
-            msg = f"the index '{part}' must be a numeric index or a valid key"
-    return msg, value
-
-
-def get_attribute(value, key):
-    """
-    get the key attribute, accepts dictionary and classes
-
-    :param value: updated value of the dict
-    :param key: part to take in the value
-    :return: error msg and updated value
-    """
-    try:
-        return getattr(value, key)
-    except AttributeError:
-        return value[key]
-
-
 def get_value_context_errors(value, part):
     """
     Returns the errors
@@ -661,6 +623,11 @@ def get_value_context_errors(value, part):
     """
     if isinstance(value, dict):
         return f"'{part}' key not found in {value} value in context"
+    elif isinstance(value, list):
+        if part.isdigit():
+            return f"Invalid index '{part}', list size is '{len(value)}'. {part} >= {len(value)}."
+        else:
+            return f"the index '{part}' must be a numeric index"
     else:
         return f"'{part}' attribute not found in {type(value).__name__} class in context"
 
@@ -681,7 +648,7 @@ def _get_initial_value_from_context(initial_key, context):
     if initial_key in context_storage:
         value = context_storage[initial_key]
     elif hasattr(context, initial_key):
-        value = get_attribute(context, initial_key)
+        value = getattr(context, initial_key)
     else:
         msg = f"'{initial_key}' key not found in context"
         logger.error(msg)