Fix argument validation logic

Author: yanne

src/robotide/validators/__init__.py

@@ -71,7 +71,7 @@ def _set_window_value(self, value):
 
 
 class ArgumentTypes(object):
-    POSITIONAL, NAMED = range(1, 3)
+    SCALAR, DEFAULT, LIST, DICT = range(1, 5)
 
 
 class ArgumentsValidator(_AbstractValidator):
@@ -85,19 +85,22 @@ def _validate(self, args_str):
         return self._validate_argument_order(types)
 
     def _get_type(self, arg):
-        if robotapi.is_scalar_var(arg) or robotapi.is_list_var(arg):
-            return ArgumentTypes.POSITIONAL
-        elif robotapi.is_scalar_var(arg.split("=")[0]) or \
-                robotapi.is_dict_var(arg):
-            return ArgumentTypes.NAMED
+        if robotapi.is_scalar_var(arg):
+            return ArgumentTypes.SCALAR
+        elif robotapi.is_scalar_var(arg.split("=")[0]):
+            return ArgumentTypes.DEFAULT
+        elif robotapi.is_list_var(arg):
+            return ArgumentTypes.LIST
+        elif robotapi.is_dict_var(arg):
+            return ArgumentTypes.DICT
         else:
             raise ValueError
 
     def _validate_argument_order(self, types):
-        prev = ArgumentTypes.POSITIONAL
+        prev = ArgumentTypes.SCALAR
         for t in types:
             if t < prev:
-                return ('List and scalar arguments must be before'
+                return ('List and scalar arguments must be before '
                         'named and dictionary arguments')
             prev = t
         return None

utest/validators/test_arguments_validation.py

@@ -8,7 +8,7 @@
 class Test(unittest.TestCase):
     validate = ArgumentsValidator()._validate
     validation_error = \
-        'List and scalar arguments must be beforenamed and dictionary arguments'
+        'List and scalar arguments must be before named and dictionary arguments'
 
     def test_valid_arguments_validation(self):
         for arg in [
@@ -18,12 +18,12 @@ def test_valid_arguments_validation(self):
                 "${arg}=def val",
                 "${a} | ${b}=d | ${c}=\\| | ${d}=",
                 "@{list}",
-                "@{list} | ${arg}",
                 "${a} | ${b} | @{f}",
                 "&{dict}",
                 "${arg} | &{dict}",
                 "@{list} | &{dict}",
                 "${a} | ${b} | @{f} | &{dict}",
+                "${arg}=foo | @{list}"
         ]:
             assert_equals(self.validate(arg), None, arg)
 
@@ -35,10 +35,10 @@ def test_invalid_arguments_validation(self):
             assert_equals(self.validate(arg),
                           "Invalid argument syntax '%s'" % err)
 
-    def test_list_arg_in_incorrect_poition(self):
-        for arg in ["${arg}=foo | @{list}",
+    def test_list_arg_in_incorrect_position(self):
+        for arg in ["@{list} | ${foo}",
                     "&{dict} | @{list}"]:
-            assert_equals(self.validate(arg), self.validation_error)
+            assert_equals(self.validate(arg), self.validation_error, arg)
 
     def test_req_arg_after_defaults(self):
         for arg in ["${a}=default | ${a2}",