[
https://issues.apache.org/jira/browse/IO-625?focusedWorklogId=308499&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-308499
]
ASF GitHub Bot logged work on IO-625:
-------------------------------------
Author: ASF GitHub Bot
Created on: 08/Sep/19 13:53
Start Date: 08/Sep/19 13:53
Worklog Time Spent: 10m
Work Description: garydgregory commented on pull request #95: [IO-625]
FileUtils.copyDirectoryToDirectory does not reflect srcDir in exception message
when srcDir is not a directory
URL: https://github.com/apache/commons-io/pull/95#discussion_r322011334
##########
File path:
src/test/java/org/apache/commons/io/FileUtilsCopyDirectoryToDirectoryTestCase.java
##########
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.io;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+/**
+ * This class ensure the correctness of {@link
FileUtils#copyDirectoryToDirectory(File, File)} (File,File)}.
+ * TODO: currently does not cover happy cases
+ *
+ * @see FileUtils#copyDirectoryToDirectory(File, File)
+ */
+public class FileUtilsCopyDirectoryToDirectoryTestCase {
+
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ @Test
+ public void
copyDirectoryToDirectoryThrowsIllegalExceptionWithCorrectMessageWhenSrcDirIsNotDirectory()
throws IOException {
+ File srcDir = temporaryFolder.newFile("notadirectory");
+ File destDir = temporaryFolder.newFolder("destinationDirectory");
+ String expectedMessage = String.format("Source '%s' is not a
directory", srcDir);
+ assertExceptionTypeAndMessage(srcDir, destDir,
IllegalArgumentException.class, expectedMessage);
+ }
+
+ @Test
+ public void
copyDirectoryToDirectoryThrowsIllegalArgumentExceptionWithCorrectMessageWhenDstDirIsNotDirectory()
throws IOException {
+ File srcDir = temporaryFolder.newFolder("sourceDirectory");
+ File destDir = temporaryFolder.newFile("notadirectory");
+ String expectedMessage = String.format("Destination '%s' is not a
directory", destDir);
+ assertExceptionTypeAndMessage(srcDir, destDir,
IllegalArgumentException.class, expectedMessage);
+ }
+
+ @Test
+ public void
copyDirectoryToDirectoryThrowsNullPointerExceptionWithCorrectMessageWhenSrcDirIsNull()
throws IOException {
+ File srcDir = null;
+ File destinationDirectory =
temporaryFolder.newFolder("destinationDirectory");
+ String expectedMessage = "Source must not be null";
+ assertExceptionTypeAndMessage(srcDir, destinationDirectory,
NullPointerException.class, expectedMessage);
+ }
+
+ @Test
+ public void
copyDirectoryToDirectoryThrowsNullPointerExceptionWithCorrectMessageWhenDstDirIsNull()
throws IOException {
+ File srcDir = temporaryFolder.newFolder("sourceDirectory");
+ File destDir = null;
+ String expectedMessage = "Destination must not be null";
+ assertExceptionTypeAndMessage(srcDir, destDir,
NullPointerException.class, expectedMessage);
+ }
+
+ private static void assertExceptionTypeAndMessage(File srcDir, File
destDir, Class expectedExceptionType, String expectedMessage) {
+ try {
+ FileUtils.copyDirectoryToDirectory(srcDir, destDir);
+ } catch (Exception e) {
+ String msg = e.getMessage();
+ assertEquals(expectedExceptionType, e.getClass());
+ assertEquals(expectedMessage, msg);
+ return;
+ }
+ fail();
+
Review comment:
Remove extra line.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 308499)
Time Spent: 0.5h (was: 20m)
> FileUtils.copyDirectoryToDirectory does not reflect srcDir in exception
> message when srcDir is not a directory
> --------------------------------------------------------------------------------------------------------------
>
> Key: IO-625
> URL: https://issues.apache.org/jira/browse/IO-625
> Project: Commons IO
> Issue Type: Bug
> Components: Utilities
> Affects Versions: 2.6
> Reporter: Mikko Maunu
> Priority: Trivial
> Attachments: FileUtilsCopyDirectoryToDirectoryTestCase.java
>
> Time Spent: 0.5h
> Remaining Estimate: 0h
>
> When destDir parameter to FileUtils.copyDirectoryToDirectory method is not a
> directory, exception message contains srcDir instead of destDir.
> Related issue is, that based on Javadocs one would expect IOException instead
> of IllegalArgumentException. Changing type of the exception would probably
> break some clients. Fixing message seems reasonable.
--
This message was sent by Atlassian Jira
(v8.3.2#803003)
