Author: chatellier Date: 2009-03-30 12:13:39 +0000 (Mon, 30 Mar 2009) New Revision: 1416 Modified: lutinutil/trunk/src/test/java/org/codelutin/util/FileUtilTest.java lutinutil/trunk/src/test/java/org/codelutin/util/ZipUtilTest.java Log: Remove temp created file and folder after use. Move test to junit 4 Modified: lutinutil/trunk/src/test/java/org/codelutin/util/FileUtilTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/FileUtilTest.java 2009-03-27 09:06:32 UTC (rev 1415) +++ lutinutil/trunk/src/test/java/org/codelutin/util/FileUtilTest.java 2009-03-30 12:13:39 UTC (rev 1416) @@ -1,5 +1,5 @@ /* *##% Lutin utilities library - * Copyright (C) 2004 - 2008 CodeLutin + * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -15,8 +15,16 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -/* * - * FileUtilTest.java +package org.codelutin.util; + +import java.io.File; +import java.util.List; + +import org.junit.Assert; +import org.junit.Test; + +/** + * FileUtilTest. * * Created: 22 nov. 2004 * @@ -26,35 +34,31 @@ * Mise a jour: $Date$ * par : $Author$ */ +public class FileUtilTest { // FileUtilTest -package org.codelutin.util; - -import junit.framework.TestCase; - -import java.io.File; -import java.util.List; - -public class FileUtilTest extends TestCase { // FileUtilTest - + @Test public void testFind() throws Exception { List result = FileUtil.find(new File("."), ".*FileUtil.*", true); - assertTrue(result.size() != 0); + Assert.assertTrue(result.size() != 0); } + @Test public void testBasename() throws Exception { String result = FileUtil.basename(new File("/tmp/toto.xml"), ".xml"); - assertEquals("toto", result); + Assert.assertEquals("toto", result); } + @Test public void testExtension() throws Exception { String result = FileUtil.extension(new File("/tmp/toto.xml")); - assertEquals("xml", result); + Assert.assertEquals("xml", result); result = FileUtil.extension(new File("/tmp/toto.xml"), ".", "o"); - assertEquals("xml", result); + Assert.assertEquals("xml", result); result = FileUtil.extension(new File("/tmp/toto.xml"), "t", "."); - assertEquals("o.xml", result); + Assert.assertEquals("o.xml", result); } + @Test public void testCopyRecursively() throws Exception { File srcDir = FileUtil.createTempDirectory("test-copyRecursively", ""); File destDir1 = FileUtil.createTempDirectory("test-copyRecursively", ""); @@ -70,10 +74,18 @@ new File(subdir, "titi").createNewFile(); FileUtil.copyRecursively(srcDir, destDir1); - FileUtil.copyRecursively(srcDir, destDir2, ".*titi$"); + + // remove created temp dirs : + FileUtil.deleteRecursively(srcDir); + FileUtil.deleteRecursively(destDir1); + FileUtil.deleteRecursively(destDir2); + Assert.assertFalse(srcDir.isDirectory()); + Assert.assertFalse(destDir1.isDirectory()); + Assert.assertFalse(destDir2.isDirectory()); } + @Test public void testFileToByteToFile() throws Exception { String content = "testFileToByteToFile"; File file = FileUtil.getTempFile(content); @@ -83,8 +95,8 @@ dest.deleteOnExit(); FileUtil.byteToFile(bytes, dest); - assertEquals(file.length(), dest.length()); - assertEquals(content, FileUtil.readAsString(dest)); + Assert.assertEquals(file.length(), dest.length()); + Assert.assertEquals(content, FileUtil.readAsString(dest)); } } // FileUtilTest Modified: lutinutil/trunk/src/test/java/org/codelutin/util/ZipUtilTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/ZipUtilTest.java 2009-03-27 09:06:32 UTC (rev 1415) +++ lutinutil/trunk/src/test/java/org/codelutin/util/ZipUtilTest.java 2009-03-30 12:13:39 UTC (rev 1416) @@ -1,5 +1,5 @@ /* *##% Lutin utilities library - * Copyright (C) 2004 - 2008 CodeLutin + * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -15,7 +15,18 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -/* * +package org.codelutin.util; + +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; +import java.util.List; + +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; + +/** * ZipUtilTest.java * * Created: 24 août 2006 10:47:21 @@ -26,62 +37,59 @@ * Last update: $Date$ * by : $Author$ */ +public class ZipUtilTest { -package org.codelutin.util; - -import junit.framework.TestCase; -import org.apache.commons.logging.LogFactory; - -import java.io.File; -import java.io.FileFilter; -import java.util.List; - - -/** @author poussin */ - -public class ZipUtilTest extends TestCase { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private org.apache.commons.logging.Log log = LogFactory.getLog(ZipUtilTest.class); + private static org.apache.commons.logging.Log log = LogFactory.getLog(ZipUtilTest.class); - File dir = new File(System.getProperty("java.home"), "bin"); + protected static final File DIR = new File(System.getProperty("java.home"), "bin"); - public void testUncompress() throws Exception { + @Test + public void testUncompress() throws IOException { //File dir = new File(System.getProperty("user.dir")); File zipFile = File.createTempFile("testCompressZip", ".zip"); - log.info("Compress " + dir + " in zip file = " + zipFile); + zipFile.deleteOnExit(); + log.info("Compress " + DIR + " in zip file = " + zipFile); - ZipUtil.compress(zipFile, dir, null); + ZipUtil.compress(zipFile, DIR, null); File ucz = FileUtil.createTempDirectory("testUncompressZip", ""); log.info("uncompress zip " + zipFile + " in " + ucz); ZipUtil.uncompress(zipFile, ucz); - List<File> src = FileUtil.getFilteredElements(dir, null, true); + List<File> src = FileUtil.getFilteredElements(DIR, null, true); List<File> dest = FileUtil.getFilteredElements(ucz, null, true); - assertEquals(src.size() + 1, dest.size()); // +1 car il y a le rep lui meme dans dest + Assert.assertEquals(src.size() + 1, dest.size()); // +1 car il y a le rep lui meme dans dest + + // remove created temp dirs : + FileUtil.deleteRecursively(ucz); + Assert.assertFalse(ucz.isDirectory()); } /* - * Test method for 'org.codelutin.util.ZipUtil.compress(File, File, FileFilter)' - */ - public void testCompress() throws Exception { + * Test method for 'org.codelutin.util.ZipUtil.compress(File, File, FileFilter)' + */ + @Test + public void testCompress() throws IOException { //File dir = new File(System.getProperty("user.dir")); File zipFile = File.createTempFile("testCompressZip", ".zip"); - log.info("Compress " + dir + " in zip file = " + zipFile); + zipFile.deleteOnExit(); + log.info("Compress " + DIR + " in zip file = " + zipFile); - ZipUtil.compress(zipFile, dir, null); + ZipUtil.compress(zipFile, DIR, null); - assertTrue(zipFile.exists()); - assertTrue(0 != zipFile.length()); + Assert.assertTrue(zipFile.exists()); + Assert.assertTrue(0 != zipFile.length()); } - public void testCompressFilter() throws Exception { + @Test + public void testCompressFilter() throws IOException { //File dir = new File(System.getProperty("user.dir")); File zipFile = File.createTempFile("testCompressZip", ".zip"); - log.info("Compress " + dir + " in zip file = " + zipFile); + zipFile.deleteOnExit(); + log.info("Compress " + DIR + " in zip file = " + zipFile); FileFilter filter = new FileFilter() { public boolean accept(File pathname) { @@ -92,23 +100,23 @@ }; - ZipUtil.compress(zipFile, dir, filter); + ZipUtil.compress(zipFile, DIR, filter); - assertTrue(zipFile.exists()); - assertTrue(0 != zipFile.length()); + Assert.assertTrue(zipFile.exists()); + Assert.assertTrue(0 != zipFile.length()); } - public void testCompressFile() throws Exception { + @Test + public void testCompressFile() throws IOException { File dir = new File(System.getProperty("java.home"), "bin" + File.separator + "java"); File zipFile = File.createTempFile("testCompressZip", ".zip"); + zipFile.deleteOnExit(); log.info("Compress " + dir + " in zip file = " + zipFile); ZipUtil.compress(zipFile, dir, null); - assertTrue(zipFile.exists()); - assertTrue(0 != zipFile.length()); + Assert.assertTrue(zipFile.exists()); + Assert.assertTrue(0 != zipFile.length()); } } - -