June 2010 - Nuiton-utils-commits - mailman.cloud.codelutin.com

r1885 - trunk/src/test/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Jun '10

17 Jun '10

Author: fdesbois Date: 2010-06-17 15:38:35 +0200 (Thu, 17 Jun 2010) New Revision: 1885 Url: http://nuiton.org/repositories/revision/nuiton-utils/1885 Log: Ano #687 : Clean test initialization Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-17 13:36:25 UTC (rev 1884) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-17 13:38:35 UTC (rev 1885) @@ -74,6 +74,7 @@ DIR_TESTS_DATA = new File(basedirPath, "target" + File.separator + "surefire-data"); FileUtil.createDirectoryIfNecessary(DIR_TESTS_DATA); + log.info("Initialize main tests-data directory : " + DIR_TESTS_DATA.getAbsolutePath()); } @Test

1 0

r1884 - trunk/src/test/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Jun '10

17 Jun '10

Author: fdesbois Date: 2010-06-17 15:36:25 +0200 (Thu, 17 Jun 2010) New Revision: 1884 Url: http://nuiton.org/repositories/revision/nuiton-utils/1884 Log: Ano #687 : Clean test initialization Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-17 13:31:02 UTC (rev 1883) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-17 13:36:25 UTC (rev 1884) @@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.Log; import org.junit.Assert; -import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.util.ApplicationConfig.Action; @@ -49,30 +49,32 @@ private static final Log log = LogFactory.getLog(ApplicationConfigTest.class); - // says testsData is where we start tests. - protected File testsDataDir; + /** main folder for tests data **/ + protected static File DIR_TESTS_DATA; protected static final String SYSTEM_PROPERTY_USER_HOME = "user.home"; - @Before - public void setUp() throws IOException { + protected static int DUMMY_ACTION_CALL = 0; + + public static class DummyAction { + @Action.Step(1) + public void dummyAction(String s, int step) { + DUMMY_ACTION_CALL++; + System.out.println(s + ":" + step); + } + } + + @BeforeClass + public static void setUpClass() throws IOException { + // Initialize DIR_TESTS_DATA to target/surefire-data String basedirPath = System.getenv("basedir"); if (basedirPath == null) { basedirPath = new File("").getAbsolutePath(); } - testsDataDir = new File(basedirPath, + DIR_TESTS_DATA = new File(basedirPath, "target" + File.separator + "surefire-data"); - FileUtil.createDirectoryIfNecessary(testsDataDir); + FileUtil.createDirectoryIfNecessary(DIR_TESTS_DATA); } - - static int dummyActionCall = 0; - static public class DummyAction { - @Action.Step(1) - public void dummyAction(String s, int step) { - dummyActionCall++; - System.out.println(s + ":" + step); - } - } @Test public void testSaveForUser() { @@ -81,7 +83,7 @@ /** PREPARE DATA **/ // Initiliaze path and filename - String path = new File(testsDataDir, "user").getAbsolutePath(); + String path = new File(DIR_TESTS_DATA, "user").getAbsolutePath(); String filename = "test-saveForUser.properties"; // Set path to USER_HOME (keep old value) @@ -152,14 +154,14 @@ Action action = new Action(1, new DummyAction(), DummyAction.class.getMethod("dummyAction", String.class, Integer.TYPE), "coucou", "12"); instance.addAction(action); - dummyActionCall = 0; - Assert.assertEquals(0, dummyActionCall); + DUMMY_ACTION_CALL = 0; + Assert.assertEquals(0, DUMMY_ACTION_CALL); instance.doAction(0); - Assert.assertEquals(0, dummyActionCall); + Assert.assertEquals(0, DUMMY_ACTION_CALL); instance.doAction(1); - Assert.assertEquals(1, dummyActionCall); + Assert.assertEquals(1, DUMMY_ACTION_CALL); instance.doAction(2); - Assert.assertEquals(1, dummyActionCall); + Assert.assertEquals(1, DUMMY_ACTION_CALL); } /** @@ -264,9 +266,9 @@ Action result = instance.createAction( DummyAction.class.getName() + "#dummyAction", args); Assert.assertEquals(1, result.step); - dummyActionCall = 0; + DUMMY_ACTION_CALL = 0; result.doAction(); - Assert.assertEquals(1, dummyActionCall); + Assert.assertEquals(1, DUMMY_ACTION_CALL); } /** @@ -284,7 +286,7 @@ instance.addAlias("-m", "--" + DummyAction.class.getName() + "#dummyAction"); instance.parse(args); - dummyActionCall = 0; + DUMMY_ACTION_CALL = 0; Assert.assertEquals("file", instance.getOption("file")); Assert.assertEquals("true", instance.getOption("verbose")); Assert.assertEquals("true", instance.getOption("debug")); @@ -292,7 +294,7 @@ Assert.assertEquals(Arrays.asList("others", "args"), instance.getUnparsed()); instance.doAction(1); - Assert.assertEquals(1, dummyActionCall); + Assert.assertEquals(1, DUMMY_ACTION_CALL); } /**

1 0

r1883 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Jun '10

17 Jun '10

Author: fdesbois Date: 2010-06-17 15:31:02 +0200 (Thu, 17 Jun 2010) New Revision: 1883 Url: http://nuiton.org/repositories/revision/nuiton-utils/1883 Log: Ano #687 : Add test Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-17 11:24:03 UTC (rev 1882) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-17 13:31:02 UTC (rev 1883) @@ -603,15 +603,16 @@ prop.remove(excludeKey); } - // Ano #687 : check existence of parentFile before using it in FileWriter - // TODO-fdesbois-2010-06-17 : Need to be tested - FileUtil.createDirectoryIfNecessary(file.getParentFile()); + // Ano #687 : create parentFile before using it in FileWriter + boolean dirCreated = FileUtil.createDirectoryIfNecessary(file.getParentFile()); + if (dirCreated && log.isDebugEnabled()) { + log.debug("Creation of config directory " + file.getParent()); + } Writer writer = new FileWriter(file); try { prop.store(writer, "Last saved " + new java.util.Date()); - } - finally { + } finally { writer.close(); } } @@ -918,7 +919,7 @@ String userHome = null; try { - userHome = System.getProperty("user.home"); + userHome = getUserHome(); } catch (SecurityException ignore) { } Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-17 11:24:03 UTC (rev 1882) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-17 13:31:02 UTC (rev 1883) @@ -26,6 +26,7 @@ package org.nuiton.util; import java.io.File; +import java.io.IOException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -33,7 +34,10 @@ import java.util.ListIterator; import java.util.Map; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import org.nuiton.util.ApplicationConfig.Action; @@ -42,6 +46,24 @@ * @author poussin */ public class ApplicationConfigTest { + + private static final Log log = LogFactory.getLog(ApplicationConfigTest.class); + + // says testsData is where we start tests. + protected File testsDataDir; + + protected static final String SYSTEM_PROPERTY_USER_HOME = "user.home"; + + @Before + public void setUp() throws IOException { + String basedirPath = System.getenv("basedir"); + if (basedirPath == null) { + basedirPath = new File("").getAbsolutePath(); + } + testsDataDir = new File(basedirPath, + "target" + File.separator + "surefire-data"); + FileUtil.createDirectoryIfNecessary(testsDataDir); + } static int dummyActionCall = 0; static public class DummyAction { @@ -52,6 +74,37 @@ } } + @Test + public void testSaveForUser() { + log.info("testSaveForUser"); + + /** PREPARE DATA **/ + + // Initiliaze path and filename + String path = new File(testsDataDir, "user").getAbsolutePath(); + String filename = "test-saveForUser.properties"; + + // Set path to USER_HOME (keep old value) + String oldHome = System.getProperty(SYSTEM_PROPERTY_USER_HOME); + System.setProperty(SYSTEM_PROPERTY_USER_HOME, path); + + /** EXEC METHOD **/ + + ApplicationConfig config = new ApplicationConfig(); + config.setOption(ApplicationConfig.CONFIG_FILE_NAME, filename); + Assert.assertFalse(config.getUserConfigFile().exists()); + + log.info("execute saveForUser : path = " + path + " _ filename = " + filename); + config.saveForUser(); + Assert.assertTrue(config.getUserConfigFile().exists()); + + /** CLEAN **/ + + // Reset initial values + System.setProperty(SYSTEM_PROPERTY_USER_HOME, oldHome); + config.getUserConfigFile().delete(); + } + /** * Test of getUnparsed method, of class ApplicationConfig. */

1 0

r1882 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Jun '10

17 Jun '10

Author: fdesbois Date: 2010-06-17 13:24:03 +0200 (Thu, 17 Jun 2010) New Revision: 1882 Url: http://nuiton.org/repositories/revision/nuiton-utils/1882 Log: Ano #687 : Create method in FileUtil 'createDirectoryIfNecessary' and use it in ApplicationConfig to create parent directory of config Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/src/main/java/org/nuiton/util/FileUtil.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-17 08:55:37 UTC (rev 1881) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-17 11:24:03 UTC (rev 1882) @@ -604,13 +604,8 @@ } // Ano #687 : check existence of parentFile before using it in FileWriter - // Need to be tested -// if (!file.getParentFile().exists()) { -// boolean createFolders = file.mkdirs(); -// if (createFolders && log.isInfoEnabled()) { -// log.info("Create folders to save file configuration : " + file.getParent()); -// } -// } + // TODO-fdesbois-2010-06-17 : Need to be tested + FileUtil.createDirectoryIfNecessary(file.getParentFile()); Writer writer = new FileWriter(file); try { Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-06-17 08:55:37 UTC (rev 1881) +++ trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-06-17 11:24:03 UTC (rev 1882) @@ -1177,4 +1177,25 @@ sed(searchRegex, replace, new File("."), fileRegex, encoding); } + /** + * Create the directory (and his parents) if necessary. + * + * @param dir the directory to create if not exisiting + * @return {@code true} if directory was created, {@code false} if was no + * need to create it + * @throws IOException if could not create directory + * @since 1.3.2 + */ + public static boolean createDirectoryIfNecessary(File dir) + throws IOException { + if (!dir.exists()) { + boolean b = dir.mkdirs(); + if (!b) { + throw new IOException("Could not create directory " + dir); + } + return true; + } + return false; + } + } // FileUtil

1 0

r1881 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Jun '10

17 Jun '10

Author: fdesbois Date: 2010-06-17 10:55:37 +0200 (Thu, 17 Jun 2010) New Revision: 1881 Url: http://nuiton.org/repositories/revision/nuiton-utils/1881 Log: Comment previous bad commit, Ano #687 need to be tested Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-16 21:02:35 UTC (rev 1880) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-17 08:55:37 UTC (rev 1881) @@ -604,12 +604,13 @@ } // Ano #687 : check existence of parentFile before using it in FileWriter - if (!file.getParentFile().exists()) { - boolean createFolders = file.mkdirs(); - if (createFolders && log.isInfoEnabled()) { - log.info("Create folders to save file configuration : " + file.getParent()); - } - } + // Need to be tested +// if (!file.getParentFile().exists()) { +// boolean createFolders = file.mkdirs(); +// if (createFolders && log.isInfoEnabled()) { +// log.info("Create folders to save file configuration : " + file.getParent()); +// } +// } Writer writer = new FileWriter(file); try {

2 1

r1880 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 16 Jun '10

16 Jun '10

Author: fdesbois Date: 2010-06-16 23:02:35 +0200 (Wed, 16 Jun 2010) New Revision: 1880 Url: http://nuiton.org/repositories/revision/nuiton-utils/1880 Log: Evo #2332 : Clean previous code for comment popup in edition mode : use a proper ContactComment prototype class. Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-12 14:01:56 UTC (rev 1879) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-16 21:02:35 UTC (rev 1880) @@ -603,6 +603,14 @@ prop.remove(excludeKey); } + // Ano #687 : check existence of parentFile before using it in FileWriter + if (!file.getParentFile().exists()) { + boolean createFolders = file.mkdirs(); + if (createFolders && log.isInfoEnabled()) { + log.info("Create folders to save file configuration : " + file.getParent()); + } + } + Writer writer = new FileWriter(file); try { prop.store(writer, "Last saved " + new java.util.Date());

1 0

r1879 - trunk
by tchemit＠users.nuiton.org 12 Jun '10

12 Jun '10

Author: tchemit Date: 2010-06-12 16:01:56 +0200 (Sat, 12 Jun 2010) New Revision: 1879 Url: http://nuiton.org/repositories/revision/nuiton-utils/1879 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-12 14:01:55 UTC (rev 1878) +++ trunk/pom.xml 2010-06-12 14:01:56 UTC (rev 1879) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.3.1</version> + <version>1.3.2-SNAPSHOT</version> <dependencies> @@ -161,9 +161,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <profiles>

1 0

r1878 - in tags: . nuiton-utils-1.3.1
by tchemit＠users.nuiton.org 12 Jun '10

12 Jun '10

Author: tchemit Date: 2010-06-12 16:01:55 +0200 (Sat, 12 Jun 2010) New Revision: 1878 Url: http://nuiton.org/repositories/revision/nuiton-utils/1878 Log: [maven-release-plugin] copy for tag nuiton-utils-1.3.1 Added: tags/nuiton-utils-1.3.1/ Property changes on: tags/nuiton-utils-1.3.1 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project Added: svn:mergeinfo +

1 0

r1877 - trunk
by tchemit＠users.nuiton.org 12 Jun '10

12 Jun '10

Author: tchemit Date: 2010-06-12 16:01:54 +0200 (Sat, 12 Jun 2010) New Revision: 1877 Url: http://nuiton.org/repositories/revision/nuiton-utils/1877 Log: [maven-release-plugin] prepare release nuiton-utils-1.3.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-12 14:01:18 UTC (rev 1876) +++ trunk/pom.xml 2010-06-12 14:01:54 UTC (rev 1877) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.3.1</version> <dependencies> @@ -161,9 +161,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> </scm> <profiles>

1 0

r1876 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 12 Jun '10

12 Jun '10

Author: tchemit Date: 2010-06-12 16:01:18 +0200 (Sat, 12 Jun 2010) New Revision: 1876 Url: http://nuiton.org/repositories/revision/nuiton-utils/1876 Log: fix Reflectutil bug Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-09 10:18:55 UTC (rev 1875) +++ trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-12 14:01:18 UTC (rev 1876) @@ -316,11 +316,14 @@ type = boxType(type); runtimeType = boxType(runtimeType); - if (!type.equals(runtimeType) || + if (!type.equals(runtimeType) && !type.isAssignableFrom(runtimeType)) { // not same type parametersMatches = false; + if (log.isDebugEnabled()) { + log.debug("Types are not matching."); + } break; } }

1 0