more test cases

Humanizr · Mar 16, 2022 · d43f50e · d43f50e
1 parent c6236c9
commit d43f50e
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 10 deletions.
diff --git a/src/Humanizer.Tests.Shared/TimeSpanHumanizeTests.cs b/src/Humanizer.Tests.Shared/TimeSpanHumanizeTests.cs
@@ -475,14 +475,14 @@ public void CanSpecifyCultureExplicitlyToWords(int days, int precision, string c
         [InlineData(2, "two milliseconds", TimeSpanStyle.Words)]
         [InlineData(2, "2 ms", TimeSpanStyle.Abbreviated)]
         [InlineData(2, "2ms", TimeSpanStyle.Short)]
-        [InlineData(1000, "1 second", TimeSpanStyle.Full)]
-        [InlineData(1000, "one second", TimeSpanStyle.Words)]
-        [InlineData(1000, "1 sec", TimeSpanStyle.Abbreviated)]
-        [InlineData(1000, "1s", TimeSpanStyle.Short)]
-        [InlineData(2000, "2 seconds", TimeSpanStyle.Full)]
-        [InlineData(2000, "two seconds", TimeSpanStyle.Words)]
-        [InlineData(2000, "2 secs", TimeSpanStyle.Abbreviated)]
-        [InlineData(2000, "2s", TimeSpanStyle.Short)]
+        [InlineData(1_000, "1 second", TimeSpanStyle.Full)]
+        [InlineData(1_000, "one second", TimeSpanStyle.Words)]
+        [InlineData(1_000, "1 sec", TimeSpanStyle.Abbreviated)]
+        [InlineData(1_000, "1s", TimeSpanStyle.Short)]
+        [InlineData(2_000, "2 seconds", TimeSpanStyle.Full)]
+        [InlineData(2_000, "two seconds", TimeSpanStyle.Words)]
+        [InlineData(2_000, "2 secs", TimeSpanStyle.Abbreviated)]
+        [InlineData(2_000, "2s", TimeSpanStyle.Short)]
         [InlineData(60_000, "1 minute", TimeSpanStyle.Full)]
         [InlineData(60_000, "one minute", TimeSpanStyle.Words)]
         [InlineData(60_000, "1 min", TimeSpanStyle.Abbreviated)]
@@ -499,9 +499,41 @@ public void CanSpecifyCultureExplicitlyToWords(int days, int precision, string c
         [InlineData(7_200_000, "two hours", TimeSpanStyle.Words)]
         [InlineData(7_200_000, "2 hrs", TimeSpanStyle.Abbreviated)]
         [InlineData(7_200_000, "2h", TimeSpanStyle.Short)]
-        public void TimeSpanWithStyle(int milliseconds, string expected, TimeSpanStyle timeSpanStyle)
+        [InlineData(86_400_000, "1 day", TimeSpanStyle.Full)]
+        [InlineData(86_400_000, "one day", TimeSpanStyle.Words)]
+        [InlineData(86_400_000, "1 day", TimeSpanStyle.Abbreviated)]
+        [InlineData(86_400_000, "1d", TimeSpanStyle.Short)]
+        [InlineData(172_800_000, "2 days", TimeSpanStyle.Full)]
+        [InlineData(172_800_000, "two days", TimeSpanStyle.Words)]
+        [InlineData(172_800_000, "2 days", TimeSpanStyle.Abbreviated)]
+        [InlineData(172_800_000, "2d", TimeSpanStyle.Short)]
+        [InlineData(604_800_000, "1 week", TimeSpanStyle.Full)]
+        [InlineData(604_800_000, "one week", TimeSpanStyle.Words)]
+        [InlineData(604_800_000, "1 wk", TimeSpanStyle.Abbreviated)]
+        [InlineData(604_800_000, "1w", TimeSpanStyle.Short)]
+        [InlineData(1_209_600_000, "2 weeks", TimeSpanStyle.Full)]
+        [InlineData(1_209_600_000, "two weeks", TimeSpanStyle.Words)]
+        [InlineData(1_209_600_000, "2 wks", TimeSpanStyle.Abbreviated)]
+        [InlineData(1_209_600_000, "2w", TimeSpanStyle.Short)]
+        [InlineData(2_678_400_000, "1 month", TimeSpanStyle.Full)]
+        [InlineData(2_678_400_000, "one month", TimeSpanStyle.Words)]
+        [InlineData(2_678_400_000, "1 mon", TimeSpanStyle.Abbreviated)]
+        [InlineData(2_678_400_000, "1M", TimeSpanStyle.Short)]
+        [InlineData(5_356_800_000, "2 months", TimeSpanStyle.Full)]
+        [InlineData(5_356_800_000, "two months", TimeSpanStyle.Words)]
+        [InlineData(5_356_800_000, "2 mos", TimeSpanStyle.Abbreviated)]
+        [InlineData(5_356_800_000, "2M", TimeSpanStyle.Short)]
+        [InlineData(31_622_400_000, "1 year", TimeSpanStyle.Full)]
+        [InlineData(31_622_400_000, "one year", TimeSpanStyle.Words)]
+        [InlineData(31_622_400_000, "1 yr", TimeSpanStyle.Abbreviated)]
+        [InlineData(31_622_400_000, "1y", TimeSpanStyle.Short)]
+        [InlineData(63_244_800_000, "2 years", TimeSpanStyle.Full)]
+        [InlineData(63_244_800_000, "two years", TimeSpanStyle.Words)]
+        [InlineData(63_244_800_000, "2 yrs", TimeSpanStyle.Abbreviated)]
+        [InlineData(63_244_800_000, "2y", TimeSpanStyle.Short)]
+        public void TimeSpanWithStyle(double milliseconds, string expected, TimeSpanStyle timeSpanStyle)
         {
-            var actual = TimeSpan.FromMilliseconds(milliseconds).Humanize(timeSpanStyle: timeSpanStyle);
+            var actual = TimeSpan.FromMilliseconds(milliseconds).Humanize(timeSpanStyle: timeSpanStyle, maxUnit: TimeUnit.Year);
             Assert.Equal(expected, actual);
         }
     }

diff --git a/src/Humanizer/Properties/Resources.resx b/src/Humanizer/Properties/Resources.resx
@@ -258,6 +258,12 @@
   <data name="TimeSpanHumanize_SingleWeek" xml:space="preserve">
     <value>1 week</value>
   </data>
+  <data name="TimeSpanHumanize_SingleWeek_Abbr" xml:space="preserve">
+    <value>1 wk</value>
+  </data>
+  <data name="TimeSpanHumanize_SingleWeek_Short" xml:space="preserve">
+    <value>1w</value>
+  </data>
   <data name="DateHumanize_MultipleDaysFromNow" xml:space="preserve">
     <value>{0} days from now</value>
   </data>
@@ -531,9 +537,21 @@
   <data name="TimeSpanHumanize_MultipleMonths" xml:space="preserve">
     <value>{0} months</value>
   </data>
+  <data name="TimeSpanHumanize_MultipleMonths_Abbr" xml:space="preserve">
+    <value>{0} mos</value>
+  </data>
+  <data name="TimeSpanHumanize_MultipleMonths_Short" xml:space="preserve">
+    <value>{0}M</value>
+  </data>
   <data name="TimeSpanHumanize_MultipleYears" xml:space="preserve">
     <value>{0} years</value>
   </data>
+  <data name="TimeSpanHumanize_MultipleYears_Abbr" xml:space="preserve">
+    <value>{0} yrs</value>
+  </data>
+  <data name="TimeSpanHumanize_MultipleYears_Short" xml:space="preserve">
+    <value>{0}y</value>
+  </data>
   <data name="TimeSpanHumanize_SingleMonth" xml:space="preserve">
     <value>1 month</value>
   </data>