X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fio%2FFileSystemUtils.java;h=bf8019808691dcaae46463cb9628a60d89fa40a2;hb=26805fc0810098c4bd8009a35c8719478e74153e;hp=4be787e791899be20eed098e532e1eab24fb341a;hpb=aeb45ea3d98eb31834e3ea9145489bbc29800ae8;p=utils diff --git a/support/general/src/test/java/org/wamblee/io/FileSystemUtils.java b/support/general/src/test/java/org/wamblee/io/FileSystemUtils.java index 4be787e7..bf801980 100644 --- a/support/general/src/test/java/org/wamblee/io/FileSystemUtils.java +++ b/support/general/src/test/java/org/wamblee/io/FileSystemUtils.java @@ -12,15 +12,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ + */ package org.wamblee.io; -import junit.framework.Assert; -import junit.framework.TestCase; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -28,14 +22,16 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.UnsupportedEncodingException; - import java.net.URL; import java.net.URLDecoder; - import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; - import java.security.CodeSource; +import java.util.logging.Level; +import java.util.logging.Logger; + +import junit.framework.Assert; +import junit.framework.TestCase; /** * File system utilities. @@ -43,7 +39,8 @@ import java.security.CodeSource; * @author Erik Brakkee */ public final class FileSystemUtils { - private static final Log LOG = LogFactory.getLog(FileSystemUtils.class); + private static final Logger LOG = Logger.getLogger(FileSystemUtils.class + .getName()); /** * Test output directory relative to the sub project. @@ -119,7 +116,7 @@ public final class FileSystemUtils { CodeSource source = aTestClass.getProtectionDomain().getCodeSource(); if (source == null) { - LOG.warn("Could not obtain path for '" + aRelativePath + + LOG.warning("Could not obtain path for '" + aRelativePath + "' for class " + aTestClass + ", using relative path as is"); return new File(aRelativePath); @@ -129,7 +126,7 @@ public final class FileSystemUtils { String protocol = location.getProtocol(); if (!protocol.equals("file")) { - LOG.warn("protocol is not 'file': " + location); + LOG.warning("protocol is not 'file': " + location); return new File(aRelativePath); } @@ -140,7 +137,8 @@ public final class FileSystemUtils { path = URLDecoder.decode(location.getPath(), "UTF-8"); } catch (UnsupportedEncodingException e) { // ignore it.. just don't decode - LOG.warn("Decoding path failed: '" + location.getPath() + "'", e); + LOG.log(Level.WARNING, "Decoding path failed: '" + + location.getPath() + "'", e); } return new File(new File(path).getParentFile(), aRelativePath); @@ -303,7 +301,7 @@ public final class FileSystemUtils { Assert.assertTrue(aSrc.isDirectory()); Assert.assertTrue(!aTarget.exists()); - if (!aTarget.mkdirs()) { + if (!aTarget.mkdirs()) { Assert.fail("Could not create target directory '" + aTarget + "'"); }