Author: tchemit Date: 2009-02-03 14:12:35 +0000 (Tue, 03 Feb 2009) New Revision: 1317 Modified: lutinutil/trunk/changelog.txt lutinutil/trunk/src/main/java/org/codelutin/util/StringUtil.java lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java Log: fix StringUtil failed tests since to locale Modified: lutinutil/trunk/changelog.txt =================================================================== --- lutinutil/trunk/changelog.txt 2009-02-03 13:35:05 UTC (rev 1316) +++ lutinutil/trunk/changelog.txt 2009-02-03 14:12:35 UTC (rev 1317) @@ -1,4 +1,5 @@ ver 1.0.3 ??? 200901?? + * 20090203 [chemit] fix StringUtil failed tests since to locale. * 20090126 [chemit] i18n Resource class * 20090121 [chemit] fix bug on Resource when a jar manifest classpath contains some XXX:// jar path Modified: lutinutil/trunk/src/main/java/org/codelutin/util/StringUtil.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/StringUtil.java 2009-02-03 13:35:05 UTC (rev 1316) +++ lutinutil/trunk/src/main/java/org/codelutin/util/StringUtil.java 2009-02-03 14:12:35 UTC (rev 1317) @@ -430,23 +430,19 @@ "d"}; /** - * * @param value * @return - * - * @deprecated method is default locale dependent + * @see #convert(long, double[], String[]) */ static public String convertTime(long value) { return convert(value, timeFactors, timeUnites); } /** - * * @param value * @param value2 * @return - * - * @deprecated method is default locale dependent + * @see #convert(long, double[], String[]) */ static public String convertTime(long value, long value2) { return convertTime(value2 - value); @@ -458,24 +454,22 @@ "To"}; /** - * * @param value * @return - * - * @deprecated method is default locale dependent + * @see #convert(long, double[], String[]) */ static public String convertMemory(long value) { return convert(value, memoryFactors, memoryUnites); } /** - * + * Note: this method use the current locale (the {@link java.util.Locale#getDefault()}) in + * the method {@link MessageFormat#MessageFormat(String)}. + * * @param value * @param factors * @param unites * @return - * - * @deprecated method is default locale dependent */ static public String convert(long value, double[] factors, String[] unites) { long sign = value == 0 ? 1 : value / Math.abs(value); Modified: lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java 2009-02-03 13:35:05 UTC (rev 1316) +++ lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java 2009-02-03 14:12:35 UTC (rev 1317) @@ -33,9 +33,17 @@ import java.awt.Color; import java.util.Arrays; +import java.util.Locale; -public class StringUtilTest extends TestCase { // StringUtilTest +import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +public class StringUtilTest { // StringUtilTest + + @Test public void testSubstring() throws Exception { String s = "Bonjour le monde"; String r = StringUtil.substring(s, -5); @@ -57,7 +65,7 @@ assertEquals("", r); } - + @Test public void testToColor() throws Exception { Color c; @@ -83,7 +91,7 @@ assertNull(c); } } - + @Test public void testSplit() { assertTrue(Arrays.equals(StringUtil.split("toto,titi,tutu"), new String[]{"toto", "titi", "tutu"})); assertTrue(Arrays.equals(StringUtil.split("toto"), new String[]{"toto"})); @@ -108,19 +116,13 @@ } - /** - * Test de la method {@link org.codelutin.util.StringUtil#convertTime(long)} - * - * @deprecated since org.codelutin.util.StringUtil#convertTime(long) is defaut locale dependent - * @throws Exception - */ + @Test public void testConvert() throws Exception { assertEquals("365d", StringUtil.convertTime(31536000000000000L)); assertEquals("2d", StringUtil.convertTime(172800000000000L)); assertEquals("2h", StringUtil.convertTime(7200000000000L)); assertEquals("2m", StringUtil.convertTime(120000000000L)); - // following test in EN locale - //assertEquals("2,02s", StringUtil.convertTime(2020000002L)); + assertEquals("2s", StringUtil.convertTime(2000000002L)); assertEquals("2s", StringUtil.convertTime(2000000000L)); assertEquals("2ms", StringUtil.convertTime(2000000L)); @@ -132,23 +134,38 @@ assertEquals("2Ko", StringUtil.convertMemory(2048L)); assertEquals("2Mo", StringUtil.convertMemory(2097152L)); assertEquals("2Mo", StringUtil.convertMemory(2097154L)); - // following test in EN locale - //assertEquals("2,094Mo", StringUtil.convertMemory(2196152L)); + assertEquals("2Go", StringUtil.convertMemory(2147483648L)); assertEquals("2To", StringUtil.convertMemory(2199023255552L)); assertEquals("2000To", StringUtil.convertMemory(2199023255552000L)); assertEquals("-2Mo", StringUtil.convertMemory(-2097152L)); assertEquals("-2Mo", StringUtil.convertMemory(-2097154L)); - // following test in EN locale - //assertEquals("-2,094Mo", StringUtil.convertMemory(-2196152L)); + + Locale oldLocale = Locale.getDefault(); + // test in french locale + Locale.setDefault(Locale.FRENCH); + assertEquals("2,02s", StringUtil.convertTime(2020000002L)); + assertEquals("2,094Mo", StringUtil.convertMemory(2196152L)); + assertEquals("-2,094Mo", StringUtil.convertMemory(-2196152L)); + + // test in english locale + Locale.setDefault(Locale.ENGLISH); + assertEquals("2.02s", StringUtil.convertTime(2020000002L)); + assertEquals("2.094Mo", StringUtil.convertMemory(2196152L)); + assertEquals("-2.094Mo", StringUtil.convertMemory(-2196152L)); + + // push back previous locale + Locale.setDefault(oldLocale); } + @Test public void testUnaccent() throws Exception { assertEquals("-aaaeeeeiioouuuc0123456789AAAEEEEIIOOUUUC._", StringUtil.unaccent("-àâäéèêëîïôöùûüç 0123456789 ÀÂÄÉÈÊËÎÏÔÖÙÛÜÇ._")); } + @Test public void testConvertToConstantName() throws Exception { assertEquals("YES", StringUtil.convertToConstantName("yes")); assertEquals("YES", StringUtil.convertToConstantName("*$$?YEs"));