Merge branch 'master' of github.com:nikiroo/nikiroo-utils

[fanfix.git] / src / be / nikiroo / utils / test / StringUtilsTest.java

diff --git a/src/be/nikiroo/utils/test/StringUtilsTest.java b/src/be/nikiroo/utils/test/StringUtilsTest.java
index df2ed5fb9ddb49b2afd7dfa6133424f26fc9648c..e3be298f9b897863da57bd20f94f5884c827317a 100644 (file)
--- a/src/be/nikiroo/utils/test/StringUtilsTest.java
+++ b/src/be/nikiroo/utils/test/StringUtilsTest.java
@@ -247,9 +247,11 @@ class StringUtilsTest extends TestLauncher {
                                assertEquals(263200l, StringUtils.toNumber("263.2k"));
                                assertEquals(42000l, StringUtils.toNumber("42.0k"));
                                assertEquals(12000000l, StringUtils.toNumber("12M"));
+                               assertEquals(2000000000l, StringUtils.toNumber("2G"));
                                assertEquals("263k", StringUtils.formatNumber(263012l));
                                assertEquals("42k", StringUtils.formatNumber(42012l));
                                assertEquals("12M", StringUtils.formatNumber(12012121l));
+                               assertEquals("7G", StringUtils.formatNumber(7364635928l));
                        }
                });
 
@@ -261,10 +263,12 @@ class StringUtilsTest extends TestLauncher {
                                assertEquals(42700000l, StringUtils.toNumber("42.7M"));
                                assertEquals(1220l, StringUtils.toNumber("1.22k"));
                                assertEquals(1432l, StringUtils.toNumber("1.432k"));
+                               assertEquals(6938l, StringUtils.toNumber("6.938k"));
                                assertEquals("1.3k", StringUtils.formatNumber(1300l, 1));
                                assertEquals("263.2020k", StringUtils.formatNumber(263202l, 4));
                                assertEquals("1.26k", StringUtils.formatNumber(1267l, 2));
                                assertEquals("42.7M", StringUtils.formatNumber(42712121l, 1));
+                               assertEquals("5.09G", StringUtils.formatNumber(5094837485l, 2));
                        }
                });
        }