Merge pull request #453 from bhdebrito/master

Update string serialize with special chars.

Author: mythz

src/ServiceStack.Text/Json/JsonUtils.cs

@@ -11,6 +11,13 @@ public static class JsonUtils
         public const long MinInteger = -9007199254740992;
 
         public const char EscapeChar = '\\';
+
+        public const char EscapeTab = 't';
+        public const char EscapeCarriageReturn = 'r';
+        public const char EscapeLineFeedChar = 'n';
+        public const char EscapeFormFeedChar = 'f';
+        public const char EscapeBackspaceChar = 'b';
+
         public const char QuoteChar = '"';
         public const string Null = "null";
         public const string True = "true";
@@ -26,11 +33,11 @@ public static class JsonUtils
         /// Micro-optimization keep pre-built char arrays saving a .ToCharArray() + function call (see .net implementation of .Write(string))
         /// </summary>
         private static readonly char[] EscapedBackslash = { EscapeChar, EscapeChar };
-        private static readonly char[] EscapedTab = { EscapeChar, TabChar };
-        private static readonly char[] EscapedCarriageReturn = { EscapeChar, CarriageReturnChar };
-        private static readonly char[] EscapedLineFeed = { EscapeChar, LineFeedChar };
-        private static readonly char[] EscapedFormFeed = { EscapeChar, FormFeedChar };
-        private static readonly char[] EscapedBackspace = { EscapeChar, BackspaceChar };
+        private static readonly char[] EscapedTab = { EscapeChar, EscapeTab };
+        private static readonly char[] EscapedCarriageReturn = { EscapeChar, EscapeCarriageReturn };
+        private static readonly char[] EscapedLineFeed = { EscapeChar, EscapeLineFeedChar };
+        private static readonly char[] EscapedFormFeed = { EscapeChar, EscapeFormFeedChar };
+        private static readonly char[] EscapedBackspace = { EscapeChar, EscapeBackspaceChar };
         private static readonly char[] EscapedQuote = { EscapeChar, QuoteChar };
 
         public static readonly char[] WhiteSpaceChars = { ' ', TabChar, CarriageReturnChar, LineFeedChar };

tests/ServiceStack.Text.Tests/JsonTests/EscapedCharsTests.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using ServiceStack.Common.Tests.Models;
 
@@ -259,6 +260,50 @@ public void Can_serialize_array_of_control_chars_and_unicode()
             Assert.That(json, Is.EqualTo(@"[""\u0018"",""Ω""]"));
         }
 
+
+        [Test]
+        public void Can_serialize_windows_new_line()
+        {
+            const string expected = "\"Hi I\'m\\r\\nnew line :)\"";
+            var text = "Hi I\'m" + Environment.NewLine + "new line :)";
+
+            var result = JsonSerializer.SerializeToString(text);
+
+            Assert.AreEqual(expected, result);
+        }
+
+        [Test]
+        public void Can_serialize_object_with_escaped_chars()
+        {
+            const string expected = "{\"Id\":1,\"Name\":\"Hi I'm\\r\\nnew line :)\"}";
+            var model = new ModelWithIdAndName
+            {
+                Id = 1,
+                Name = "Hi I'm" + Environment.NewLine + "new line :)"
+            };
+
+            var result = JsonSerializer.SerializeToString(model);
+
+            Assert.AreEqual(expected, result);
+        }
+
+        [Test]
+        public void Can_deserialize_with_new_line()
+        {
+            var model = new ModelWithIdAndName
+            {
+                Id = 1,
+                Name = "Hi I'm" + Environment.NewLine + "new line :)"
+            };
+
+            const string json = "{\"Id\":1,\"Name\":\"Hi I'm\\r\\nnew line :)\"}";
+
+            var fromJson = JsonSerializer.DeserializeFromString<ModelWithIdAndName>(json);
+
+            Assert.That(fromJson, Is.EqualTo(model));
+        }
+
+
         public class MyModel
         {
             public string Name { get; set; }