hotfix: string comparison checks

Author: swagfin

ObjectSemantics.NET.Tests/ObjectSemanticsTests.cs

@@ -411,20 +411,7 @@ public void Should_Act_On_IfCondition_Equality_Checks(string condition, double a
         }
 
 
-        [Fact]
-        public void Should_Act_On_IfCondition_Simple_Property_String_Equality()
-        {
-            //Create Model
-            Student student = new Student { StudentName = "John Doe" };
-            //Template
-            var template = new ObjectSemanticsTemplate
-            {
-                FileContents = "{{ if-start:studentName(=John Doe) }} YES, i am John Doe {{ if-end:studentName }}"
-            };
-            string generatedTemplate = TemplateMapper.Map(student, template);
-            string expectedResult = " YES, i am John Doe ";
-            Assert.Equal(expectedResult, generatedTemplate, false, true, true);
-        }
+
 
 
         [Fact]
@@ -571,6 +558,44 @@ public void Should_Act_On_IfCondition_Having_ElseIf_MultiLine(double amount)
             Assert.Equal(expectedResult, generatedTemplate, false, true, true);
         }
 
+        [Theory]
+        [InlineData(null)]
+        [InlineData("John Doe")]
+        [InlineData("")]
+        public void Should_Act_On_IfCondition_Having_ElseIf_MultiLine_StringTest(string studentName)
+        {
+            //Create Model
+            Student student = new Student { StudentName = studentName };
+            //Template
+            var template = new ObjectSemanticsTemplate
+            {
+                FileContents = @"
+{{ if-start:StudentName(=NULL) }}
+--is null--
+{{ else-if }}
+--not-null--
+{{ if-end:Balance }}"
+            };
+            string generatedTemplate = TemplateMapper.Map(student, template);
+            string expectedResult = (string.IsNullOrEmpty(studentName)) ? "\r\n\r\n--is null--\r\n" : "\r\n\r\n--not-null--\r\n";
+            Assert.Equal(expectedResult, generatedTemplate, false, true, true);
+        }
+
+
+        [Fact]
+        public void Should_Act_On_IfCondition_Simple_Property_String_Equality()
+        {
+            //Create Model
+            Student student = new Student { StudentName = "John Doe" };
+            //Template
+            var template = new ObjectSemanticsTemplate
+            {
+                FileContents = "{{ if-start:studentName(=John Doe) }} YES, i am John Doe {{ if-end:studentName }}"
+            };
+            string generatedTemplate = TemplateMapper.Map(student, template);
+            string expectedResult = " YES, i am John Doe ";
+            Assert.Equal(expectedResult, generatedTemplate, false, true, true);
+        }
 
 
         [Theory]

ObjectSemantics.NET/Extensions/ExtractedObjPropertyExtensions.cs

@@ -7,18 +7,22 @@ public static class ExtractedObjPropertyExtensions
     {
         private static T GetConvertibleValue<T>(string value) where T : IConvertible
         {
-            return (value == "null" || string.IsNullOrEmpty(value)) ? default : (T)Convert.ChangeType(value, typeof(T));
+            return (string.IsNullOrEmpty(value) || value?.ToLower()?.Trim() == "null") ? default : (T)Convert.ChangeType(value, typeof(T));
         }
         public static bool IsPropertyValueConditionPassed(this ExtractedObjProperty property, string valueComparer, string criteria)
         {
             try
             {
                 if (property == null) return false;
                 else if (property.Type == typeof(string))
-                    return string.Compare(property.OriginalValue.ToString()?.Trim(), GetConvertibleValue<string>(valueComparer)?.Trim(), true) == 0;
+                {
+                    string v1 = property.OriginalValue?.ToString()?.Trim().ToLower() ?? string.Empty;
+                    string v2 = GetConvertibleValue<string>(valueComparer)?.Trim().ToLower() ?? string.Empty;
+                    return string.Compare(v1, v2, true) == 0;
+                }
                 else if (property.Type == typeof(int) || property.Type == typeof(double) || property.Type == typeof(long) || property.Type == typeof(float) || property.Type == typeof(decimal))
                 {
-                    double v1 = Convert.ToDouble(property.OriginalValue);
+                    double v1 = Convert.ToDouble(property.OriginalValue ?? "0");
                     double v2 = Convert.ToDouble(GetConvertibleValue<double>(valueComparer));
                     switch (criteria)
                     {
@@ -63,7 +67,6 @@ public static bool IsPropertyValueConditionPassed(this ExtractedObjProperty prop
                 }
                 else
                     return false;
-
             }
             catch { return false; }
         }

ObjectSemantics.NET/ObjectSemantics.NET.csproj

@@ -14,9 +14,9 @@
     <RepositoryType>Github</RepositoryType>
     <PackageReleaseNotes>v.5.1.3
 Added support for if condition statements with ElseIf</PackageReleaseNotes>
-    <AssemblyVersion>5.1.3.1</AssemblyVersion>
-    <FileVersion>5.1.3.1</FileVersion>
-    <Version>5.1.3</Version>
+    <AssemblyVersion>5.1.4.1</AssemblyVersion>
+    <FileVersion>5.1.4.1</FileVersion>
+    <Version>5.1.4</Version>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <ApplicationIcon></ApplicationIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>