Skip to content

Commit b05886c

Browse files
majajoksovicmajajoksovic
committed
clean-up
1 parent 43914be commit b05886c

9 files changed

Lines changed: 192 additions & 192 deletions

File tree

core-java-modules/core-java-io-3/src/main/java/com/baeldung/copyfolder/ApacheCommons.java renamed to core-java-modules/core-java-io-3/src/main/java/com/baeldung/copydirectory/ApacheCommons.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.copyfolder;
1+
package com.baeldung.copydirectory;
22

33
import java.io.File;
44
import java.io.IOException;
@@ -8,8 +8,8 @@
88
public class ApacheCommons {
99

1010
public static void copyDirectory(String sourceDirectoryLocation, String destinationDirectoryLocation) throws IOException {
11-
File sourceFolder = new File(sourceDirectoryLocation);
12-
File destinationFolder = new File(destinationDirectoryLocation);
13-
FileUtils.copyDirectory(sourceFolder, destinationFolder);
11+
File sourceDirectory = new File(sourceDirectoryLocation);
12+
File destinationDirectory = new File(destinationDirectoryLocation);
13+
FileUtils.copyDirectory(sourceDirectory, destinationDirectory);
1414
}
1515
}

core-java-modules/core-java-io-3/src/main/java/com/baeldung/copyfolder/CoreOld.java renamed to core-java-modules/core-java-io-3/src/main/java/com/baeldung/copydirectory/CoreOld.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.copyfolder;
1+
package com.baeldung.copydirectory;
22

33
import java.io.File;
44
import java.io.FileInputStream;
@@ -17,12 +17,12 @@ public static void copyDirectoryJavaUnder7(File source, File destination) throws
1717
}
1818
}
1919

20-
private static void copyDirectory(File sourceFolder, File destinationFolder) throws IOException {
21-
if (!destinationFolder.exists()) {
22-
destinationFolder.mkdir();
20+
private static void copyDirectory(File sourceDirectory, File destinationDirectory) throws IOException {
21+
if (!destinationDirectory.exists()) {
22+
destinationDirectory.mkdir();
2323
}
24-
for (String f : sourceFolder.list()) {
25-
copyDirectoryJavaUnder7(new File(sourceFolder, f), new File(destinationFolder, f));
24+
for (String f : sourceDirectory.list()) {
25+
copyDirectoryJavaUnder7(new File(sourceDirectory, f), new File(destinationDirectory, f));
2626
}
2727
}
2828

core-java-modules/core-java-io-3/src/main/java/com/baeldung/copyfolder/JavaNio.java renamed to core-java-modules/core-java-io-3/src/main/java/com/baeldung/copydirectory/JavaNio.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.copyfolder;
1+
package com.baeldung.copydirectory;
22

33
import java.io.IOException;
44
import java.nio.file.Files;

‎core-java-modules/core-java-io-3/src/test/java/com/baeldung/copydirectory/ApacheCommonsUnitTest.java‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
package com.baeldung.copydirectory;
2+
3+
import static org.junit.Assert.assertTrue;
4+
import static org.junit.jupiter.api.Assertions.assertThrows;
5+
6+
import java.io.File;
7+
import java.io.IOException;
8+
import java.nio.file.Files;
9+
import java.nio.file.Path;
10+
import java.nio.file.Paths;
11+
import java.util.Comparator;
12+
13+
import org.junit.jupiter.api.AfterEach;
14+
import org.junit.jupiter.api.BeforeEach;
15+
import org.junit.jupiter.api.Test;
16+
17+
public class ApacheCommonsUnitTest {
18+
19+
private final String sourceDirectoryLocation = "src/test/resources/sourceDirectory";
20+
private final String subDirectoryName = "/childDirectory";
21+
private final String fileName = "/file.txt";
22+
private final String destinationDirectoryLocation = "src/test/resources/destinationDirectory";
23+
24+
@BeforeEach
25+
public void createDirectoryWithSubdirectoryAndFile() throws IOException {
26+
Files.createDirectories(Paths.get(sourceDirectoryLocation));
27+
Files.createDirectories(Paths.get(sourceDirectoryLocation + subDirectoryName));
28+
Files.createFile(Paths.get(sourceDirectoryLocation + subDirectoryName + fileName));
29+
}
30+
31+
@Test
32+
public void whenSourceDirectoryExists_thenDirectoryIsFullyCopied() throws IOException {
33+
ApacheCommons.copyDirectory(sourceDirectoryLocation, destinationDirectoryLocation);
34+
35+
assertTrue(new File(destinationDirectoryLocation).exists());
36+
assertTrue(new File(destinationDirectoryLocation + subDirectoryName).exists());
37+
assertTrue(new File(destinationDirectoryLocation + subDirectoryName + fileName).exists());
38+
}
39+
40+
@Test
41+
public void whenSourceDirectoryDoesNotExist_thenExceptionIsThrown() {
42+
assertThrows(Exception.class, () -> ApacheCommons.copyDirectory("nonExistingDirectory", destinationDirectoryLocation));
43+
}
44+
45+
@AfterEach
46+
public void cleanUp() throws IOException {
47+
Files.walk(Paths.get(sourceDirectoryLocation))
48+
.sorted(Comparator.reverseOrder())
49+
.map(Path::toFile)
50+
.forEach(File::delete);
51+
if (new File(destinationDirectoryLocation).exists()) {
52+
Files.walk(Paths.get(destinationDirectoryLocation))
53+
.sorted(Comparator.reverseOrder())
54+
.map(Path::toFile)
55+
.forEach(File::delete);
56+
}
57+
}
58+
59+
}

‎core-java-modules/core-java-io-3/src/test/java/com/baeldung/copydirectory/CoreOldUnitTest.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
package com.baeldung.copydirectory;
2+
3+
import static org.junit.Assert.assertTrue;
4+
import static org.junit.jupiter.api.Assertions.assertThrows;
5+
6+
import java.io.File;
7+
import java.io.IOException;
8+
import java.nio.file.Files;
9+
import java.nio.file.Path;
10+
import java.nio.file.Paths;
11+
import java.util.Comparator;
12+
13+
import org.junit.jupiter.api.AfterEach;
14+
import org.junit.jupiter.api.BeforeEach;
15+
import org.junit.jupiter.api.Test;
16+
17+
public class CoreOldUnitTest {
18+
19+
private final String sourceDirectoryLocation = "src/test/resources/sourceDirectory";
20+
private final String subDirectoryName = "/childDirectory";
21+
private final String fileName = "/file.txt";
22+
private final String destinationDirectoryLocation = "src/test/resources/destinationDirectory";
23+
24+
@BeforeEach
25+
public void createDirectoryWithSubdirectoryAndFile() throws IOException {
26+
Files.createDirectories(Paths.get(sourceDirectoryLocation));
27+
Files.createDirectories(Paths.get(sourceDirectoryLocation + subDirectoryName));
28+
Files.createFile(Paths.get(sourceDirectoryLocation + subDirectoryName + fileName));
29+
}
30+
31+
@Test
32+
public void whenSourceDirectoryExists_thenDirectoryIsFullyCopied() throws IOException {
33+
File sourceDirectory = new File(sourceDirectoryLocation);
34+
File destinationDirectory = new File(destinationDirectoryLocation);
35+
CoreOld.copyDirectoryJavaUnder7(sourceDirectory, destinationDirectory);
36+
37+
assertTrue(new File(destinationDirectoryLocation).exists());
38+
assertTrue(new File(destinationDirectoryLocation + subDirectoryName).exists());
39+
assertTrue(new File(destinationDirectoryLocation + subDirectoryName + fileName).exists());
40+
}
41+
42+
@Test
43+
public void whenSourceDirectoryDoesNotExist_thenExceptionIsThrown() throws IOException {
44+
File sourceDirectory = new File("nonExistingDirectory");
45+
File destinationDirectory = new File(destinationDirectoryLocation);
46+
assertThrows(IOException.class, () -> CoreOld.copyDirectoryJavaUnder7(sourceDirectory, destinationDirectory));
47+
}
48+
49+
@AfterEach
50+
public void cleanUp() throws IOException {
51+
Files.walk(Paths.get(sourceDirectoryLocation))
52+
.sorted(Comparator.reverseOrder())
53+
.map(Path::toFile)
54+
.forEach(File::delete);
55+
if (new File(destinationDirectoryLocation).exists()) {
56+
Files.walk(Paths.get(destinationDirectoryLocation))
57+
.sorted(Comparator.reverseOrder())
58+
.map(Path::toFile)
59+
.forEach(File::delete);
60+
}
61+
}
62+
63+
}

‎core-java-modules/core-java-io-3/src/test/java/com/baeldung/copydirectory/JavaNioUnitTest.java‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
package com.baeldung.copydirectory;
2+
3+
import static org.junit.Assert.assertTrue;
4+
import static org.junit.jupiter.api.Assertions.assertThrows;
5+
6+
import java.io.File;
7+
import java.io.IOException;
8+
import java.nio.file.Files;
9+
import java.nio.file.Path;
10+
import java.nio.file.Paths;
11+
import java.util.Comparator;
12+
13+
import org.junit.jupiter.api.AfterEach;
14+
import org.junit.jupiter.api.BeforeEach;
15+
import org.junit.jupiter.api.Test;
16+
17+
public class JavaNioUnitTest {
18+
19+
private final String sourceDirectoryLocation = "src/test/resources/sourceDirectory";
20+
private final String subDirectoryName = "/childDirectory";
21+
private final String fileName = "/file.txt";
22+
private final String destinationDirectoryLocation = "src/test/resources/destinationDirectory";
23+
24+
@BeforeEach
25+
public void createDirectoryWithSubdirectoryAndFile() throws IOException {
26+
Files.createDirectories(Paths.get(sourceDirectoryLocation));
27+
Files.createDirectories(Paths.get(sourceDirectoryLocation + subDirectoryName));
28+
Files.createFile(Paths.get(sourceDirectoryLocation + subDirectoryName + fileName));
29+
}
30+
31+
@Test
32+
public void whenSourceDirectoryExists_thenDirectoryIsFullyCopied() throws IOException {
33+
JavaNio.copyDirectory(sourceDirectoryLocation, destinationDirectoryLocation);
34+
35+
assertTrue(new File(destinationDirectoryLocation).exists());
36+
assertTrue(new File(destinationDirectoryLocation + subDirectoryName).exists());
37+
assertTrue(new File(destinationDirectoryLocation + subDirectoryName + fileName).exists());
38+
}
39+
40+
@Test
41+
public void whenSourceDirectoryDoesNotExist_thenExceptionIsThrown() {
42+
assertThrows(IOException.class, () -> JavaNio.copyDirectory("nonExistingDirectory", destinationDirectoryLocation));
43+
}
44+
45+
@AfterEach
46+
public void cleanUp() throws IOException {
47+
Files.walk(Paths.get(sourceDirectoryLocation))
48+
.sorted(Comparator.reverseOrder())
49+
.map(Path::toFile)
50+
.forEach(File::delete);
51+
if (new File(destinationDirectoryLocation).exists()) {
52+
Files.walk(Paths.get(destinationDirectoryLocation))
53+
.sorted(Comparator.reverseOrder())
54+
.map(Path::toFile)
55+
.forEach(File::delete);
56+
}
57+
}
58+
59+
}

‎core-java-modules/core-java-io-3/src/test/java/com/baeldung/copyfolder/ApacheCommonsUnitTest.java‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎core-java-modules/core-java-io-3/src/test/java/com/baeldung/copyfolder/CoreOldUnitTest.java‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)