Removing out of range test, correcting names of large numbers

Humanizr · May 4, 2017 · 125cb28 · 125cb28
1 parent 06871bb
commit 125cb28
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/src/Humanizer.Tests.Shared/NumberToWordsTests.cs b/src/Humanizer.Tests.Shared/NumberToWordsTests.cs
@@ -59,7 +59,6 @@ public void ToWords(int number, string expected)
         [InlineData(11111111111111111L, "eleven quadrillion one hundred and eleven trillion one hundred and eleven billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
         [InlineData(111111111111111111L, "one hundred and eleven quadrillion one hundred and eleven trillion one hundred and eleven billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
         [InlineData(1111111111111111111L, "one quintillion one hundred and eleven quadrillion one hundred and eleven trillion one hundred and eleven billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
-        [InlineData(11111111111111111111L, "eleven quintillion one hundred and eleven quadrillion one hundred and eleven trillion one hundred and eleven billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
         [Theory]
         public void ToWords(long number, string expected)
         {

diff --git a/src/Humanizer.Tests.Shared/ToQuantityTests.cs b/src/Humanizer.Tests.Shared/ToQuantityTests.cs
@@ -81,10 +81,6 @@ public void ToQuantityWords(string word, int quantity, string expected)
             Assert.Equal(expected, word.ToQuantity(quantity, ShowQuantityAs.Words));
             Assert.Equal(expected, word.ToQuantity((long)quantity, ShowQuantityAs.Words));
         }
-        public void ToQuantityWordsThrowsErrorIfGreaterThanInt32()
-        {
-            Assert.Throws<NotImplementedException>(() => "case".ToQuantity(10000000000, ShowQuantityAs.Words));
-        }
 
         [Theory]
         [InlineData("case", 0, null, "0 cases")]

diff --git a/src/Humanizer/Localisation/NumberToWords/EnglishNumberToWordsConverter.cs b/src/Humanizer/Localisation/NumberToWords/EnglishNumberToWordsConverter.cs
@@ -42,13 +42,13 @@ private string Convert(long number, bool isOrdinal)
 
             if ((number / 1000000000000000000) > 0)
             {
-                parts.Add(string.Format("{0} quadrillion", Convert(number / 1000000000000000000)));
+                parts.Add(string.Format("{0} quintillion", Convert(number / 1000000000000000000)));
                 number %= 1000000000000000000;
             }
 
             if ((number / 1000000000000000) > 0)
             {
-                parts.Add(string.Format("{0} trillion", Convert(number / 1000000000000000)));
+                parts.Add(string.Format("{0} quadrillion", Convert(number / 1000000000000000)));
                 number %= 1000000000000000;
             }