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

diff --git a/src/be/nikiroo/utils/test/StringUtilsTest.java b/src/be/nikiroo/utils/test/StringUtilsTest.java
index 452b906..5280181 100644
--- a/src/be/nikiroo/utils/test/StringUtilsTest.java
+++ b/src/be/nikiroo/utils/test/StringUtilsTest.java
@@ -1,5 +1,6 @@
 package be.nikiroo.utils.test;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -142,31 +143,59 @@ class StringUtilsTest extends TestLauncher {
 		addTest(new TestCase("Justifying") {
 			@Override
 			public void test() throws Exception {
-				for (String data : new String[] { "test",
-						"let's test some words", "" }) {
-					int total = 0;
-					for (String word : data.split((" "))) {
-						total += word.replace("-", "").replace(" ", "")
-								.length();
-					}
-					List<String> result = StringUtils.justifyText(data, 5,
-							StringUtils.Alignment.LEFT);
-					
-					System.out.println("["+data+"] -> [");
-
-					int totalResult = 0;
-					for (String resultLine : result) {
-						System.out.println(resultLine);
-						for (String word : resultLine.split((" "))) {
-							totalResult += word.replace("-", "")
-									.replace(" ", "").length();
-						}
-					}
-					System.out.println("]");
+				Map<String, Map<Integer, Entry<Alignment, List<String>>>> source = new HashMap<String, Map<Integer, Entry<Alignment, List<String>>>>();
+				addValue(source, Alignment.LEFT, "testy", -1, "testy");
+				addValue(source, Alignment.RIGHT, "testy", -1, "testy");
+				addValue(source, Alignment.CENTER, "testy", -1, "testy");
+				addValue(source, Alignment.JUSTIFY, "testy", -1, "testy");
+				addValue(source, Alignment.LEFT, "testy", 5, "testy");
+				addValue(source, Alignment.LEFT, "testy", 3, "te-", "sty");
+				addValue(source, Alignment.LEFT,
+						"Un petit texte qui se mettra sur plusieurs lignes",
+						10, "Un petit", "texte qui", "se mettra", "sur",
+						"plusieurs", "lignes");
+				addValue(source, Alignment.LEFT,
+						"Un petit texte qui se mettra sur plusieurs lignes", 7,
+						"Un", "petit", "texte", "qui se", "mettra", "sur",
+						"plusie-", "urs", "lignes");
+				addValue(source, Alignment.RIGHT,
+						"Un petit texte qui se mettra sur plusieurs lignes", 7,
+						"     Un", "  petit", "  texte", " qui se", " mettra",
+						"    sur", "plusie-", "    urs", " lignes");
+				addValue(source, Alignment.CENTER,
+						"Un petit texte qui se mettra sur plusieurs lignes", 7,
+						"  Un   ", " petit ", " texte ", "qui se ", "mettra ",
+						"  sur  ", "plusie-", "  urs  ", "lignes ");
+				addValue(source, Alignment.JUSTIFY,
+						"Un petit texte qui se mettra sur plusieurs lignes", 7,
+						"Un pet-", "it tex-", "te  qui", "se met-", "tra sur",
+						"plusie-", "urs li-", "gnes");
+				addValue(source, Alignment.JUSTIFY,
+						"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()) {
+						Alignment align = source.get(data).get(size).getKey();
+						List<String> values = source.get(data).get(size)
+								.getValue();
+
+						List<String> result = StringUtils.justifyText(data,
+								size, align);
+
+						// System.out.println("[" + data + " (" + size + ")" +
+						// "] -> [");
+						// for (int i = 0; i < result.size(); i++) {
+						// String resultLine = result.get(i);
+						// System.out.println(i + ": " + resultLine);
+						// }
+						// System.out.println("]");
 
-					assertEquals(
-							"The number of letters ('-' not included) should be identical before and after",
-							total, totalResult);
+						assertEquals(values, result);
+					}
 				}
 			}
 		});
@@ -194,10 +223,66 @@ 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(
+			Map<String, Map<Integer, Entry<Alignment, List<String>>>> source,
+			final Alignment align, String input, int size,
+			final String... result) {
+		if (!source.containsKey(input)) {
+			source.put(input,
+					new HashMap<Integer, Entry<Alignment, List<String>>>());
+		}
+
+		source.get(input).put(size, new Entry<Alignment, List<String>>() {
+			@Override
+			public Alignment getKey() {
+				return align;
+			}
+
+			@Override
+			public List<String> getValue() {
+				return Arrays.asList(result);
+			}
+
+			@Override
+			public List<String> setValue(List<String> value) {
+				return null;
+			}
+		});
 	}
 }