Addressed comments

Author: gavin-aguiar

azure_functions_worker/functions.py

@@ -85,7 +85,8 @@ def validate_binding_route(func_name: str, binding: BindingInfo,
                 '/') and func_type == 'function':
             raise FunctionLoadError(
                 func_name,
-                f'Invalid route name. {binding.route}')
+                f'Invalid route name: {binding.route}. Route name cannot begin'
+                f' with a /')
 
     @staticmethod
     def validate_binding_direction(binding_name: str,
@@ -102,6 +103,14 @@ def validate_binding_direction(binding_name: str,
                 func_name,
                 '"$return" binding must have direction set to "out"')
 
+    def validate_bindings(self, func_name: str, binding: BindingInfo,
+                          func_type: str):
+        self.validate_binding_route(func_name, binding, func_type)
+
+        self.validate_binding_direction(binding.name,
+                                        binding.direction,
+                                        func_name)
+
     @staticmethod
     def is_context_required(params, bound_params: dict,
                             annotations: dict,
@@ -378,11 +387,7 @@ def add_indexed_function(self, function_id: str,
 
         bound_params = {}
         for binding in function.get_bindings():
-            self.validate_binding_route(func_name, binding, func_type)
-
-            self.validate_binding_direction(binding.name,
-                                            binding.direction,
-                                            func_name)
+            self.validate_bindings(func_name, binding, func_type)
 
             has_explicit_return, has_implicit_return = \
                 self.get_explicit_and_implicit_return(

tests/unittests/test_functions_registry.py

@@ -2,7 +2,9 @@
 # Licensed under the MIT License.
 
 import unittest
+
 from azure.functions import Function
+from azure.functions.decorators.blob import BlobInput
 from azure.functions.decorators.http import HttpTrigger
 
 from azure_functions_worker import functions
@@ -19,13 +21,29 @@ def dummy():
         self.func = Function(self.dummy, "test.py")
         self.function_registry = functions.Registry()
 
-    def test_add_index_functions_invalid_route(self):
-        function_id = '123'
+    def test_add_indexed_function_invalid_route(self):
+        trigger1 = HttpTrigger(name="req1", route="/")
+        self.func.add_trigger(trigger=trigger1)
+
+        with self.assertRaises(FunctionLoadError) as ex:
+            self.function_registry.add_indexed_function(function_id='123',
+                                                        function=self.func)
 
-        trigger1 = HttpTrigger(name="req1",
-                               route="/")
+        self.assertEqual(str(ex.exception),
+                         'cannot load the dummy function: Invalid route name: '
+                         '/. Route name cannot begin with a /')
+
+    def test_add_indexed_function_invalid_direction(self):
+        trigger1 = HttpTrigger(name="req1", route="test")
+        binding = BlobInput(name="$return", path="testpath",
+                            connection="testconnection")
         self.func.add_trigger(trigger=trigger1)
+        self.func.add_binding(binding=binding)
+
+        with self.assertRaises(FunctionLoadError) as ex:
+            self.function_registry.add_indexed_function(function_id='123',
+                                                        function=self.func)
 
-        with self.assertRaises(FunctionLoadError):
-            self.function_registry.add_indexed_function(function_id,
-                                                        self.func)
+        self.assertEqual(str(ex.exception),
+                         'cannot load the dummy function: \"$return\" '
+                         'binding must have direction set to \"out\"')