Index: lutinutil/src/test/org/codelutin/util/CallAnalyseTest.java diff -u lutinutil/src/test/org/codelutin/util/CallAnalyseTest.java:1.1 lutinutil/src/test/org/codelutin/util/CallAnalyseTest.java:1.2 --- lutinutil/src/test/org/codelutin/util/CallAnalyseTest.java:1.1 Thu Aug 25 21:16:51 2005 +++ lutinutil/src/test/org/codelutin/util/CallAnalyseTest.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * Created: 25 août 2005 21:03:50 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Last update: $Date: 2005/08/25 21:16:51 $ + * Last update: $Date: 2006/01/04 13:26:32 $ * by : $Author: bpoussin $ */ @@ -54,7 +54,7 @@ assertEquals(10, CallAnalyse.getThreadStatistics().get("eatMemory").getCalls()); assertEquals(10, CallAnalyse.getThreadStatistics().get("freeMemory").getCalls()); - System.out.println(CallAnalyse.getThreadStatistics()); + log.debug(CallAnalyse.getThreadStatistics()); } protected void eatMemory(){ Index: lutinutil/src/test/org/codelutin/util/FileUtilTest.java diff -u lutinutil/src/test/org/codelutin/util/FileUtilTest.java:1.1 lutinutil/src/test/org/codelutin/util/FileUtilTest.java:1.2 --- lutinutil/src/test/org/codelutin/util/FileUtilTest.java:1.1 Thu Dec 23 18:19:15 2004 +++ lutinutil/src/test/org/codelutin/util/FileUtilTest.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * Created: 22 nov. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/12/23 18:19:15 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ @@ -42,5 +42,19 @@ 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); + } + } // FileUtilTest Index: lutinutil/src/test/org/codelutin/util/HashMapMultiKeyTest.java diff -u lutinutil/src/test/org/codelutin/util/HashMapMultiKeyTest.java:1.3 lutinutil/src/test/org/codelutin/util/HashMapMultiKeyTest.java:1.4 --- lutinutil/src/test/org/codelutin/util/HashMapMultiKeyTest.java:1.3 Thu Nov 17 19:09:55 2005 +++ lutinutil/src/test/org/codelutin/util/HashMapMultiKeyTest.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * Created: 27 septembre 2005 12:28:03 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ * - * Last update: $Date: 2005/11/17 19:09:55 $ + * Last update: $Date: 2006/01/04 13:26:32 $ * by : $Author: bpoussin $ */ @@ -33,20 +33,17 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.Set; + import javax.swing.JLabel; + import junit.framework.TestCase; + import org.apache.commons.collections.map.LRUMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; public class HashMapMultiKeyTest extends TestCase { // HashMapMultiKeyTest - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(HashMapMultiKeyTest.class); - public void testPutGet() throws Exception { HashMapMultiKey map = new HashMapMultiKey(); map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"), "valeur"); Index: lutinutil/src/test/org/codelutin/util/ListenerSetTest.java diff -u lutinutil/src/test/org/codelutin/util/ListenerSetTest.java:1.1 lutinutil/src/test/org/codelutin/util/ListenerSetTest.java:1.2 --- lutinutil/src/test/org/codelutin/util/ListenerSetTest.java:1.1 Thu May 13 15:40:49 2004 +++ lutinutil/src/test/org/codelutin/util/ListenerSetTest.java Wed Jan 4 13:26:32 2006 @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2002, 2003 Code Lutin - * + * * 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 @@ -23,19 +23,18 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/05/13 15:40:49 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ package org.codelutin.util; -import junit.framework.TestCase; -import junit.framework.TestSuite; -import junit.framework.TestResult; import java.util.Iterator; +import junit.framework.TestCase; + public class ListenerSetTest extends TestCase { // ListenerSetTest int callCount; Index: lutinutil/src/test/org/codelutin/util/LogTest.java diff -u lutinutil/src/test/org/codelutin/util/LogTest.java:1.2 lutinutil/src/test/org/codelutin/util/LogTest.java:1.3 --- lutinutil/src/test/org/codelutin/util/LogTest.java:1.2 Thu Aug 12 18:50:12 2004 +++ lutinutil/src/test/org/codelutin/util/LogTest.java Wed Jan 4 13:26:32 2006 @@ -23,21 +23,15 @@ * Created: 12 août 2004 * * @author Benjamin Poussin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2004/08/12 18:50:12 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ package org.codelutin.util; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; -import junit.framework.TestResult; -import java.util.ArrayList; -import java.io.File; -import java.net.URLClassLoader; public class LogTest extends TestCase { // LogTest Index: lutinutil/src/test/org/codelutin/util/ResourceTest.java diff -u lutinutil/src/test/org/codelutin/util/ResourceTest.java:1.8 lutinutil/src/test/org/codelutin/util/ResourceTest.java:1.9 --- lutinutil/src/test/org/codelutin/util/ResourceTest.java:1.8 Fri Sep 30 18:43:29 2005 +++ lutinutil/src/test/org/codelutin/util/ResourceTest.java Wed Jan 4 13:26:32 2006 @@ -1,6 +1,6 @@ /* *##% * 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 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.8 $ +* @version $Revision: 1.9 $ * -* Mise a jour: $Date: 2005/09/30 18:43:29 $ -* par : $Author: pineau $ +* Mise a jour: $Date: 2006/01/04 13:26:32 $ +* par : $Author: bpoussin $ */ package org.codelutin.util; @@ -36,10 +36,8 @@ import java.net.URLClassLoader; import java.util.ArrayList; import java.util.List; -import junit.framework.Test; + import junit.framework.TestCase; -import junit.framework.TestResult; -import junit.framework.TestSuite; public class ResourceTest extends TestCase { // ResourceTest Index: lutinutil/src/test/org/codelutin/util/StreamKeywordTokenizerTest.java diff -u lutinutil/src/test/org/codelutin/util/StreamKeywordTokenizerTest.java:1.1 lutinutil/src/test/org/codelutin/util/StreamKeywordTokenizerTest.java:1.2 --- lutinutil/src/test/org/codelutin/util/StreamKeywordTokenizerTest.java:1.1 Fri Jun 18 19:00:11 2004 +++ lutinutil/src/test/org/codelutin/util/StreamKeywordTokenizerTest.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/06/18 19:00:11 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ @@ -56,15 +56,15 @@ parser.addKeyword("TouT"); parser.addKeyword("mondE"); - assertTrue(parser.TT_KEYWORD == parser.nextToken() + assertTrue(StreamKeywordTokenizer.TT_KEYWORD == parser.nextToken() && parser.sval.equals("coucou")); - assertTrue(parser.TT_KEYWORD == parser.nextToken() + assertTrue(StreamKeywordTokenizer.TT_KEYWORD == parser.nextToken() && parser.sval.equals("tout")); - assertTrue(parser.TT_KEYWORD == parser.nextToken() + assertTrue(StreamKeywordTokenizer.TT_KEYWORD == parser.nextToken() && parser.sval.equals("tout")); - assertTrue(parser.TT_WORD == parser.nextToken() + assertTrue(StreamKeywordTokenizer.TT_WORD == parser.nextToken() && parser.sval.equals("lE")); - assertTrue(parser.TT_KEYWORD == parser.nextToken() + assertTrue(StreamKeywordTokenizer.TT_KEYWORD == parser.nextToken() && parser.sval.equals("monde")); } @@ -89,15 +89,15 @@ parser.addKeyword("TouT"); parser.addKeyword("mondE"); - assertTrue(parser.TT_KEYWORD == parser.nextToken() + assertTrue(StreamKeywordTokenizer.TT_KEYWORD == parser.nextToken() && parser.sval.equals("Coucou")); - assertTrue(parser.TT_WORD == parser.nextToken() + assertTrue(StreamKeywordTokenizer.TT_WORD == parser.nextToken() && parser.sval.equals("tOUt")); - assertTrue(parser.TT_KEYWORD == parser.nextToken() + assertTrue(StreamKeywordTokenizer.TT_KEYWORD == parser.nextToken() && parser.sval.equals("TouT")); - assertTrue(parser.TT_WORD == parser.nextToken() + assertTrue(StreamKeywordTokenizer.TT_WORD == parser.nextToken() && parser.sval.equals("lE")); - assertTrue(parser.TT_WORD == parser.nextToken() + assertTrue(StreamKeywordTokenizer.TT_WORD == parser.nextToken() && parser.sval.equals("MONDE")); } Index: lutinutil/src/test/org/codelutin/util/StringUtilTest.java diff -u lutinutil/src/test/org/codelutin/util/StringUtilTest.java:1.5 lutinutil/src/test/org/codelutin/util/StringUtilTest.java:1.6 --- lutinutil/src/test/org/codelutin/util/StringUtilTest.java:1.5 Fri Sep 30 18:43:29 2005 +++ lutinutil/src/test/org/codelutin/util/StringUtilTest.java Wed Jan 4 13:26:32 2006 @@ -23,22 +23,35 @@ * Created: 7 oct. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ * - * Mise a jour: $Date: 2005/09/30 18:43:29 $ - * par : $Author: pineau $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ + * par : $Author: bpoussin $ */ package org.codelutin.util; import java.awt.Color; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestResult; -import junit.framework.TestSuite; 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); + + } + public void testToColor() throws Exception { Color c; Index: lutinutil/src/test/org/codelutin/util/CategorisedListenerSetTest.java diff -u /dev/null lutinutil/src/test/org/codelutin/util/CategorisedListenerSetTest.java:1.1 --- /dev/null Wed Jan 4 13:26:37 2006 +++ lutinutil/src/test/org/codelutin/util/CategorisedListenerSetTest.java Wed Jan 4 13:26:32 2006 @@ -0,0 +1,109 @@ +/* + * *##% Copyright (C) 2006 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. ##% + */ + +/******************************************************************************* + * CategorisedListenerSetTest.java + * + * Created: 3 janv. 2006 23:27:42 + * + * @author poussin + * + * @version $Revision: 1.1 $ + * + * Last update: $Date: 2006/01/04 13:26:32 $ by : $Author: bpoussin $ + */ + +package org.codelutin.util; + +import junit.framework.TestCase; + +/** + * @author poussin + * + */ + +public class CategorisedListenerSetTest extends TestCase { + + /* + * Test method for + * 'org.codelutin.util.CategorisedListenerSet.getAllListeners(Object)' + */ + public void testGetAllListeners() { + + { + CategorisedListenerSet cls = new CategorisedListenerSet(); + + String[] ls = new String[] { "Double", "Long", "Number", "Object", + "LoggingException", "Throwable" }; + + cls.add(Double.class, ls[0]); + cls.add(Long.class, ls[1]); + cls.add(Number.class, ls[2]); + cls.add(Object.class, ls[3]); + + assertEquals(3, cls.getAllListeners(Double.class).size()); + assertEquals(3, cls.getAllListeners(Long.class).size()); + assertEquals(2, cls.getAllListeners(Number.class).size()); + assertEquals(1, cls.getAllListeners(Object.class).size()); + + cls.addCategory(LoggingException.class, Number.class); + + cls.add(LoggingException.class, ls[4]); + cls.add(Throwable.class, ls[5]); + + assertEquals(5, cls.getAllListeners(Double.class).size()); + assertEquals(5, cls.getAllListeners(Long.class).size()); + assertEquals(4, cls.getAllListeners(Number.class).size()); + assertEquals(1, cls.getAllListeners(Object.class).size()); + + assertEquals(3, cls.getAllListeners(LoggingException.class).size()); + assertEquals(2, cls.getAllListeners(Throwable.class).size()); + + } + { + CategorisedListenerSet cls = new CategorisedListenerSet(null, false); + + String[] ls = new String[] { "Double", "Long", "Number", "Object", + "LoggingException", "Throwable" }; + + cls.add(Double.class, ls[0]); + cls.add(Long.class, ls[1]); + cls.add(Number.class, ls[2]); + cls.add(Object.class, ls[3]); + + assertEquals(1, cls.getAllListeners(Double.class).size()); + assertEquals(1, cls.getAllListeners(Long.class).size()); + assertEquals(1, cls.getAllListeners(Number.class).size()); + assertEquals(1, cls.getAllListeners(Object.class).size()); + + cls.addCategory(LoggingException.class, Number.class); + + cls.add(LoggingException.class, ls[4]); + cls.add(Throwable.class, ls[5]); + + assertEquals(1, cls.getAllListeners(Double.class).size()); + assertEquals(1, cls.getAllListeners(Long.class).size()); + assertEquals(2, cls.getAllListeners(Number.class).size()); + assertEquals(1, cls.getAllListeners(Object.class).size()); + + assertEquals(1, cls.getAllListeners(LoggingException.class).size()); + assertEquals(1, cls.getAllListeners(Throwable.class).size()); + } + } + +}