More tests.

Author: JohanLarsson

AspNetCoreAnalyzers.Tests/ASP004ParameterSyntaxTests/CodeFix.cs

@@ -21,7 +21,7 @@ public class CodeFix
         [TestCase("api/orders/{id:length(1,2}",    "api/orders/{id:length(1,2)}")]
         [TestCase("api/orders/{id:range(1,2}",     "api/orders/{id:range(1,2)}")]
         [TestCase("api/orders/{id:regex((a|b)-c}", "api/orders/{id:regex((a|b)-c)}")]
-        public void WhenFixable(string before, string after)
+        public void When(string before, string after)
         {
             var code = @"
 namespace ValidCode
@@ -56,29 +56,5 @@ public IActionResult GetId(long id)
 }".AssertReplace("api/orders/{id:long}", after);
             AnalyzerAssert.CodeFix(Analyzer, Fix, ExpectedDiagnostic, code, fixedCode);
         }
-
-        [TestCase("api/orders/{id:↓wrong}")]
-        [TestCase("api/orders/{id:min1)}")]
-        [TestCase("api/orders/{id:max1)}")]
-        public void WhenNot(string before)
-        {
-            var code = @"
-namespace ValidCode
-{
-    using Microsoft.AspNetCore.Mvc;
-
-    [ApiController]
-    public class OrdersController : Controller
-    {
-        [HttpGet(""api/orders/↓{id:wrong}"")]
-        public IActionResult GetId(long id)
-        {
-            return this.Ok(id);
-        }
-    }
-}".AssertReplace("api/orders/↓{id:wrong}", before);
-
-            AnalyzerAssert.Diagnostics(Analyzer, ExpectedDiagnostic, code);
-        }
     }
 }

AspNetCoreAnalyzers.Tests/ASP004ParameterSyntaxTests/Diagnostics.cs

@@ -0,0 +1,39 @@
+namespace AspNetCoreAnalyzers.Tests.ASP004ParameterSyntaxTests
+{
+    using Gu.Roslyn.Asserts;
+    using Microsoft.CodeAnalysis.Diagnostics;
+    using NUnit.Framework;
+
+    public class Diagnostics
+    {
+        private static readonly DiagnosticAnalyzer Analyzer = new AttributeAnalyzer();
+        private static readonly ExpectedDiagnostic ExpectedDiagnostic = ExpectedDiagnostic.Create(ASP004ParameterSyntax.Descriptor);
+
+        [TestCase("api/orders/{id:↓wrong}")]
+        [TestCase("api/orders/{id:min1)}")]
+        [TestCase("api/orders/{id:max1)}")]
+        [TestCase("api/orders/{id:↓:int)}")]
+        [TestCase("api/orders/{id:int:↓)}")]
+        [TestCase("api/orders/{id:int:↓:)}")]
+        public void When(string before)
+        {
+            var code = @"
+namespace ValidCode
+{
+    using Microsoft.AspNetCore.Mvc;
+
+    [ApiController]
+    public class OrdersController : Controller
+    {
+        [HttpGet(""api/orders/↓{id:wrong}"")]
+        public IActionResult GetId(long id)
+        {
+            return this.Ok(id);
+        }
+    }
+}".AssertReplace("api/orders/↓{id:wrong}", before);
+
+            AnalyzerAssert.Diagnostics(Analyzer, ExpectedDiagnostic, code);
+        }
+    }
+}

AspNetCoreAnalyzers.Tests/ASP004ParameterSyntaxTests/ValidCode.cs

@@ -8,22 +8,24 @@ public class ValidCode
     {
         private static readonly DiagnosticAnalyzer Analyzer = new AttributeAnalyzer();
 
-        [TestCase("{value:bool}",                                              "bool")]
-        [TestCase("{value:datetime}",                                          "System.DateTime")]
-        [TestCase("{value:decimal}",                                           "decimal")]
-        [TestCase("{value:double}",                                            "double")]
-        [TestCase("{value:float}",                                             "float")]
-        [TestCase("{value:int}",                                               "int")]
+        [TestCase("{value}",                                                      "string")]
+        [TestCase("{value?}",                                                     "string")]
+        [TestCase("{value:bool}",                                                 "bool")]
+        [TestCase("{value:datetime}",                                             "System.DateTime")]
+        [TestCase("{value:decimal}",                                              "decimal")]
+        [TestCase("{value:double}",                                               "double")]
+        [TestCase("{value:float}",                                                "float")]
+        [TestCase("{value:int}",                                                  "int")]
         [TestCase("api/orders/{value:int:min(1)}",                                "int")]
         [TestCase("api/orders/{value:int:max(1)}",                                "int")]
         [TestCase("api/orders/{value:int:range(1,10)}",                           "int")]
         [TestCase("api/orders/{value:int:required}",                              "int")]
-        [TestCase("{value:long}",                                              "long")]
+        [TestCase("{value:long}",                                                 "long")]
         [TestCase("api/orders/{value:min(1)}",                                    "long")]
         [TestCase("api/orders/{value:max(1)}",                                    "long")]
         [TestCase("api/orders/{value:range(1,10)}",                               "long")]
         [TestCase("api/orders/{value:required}",                                  "long")]
-        [TestCase("{value:guid}",                                              "System.Guid")]
+        [TestCase("{value:guid}",                                                 "System.Guid")]
         [TestCase("api/orders/{value:minlength(1)}",                              "string")]
         [TestCase("api/orders/{value:maxlength(1)}",                              "string")]
         [TestCase("api/orders/{value:length(1)}",                                 "string")]
@@ -45,13 +47,13 @@ namespace ValidCode
     public class OrdersController : Controller
     {
         [HttpGet(""api/{value}"")]
-        public async Task<int> GetOrder(int value)
+        public IActionResult GetValue(string value)
         {
-            return value;
+            return this.Ok(value);
         }
     }
-}".AssertReplace("int", type)
-  .AssertReplace("{value}", parameter);
+}".AssertReplace("{value}", parameter)
+  .AssertReplace("string", type);
             AnalyzerAssert.Valid(Analyzer, code);
         }
     }

AspNetCoreAnalyzers/Analyzers/AttributeAnalyzer.cs

@@ -241,7 +241,8 @@ private static bool HasWrongSyntax(PathSegment segment, out Location location, o
                         }
                     }
 
-                    if (!text.Equals("int", StringComparison.OrdinalIgnoreCase) &&
+                    if (!text.Equals("?", StringComparison.OrdinalIgnoreCase) &&
+                        !text.Equals("int", StringComparison.OrdinalIgnoreCase) &&
                         !text.Equals("bool", StringComparison.OrdinalIgnoreCase) &&
                         !text.Equals("datetime", StringComparison.OrdinalIgnoreCase) &&
                         !text.Equals("decimal", StringComparison.OrdinalIgnoreCase) &&

ValidCode/IdentityController.cs

@@ -0,0 +1,14 @@
+namespace ValidCode
+{
+    using Microsoft.AspNetCore.Mvc;
+
+    [ApiController]
+    public class IdentityController : Controller
+    {
+        [HttpGet("string/{text:minlength(1):maxlength(2)}")]
+        public IActionResult GetString(string text)
+        {
+            return this.Ok(text);
+        }
+    }
+}