Improve case tests

Author: sebastienros

Fluid.Tests/TemplateTests.cs

@@ -1145,49 +1145,61 @@ public async Task RawStatementShouldOutputSameText()
         }
 
         [Fact]
-        public async Task DefaultMemberStrategyShouldSupportCamelCase()
+        public void DictionaryShouldWorkWithComparers_SnakeCase()
+        {
+            var comparer = StringComparers.SnakeCase;
+            var dict = new Dictionary<string, string>(comparer);
+            dict["FirstName"] = "Sebastien";
+            Assert.True(dict.ContainsKey("first_name"));
+            Assert.Equal("Sebastien", dict["first_name"]);
+        }
+        
+        [Fact]
+        public async Task DefaultMemberStrategyShouldSupportSnakeCase()
         {
             var model = new { FirstName = "Sebastien" };
-            var source = "{{ firstName }}";
-            var expected = "Sebastien";
+            var source = "{{ first_name }} {{ last_name }}";
 
             _parser.TryParse(source, out var template, out var error);
 
-            var options = new TemplateOptions();
-            options.ModelNamesComparer = StringComparers.CamelCase;
+            var options = new TemplateOptions() { ModelNamesComparer = StringComparers.SnakeCase };
             var context = new TemplateContext(model, options);
+            context.SetValue("LastName", "Ros");
 
             var result = await template.RenderAsync(context);
-            Assert.Equal(expected, result);
+            Assert.Equal("Sebastien Ros", result);
         }
 
         [Fact]
-        public async Task DefaultMemberStrategyShouldSupportSnakeCase()
+        public async Task DefaultMemberStrategyShouldSupportCamelCase()
         {
             var model = new { FirstName = "Sebastien" };
-            var source = "{{ first_name }}";
-            var expected = "Sebastien";
+            var source = "{{ firstName }} {{ lastName}}";
 
             _parser.TryParse(source, out var template, out var error);
 
-            var options = new TemplateOptions() { ModelNamesComparer = StringComparers.SnakeCase };
+            var options = new TemplateOptions() { ModelNamesComparer = StringComparers.CamelCase };
             var context = new TemplateContext(model, options);
+            context.SetValue("LastName", "Ros");
 
             var result = await template.RenderAsync(context);
-            Assert.Equal(expected, result);
+            Assert.Equal("Sebastien Ros", result);
         }
 
-        [Fact(Skip = "Refactoring")]
-        public void MemberNameStrategiesHandleSuccessiveUppercase()
+        [Fact]
+        public async Task DefaultMemberStrategyShouldSupportAnyCase()
         {
-            var model = new { UVIndex = "" };
-            var memberInfo = model.GetType().GetProperty("UVIndex");
+            var model = new { FirstName = "Sebastien" };
+            var source = "{{ fIrSTnAme }} {{ lAsTnAme}}";
 
-            //var camelCase = MemberNameStrategies.CamelCase(memberInfo);
-            //var snakeCase = MemberNameStrategies.SnakeCase(memberInfo);
+            _parser.TryParse(source, out var template, out var error);
 
-            //Assert.Equal("uvIndex", camelCase);
-            //Assert.Equal("uv_index", snakeCase);
+            var options = new TemplateOptions() { ModelNamesComparer = StringComparer.OrdinalIgnoreCase };
+            var context = new TemplateContext(model, options);
+            context.SetValue("LastName", "Ros");
+
+            var result = await template.RenderAsync(context);
+            Assert.Equal("Sebastien Ros", result);
         }
 
         [Fact]

Fluid/MemberNameStrategies.cs

@@ -1,4 +1,3 @@
-using System.Text;
 using System.Text.Json;
 
 namespace Fluid
@@ -13,31 +12,43 @@ public sealed class CamelCaseStringComparer : StringComparer
     {
         public override int Compare(string x, string y)
         {
-            return JsonNamingPolicy.CamelCase.ConvertName(x).CompareTo(y);
+            var cx = JsonNamingPolicy.CamelCase.ConvertName(x);
+            var cy = JsonNamingPolicy.CamelCase.ConvertName(y);
+            return string.Compare(cx, cy, StringComparison.Ordinal);
         }
+
         public override bool Equals(string x, string y)
         {
-            return JsonNamingPolicy.CamelCase.ConvertName(x).Equals(y, StringComparison.OrdinalIgnoreCase);
+            var cx = JsonNamingPolicy.CamelCase.ConvertName(x);
+            var cy = JsonNamingPolicy.CamelCase.ConvertName(y);
+            return string.Equals(cx, cy, StringComparison.Ordinal);
         }
+    
         public override int GetHashCode(string obj)
         {
-            return StringComparer.OrdinalIgnoreCase.GetHashCode(obj);
+            return JsonNamingPolicy.CamelCase.ConvertName(obj).GetHashCode();
         }
     }
 
     public sealed class SnakeCaseStringComparer : StringComparer
     {
         public override int Compare(string x, string y)
         {
-            return JsonNamingPolicy.SnakeCaseLower.ConvertName(x).CompareTo(y);
+            var cx = JsonNamingPolicy.SnakeCaseLower.ConvertName(x);
+            var cy = JsonNamingPolicy.SnakeCaseLower.ConvertName(y);
+            return string.Compare(cx, cy, StringComparison.Ordinal);
         }
+
         public override bool Equals(string x, string y)
         {
-            return JsonNamingPolicy.SnakeCaseLower.ConvertName(x).Equals(y, StringComparison.OrdinalIgnoreCase);
+            var cx = JsonNamingPolicy.SnakeCaseLower.ConvertName(x);
+            var cy = JsonNamingPolicy.SnakeCaseLower.ConvertName(y);
+            return string.Equals(cx, cy, StringComparison.Ordinal);
         }
+
         public override int GetHashCode(string obj)
         {
-            return StringComparer.OrdinalIgnoreCase.GetHashCode(obj);
+            return JsonNamingPolicy.SnakeCaseLower.ConvertName(obj).GetHashCode();
         }
     }
 }