new tests (wip) for from/to number

[nikiroo-utils.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 6ebf43ef019a0d2d2760892cd0ea2465888e7c2c..5280181b9dbc94db92b76d6f62461d55a60f456c 100644 (file)
--- a/src/be/nikiroo/utils/test/StringUtilsTest.java
+++ b/src/be/nikiroo/utils/test/StringUtilsTest.java
@@ -174,6 +174,8 @@ class StringUtilsTest extends TestLauncher {
                                                "Un petit texte qui se mettra sur plusieurs lignes",
                                                14, "Un       petit", "texte  qui  se",
                                                "mettra     sur", "plusieurs lig-", "nes");
+                               addValue(source, Alignment.JUSTIFY, "le dash-test", 9,
+                                               "le  dash-", "test");
 
                                for (String data : source.keySet()) {
                                        for (int size : source.get(data).keySet()) {
@@ -221,11 +223,40 @@ class StringUtilsTest extends TestLauncher {
                        @Override
                        public void test() throws Exception {
                                String orig = "test";
-                               String zipped = StringUtils.zip64(orig);
-                               String unzipped = StringUtils.unzip64(zipped);
+                               String zipped = StringUtils.base64(orig, true);
+                               String unzipped = StringUtils.unbase64s(zipped, true);
                                assertEquals(orig, unzipped);
                        }
                });
+               
+               addTest(new TestCase("from/toNumber") {
+                       @Override
+                       public void test() throws Exception {
+                               assertEquals(StringUtils.toNumber("263"), 263l);
+                               assertEquals(StringUtils.toNumber("21200"), 21200l);
+                               assertEquals(StringUtils.toNumber("0"), 0l);
+                               assertEquals(StringUtils.formatNumber(263l), "263");
+                               assertEquals(StringUtils.formatNumber(21000l), "21k");
+                               assertEquals(StringUtils.formatNumber(0l), "0");
+                               
+                               assertEquals(StringUtils.formatNumber(1287l, false), "1287");
+                               assertEquals(StringUtils.formatNumber(6056l, false), "6k");
+                               
+                               assertEquals(StringUtils.toNumber("263k"), 263000l);
+                               assertEquals(StringUtils.toNumber("42k"), 42000l);
+                               assertEquals(StringUtils.toNumber("12M"), 12000000l);
+                               assertEquals(StringUtils.formatNumber(263012l), "263k");
+                               assertEquals(StringUtils.formatNumber(42012l), "42k");
+                               assertEquals(StringUtils.formatNumber(12012121212l), "12M");
+                               
+                               assertEquals(StringUtils.toNumber("263.2k"), 263200l);
+                               assertEquals(StringUtils.toNumber("1.2k"), 1200l);
+                               assertEquals(StringUtils.toNumber("42.7M"), 42700000000l);
+                               assertEquals(StringUtils.formatNumber(263202l), "263.2k");
+                               assertEquals(StringUtils.formatNumber(1267l), "1.2k");
+                               assertEquals(StringUtils.formatNumber(42712121212l), "42.7M");
+                       }
+               });
        }
 
        static private void addValue(