Refactor JavaFolderSizeTest

This commit is contained in:
Grzegorz Piwowarek 2016-09-28 19:46:18 +02:00
parent ea85fa99ee
commit e1ffd14c0d

View File

@ -21,7 +21,7 @@ public class JavaFolderSizeTest {
@Before @Before
public void init() { public void init() {
final String separator = File.separator; final String separator = File.separator;
path = "src" + separator + "test" + separator + "resources"; path = String.format("src%stest%sresources", separator, separator);
} }
@Test @Test
@ -79,7 +79,9 @@ public class JavaFolderSizeTest {
final File folder = new File(path); final File folder = new File(path);
final Iterable<File> files = com.google.common.io.Files.fileTreeTraverser().breadthFirstTraversal(folder); final Iterable<File> files = com.google.common.io.Files.fileTreeTraverser().breadthFirstTraversal(folder);
final long size = StreamSupport.stream(files.spliterator(), false).filter(f -> f.isFile()).mapToLong(File::length).sum(); final long size = StreamSupport.stream(files.spliterator(), false)
.filter(File::isFile)
.mapToLong(File::length).sum();
assertEquals(expectedSize, size); assertEquals(expectedSize, size);
} }
@ -101,13 +103,11 @@ public class JavaFolderSizeTest {
long length = 0; long length = 0;
final File[] files = folder.listFiles(); final File[] files = folder.listFiles();
final int count = files.length; for (File file : files) {
if (file.isFile()) {
for (int i = 0; i < count; i++) { length += file.length();
if (files[i].isFile()) {
length += files[i].length();
} else { } else {
length += getFolderSize(files[i]); length += getFolderSize(file);
} }
} }
return length; return length;