Author: tchemit Date: 2008-07-31 21:07:05 +0000 (Thu, 31 Jul 2008) New Revision: 955 Added: trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/CollectionUtilTest.java trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/FileUtilTest.java trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/StringUtilTest.java Removed: trunk/lutinutil/src/test/java/org/codelutin/util/CollectionUtilTest.java trunk/lutinutil/src/test/java/org/codelutin/util/FileUtilTest.java trunk/lutinutil/src/test/java/org/codelutin/util/StringUtilTest.java Log: utilisation du projet lutinutil-no-i18n pour les classes utilitaires sans i18n. et ceci pour casser le cycle entre lutinutil et maven-i18n-plugin Deleted: trunk/lutinutil/src/test/java/org/codelutin/util/CollectionUtilTest.java =================================================================== --- trunk/lutinutil/src/test/java/org/codelutin/util/CollectionUtilTest.java 2008-07-31 20:57:32 UTC (rev 954) +++ trunk/lutinutil/src/test/java/org/codelutin/util/CollectionUtilTest.java 2008-07-31 21:07:05 UTC (rev 955) @@ -1,38 +0,0 @@ -package org.codelutin.util; - -import junit.framework.TestCase; - -import java.util.List; -import java.util.ArrayList; - -/** - * CollectionUtil Tester. - * - * @author chemit - * @version 1.0 - * @since <pre>02/04/2008</pre> - */ -public class CollectionUtilTest extends TestCase { - public CollectionUtilTest(String name) { - super(name); - } - - public void testToGenericList() throws Exception { - List<String> list = new ArrayList<String>(); - list.add("a"); - list.add("b"); - list.add("c"); - - assertEquals(CollectionUtil.toGenericList(list,String.class),list); - assertEquals(CollectionUtil.toGenericList(list,Object.class),list); - - try { - CollectionUtil.toGenericList(list,Integer.class); - fail(); - } catch (IllegalArgumentException e) { - assertTrue(true); - } - - } - -} Deleted: trunk/lutinutil/src/test/java/org/codelutin/util/FileUtilTest.java =================================================================== --- trunk/lutinutil/src/test/java/org/codelutin/util/FileUtilTest.java 2008-07-31 20:57:32 UTC (rev 954) +++ trunk/lutinutil/src/test/java/org/codelutin/util/FileUtilTest.java 2008-07-31 21:07:05 UTC (rev 955) @@ -1,92 +0,0 @@ -/* *##% - * Copyright (C) 2002, 2003, 2004 Code Lutin, C�dric Pineau, - * Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * FileUtilTest.java - * - * Created: 22 nov. 2004 - * - * @author Benjamin Poussin <poussin@codelutin.com> - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ - -package org.codelutin.util; - -import java.util.List; -import junit.framework.TestCase; -import java.io.File; - -public class FileUtilTest extends TestCase { // FileUtilTest - - public void testFind() throws Exception { - List result = FileUtil.find (new File("."), ".*FileUtil.*", true); - assertTrue(result.size() != 0); - } - - public void testBasename() throws Exception { - String result = FileUtil.basename(new File("/tmp/toto.xml"), ".xml"); - assertEquals("toto", result); - } - - public void testExtension() throws Exception { - String result = FileUtil.extension(new File("/tmp/toto.xml")); - assertEquals("xml", result); - result = FileUtil.extension(new File("/tmp/toto.xml"), ".", "o"); - assertEquals("xml", result); - result = FileUtil.extension(new File("/tmp/toto.xml"), "t", "."); - assertEquals("o.xml", result); - } - - public void testCopyRecursively () throws Exception { - File srcDir = FileUtil.createTempDirectory("test-copyRecursively", ""); - File destDir1 = FileUtil.createTempDirectory("test-copyRecursively", ""); - File destDir2 = FileUtil.createTempDirectory("test-copyRecursively", ""); - - new File(srcDir, "toto").createNewFile(); - new File(srcDir, "titi").createNewFile(); - new File(srcDir, "tutu").createNewFile(); - new File(srcDir, "tata").createNewFile(); - File subdir = new File(srcDir, "subdir"); - subdir.mkdirs(); - new File(subdir, "tyty").createNewFile(); - new File(subdir, "titi").createNewFile(); - - FileUtil.copyRecursively(srcDir, destDir1); - - FileUtil.copyRecursively(srcDir, destDir2, ".*titi$"); - } - - public void testFileToByteToFile () throws Exception { - String content = "testFileToByteToFile"; - File file = FileUtil.getTempFile(content); - - byte[] bytes = FileUtil.fileToByte(file); - File dest = File.createTempFile("testFileToByteToFile", ".txt"); - dest.deleteOnExit(); - FileUtil.byteToFile(bytes, dest); - - assertEquals(file.length(), dest.length()); - assertEquals(content, FileUtil.readAsString(dest)); - } - -} // FileUtilTest - Deleted: trunk/lutinutil/src/test/java/org/codelutin/util/StringUtilTest.java =================================================================== --- trunk/lutinutil/src/test/java/org/codelutin/util/StringUtilTest.java 2008-07-31 20:57:32 UTC (rev 954) +++ trunk/lutinutil/src/test/java/org/codelutin/util/StringUtilTest.java 2008-07-31 21:07:05 UTC (rev 955) @@ -1,159 +0,0 @@ -/* *##% - * Copyright (C) 2002, 2003 Code Lutin, C�dric Pineau, - Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/******************************************************************************* - * StringUtilTest.java - * - * Created: 7 oct. 2004 - * - * @author Benjamin Poussin <poussin@codelutin.com> - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ - -package org.codelutin.util; - -import java.awt.Color; -import java.util.Arrays; - -import junit.framework.TestCase; - -public class StringUtilTest extends TestCase { // StringUtilTest - - public void testSubstring() throws Exception { - String s = "Bonjour le monde"; - String r = StringUtil.substring(s, -5); - assertEquals("monde", r); - - r = StringUtil.substring(s, 7, -5); - assertEquals(" le ", r); - - r = StringUtil.substring(s, 0, s.length()); - assertEquals(s, r); - - r = StringUtil.substring(s, -5, s.length()); - assertEquals("monde", r); - - r = StringUtil.substring("a", 1, -1); - assertEquals("", r); - - r = StringUtil.substring("", 0, -1); - assertEquals("", r); - - } - - public void testToColor() throws Exception { - Color c; - - c = StringUtil.toColor("#FF55AA"); - assertEquals(c, new Color(255, 85, 170)); - - c = StringUtil.toColor("#FF55AA55"); - assertEquals(c, new Color(255, 85, 170, 85)); - - try{ - c = null; - c = StringUtil.toColor("toto"); - assertFalse(true); - }catch(StringUtilException eee){ - assertNull(c); - } - - try{ - c = null; - c = StringUtil.toColor("#ZRETJ4040R"); - assertFalse(true); - }catch(StringUtilException eee){ - assertNull(c); - } - } - - 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"})); - assertTrue(Arrays.equals(StringUtil.split(""), new String[0])); - assertTrue(Arrays.equals(StringUtil.split(null), new String[0])); - - String argTest = "toto, titi, titi($tru('roer'), erke), \"t|u(t{u\\\"ti[ti'\", fin"; - String [] arg = StringUtil.split(argTest); - assertEquals(5, arg.length); - - argTest = ""; - arg = StringUtil.split(argTest); - assertEquals(0, arg.length); - - argTest = "tptp"; - arg = StringUtil.split(argTest); - assertEquals(1, arg.length); - - argTest = ",ooo|ooo|o|,ooo'ooo(',ooo-"; - arg = StringUtil.split(argTest, "ooo"); - assertEquals(5, arg.length); - - } - - 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)); - assertEquals("2,02s", StringUtil.convertTime(2020000002L)); - assertEquals("2s", StringUtil.convertTime(2000000002L)); - assertEquals("2s", StringUtil.convertTime(2000000000L)); - assertEquals("2ms", StringUtil.convertTime(2000000L)); - assertEquals("2ns", StringUtil.convertTime(2L)); - assertEquals("0ns", StringUtil.convertTime(0L)); - - assertEquals("0o", StringUtil.convertMemory(0L)); - assertEquals("2o", StringUtil.convertMemory(2L)); - assertEquals("2Ko", StringUtil.convertMemory(2048L)); - assertEquals("2Mo", StringUtil.convertMemory(2097152L)); - assertEquals("2Mo", StringUtil.convertMemory(2097154L)); - 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)); - assertEquals("-2,094Mo", StringUtil.convertMemory(-2196152L)); - } - - public void testUnaccent() throws Exception { - assertEquals( "-aaaeeeeiioouuuc0123456789AAAEEEEIIOOUUUC._", - StringUtil.unaccent("-��������������� 0123456789 ���������������._")); - } - - public void testConvertToConstantName() throws Exception { - assertEquals("YES",StringUtil.convertToConstantName("yes")); - assertEquals("YES",StringUtil.convertToConstantName("*$$?YEs")); - assertEquals("YES",StringUtil.convertToConstantName("_yes!$*_")); - assertEquals("YES",StringUtil.convertToConstantName("_Yes____")); - - assertEquals("YES_OR_NO",StringUtil.convertToConstantName("__yesOrNo_")); - assertEquals("YES_OR_NO",StringUtil.convertToConstantName("Yes-or-!*=No")); - assertEquals("YES_OR_NO",StringUtil.convertToConstantName("_yes__or__no")); - assertEquals("YES_OR_NO",StringUtil.convertToConstantName("_YesOR___No")); - - } - -} // StringUtilTest - Copied: trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/CollectionUtilTest.java (from rev 953, trunk/lutinutil/src/test/java/org/codelutin/util/CollectionUtilTest.java) =================================================================== --- trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/CollectionUtilTest.java (rev 0) +++ trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/CollectionUtilTest.java 2008-07-31 21:07:05 UTC (rev 955) @@ -0,0 +1,38 @@ +package org.codelutin.util; + +import junit.framework.TestCase; + +import java.util.ArrayList; +import java.util.List; + +/** + * CollectionUtil Tester. + * + * @author chemit + * @version 1.0 + * @since <pre>02/04/2008</pre> + */ +public class CollectionUtilTest extends TestCase { + public CollectionUtilTest(String name) { + super(name); + } + + public void testToGenericList() throws Exception { + List<String> list = new ArrayList<String>(); + list.add("a"); + list.add("b"); + list.add("c"); + + assertEquals(CollectionUtil.toGenericList(list, String.class), list); + assertEquals(CollectionUtil.toGenericList(list, Object.class), list); + + try { + CollectionUtil.toGenericList(list, Integer.class); + fail(); + } catch (IllegalArgumentException e) { + assertTrue(true); + } + + } + +} Property changes on: trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/CollectionUtilTest.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/FileUtilTest.java (from rev 953, trunk/lutinutil/src/test/java/org/codelutin/util/FileUtilTest.java) =================================================================== --- trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/FileUtilTest.java (rev 0) +++ trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/FileUtilTest.java 2008-07-31 21:07:05 UTC (rev 955) @@ -0,0 +1,93 @@ +/* *##% + * Copyright (C) 2002, 2003, 2004 Code Lutin, C�dric Pineau, + * Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +/* * + * FileUtilTest.java + * + * Created: 22 nov. 2004 + * + * @author Benjamin Poussin <poussin@codelutin.com> + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ + +package org.codelutin.util; + +import junit.framework.TestCase; + +import java.io.File; +import java.util.List; + +public class FileUtilTest extends TestCase { // FileUtilTest + + public void testFind() throws Exception { + List result = FileUtil.find(new File("."), ".*FileUtil.*", true); + assertTrue(result.size() != 0); + } + + public void testBasename() throws Exception { + String result = FileUtil.basename(new File("/tmp/toto.xml"), ".xml"); + assertEquals("toto", result); + } + + public void testExtension() throws Exception { + String result = FileUtil.extension(new File("/tmp/toto.xml")); + assertEquals("xml", result); + result = FileUtil.extension(new File("/tmp/toto.xml"), ".", "o"); + assertEquals("xml", result); + result = FileUtil.extension(new File("/tmp/toto.xml"), "t", "."); + assertEquals("o.xml", result); + } + + public void testCopyRecursively() throws Exception { + File srcDir = FileUtil.createTempDirectory("test-copyRecursively", ""); + File destDir1 = FileUtil.createTempDirectory("test-copyRecursively", ""); + File destDir2 = FileUtil.createTempDirectory("test-copyRecursively", ""); + + new File(srcDir, "toto").createNewFile(); + new File(srcDir, "titi").createNewFile(); + new File(srcDir, "tutu").createNewFile(); + new File(srcDir, "tata").createNewFile(); + File subdir = new File(srcDir, "subdir"); + subdir.mkdirs(); + new File(subdir, "tyty").createNewFile(); + new File(subdir, "titi").createNewFile(); + + FileUtil.copyRecursively(srcDir, destDir1); + + FileUtil.copyRecursively(srcDir, destDir2, ".*titi$"); + } + + public void testFileToByteToFile() throws Exception { + String content = "testFileToByteToFile"; + File file = FileUtil.getTempFile(content); + + byte[] bytes = FileUtil.fileToByte(file); + File dest = File.createTempFile("testFileToByteToFile", ".txt"); + dest.deleteOnExit(); + FileUtil.byteToFile(bytes, dest); + + assertEquals(file.length(), dest.length()); + assertEquals(content, FileUtil.readAsString(dest)); + } + +} // FileUtilTest + Property changes on: trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/FileUtilTest.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/StringUtilTest.java (from rev 953, trunk/lutinutil/src/test/java/org/codelutin/util/StringUtilTest.java) =================================================================== --- trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/StringUtilTest.java (rev 0) +++ trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/StringUtilTest.java 2008-07-31 21:07:05 UTC (rev 955) @@ -0,0 +1,159 @@ +/* *##% + * Copyright (C) 2002, 2003 Code Lutin, C�dric Pineau, + Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +/******************************************************************************* + * StringUtilTest.java + * + * Created: 7 oct. 2004 + * + * @author Benjamin Poussin <poussin@codelutin.com> + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ + +package org.codelutin.util; + +import junit.framework.TestCase; + +import java.awt.Color; +import java.util.Arrays; + +public class StringUtilTest extends TestCase { // StringUtilTest + + public void testSubstring() throws Exception { + String s = "Bonjour le monde"; + String r = StringUtil.substring(s, -5); + assertEquals("monde", r); + + r = StringUtil.substring(s, 7, -5); + assertEquals(" le ", r); + + r = StringUtil.substring(s, 0, s.length()); + assertEquals(s, r); + + r = StringUtil.substring(s, -5, s.length()); + assertEquals("monde", r); + + r = StringUtil.substring("a", 1, -1); + assertEquals("", r); + + r = StringUtil.substring("", 0, -1); + assertEquals("", r); + + } + + public void testToColor() throws Exception { + Color c; + + c = StringUtil.toColor("#FF55AA"); + assertEquals(c, new Color(255, 85, 170)); + + c = StringUtil.toColor("#FF55AA55"); + assertEquals(c, new Color(255, 85, 170, 85)); + + try { + c = null; + c = StringUtil.toColor("toto"); + assertFalse(true); + } catch (StringUtilException eee) { + assertNull(c); + } + + try { + c = null; + c = StringUtil.toColor("#ZRETJ4040R"); + assertFalse(true); + } catch (StringUtilException eee) { + assertNull(c); + } + } + + 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"})); + assertTrue(Arrays.equals(StringUtil.split(""), new String[0])); + assertTrue(Arrays.equals(StringUtil.split(null), new String[0])); + + String argTest = "toto, titi, titi($tru('roer'), erke), \"t|u(t{u\\\"ti[ti'\", fin"; + String[] arg = StringUtil.split(argTest); + assertEquals(5, arg.length); + + argTest = ""; + arg = StringUtil.split(argTest); + assertEquals(0, arg.length); + + argTest = "tptp"; + arg = StringUtil.split(argTest); + assertEquals(1, arg.length); + + argTest = ",ooo|ooo|o|,ooo'ooo(',ooo-"; + arg = StringUtil.split(argTest, "ooo"); + assertEquals(5, arg.length); + + } + + 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)); + assertEquals("2,02s", StringUtil.convertTime(2020000002L)); + assertEquals("2s", StringUtil.convertTime(2000000002L)); + assertEquals("2s", StringUtil.convertTime(2000000000L)); + assertEquals("2ms", StringUtil.convertTime(2000000L)); + assertEquals("2ns", StringUtil.convertTime(2L)); + assertEquals("0ns", StringUtil.convertTime(0L)); + + assertEquals("0o", StringUtil.convertMemory(0L)); + assertEquals("2o", StringUtil.convertMemory(2L)); + assertEquals("2Ko", StringUtil.convertMemory(2048L)); + assertEquals("2Mo", StringUtil.convertMemory(2097152L)); + assertEquals("2Mo", StringUtil.convertMemory(2097154L)); + 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)); + assertEquals("-2,094Mo", StringUtil.convertMemory(-2196152L)); + } + + public void testUnaccent() throws Exception { + assertEquals("-aaaeeeeiioouuuc0123456789AAAEEEEIIOOUUUC._", + StringUtil.unaccent("-��������������� 0123456789 ���������������._")); + } + + public void testConvertToConstantName() throws Exception { + assertEquals("YES", StringUtil.convertToConstantName("yes")); + assertEquals("YES", StringUtil.convertToConstantName("*$$?YEs")); + assertEquals("YES", StringUtil.convertToConstantName("_yes!$*_")); + assertEquals("YES", StringUtil.convertToConstantName("_Yes____")); + + assertEquals("YES_OR_NO", StringUtil.convertToConstantName("__yesOrNo_")); + assertEquals("YES_OR_NO", StringUtil.convertToConstantName("Yes-or-!*=No")); + assertEquals("YES_OR_NO", StringUtil.convertToConstantName("_yes__or__no")); + assertEquals("YES_OR_NO", StringUtil.convertToConstantName("_YesOR___No")); + + } + +} // StringUtilTest + Property changes on: trunk/lutinutil-no-i18n/src/test/java/org/codelutin/util/StringUtilTest.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native