(no commit message)

[utils] / support / general / src / test / java / org / wamblee / io / FileSystemUtils.java

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 384eb09e894f6cf2b698cffae0be0b4f895b2e49..bf8019808691dcaae46463cb9628a60d89fa40a2 100644 (file)
--- a/support/general/src/test/java/org/wamblee/io/FileSystemUtils.java
+++ b/support/general/src/test/java/org/wamblee/io/FileSystemUtils.java
@@ -1,12 +1,12 @@
 /*
- * Copyright 2006 the original author or authors.
- *
+ * Copyright 2005-2010 the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,12 +15,6 @@
  */
 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,9 @@ public final class FileSystemUtils {
         Assert.assertTrue(aSrc.isDirectory());
         Assert.assertTrue(!aTarget.exists());
 
-        aTarget.mkdirs();
+        if (!aTarget.mkdirs()) {
+            Assert.fail("Could not create target directory '" + aTarget + "'");
+        }
 
         File[] files = aSrc.listFiles();