Make EncodeImpl<T> static.

Add unit tests for overloads.
Handlebars-Net · Dec 22, 2021 · cc80d19 · cc80d19
1 parent 7e81feb
commit cc80d19
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 2 deletions.
diff --git a/source/Handlebars.Test/HtmlEncoderLegacyTests.cs b/source/Handlebars.Test/HtmlEncoderLegacyTests.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Text;
 using Xunit;
 
 namespace HandlebarsDotNet.Test
@@ -56,5 +57,34 @@ public void EncodeTestHandlebarsNetLegacyRules(string input, string expected)
             // Assert
             Assert.Equal(expected, writer.ToString());
         }
+
+        [Theory]
+        [InlineData(null, "")]
+        [InlineData("", "")]
+        [InlineData("a", "a")]
+        [InlineData("<", "&lt;")]
+        public void EncodeStringBuilderOverload(string input, string expected)
+        {
+            using var writer = new StringWriter();
+
+            var inputStringBuilder = input == null ? null : new StringBuilder(input);
+
+            _htmlEncoderLegacy.Encode(inputStringBuilder, writer);
+
+            Assert.Equal(expected, writer.ToString());
+        }
+
+        [Theory]
+        [InlineData(null, "")]
+        [InlineData("a", "a")]
+        [InlineData("<", "&lt;")]
+        public void EncodeCharEnumeratorOverload(string input, string expected)
+        {
+            using var writer = new StringWriter();
+
+            _htmlEncoderLegacy.Encode(input?.GetEnumerator(), writer);
+
+            Assert.Equal(expected, writer.ToString());
+        }
     }
 }
diff --git a/source/Handlebars.Test/HtmlEncoderTests.cs b/source/Handlebars.Test/HtmlEncoderTests.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Text;
 using Xunit;
 
 namespace HandlebarsDotNet.Test
@@ -55,5 +56,34 @@ public void EncodeTest(string input, string expected)
             // Assert
             Assert.Equal(expected, writer.ToString());
         }
+
+        [Theory]
+        [InlineData(null, "")]
+        [InlineData("", "")]
+        [InlineData("a", "a")]
+        [InlineData("<", "&lt;")]
+        public void EncodeStringBuilderOverload(string input, string expected)
+        {
+            using var writer = new StringWriter();
+
+            var inputStringBuilder = input == null ? null : new StringBuilder(input);
+
+            _htmlEncoder.Encode(inputStringBuilder, writer);
+
+            Assert.Equal(expected, writer.ToString());
+        }
+
+        [Theory]
+        [InlineData(null, "")]
+        [InlineData("a", "a")]
+        [InlineData("<", "&lt;")]
+        public void EncodeCharEnumeratorOverload(string input, string expected)
+        {
+            using var writer = new StringWriter();
+
+            _htmlEncoder.Encode(input?.GetEnumerator(), writer);
+
+            Assert.Equal(expected, writer.ToString());
+        }
     }
 }
diff --git a/source/Handlebars/IO/HtmlEncoder.cs b/source/Handlebars/IO/HtmlEncoder.cs
@@ -36,7 +36,7 @@ public void Encode(string text, TextWriter target)
             EncodeImpl(text, target);
         }
 
-        private void EncodeImpl<T>(T text, TextWriter target) where T : IEnumerator<char>
+        private static void EncodeImpl<T>(T text, TextWriter target) where T : IEnumerator<char>
         {
             /*
              * Based on: https://github.com/handlebars-lang/handlebars.js/blob/master/lib/handlebars/utils.js

diff --git a/source/Handlebars/IO/HtmlEncoderLegacy.cs b/source/Handlebars/IO/HtmlEncoderLegacy.cs
@@ -40,7 +40,7 @@ public void Encode(string text, TextWriter target)
             EncodeImpl(text, target);
         }
 
-        private void EncodeImpl<T>(T text, TextWriter target) where T : IEnumerator<char>
+        private static void EncodeImpl<T>(T text, TextWriter target) where T : IEnumerator<char>
         {
             while (text.MoveNext())
             {