Parameter validation

Author: codeape2

UnitTests/TestEndpointWithParams.cs

@@ -29,6 +29,55 @@ private EndpointCollection CreateEndpointWithScript()
             return EndpointCollectionReader.ReadFromDirectory(dc.DirectoryName);
         }
 
+        private EndpointCollection CreateEndpointWithParam(JSONParam jsonParam)
+        {
+            dc.AddFile("endpoint\\endpoint.json", JsonConvert.SerializeObject(DataUtils.CreateScriptEndpoint("endpoint", "script.csscript")));
+            dc.AddFile("endpoint\\script.csscript", "return GetParam(\"greeting\") + \" \" + GetParam(\"subject\");");
+            dc.AddFile("endpoint\\params.json", JsonConvert.SerializeObject(new[] {
+                jsonParam
+            }));
+
+            return EndpointCollectionReader.ReadFromDirectory(dc.DirectoryName);
+        }
+
+        [Fact]
+        public void MissingNameGivesError()
+        {
+            var ae = Assert.Throws<ArgumentException>(() => {
+                CreateEndpointWithParam(new JSONParam { @default = "foo", description = "bar" });
+            });
+            Assert.Equal("Parameter missing name", ae.Message);      
+        }
+
+        [Fact]
+        public void InvalidNameGivesError()
+        {
+            var ae = Assert.Throws<ArgumentException>(() => {
+                CreateEndpointWithParam(new JSONParam { name = "æøå", @default = "foo", description = "bar" });
+            });
+            Assert.Equal("Invalid parameter name: 'æøå'", ae.Message);
+        }
+
+        [Fact]
+        public void MissingDefaultGivesError()
+        {
+            var ae = Assert.Throws<ArgumentException>(() => {
+                CreateEndpointWithParam(new JSONParam { name = "abc", description = "bar" });
+            });
+
+            Assert.Equal("Missing default value for parameter 'abc'", ae.Message);
+        }
+
+        [Fact]
+        public void MissingDescriptionGivesError()
+        {
+            var ae = Assert.Throws<ArgumentException>(() => {
+                CreateEndpointWithParam(new JSONParam { name = "abc", @default="bar" });
+            });
+            Assert.Equal("Missing description for parameter 'abc'", ae.Message);
+        }
+
+
         [Fact]
         public void ValueAndDefaultWorksAsExpected()
         {
@@ -41,6 +90,11 @@ public void ValueAndDefaultWorksAsExpected()
             Assert.False(ep.ValueIsDefault);
         }
 
+        public void RequireNameDefaultAndDescription()
+        {
+
+        }
+
         [Fact]
         public void CanReadParams()
         {

netmockery/JSONReader.cs

@@ -6,8 +6,10 @@
 using System.Diagnostics;
 using System.IO;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Net;
 
+
 namespace netmockery
 {
     public static class JSONReader
@@ -23,6 +25,31 @@ public class JSONParam
         public string name;
         public string @default;
         public string description;
+
+        public JSONParam Validated()
+        {
+            if (name == null)
+            {
+                throw new ArgumentException($"Parameter missing name");
+            }
+
+            if (! Regex.IsMatch(name, "^[a-zA-Z_]+$"))
+            {
+                throw new ArgumentException($"Invalid parameter name: '{name}'");
+            }
+
+            if (@default == null)
+            {
+                throw new ArgumentException($"Missing default value for parameter '{name}'");
+            }
+
+            if (description == null)
+            {
+                throw new ArgumentException($"Missing description for parameter '{name}'");
+            }
+
+            return this;
+        }
     }
 
     public class JSONTest
@@ -282,7 +309,7 @@ public Endpoint CreateEndpoint(string rootDir, JSONDefaults globalDefaults)
             var paramsFile = Path.Combine(rootDir, "params.json");
             if (File.Exists(paramsFile))
             {
-                var jsonParams = JsonConvert.DeserializeObject<JSONParam[]>(File.ReadAllText(paramsFile));
+                var jsonParams = from item in JsonConvert.DeserializeObject<JSONParam[]>(File.ReadAllText(paramsFile)) select item.Validated();
                 foreach (var jsonParam in jsonParams)
                 {
                     endpoint.AddParameter(new EndpointParameter