Author: tchemit Date: 2012-06-11 18:04:07 +0200 (Mon, 11 Jun 2012) New Revision: 2583 Url: http://nuiton.org/repositories/revision/topia/2583 Log: replace no more api from nuiton-utils Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java 2012-06-11 14:49:33 UTC (rev 2582) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java 2012-06-11 16:04:07 UTC (rev 2583) @@ -24,6 +24,7 @@ */ package org.nuiton.topia; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; @@ -74,7 +75,7 @@ // when calling this method (always in a BeforeClass method), we wants // to clean the directory, this is a new build - FileUtil.deleteRecursively(result); + FileUtils.deleteDirectory(result); } // always create the directory Modified: branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java =================================================================== --- branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java 2012-06-11 14:49:33 UTC (rev 2582) +++ branches/topia-2.6.x/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java 2012-06-11 16:04:07 UTC (rev 2583) @@ -25,16 +25,18 @@ package org.nuiton.topia; +import org.apache.commons.io.FileUtils; +import org.nuiton.util.FileUtil; + import java.io.File; +import java.io.IOException; -import org.nuiton.util.FileUtil; - /** * Une classe pour avoir des choses utiles pour tous les tests. * * @author Chatellier Eric - * - * Last update : $Date$ + * <p/> + * Last update : $Date$ * @deprecated since 2.5, everything usefull already exists in the class {@link TestHelper} from {@code topia-persistence module}. */ @Deprecated @@ -45,7 +47,7 @@ protected static File targetdir; protected static File dirDatabase; - + public static File getBasedir() { if (basedir == null) { String base = System.getProperty("basedir"); @@ -65,28 +67,26 @@ } return targetdir; } - + /** * Create a temp dir and init isis with that temp dir as database. - * + * * @throws Exception */ public static void init() throws Exception { - + File mavenTestDir = new File(getTargetdir() + File.separator + "surefire-workdir"); dirDatabase = FileUtil.createTempDirectory("topia-test", "", mavenTestDir); } - + public static File getDirDatabase() { return dirDatabase; } - - /** - * Delete created temp directory. - */ - public static void clean() { - if(dirDatabase != null) { - FileUtil.deleteRecursively(dirDatabase); + + /** Delete created temp directory. */ + public static void clean() throws IOException { + if (dirDatabase != null) { + FileUtils.deleteDirectory(dirDatabase); dirDatabase = null; } }