From a18f59ab88f34213c96b571f7a43f4b82477eb13 Mon Sep 17 00:00:00 2001
From: Joonas Westlin <joonas.westlin@onsight.fi>
Date: Mon, 22 May 2017 22:16:52 +0300
Subject: [PATCH] Changed expected exception message to the one defined in
 Resources.resx.

Removed the Debug.Assert as that caused the test runner to crash as in
this case the preceding part is not a literal.
Fixes the test runner crash.
---
 .../Resources.resx                            |  2 +-
 .../Template/TemplateParser.cs                | 31 ++++++++++++-------
 .../Template/TemplateParserTests.cs           |  8 ++---
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Routing/Resources.resx b/src/Microsoft.AspNetCore.Routing/Resources.resx
index 52b22d6962..96ecf1f445 100644
--- a/src/Microsoft.AspNetCore.Routing/Resources.resx
+++ b/src/Microsoft.AspNetCore.Routing/Resources.resx
@@ -187,7 +187,7 @@
     <value>In a route parameter, '{' and '}' must be escaped with '{{' and '}}'.</value>
   </data>
   <data name="TemplateRoute_OptionalParameterCanbBePrecededByPeriod" xml:space="preserve">
-    <value>In the segment '{0}', the optional parameter '{1}' is preceded by an invalid segment '{2}'.  Only a period (.) can precede an optional parameter.</value>
+    <value>In the segment '{0}', the optional parameter '{1}' is preceded by an invalid segment '{2}'. Only a period (.) can precede an optional parameter.</value>
   </data>
   <data name="TemplateRoute_OptionalParameterHasTobeTheLast" xml:space="preserve">
     <value>An optional parameter must be at the end of the segment. In the segment '{0}', optional parameter '{1}' is followed by '{2}'.</value>
diff --git a/src/Microsoft.AspNetCore.Routing/Template/TemplateParser.cs b/src/Microsoft.AspNetCore.Routing/Template/TemplateParser.cs
index ab38bf55f2..4ef9e394de 100644
--- a/src/Microsoft.AspNetCore.Routing/Template/TemplateParser.cs
+++ b/src/Microsoft.AspNetCore.Routing/Template/TemplateParser.cs
@@ -342,20 +342,26 @@ namespace Microsoft.AspNetCore.Routing.Template
                     // This optional parameter is the last part in the segment
                     if (i == segment.Parts.Count - 1)
                     {
-                        Debug.Assert(segment.Parts[i - 1].IsLiteral);
-
-                        // the optional parameter is preceded by a period
-                        if (segment.Parts[i - 1].Text == PeriodString)
+                        if(!segment.Parts[i - 1].IsLiteral)
                         {
-                            segment.Parts[i - 1].IsOptionalSeperator = true;
-                        }
-                        else
-                        {
-                            // The optional parameter is preceded by a literal other than period
+                            // The optional parameter is preceded by something that is not a literal.
                             // Example of error message:
-                            // "In the complex segment {RouteValue}-{param?}, the optional parameter 'param'is preceded
-                            // by an invalid segment "-". Only valid literal to precede an optional parameter is a 
-                            // period (.).
+                            // "In the segment '{RouteValue}-{param?}', the optional parameter 'param' is preceded
+                            // by an invalid segment '-'. Only a period (.) can precede an optional parameter.
+                            context.Error = string.Format(
+                                Resources.TemplateRoute_OptionalParameterCanbBePrecededByPeriod,
+                                segment.DebuggerToString(),
+                                part.Name,
+                                segment.Parts[i - 1].DebuggerToString());
+
+                            return false;
+                        }
+                        if(segment.Parts[i - 1].Text != PeriodString)
+                        {
+                            // The optional parameter is preceded by a literal other than period.
+                            // Example of error message:
+                            // "In the segment '{RouteValue}-{param?}', the optional parameter 'param' is preceded
+                            // by an invalid segment '-'. Only a period (.) can precede an optional parameter.
                             context.Error = string.Format(
                                 Resources.TemplateRoute_OptionalParameterCanbBePrecededByPeriod,
                                 segment.DebuggerToString(),
@@ -364,6 +370,7 @@ namespace Microsoft.AspNetCore.Routing.Template
 
                             return false;
                         }
+                        segment.Parts[i - 1].IsOptionalSeperator = true;
                     }
                     else
                     {
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs
index 140a8292e1..7ffd8f1026 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs
+++ b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs
@@ -545,19 +545,19 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests
                  + Environment.NewLine + "Parameter name: routeTemplate");
         }
 
-        [Theory(Skip = "Skipped because it causes the test framework to crash")]
+        [Theory]
         [InlineData("{p1}-{p2?}", "-")]
         [InlineData("{p1}..{p2?}", "..")]
         [InlineData("..{p2?}", "..")]
         [InlineData("{p1}.abc.{p2?}", ".abc.")]
-        [InlineData("{p1}{p2?}", "p1")]
+        [InlineData("{p1}{p2?}", "{p1}")]
         public void Parse_ComplexSegment_OptionalParametersSeperatedByPeriod_Invalid(string template, string parameter)
         {
             // Act and Assert
             ExceptionAssert.Throws<ArgumentException>(
                 () => TemplateParser.Parse(template),
-                "In the complex segment '"+ template +"',  the optional parameter 'p2' is preceded by an invalid " +
-                "segment '" + parameter +"'. Only valid literal to precede an optional parameter is a period (.)." +
+                "In the segment '"+ template +"', the optional parameter 'p2' is preceded by an invalid " +
+                "segment '" + parameter +"'. Only a period (.) can precede an optional parameter." +
                 Environment.NewLine + "Parameter name: routeTemplate");
         }