X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Ftest%2FStringUtilsTest.java;h=6ebf43ef019a0d2d2760892cd0ea2465888e7c2c;hb=620f732927beb44ba33d35cc47646ec53b5f535b;hp=4be75040b9966106beb932b825f60d2e53a8adeb;hpb=771c4ba4a1c17a95acbfdcbdb489094b04947713;p=fanfix.git

diff --git a/src/be/nikiroo/utils/test/StringUtilsTest.java b/src/be/nikiroo/utils/test/StringUtilsTest.java
index 4be7504..6ebf43e 100644
--- a/src/be/nikiroo/utils/test/StringUtilsTest.java
+++ b/src/be/nikiroo/utils/test/StringUtilsTest.java
@@ -144,6 +144,10 @@ class StringUtilsTest extends TestLauncher {
 			@Override
 			public void test() throws Exception {
 				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,
@@ -164,14 +168,13 @@ class StringUtilsTest extends TestLauncher {
 						"  sur  ", "plusie-", "  urs  ", "lignes ");
 				addValue(source, Alignment.JUSTIFY,
 						"Un petit texte qui se mettra sur plusieurs lignes", 7,
-						"Un", "petit", "texte", "qui  se", "mettra", "sur",
-						"plusie-", "urs", "lignes");
+						"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");
 
-				System.out.println();
 				for (String data : source.keySet()) {
 					for (int size : source.get(data).keySet()) {
 						Alignment align = source.get(data).get(size).getKey();
@@ -181,21 +184,17 @@ class StringUtilsTest extends TestLauncher {
 						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("]");
+						// 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("]");
 
-						for (int i = 0; i < result.size() && i < values.size(); i++) {
-							assertEquals("The line " + i + " is not correct",
-									values.get(i), result.get(i));
-						}
+						assertEquals(values, result);
 					}
 				}
-				System.out.println();
 			}
 		});