Mixed case am/pm fixes. More tests. Bump version

Author: andersnm

src/ExcelNumberFormat/ExcelNumberFormat.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net20;netstandard1.0;netstandard2.0</TargetFrameworks>
-    <VersionPrefix>1.0.7</VersionPrefix>
+    <VersionPrefix>1.0.8</VersionPrefix>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Description>.NET library to parse ECMA-376 number format strings and format values like Excel and other spreadsheet softwares.</Description>

src/ExcelNumberFormat/Formatter.cs

@@ -129,7 +129,8 @@ private static string FormatTimeSpan(TimeSpan timeSpan, List<string> tokens, Cul
 
         private static string FormatDate(DateTime date, List<string> tokens, CultureInfo culture)
         {
-            var containsAmPm = tokens.Contains("AM/PM") || tokens.Contains("A/P");
+            var containsAmPm = ContainsAmPm(tokens);
+
             var result = new StringBuilder();
             for (var i = 0; i < tokens.Count; i++)
             {
@@ -202,7 +203,7 @@ private static string FormatDate(DateTime date, List<string> tokens, CultureInfo
                 {
                     var digits = token.Length;
                     if(containsAmPm)
-                        result.Append(date.ToString("%h"));
+                        result.Append((date.Hour % 12).ToString("D" + digits));
                     else
                         result.Append(date.Hour.ToString("D" + digits));
                 }
@@ -227,14 +228,7 @@ private static string FormatDate(DateTime date, List<string> tokens, CultureInfo
                 else if (string.Compare(token, "am/pm", StringComparison.OrdinalIgnoreCase) == 0)
                 {
                     var ampm = date.ToString("tt", CultureInfo.InvariantCulture);
-                    if (char.IsUpper(token[0]))
-                    {
-                        result.Append(ampm.ToUpperInvariant());
-                    }
-                    else
-                    {
-                        result.Append(ampm.ToLowerInvariant());
-                    }
+                    result.Append(ampm.ToUpperInvariant());
                 }
                 else if (string.Compare(token, "a/p", StringComparison.OrdinalIgnoreCase) == 0)
                 {
@@ -299,6 +293,24 @@ private static bool LookBackDatePart(List<string> tokens, int fromIndex, string
             return false;
         }
 
+        private static bool ContainsAmPm(List<string> tokens)
+        {
+            foreach (var token in tokens)
+            {
+                if (string.Compare(token, "am/pm", StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    return true;
+                }
+
+                if (string.Compare(token, "a/p", StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         static string FormatNumber(double value, DecimalSection format, CultureInfo culture)
         {
             bool thousandSeparator = format.ThousandSeparator;

test/ExcelNumberFormat.Tests/Class1.cs

@@ -131,8 +131,14 @@ public void TestDate()
             Test(new DateTime(2010, 9, 26, 12, 34, 56, 123), "m/d/yy hh:mm:ss.000", "9/26/10 12:34:56.123");
             Test(new DateTime(2010, 9, 26, 12, 34, 56, 123), "YYYY-MM-DD HH:MM:SS", "2010-09-26 12:34:56");
             Test(new DateTime(2020, 1, 1, 14, 35, 55), "m/d/yyyy\\ h:mm:ss AM/PM;@", "1/1/2020 2:35:55 PM");
+            Test(new DateTime(2020, 1, 1, 14, 35, 55), "m/d/yyyy\\ h:mm:ss aM/Pm;@", "1/1/2020 2:35:55 PM");
+            Test(new DateTime(2020, 1, 1, 14, 35, 55), "m/d/yyyy\\ h:mm:ss am/PM;@", "1/1/2020 2:35:55 PM");
             Test(new DateTime(2020, 1, 1, 14, 35, 55), "m/d/yyyy\\ h:mm:ss A/P;@", "1/1/2020 2:35:55 P");
+            Test(new DateTime(2020, 1, 1, 14, 35, 55), "m/d/yyyy\\ h:mm:ss a/P;@", "1/1/2020 2:35:55 p");
+            Test(new DateTime(2020, 1, 1, 14, 35, 55), "m/d/yyyy\\ h:mm:ss A/p;@", "1/1/2020 2:35:55 P");
             Test(new DateTime(2020, 1, 1, 14, 35, 55), "m/d/yyyy\\ h:mm:ss;@", "1/1/2020 14:35:55");
+            Test(new DateTime(2020, 1, 1, 14, 35, 55), "m/d/yyyy\\ hh:mm:ss AM/PM;@", "1/1/2020 02:35:55 PM");
+            Test(new DateTime(2020, 1, 1, 16, 5, 6), "m/d/yyyy\\ h:m:s AM/PM;@", "1/1/2020 4:5:6 PM");
         }
 
         [TestMethod]