From 0ca3fde5261a61ff88d93796733a181523870b17 Mon Sep 17 00:00:00 2001
From: Doug Bunting <dougbu@microsoft.com>
Date: Fri, 29 Jan 2016 23:33:38 -0800
Subject: [PATCH] Fix line endings in HTML helper tests for x-plat

---
 .../HtmlHelperTextAreaExtensionsTest.cs       | 26 +++++++++----
 .../HtmlHelperValidationSummaryTest.cs        | 39 ++++++++++++++-----
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaExtensionsTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaExtensionsTest.cs
index 1a9aef4391..3d8909c705 100644
--- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaExtensionsTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaExtensionsTest.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.TestCommon;
@@ -28,7 +29,8 @@ namespace Microsoft.AspNetCore.Mvc.Core
 
             // Assert
             Assert.Equal(
-                "<textarea id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">\r\nHtmlEncode[[propValue]]</textarea>",
+                "<textarea id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">" + Environment.NewLine +
+                "HtmlEncode[[propValue]]</textarea>",
                 HtmlContentUtilities.HtmlContentToString(textAreaResult));
         }
 
@@ -46,7 +48,8 @@ namespace Microsoft.AspNetCore.Mvc.Core
 
             // Assert
             Assert.Equal(
-                "<textarea id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">\r\nHtmlEncode[[propValue]]</textarea>",
+                "<textarea id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">" + Environment.NewLine +
+                "HtmlEncode[[propValue]]</textarea>",
                 HtmlContentUtilities.HtmlContentToString(textAreaForResult));
         }
 
@@ -64,7 +67,8 @@ namespace Microsoft.AspNetCore.Mvc.Core
 
             // Assert
             Assert.Equal(
-                "<textarea id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">\r\nHtmlEncode[[myvalue]]</textarea>",
+                "<textarea id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">" + Environment.NewLine +
+                "HtmlEncode[[myvalue]]</textarea>",
                 HtmlContentUtilities.HtmlContentToString(textAreaResult));
         }
 
@@ -82,7 +86,9 @@ namespace Microsoft.AspNetCore.Mvc.Core
 
             // Assert
             Assert.Equal(
-                "<textarea attr=\"HtmlEncode[[value]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">\r\nHtmlEncode[[propValue]]</textarea>",
+                "<textarea attr=\"HtmlEncode[[value]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">" +
+                Environment.NewLine +
+                "HtmlEncode[[propValue]]</textarea>",
                 HtmlContentUtilities.HtmlContentToString(textAreaResult));
         }
 
@@ -100,7 +106,9 @@ namespace Microsoft.AspNetCore.Mvc.Core
 
             // Assert
             Assert.Equal(
-                "<textarea attr=\"HtmlEncode[[value]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">\r\nHtmlEncode[[propValue]]</textarea>",
+                "<textarea attr=\"HtmlEncode[[value]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">" +
+                Environment.NewLine +
+                "HtmlEncode[[propValue]]</textarea>",
                 HtmlContentUtilities.HtmlContentToString(textAreaForResult));
         }
 
@@ -115,7 +123,9 @@ namespace Microsoft.AspNetCore.Mvc.Core
 
             // Assert
             Assert.Equal(
-                "<textarea attr=\"HtmlEncode[[value]]\" columns=\"HtmlEncode[[2]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" rows=\"HtmlEncode[[1]]\">\r\nHtmlEncode[[myvalue]]</textarea>",
+                "<textarea attr=\"HtmlEncode[[value]]\" columns=\"HtmlEncode[[2]]\" id=\"HtmlEncode[[Property1]]\" " +
+                "name=\"HtmlEncode[[Property1]]\" rows=\"HtmlEncode[[1]]\">" + Environment.NewLine +
+                "HtmlEncode[[myvalue]]</textarea>",
                 HtmlContentUtilities.HtmlContentToString(textAreaResult));
         }
 
@@ -130,7 +140,9 @@ namespace Microsoft.AspNetCore.Mvc.Core
 
             // Assert
             Assert.Equal(
-                "<textarea attr=\"HtmlEncode[[value]]\" columns=\"HtmlEncode[[2]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" rows=\"HtmlEncode[[1]]\">\r\n</textarea>",
+                "<textarea attr=\"HtmlEncode[[value]]\" columns=\"HtmlEncode[[2]]\" id=\"HtmlEncode[[Property1]]\" " +
+                "name=\"HtmlEncode[[Property1]]\" rows=\"HtmlEncode[[1]]\">" + Environment.NewLine +
+                "</textarea>",
                 HtmlContentUtilities.HtmlContentToString(textAreaForResult));
         }
 
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs
index d29a01891a..36257f9ba2 100644
--- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs
@@ -348,7 +348,8 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
             // Assert
             Assert.Equal(
                 "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
-                "<ul><li>HtmlEncode[[Error for Property1]]</li>\r\n</ul></div>",
+                "<ul><li>HtmlEncode[[Error for Property1]]</li>" + Environment.NewLine +
+                "</ul></div>",
                 HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
         }
 
@@ -364,7 +365,9 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
 
             // Assert
             Assert.Equal(
-                "<div class=\"HtmlEncode[[validation-summary-errors]]\"><ul><li style=\"display:none\"></li>\r\n</ul></div>",
+                "<div class=\"HtmlEncode[[validation-summary-errors]]\"><ul><li style=\"display:none\"></li>" +
+                Environment.NewLine +
+                "</ul></div>",
                 HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
         }
 
@@ -381,7 +384,9 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
             // Assert
             Assert.Equal(
                 "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
-                "<span>HtmlEncode[[Custom Message]]</span>\r\n<ul><li>HtmlEncode[[Error for Property1]]</li>\r\n</ul></div>",
+                "<span>HtmlEncode[[Custom Message]]</span>" + Environment.NewLine +
+                "<ul><li>HtmlEncode[[Error for Property1]]</li>" + Environment.NewLine +
+                "</ul></div>",
                 HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
         }
 
@@ -398,7 +403,9 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
             // Assert
             Assert.Equal(
                 "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
-                "<div>HtmlEncode[[Custom Message]]</div>\r\n<ul><li>HtmlEncode[[Error for Property1]]</li>\r\n</ul></div>",
+                "<div>HtmlEncode[[Custom Message]]</div>" + Environment.NewLine +
+                "<ul><li>HtmlEncode[[Error for Property1]]</li>" + Environment.NewLine +
+                "</ul></div>",
                 HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
         }
 
@@ -414,7 +421,10 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
 
             // Assert
             Assert.Equal(
-                "<div class=\"HtmlEncode[[validation-summary-errors]]\"><span>HtmlEncode[[Custom Message]]</span>\r\n<ul><li style=\"display:none\"></li>\r\n</ul></div>",
+                "<div class=\"HtmlEncode[[validation-summary-errors]]\"><span>HtmlEncode[[Custom Message]]</span>" +
+                Environment.NewLine +
+                "<ul><li style=\"display:none\"></li>" + Environment.NewLine +
+                "</ul></div>",
                 HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
         }
 
@@ -431,7 +441,9 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
             // Assert
             Assert.Equal(
                 "<div attr=\"HtmlEncode[[value]]\" class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
-                "<span>HtmlEncode[[Custom Message]]</span>\r\n<ul><li>HtmlEncode[[Error for Property1]]</li>\r\n</ul></div>",
+                "<span>HtmlEncode[[Custom Message]]</span>" + Environment.NewLine +
+                "<ul><li>HtmlEncode[[Error for Property1]]</li>" + Environment.NewLine +
+                "</ul></div>",
                 HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
         }
 
@@ -448,7 +460,9 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
             // Assert
             Assert.Equal(
                 "<div attr=\"HtmlEncode[[value]]\" class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
-                "<div>HtmlEncode[[Custom Message]]</div>\r\n<ul><li>HtmlEncode[[Error for Property1]]</li>\r\n</ul></div>",
+                "<div>HtmlEncode[[Custom Message]]</div>" + Environment.NewLine +
+                "<ul><li>HtmlEncode[[Error for Property1]]</li>" + Environment.NewLine +
+                "</ul></div>",
                 HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
         }
 
@@ -464,7 +478,10 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
 
             // Assert
             Assert.Equal(
-                "<div class=\"HtmlEncode[[validation-summary-errors]]\"><div>HtmlEncode[[Custom Message]]</div>\r\n<ul><li style=\"display:none\"></li>\r\n</ul></div>",
+                "<div class=\"HtmlEncode[[validation-summary-errors]]\"><div>HtmlEncode[[Custom Message]]</div>" +
+                Environment.NewLine +
+                "<ul><li style=\"display:none\"></li>" + Environment.NewLine +
+                "</ul></div>",
                 HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
         }
 
@@ -480,8 +497,10 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
 
             // Assert
             Assert.Equal(
-                "<div attr=\"HtmlEncode[[value]]\" class=\"HtmlEncode[[validation-summary-errors]]\"><span>HtmlEncode[[Custom Message]]</span>\r\n" +
-                "<ul><li style=\"display:none\"></li>\r\n</ul></div>",
+                "<div attr=\"HtmlEncode[[value]]\" class=\"HtmlEncode[[validation-summary-errors]]\"><span>HtmlEncode[[Custom Message]]</span>" +
+                Environment.NewLine +
+                "<ul><li style=\"display:none\"></li>" + Environment.NewLine +
+                "</ul></div>",
                 HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
         }