From: Niki Roo <niki@nikiroo.be>
Date: Fri, 12 Apr 2019 08:02:05 +0000 (+0200)
Subject: Merge branch 'master' of github.com:nikiroo/nikiroo-utils
X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=commitdiff_plain;h=7ca6b9d0787f4bfc5df8ef88f4e365180f59ddfd;hp=43d2b5625c9eff86695495622cb3b13f4fa4f738

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

diff --git a/src/be/nikiroo/utils/test/StringUtilsTest.java b/src/be/nikiroo/utils/test/StringUtilsTest.java
index e35be4f..5280181 100644
--- a/src/be/nikiroo/utils/test/StringUtilsTest.java
+++ b/src/be/nikiroo/utils/test/StringUtilsTest.java
@@ -228,6 +228,35 @@ class StringUtilsTest extends TestLauncher {
 				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(