branch develop updated (7da3332 -> 9485de9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-utils. See https://gitlab.nuiton.org/nuiton/nuiton-utils.git from 7da3332 Updates to nuitonpom 10.2 (Fixes #3993) new 277c5ea fix javadoc in tests new 9485de9 Updates nuiton-i18n to 3.5 (Fixes #3994)" Updates commons-io to 2.5 (Fixes #3995) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9485de986a34d9d95796e7e85a81024573abf926 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 1 13:10:46 2016 +0200 Updates nuiton-i18n to 3.5 (Fixes #3994)" Updates commons-io to 2.5 (Fixes #3995) commit 277c5ea47960b4e41c8d29905ec23ed88c9a6941 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 1 13:09:40 2016 +0200 fix javadoc in tests Summary of changes: pom.xml | 4 ++-- src/test/java/org/nuiton/util/DateUtilTest.java | 1 + src/test/java/org/nuiton/util/FileUtilTest.java | 10 +++++----- src/test/java/org/nuiton/util/MD5InputStreamTest.java | 18 ------------------ .../java/org/nuiton/util/RecursivePropertiesTest.java | 4 ++-- src/test/java/org/nuiton/util/ResourceTest.java | 13 +++++++------ .../java/org/nuiton/util/ReverseFileReaderTest.java | 2 +- src/test/java/org/nuiton/util/SemVerTest.java | 4 ++-- src/test/java/org/nuiton/util/ZipUtilTest.java | 8 ++------ src/test/java/org/nuiton/util/version/SemVerTest.java | 4 ++-- 10 files changed, 24 insertions(+), 44 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See https://gitlab.nuiton.org/nuiton/nuiton-utils.git commit 277c5ea47960b4e41c8d29905ec23ed88c9a6941 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 1 13:09:40 2016 +0200 fix javadoc in tests --- src/test/java/org/nuiton/util/DateUtilTest.java | 1 + src/test/java/org/nuiton/util/FileUtilTest.java | 10 +++++----- src/test/java/org/nuiton/util/MD5InputStreamTest.java | 18 ------------------ .../java/org/nuiton/util/RecursivePropertiesTest.java | 4 ++-- src/test/java/org/nuiton/util/ResourceTest.java | 13 +++++++------ .../java/org/nuiton/util/ReverseFileReaderTest.java | 2 +- src/test/java/org/nuiton/util/SemVerTest.java | 4 ++-- src/test/java/org/nuiton/util/ZipUtilTest.java | 8 ++------ src/test/java/org/nuiton/util/version/SemVerTest.java | 4 ++-- 9 files changed, 22 insertions(+), 42 deletions(-) diff --git a/src/test/java/org/nuiton/util/DateUtilTest.java b/src/test/java/org/nuiton/util/DateUtilTest.java index be8ab7e..f9c2db4 100644 --- a/src/test/java/org/nuiton/util/DateUtilTest.java +++ b/src/test/java/org/nuiton/util/DateUtilTest.java @@ -67,6 +67,7 @@ public class DateUtilTest { /** * Non regression test for bug #1157 * @since 1.5.2 + * @throws ParseException ? */ @Test public void testCreateDateIsDeterministic() throws ParseException { diff --git a/src/test/java/org/nuiton/util/FileUtilTest.java b/src/test/java/org/nuiton/util/FileUtilTest.java index 0a3d0f8..0ac708b 100644 --- a/src/test/java/org/nuiton/util/FileUtilTest.java +++ b/src/test/java/org/nuiton/util/FileUtilTest.java @@ -109,7 +109,7 @@ public class FileUtilTest { // FileUtilTest * <p> * Search for grep() method count. * - * @throws IOException + * @throws IOException ? */ @Test public void testGrepSingleFile() throws IOException { @@ -135,7 +135,7 @@ public class FileUtilTest { // FileUtilTest * Try to find all java file containing "CodeLutin". Can fail if some * src files are deleted. * - * @throws IOException + * @throws IOException ? */ @Test public void testGrepMultiple() throws IOException { @@ -152,7 +152,7 @@ public class FileUtilTest { // FileUtilTest /** * Test sed method on a single file. * - * @throws IOException + * @throws IOException ? */ @Test public void testSedSingleFile() throws IOException { @@ -190,7 +190,7 @@ public class FileUtilTest { // FileUtilTest * Try to replace all "CodeLutin" by "nuiton" in all files. Can fail if some * src files are deleted. * - * @throws IOException + * @throws IOException ? */ @Test public void testSedMultiple() throws IOException { @@ -224,7 +224,7 @@ public class FileUtilTest { // FileUtilTest /** * Test that sed result which produce shorter file work as well. * - * @throws IOException + * @throws IOException ? */ @Test public void testSedComment() throws IOException { diff --git a/src/test/java/org/nuiton/util/MD5InputStreamTest.java b/src/test/java/org/nuiton/util/MD5InputStreamTest.java index c5d4d33..87acbf3 100644 --- a/src/test/java/org/nuiton/util/MD5InputStreamTest.java +++ b/src/test/java/org/nuiton/util/MD5InputStreamTest.java @@ -669,9 +669,6 @@ public class MD5InputStreamTest { * is only the main driver. */ - /** - * Plain update, updates this object - **/ public void Update(byte buffer[], int offset, int length) { Update(this.state, buffer, offset, length); } @@ -738,12 +735,6 @@ public class MD5InputStreamTest { Update(chars, chars.length); } - /** - * Update buffer with a single integer (only & 0xff part is used, - * as a byte) - * - * @param i Integer value, which is then converted to byte as i & 0xff - **/ public void Update(int i) { Update((byte) (i & 0xff)); } @@ -967,9 +958,6 @@ public class MD5InputStreamTest { return false; } - /** - * Calculates and returns the hash of the contents of the given file. - **/ public static byte[] getHash(File f) throws IOException { if (!f.exists()) throw new FileNotFoundException(f.toString()); InputStream close_me = null; @@ -992,12 +980,6 @@ public class MD5InputStreamTest { } } - /** - * @return true iff the first 16 bytes of both hash1 and hash2 are - * equal; both hash1 and hash2 are null; or either hash - * array is less than 16 bytes in length and their lengths and - * all of their bytes are equal. - **/ public static boolean hashesEqual(byte[] hash1, byte[] hash2) { if (hash1 == null) return hash2 == null; if (hash2 == null) return false; diff --git a/src/test/java/org/nuiton/util/RecursivePropertiesTest.java b/src/test/java/org/nuiton/util/RecursivePropertiesTest.java index 0be6157..769d7e3 100644 --- a/src/test/java/org/nuiton/util/RecursivePropertiesTest.java +++ b/src/test/java/org/nuiton/util/RecursivePropertiesTest.java @@ -38,7 +38,7 @@ public class RecursivePropertiesTest { /** * Test string by \\ in value. * - * @throws IOException + * @throws IOException ? */ @Test public void testWindowsFile() throws IOException { @@ -51,7 +51,7 @@ public class RecursivePropertiesTest { /** * Test with recursive properties. * - * @throws IOException + * @throws IOException ? */ @Test public void testRecursive() throws IOException { diff --git a/src/test/java/org/nuiton/util/ResourceTest.java b/src/test/java/org/nuiton/util/ResourceTest.java index cb71803..3f4800a 100644 --- a/src/test/java/org/nuiton/util/ResourceTest.java +++ b/src/test/java/org/nuiton/util/ResourceTest.java @@ -35,6 +35,7 @@ import org.junit.Test; import org.junit.rules.TestName; import java.io.File; +import java.io.IOException; import java.lang.reflect.Field; import java.net.URL; import java.net.URLClassLoader; @@ -199,10 +200,10 @@ public class ResourceTest { // ResourceTest /** * Test de recherche de resource dans le classpath (jar). * - * @throws Exception + * @throws IOException ? */ @Test - public void testGetResourcesJarClassPath() throws Exception { + public void testGetResourcesJarClassPath() throws IOException { assumeNotUnderWindows(getClass(), testName); @@ -221,10 +222,10 @@ public class ResourceTest { // ResourceTest /** * Test de recherche de resource dans le classpath (dossier hors jar). * - * @throws Exception + * @throws IOException ? */ @Test - public void testGetResourcesFileSystemClassPath() throws Exception { + public void testGetResourcesFileSystemClassPath() throws IOException { List<URL> urls = Resource.getResources("META-INF/services/.*apache.commons.*"); // resources, test resources Assert.assertEquals("Should have 2 urls but had: " + urls, 2, urls.size()); @@ -234,10 +235,10 @@ public class ResourceTest { // ResourceTest * Test de recherche de resource dans le classpath (dossier hors jar) en * utiliant le classloader de test. * - * @throws Exception + * @throws IOException ? */ @Test - public void testGetTestResourcesClassPath() throws Exception { + public void testGetTestResourcesClassPath() throws IOException { assumeNotUnderWindows(getClass(), testName); diff --git a/src/test/java/org/nuiton/util/ReverseFileReaderTest.java b/src/test/java/org/nuiton/util/ReverseFileReaderTest.java index 1ab31dc..8966501 100644 --- a/src/test/java/org/nuiton/util/ReverseFileReaderTest.java +++ b/src/test/java/org/nuiton/util/ReverseFileReaderTest.java @@ -38,7 +38,7 @@ public class ReverseFileReaderTest { /** * Test to read test file in reverse order. * - * @throws IOException + * @throws IOException ? */ @Test public void testReverseRead() throws IOException { diff --git a/src/test/java/org/nuiton/util/SemVerTest.java b/src/test/java/org/nuiton/util/SemVerTest.java index d8d806a..1d1cc70 100644 --- a/src/test/java/org/nuiton/util/SemVerTest.java +++ b/src/test/java/org/nuiton/util/SemVerTest.java @@ -218,8 +218,8 @@ public class SemVerTest { /** * Si le comparator ne renvoi pas -1, 0, 1 on normalize pour avoir -1, 0, 1 * - * @param v - * @return + * @param v ? + * @return ? */ protected int normalize(int v) { int result = v; diff --git a/src/test/java/org/nuiton/util/ZipUtilTest.java b/src/test/java/org/nuiton/util/ZipUtilTest.java index 21887b8..b123be9 100644 --- a/src/test/java/org/nuiton/util/ZipUtilTest.java +++ b/src/test/java/org/nuiton/util/ZipUtilTest.java @@ -118,10 +118,6 @@ public class ZipUtilTest { Assert.assertFalse(ucz.isDirectory()); } - /* - * Test method for 'org.nuiton.util.ZipUtil.compress(File, File, FileFilter)' - */ - @Test public void testCompress() throws IOException { //File dir = new File(System.getProperty("user.dir")); @@ -193,7 +189,7 @@ public class ZipUtilTest { /** * Test la fonction de decompression sans filtres. * - * @throws IOException + * @throws IOException ? */ @Test public void testUncompressFiltredWithoutFilter() throws IOException { @@ -212,7 +208,7 @@ public class ZipUtilTest { /** * Test la fonction de decompression avec filtres. * - * @throws IOException + * @throws IOException ? */ @Test public void testUncompressFiltredWithFilter() throws IOException { diff --git a/src/test/java/org/nuiton/util/version/SemVerTest.java b/src/test/java/org/nuiton/util/version/SemVerTest.java index bd0f171..e2a1523 100644 --- a/src/test/java/org/nuiton/util/version/SemVerTest.java +++ b/src/test/java/org/nuiton/util/version/SemVerTest.java @@ -210,8 +210,8 @@ public class SemVerTest { /** * Si le comparator ne renvoi pas -1, 0, 1 on normalize pour avoir -1, 0, 1 * - * @param v - * @return + * @param v ? + * @return ? */ protected int normalize(int v) { int result = v; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See https://gitlab.nuiton.org/nuiton/nuiton-utils.git commit 9485de986a34d9d95796e7e85a81024573abf926 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 1 13:10:46 2016 +0200 Updates nuiton-i18n to 3.5 (Fixes #3994)" Updates commons-io to 2.5 (Fixes #3995) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6ffc55e..3b09d9d 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,7 @@ <signatureArtifactId>java16</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <nuitonI18nVersion>3.3</nuitonI18nVersion> + <nuitonI18nVersion>3.5</nuitonI18nVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -182,7 +182,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> + <version>2.5</version> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm