Author: bpoussin Date: 2008-08-04 17:18:14 +0000 (Mon, 04 Aug 2008) New Revision: 977 Modified: trunk/lutinutil/src/test/java/org/codelutin/i18n/I18nLoaderTest.java trunk/lutinutil/src/test/java/org/codelutin/util/ConverterUtilTest.java trunk/lutinutil/src/test/java/org/codelutin/util/HashMapMultiKeyTest.java trunk/lutinutil/src/test/java/org/codelutin/util/ObjectUtilTest.java Log: Modif de quelques tests pour les rendre meilleurs, car ils le valent bien :) Modified: trunk/lutinutil/src/test/java/org/codelutin/i18n/I18nLoaderTest.java =================================================================== --- trunk/lutinutil/src/test/java/org/codelutin/i18n/I18nLoaderTest.java 2008-08-04 15:00:50 UTC (rev 976) +++ trunk/lutinutil/src/test/java/org/codelutin/i18n/I18nLoaderTest.java 2008-08-04 17:18:14 UTC (rev 977) @@ -44,7 +44,7 @@ loader = I18n.getLoader(I18n.DEFAULT_ENCODING); bundleManager = I18n.getBundleManager(); assertNotNull(loader); - assertEquals(I18n.DEFAULT_ENCODING, loader.getEncoding()); + assertEquals(I18n.DEFAULT_ENCODING, loader.getEncoding()); assertEquals(bundleManager.getDefaultLocale(), I18n.DEFAULT_LOCALE); assertNull(loader.getLanguage()); } Modified: trunk/lutinutil/src/test/java/org/codelutin/util/ConverterUtilTest.java =================================================================== --- trunk/lutinutil/src/test/java/org/codelutin/util/ConverterUtilTest.java 2008-08-04 15:00:50 UTC (rev 976) +++ trunk/lutinutil/src/test/java/org/codelutin/util/ConverterUtilTest.java 2008-08-04 17:18:14 UTC (rev 977) @@ -22,19 +22,19 @@ public void testConvert() throws Exception { String s; s = ""; - assertTrue(Arrays.equals(s.getBytes(),ConverterUtil.convert(s.toCharArray()))); + assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); s = "a"; - assertTrue(Arrays.equals(s.getBytes(),ConverterUtil.convert(s.toCharArray()))); + assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); s = "kZZFIOFEIOFEfdskdfmldsfjklsfjldfldfjdsfiosabcd4567'''`~teAZEst"; - assertTrue(Arrays.equals(s.getBytes(),ConverterUtil.convert(s.toCharArray()))); + assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); s = "]{}{}{{[#{[{#[#]{][{^#][^]#{^[]{#][#]{]@[{#][^#{][^]#{teAZEst"; - assertTrue(Arrays.equals(s.getBytes(),ConverterUtil.convert(s.toCharArray()))); + assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); s = "�����]{}{}{{[#{[{#[#]{][{^#][^]#{^[]{#][#]{]@[{#][^#{][^]#{teAZEst"; - assertTrue(Arrays.equals(s.getBytes(),ConverterUtil.convert(s.toCharArray()))); + assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); } Modified: trunk/lutinutil/src/test/java/org/codelutin/util/HashMapMultiKeyTest.java =================================================================== --- trunk/lutinutil/src/test/java/org/codelutin/util/HashMapMultiKeyTest.java 2008-08-04 15:00:50 UTC (rev 976) +++ trunk/lutinutil/src/test/java/org/codelutin/util/HashMapMultiKeyTest.java 2008-08-04 17:18:14 UTC (rev 977) @@ -231,7 +231,10 @@ Object valeur = new ArrayList(); Object key = new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"); + // doit rester map.put(key, valeur); + + // doit etre retire map.put(new HashMapMultiKey.Key().add("tata").add("titi").add("tutu"), new JLabel("v2")); map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tyty"), new JLabel("v3")); map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("double"), 12.0); Modified: trunk/lutinutil/src/test/java/org/codelutin/util/ObjectUtilTest.java =================================================================== --- trunk/lutinutil/src/test/java/org/codelutin/util/ObjectUtilTest.java 2008-08-04 15:00:50 UTC (rev 976) +++ trunk/lutinutil/src/test/java/org/codelutin/util/ObjectUtilTest.java 2008-08-04 17:18:14 UTC (rev 977) @@ -34,6 +34,8 @@ import java.io.File; import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import junit.framework.TestCase; @@ -49,11 +51,21 @@ List<Method> methods = ObjectUtil.getMethod(Dummy.class, "setfile", true); assertEquals(1, methods.size()); - ObjectUtil.call(dummy, methods.get(0), "/tmp"); + assertEquals(new File("/tmp"), dummy.getFile()); - assertEquals(new File("/tmp"), dummy.getFile()); - } + methods = ObjectUtil.getMethod(Dummy.class, "setAllFile", true); + assertEquals(1, methods.size()); + ObjectUtil.call(dummy, methods.get(0), "toto", "/tmp", "/tmp/titi"); + assertEquals("toto", dummy.getName()); + assertEquals(Arrays.asList(new File("/tmp"), new File("/tmp/titi")), + Arrays.asList(dummy.getAllFile())); + + ObjectUtil.call(dummy, methods.get(0), "toto"); + assertEquals("toto", dummy.getName()); + assertEquals(new ArrayList<File>(), + Arrays.asList(dummy.getAllFile())); +} public void testCreate() throws Exception { Object o = ObjectUtil.create("java.lang.StringBuffer"); @@ -74,8 +86,17 @@ String name; int integer; File file; + File[] allFile; + public File[] getAllFile() { + return allFile; + } + public void setAllFile(String name, File ... allFile) { + this.name = name; + this.allFile = allFile; + } + /** * @return the file */