Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/test/java/com/smartsheet/utils/FileUtils_DeleteFolder.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;

import org.junit.After;
import org.junit.Assert;
Expand Down Expand Up @@ -49,7 +50,7 @@ public void testDeleteFolder_NullInput() throws IOException{

@Test
public void testDeleteFolder_FolderWithOneFile() throws IOException{
File testFile = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder);
File testFile = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile();
FileUtils.deleteFolder(testFolder);

Assert.assertTrue(!testFolder.exists());
Expand All @@ -58,12 +59,12 @@ public void testDeleteFolder_FolderWithOneFile() throws IOException{

@Test
public void testDeleteFolder_FolderWithSixFiles() throws IOException{
File testFile1 = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder);
File testFile2 = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder);
File testFile3 = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder);
File testFile4 = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder);
File testFile5 = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder);
File testFile6 = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder);
File testFile1 = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile();
File testFile2 = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile();
File testFile3 = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile();
File testFile4 = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile();
File testFile5 = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile();
File testFile6 = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile();

FileUtils.deleteFolder(testFolder);

Expand All @@ -78,7 +79,7 @@ public void testDeleteFolder_FolderWithSixFiles() throws IOException{

@Test
public void testDeleteFolder_FolderWithOneFileAndEmptySubFolder() throws IOException{
File testFile = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder);
File testFile = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile();
File testSubFolder = new File(testFolder.getAbsoluteFile() + File.separator + "docs");

FileUtils.deleteFolder(testFolder);
Expand All @@ -92,7 +93,7 @@ public void testDeleteFolder_FolderWithOneFileAndEmptySubFolder() throws IOExcep
public void testDeleteFolder_FolderWithContentInSubFolder() throws IOException{
File testSubFolder = new File(testFolder.getAbsoluteFile() + File.separator + "docs");
testSubFolder.mkdir();
File testFileInSubFolder = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testSubFolder);
File testFileInSubFolder = Files.createTempFile(testSubFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile();

FileUtils.deleteFolder(testFolder);

Expand All @@ -105,11 +106,11 @@ public void testDeleteFolder_FolderWithContentInSubFolder() throws IOException{
public void testDeleteFolder_FolderWithContentInTwoSubFolder() throws IOException{
File testDocsSubFolder = new File(testFolder.getAbsoluteFile() + File.separator + "docs");
testDocsSubFolder.mkdir();
File testDoc = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testDocsSubFolder);
File testDoc = Files.createTempFile(testDocsSubFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile();

File testHTMLSubFolder = new File(testFolder.getAbsoluteFile() + File.separator + "html");
testHTMLSubFolder.mkdir();
File testHTMLDoc = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testHTMLSubFolder);
File testHTMLDoc = Files.createTempFile(testHTMLSubFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile();

FileUtils.deleteFolder(testFolder);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
Expand Down Expand Up @@ -94,12 +95,12 @@ public void testFileExistsInFolder_NoSuchFileInTempFolder() {
}

private void createUniqueFileInSystemTempFolder() throws IOException{
File tempFile = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX);
File tempFile = Files.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile();
testFiles.add(tempFile);
}

private void createNewFolderInSystemTempFolder() throws IOException{
File tempFile = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX);
File tempFile = Files.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile();
tempFile.mkdir();
testFiles.add(tempFile);
}
Expand Down