X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Ftest%2FStringUtilsTest.java;h=5280181b9dbc94db92b76d6f62461d55a60f456c;hb=00b43c19e0563e0916c1cc9d5ffd573bfc92693d;hp=29f5bf3d8936b9f9c48637ddbe7af43057fc238c;hpb=ef34f6f76b3446c7310b2c2057e01bfe725e7aa4;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/test/StringUtilsTest.java b/src/be/nikiroo/utils/test/StringUtilsTest.java
index 29f5bf3..5280181 100644
--- a/src/be/nikiroo/utils/test/StringUtilsTest.java
+++ b/src/be/nikiroo/utils/test/StringUtilsTest.java
@@ -223,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(