March 2011 - Nuiton-utils-commits - mailman.cloud.codelutin.com

r2098 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org March 31, 2011

March 31, 2011

Author: echatellier Date: 2011-03-31 16:52:59 +0200 (Thu, 31 Mar 2011) New Revision: 2098 Url: http://nuiton.org/repositories/revision/nuiton-utils/2098 Log: #359 : essai en fermant le fichier input avant d'ecrire le fichier output. Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/FileUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/FileUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/FileUtil.java 2011-03-30 16:45:03 UTC (rev 2097) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/FileUtil.java 2011-03-31 14:52:59 UTC (rev 2098) @@ -51,8 +51,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.io.RandomAccessFile; -import java.nio.ByteBuffer; +import java.io.PrintStream; import java.nio.CharBuffer; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; @@ -1209,17 +1208,16 @@ Pattern pattern = Pattern.compile(searchRegex); - RandomAccessFile raf = null; - FileChannel fc = null; + FileInputStream fis = null; String outString = null; try { // Open the file and then get a channel from the stream - raf = new RandomAccessFile(file, "rw"); - fc = raf.getChannel(); + fis = new FileInputStream(file); + FileChannel fc = fis.getChannel(); // Get the file's size and then map it into memory int sz = (int)fc.size(); - MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_WRITE, 0, sz); + MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, sz); // Decode the file into a char buffer // Charset and decoder for encoding @@ -1229,20 +1227,25 @@ Matcher matcher = pattern.matcher(cb); outString = matcher.replaceAll(replace); - - // write content - // TODO is it a good way to write file ? - fc.position(0); - fc.write(ByteBuffer.wrap(outString.getBytes())); - fc.truncate(outString.getBytes().length); } finally { - if (fc != null) { - fc.close(); + if (fis != null) { + fis.close(); } - if (raf != null) { - raf.close(); + } + + if (outString != null) { + PrintStream ps = null; + try { + ps = new PrintStream(new FileOutputStream(file)); + ps.print(outString); + ps.close(); } + finally { + if (ps != null) { + ps.close(); + } + } } }

1 0

r2097 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by sletellier＠users.nuiton.org March 30, 2011

March 30, 2011

Author: sletellier Date: 2011-03-30 18:45:03 +0200 (Wed, 30 Mar 2011) New Revision: 2097 Url: http://nuiton.org/repositories/revision/nuiton-utils/2097 Log: - Use set to prevent double property loading Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-03-30 15:00:07 UTC (rev 2096) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-03-30 16:45:03 UTC (rev 2097) @@ -26,7 +26,11 @@ package org.nuiton.util; -import static org.nuiton.i18n.I18n._; +import org.apache.commons.beanutils.ConstructorUtils; +import org.apache.commons.collections.EnumerationUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.converter.ConverterUtil; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -53,18 +57,16 @@ import java.util.Arrays; import java.util.Enumeration; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.ListIterator; import java.util.Locale; import java.util.Map; import java.util.Properties; +import java.util.Set; -import org.apache.commons.beanutils.ConstructorUtils; -import org.apache.commons.collections.EnumerationUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.converter.ConverterUtil; +import static org.nuiton.i18n.I18n._; /** * Application configuration. @@ -1787,8 +1789,8 @@ // classpath String filename = getConfigFileName(); Enumeration<URL> enumInClasspath = ClassLoader.getSystemClassLoader().getResources(filename); - List<URL> urlsInClasspath = EnumerationUtils.toList(enumInClasspath); - + Set<URL> urlsInClasspath = new HashSet<URL>(EnumerationUtils.toList(enumInClasspath)); + enumInClasspath = ApplicationConfig.class.getClassLoader().getResources(filename); urlsInClasspath.addAll(EnumerationUtils.toList(enumInClasspath));

1 0

r2096 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by sletellier＠users.nuiton.org March 30, 2011

March 30, 2011

Author: sletellier Date: 2011-03-30 17:00:07 +0200 (Wed, 30 Mar 2011) New Revision: 2096 Url: http://nuiton.org/repositories/revision/nuiton-utils/2096 Log: - Create method setLastDayOfYear and setFirstDayOfYear - Debug setLastDayOfMonth, dont set max of day Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-03-25 12:13:54 UTC (rev 2095) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-03-30 15:00:07 UTC (rev 2096) @@ -152,7 +152,6 @@ int maximum = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); calendar.set(Calendar.DAY_OF_MONTH, maximum); Date lastDay = calendar.getTime(); - lastDay = setMaxTimeOfDay(lastDay); return lastDay; } @@ -165,10 +164,38 @@ public static Date setFirstDayOfMonth(Date date) { Calendar calendar = getDefaultCalendar(date); calendar.set(Calendar.DAY_OF_MONTH, 1); - return calendar.getTime(); + Date firstDay = calendar.getTime(); + return firstDay; } /** + * Set the last day of year to the date in argument. + * + * @param date Date to modify + * @return the date with day of year modified + */ + public static Date setLastDayOfYear(Date date) { + Calendar calendar = getDefaultCalendar(date); + int maximum = calendar.getActualMaximum(Calendar.DAY_OF_YEAR); + calendar.set(Calendar.DAY_OF_YEAR, maximum); + Date lastDay = calendar.getTime(); + return lastDay; + } + + /** + * Set the first day of year to the date in argument. + * + * @param date Date to modify + * @return the date with day of year modified + */ + public static Date setFirstDayOfYear(Date date) { + Calendar calendar = getDefaultCalendar(date); + calendar.set(Calendar.DAY_OF_YEAR, 1); + Date firstDay = calendar.getTime(); + return firstDay; + } + + /** * Set the min time of the day : 00:00:00.000. * * @param date to modify @@ -201,7 +228,7 @@ } /** - * Check if the first date in argument is included between the two other + * Check if the first date in argument is included between the two other * dates. The argument myDate can be equals to beforeDate or afterDate to * validate the includes. * @@ -216,7 +243,7 @@ } boolean result = true; result &= myDate.after(beforeDate) || myDate.compareTo(beforeDate) == 0; - result &= afterDate == null || myDate.before(afterDate) || + result &= afterDate == null || myDate.before(afterDate) || myDate.compareTo(afterDate) == 0; return result; } @@ -226,7 +253,7 @@ * * @param beforeDate the first date of the period * @param afterDate the second date of the period - * @return true if the current date is included between the two dates, + * @return true if the current date is included between the two dates, * false otherwise * @see #between(Date, Date, Date) */ Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2011-03-25 12:13:54 UTC (rev 2095) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2011-03-30 15:00:07 UTC (rev 2096) @@ -96,9 +96,31 @@ } Assert.assertTrue(DateUtil.between(day1, firstDayOfFebruary, lastDayOfFebruary)); - Assert.assertTrue(DateUtil.between(day2, firstDayOfFebruary, lastDayOfFebruary)); + + // In this case, day2'hour is after lastDayOfMonth + Assert.assertFalse(DateUtil.between(day2, firstDayOfFebruary, lastDayOfFebruary)); } + /** + * Test of setLastDayOfMonth method, of class DateUtil. + */ + @Test + public void testSetFistLastDayOfYear() { + Date february = DateUtil.createDate(22, 2, 2011); + Date firstDayOf2011 = DateUtil.setFirstDayOfYear(february); + Date lastDayOf2011 = DateUtil.setLastDayOfYear(february); + Date day1 = DateUtil.createDate(0, 0, 2, 1, 2, 2011); + Date day2 = DateUtil.createDate(67, 45, 23, 28, 2, 2012); + + if (log.isDebugEnabled()) { + log.debug("first day of february = " + firstDayOf2011 + ", last day of february = " + + lastDayOf2011 + ", day1 = " + day1 + ", day 2 = " + day2); + } + + Assert.assertTrue(DateUtil.between(day1, firstDayOf2011, lastDayOf2011)); + Assert.assertFalse(DateUtil.between(day2, firstDayOf2011, lastDayOf2011)); + } + /** * Test of between method, of class DateUtil. */

1 0

r2095 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org March 25, 2011

March 25, 2011

Author: tchemit Date: 2011-03-25 13:13:54 +0100 (Fri, 25 Mar 2011) New Revision: 2095 Url: http://nuiton.org/repositories/revision/nuiton-utils/2095 Log: Evolution #1427: add method getOptionAsFloat in ApplicationConfig Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-03-25 11:40:23 UTC (rev 2094) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-03-25 12:13:54 UTC (rev 2095) @@ -1434,6 +1434,22 @@ return result; } + /** + * Get option value as {@code float}. + * + * @param key the option's key + * @return value as {@code float} + * @since 2.2 + */ + public float getOptionAsFloat(String key) { + Float result = getOption(Float.class, key); + if (result == null) { + // primitive value can not be null + result = 0f; + } + return result; + } + /** * Get option value as {@code double}. *

1 0

r2094 - trunk
by tchemit＠users.nuiton.org March 25, 2011

March 25, 2011

Author: tchemit Date: 2011-03-25 12:40:23 +0100 (Fri, 25 Mar 2011) New Revision: 2094 Url: http://nuiton.org/repositories/revision/nuiton-utils/2094 Log: Evolution #1421: Updates to i18n 2.3.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-24 12:37:11 UTC (rev 2093) +++ trunk/pom.xml 2011-03-25 11:40:23 UTC (rev 2094) @@ -183,7 +183,7 @@ <projectId>nuiton-utils</projectId> - <nuitonI18nVersion>2.3</nuitonI18nVersion> + <nuitonI18nVersion>2.3.2</nuitonI18nVersion> <aspectwerkzVersion>2.0</aspectwerkzVersion> <xworkVersion>2.2.1.1</xworkVersion>

1 0

r2093 - in trunk: . nuiton-profiling nuiton-utils nuiton-validator
by hudson＠users.nuiton.org March 24, 2011

March 24, 2011

Author: hudson Date: 2011-03-24 13:37:11 +0100 (Thu, 24 Mar 2011) New Revision: 2093 Url: http://nuiton.org/repositories/revision/nuiton-utils/2093 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-profiling/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2011-03-24 12:37:10 UTC (rev 2092) +++ trunk/nuiton-profiling/pom.xml 2011-03-24 12:37:11 UTC (rev 2093) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1</version> + <version>2.2-SNAPSHOT</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2011-03-24 12:37:10 UTC (rev 2092) +++ trunk/nuiton-utils/pom.xml 2011-03-24 12:37:11 UTC (rev 2093) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1</version> + <version>2.2-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2011-03-24 12:37:10 UTC (rev 2092) +++ trunk/nuiton-validator/pom.xml 2011-03-24 12:37:11 UTC (rev 2093) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1</version> + <version>2.2-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-24 12:37:10 UTC (rev 2092) +++ trunk/pom.xml 2011-03-24 12:37:11 UTC (rev 2093) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1</version> + <version>2.2-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -217,12 +217,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.1 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.1 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.1</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> </project>

1 0

r2092 - in tags: . nuiton-utils-2.1
by hudson＠users.nuiton.org March 24, 2011

March 24, 2011

Author: hudson Date: 2011-03-24 13:37:10 +0100 (Thu, 24 Mar 2011) New Revision: 2092 Url: http://nuiton.org/repositories/revision/nuiton-utils/2092 Log: [maven-release-plugin] copy for tag nuiton-utils-2.1 Added: tags/nuiton-utils-2.1/ Property changes on: tags/nuiton-utils-2.1 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir Added: svn:mergeinfo +

1 0

r2091 - in trunk: . nuiton-profiling nuiton-utils nuiton-validator
by hudson＠users.nuiton.org March 24, 2011

March 24, 2011

Author: hudson Date: 2011-03-24 13:37:09 +0100 (Thu, 24 Mar 2011) New Revision: 2091 Url: http://nuiton.org/repositories/revision/nuiton-utils/2091 Log: [maven-release-plugin] prepare release nuiton-utils-2.1 Modified: trunk/nuiton-profiling/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2011-03-24 12:10:07 UTC (rev 2090) +++ trunk/nuiton-profiling/pom.xml 2011-03-24 12:37:09 UTC (rev 2091) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2011-03-24 12:10:07 UTC (rev 2090) +++ trunk/nuiton-utils/pom.xml 2011-03-24 12:37:09 UTC (rev 2091) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2011-03-24 12:10:07 UTC (rev 2090) +++ trunk/nuiton-validator/pom.xml 2011-03-24 12:37:09 UTC (rev 2091) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-24 12:10:07 UTC (rev 2090) +++ trunk/pom.xml 2011-03-24 12:37:09 UTC (rev 2091) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> <modules> <module>nuiton-utils</module> @@ -217,12 +217,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.1 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.1</url> </scm> </project>

1 0

r2090 - trunk/nuiton-utils/src/main/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org March 24, 2011

March 24, 2011

Author: tchemit Date: 2011-03-24 13:10:07 +0100 (Thu, 24 Mar 2011) New Revision: 2090 Url: http://nuiton.org/repositories/revision/nuiton-utils/2090 Log: Evolution #1419: add toBinder method on binderModelBuilder Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderFactory.java trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderFactory.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderFactory.java 2011-03-17 16:48:18 UTC (rev 2089) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderFactory.java 2011-03-24 12:10:07 UTC (rev 2090) @@ -202,6 +202,37 @@ } /** + * Given a {@code model} and a {@code binderType}, instanciate a new binder + * and returns it. + * + * Note: This method will NOT register + * the model in the factory. If you want to reuse your model, please use + * one of the {@code registerBinderModel(XXX)} method. + * + * @param model the model used by the binder + * @param binderType the type of the binder + * @param <S> the source type + * @param <T> the target type + * @param the type of the binder + * @return the new instanciated binder + * @since 2.1 + */ + public static <S, T, B extends Binder<S, T>> B newBinder(Binder.BinderModel<S, T> model, + Class binderType) { + + B binder; + try { + binder = binderType.getConstructor().newInstance(); + } catch (Exception e) { + throw new IllegalStateException( + "Could not instanciate binder of type " + binderType, e); + } + + binder.setModel(model); + return binder; + } + + /** * Clear the cache of registred binder models. * * Note : This is a convienient method for test purposes and should @@ -306,14 +337,7 @@ model = registerBinderModel(builder, contextName); } - B binder; - try { - binder = binderType.newInstance(); - } catch (Exception e) { - throw new IllegalStateException("Could not instanciate binder of type " + binderType, e); - } - - binder.setModel(model); + B binder = newBinder(model, binderType); return binder; } Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java 2011-03-17 16:48:18 UTC (rev 2089) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java 2011-03-24 12:10:07 UTC (rev 2090) @@ -89,7 +89,7 @@ * builder.addSimpleProperties("name", "surname"); * BinderFactory.registerBinderModel(builder); * Binder<Bean, Bean> binder = BinderFactory.getBinder(BeanA.class); - * + * * </pre> * * Once the binder is registred into the {@link BinderFactory}, you can get it @@ -195,8 +195,42 @@ return builder; } + /** + * Convinient method to create directly a {@link Binder} using the + * underlying {@link #model} the builder contains. + * + * Note: Using this method will not make reusable the model + * via the {@link BinderFactory}. + * + * @return a new binder using the model of the builder. + * @see BinderFactory#newBinder(Binder.BinderModel, Class) + * @since 2.1 + */ + public Binder<S, T> toBinder() { + Binder<S, T> binder = toBinder(Binder.class); + return binder; + } /** + * Convinient method to create directly a {@link Binder} using the + * underlying {@link #model} the builder contains. + * + * Note: Using this method will not make reusable the model + * via the {@link BinderFactory}. + * + * @param binderType type of binder to create + * @param type of binder to create + * @return a new binder using the model of the builder. + * @see BinderFactory#newBinder(Binder.BinderModel, Class) + * @since 2.1 + */ + public > B toBinder(Class binderType) { + B binder = BinderFactory.newBinder(model, binderType); + return binder; + } + + + /** * Add to the binder model some simple properties (says source property name * = target property name). *

1 0

r2089 - trunk/nuiton-utils/src/test/java/org/nuiton/util
by bleny＠users.nuiton.org March 17, 2011

March 17, 2011

Author: bleny Date: 2011-03-17 17:48:18 +0100 (Thu, 17 Mar 2011) New Revision: 2089 Url: http://nuiton.org/repositories/revision/nuiton-utils/2089 Log: clean up DateUtilTest Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2011-03-17 15:58:07 UTC (rev 2088) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2011-03-17 16:48:18 UTC (rev 2089) @@ -27,11 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.AfterClass; import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import java.sql.Timestamp; @@ -50,39 +46,7 @@ /** Logger */ private static final Log log = LogFactory.getLog(DateUtilTest.class); - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - /** - * Test of formatDate method, of class DateUtil. - */ - //@Test - public void testFormatDate() { - log.info("formatDate"); - } - - /** - * Test of parseDate method, of class DateUtil. - */ - //@Test - public void testParseDate() { - log.info("parseDate"); - } - - /** * Test of createDate method, of class DateUtil. */ @Test @@ -115,14 +79,6 @@ } /** - * Test of createDateAfterToday method, of class DateUtil. - */ - //@Test - public void testCreateDateAfterToday() { - log.info("createDateAfterToday"); - } - - /** * Test of setLastDayOfMonth method, of class DateUtil. */ @Test @@ -144,14 +100,6 @@ } /** - * Test of setFirstDayOfMonth method, of class DateUtil. - */ - //@Test - public void testSetFirstDayOfMonth() { - log.info("setFirstDayOfMonth"); - } - - /** * Test of between method, of class DateUtil. */ @Test @@ -192,22 +140,6 @@ Assert.assertFalse(result); } - /** - * Test of currentPeriod method, of class DateUtil. - */ - //@Test - public void testCurrentPeriod() { - log.info("currentPeriod"); - } - - /** - * Test of getMonth method, of class DateUtil. - */ - //@Test - public void testGetMonth() { - log.info("getMonth"); - } - @Test public void testGetDifferenceInSeconds() { log.info("getDifferenceInSecondes");

1 0