Author: bleny Date: 2012-01-04 11:02:03 +0100 (Wed, 04 Jan 2012) New Revision: 2267 Url: http://nuiton.org/repositories/revision/nuiton-utils/2267 Log: ##1737 Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java 2011-12-14 08:12:56 UTC (rev 2266) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java 2012-01-04 10:02:03 UTC (rev 2267) @@ -65,7 +65,11 @@ * * @param s la chaine a unaccentuer * @return la chaine sans accent + * @deprecated since 2.4.2. Use + * {@link org.apache.commons.lang3.StringUtils#stripAccents(String)} + * instead. */ + @Deprecated static public String unaccent(String s) { // this is java 1.6 code String temp = Normalizer.normalize(s, Normalizer.Form.NFD); Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java 2011-12-14 08:12:56 UTC (rev 2266) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java 2012-01-04 10:02:03 UTC (rev 2267) @@ -36,15 +36,17 @@ package org.nuiton.util; -import java.awt.Color; +import org.apache.commons.lang3.StringUtils; +import org.junit.Test; + +import java.awt.*; import java.util.Arrays; import java.util.Locale; -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; +import static org.junit.Assert.assertTrue; public class StringUtilTest { private static final String[] EMPTY_STRING_ARRAY = new String[0]; // StringUtilTest @@ -177,7 +179,7 @@ * @throws Exception */ @Test - public void testUnaccent() throws Exception { + public void testUnAccent() throws Exception { assertEquals("-aaaeeeeiioouuuc 0123456789 AAAEEEEIIOOUUUC._", StringUtil.unaccent("-àâäéèêëîïôöùûüç 0123456789 ÀÂÄÉÈÊËÎÏÔÖÙÛÜÇ._")); @@ -185,7 +187,22 @@ StringUtil.unaccent("test en été")); } + /** + * Tests that {@link StringUtils#stripAccents(String)} is a suitable + * replacement. + * + * @since 2.4.2 + */ @Test + public void testUnAccentDeprecation() { + assertEquals(StringUtil.unaccent("-àâäéèêëîïôöùûüç 0123456789 ÀÂÄÉÈÊËÎÏÔÖÙÛÜÇ._"), + StringUtils.stripAccents("-àâäéèêëîïôöùûüç 0123456789 ÀÂÄÉÈÊËÎÏÔÖÙÛÜÇ._")); + + assertEquals(StringUtil.unaccent("test en été"), + StringUtils.stripAccents("test en été")); + } + + @Test public void testConvertToConstantName() throws Exception { assertEquals("YES", StringUtil.convertToConstantName("yes")); assertEquals("YES", StringUtil.convertToConstantName("*$$?YEs"));