Merge pull request JohnSundell#64 from clayellis/contains-file

Folder contains file/subfolder

Sources/Files.swift

@@ -685,6 +685,15 @@ public final class Folder: FileSystem.Item, FileSystemIterable {
     public func containsFile(named fileName: String) -> Bool {
         return (try? file(named: fileName)) != nil
     }
+
+    /**
+     *  Return whether this folder contains a given file
+     *
+     *  - parameter file: The file to check for
+     */
+    public func contains(_ file: File) -> Bool {
+        return containsFile(named: file.name)
+    }
 
     /**
      *  Return a folder with a given name that is contained in this folder
@@ -716,6 +725,15 @@ public final class Folder: FileSystem.Item, FileSystemIterable {
     public func containsSubfolder(named folderName: String) -> Bool {
         return (try? subfolder(named: folderName)) != nil
     }
+
+    /**
+     *  Return whether this folder contains a given subfolder
+     *
+     *  - parameter subfolder: The folder to check for
+     */
+    public func contains(_ subfolder: Folder) -> Bool {
+        return containsSubfolder(named: subfolder.name)
+    }
 
     /**
      *  Create a file in this folder and return it

Tests/FilesTests/FilesTests.swift

@@ -698,6 +698,28 @@ class FilesTests: XCTestCase {
             try assert(subfolder.file(named: "file"), throwsError: File.PathError.invalid(file.path))
         }
     }
+
+    func testFolderContainsFile() {
+        performTest {
+            let subfolder = try folder.createSubfolder(named: "subfolder")
+            let fileA = try subfolder.createFile(named: "A")
+            XCTAssertFalse(folder.contains(fileA))
+
+            let fileB = try folder.createFile(named: "B")
+            XCTAssertTrue(folder.contains(fileB))
+        }
+    }
+
+    func testFolderContainsSubfolder() {
+        performTest {
+            let subfolder = try folder.createSubfolder(named: "subfolder")
+            let subfolderA = try subfolder.createSubfolder(named: "A")
+            XCTAssertFalse(folder.contains(subfolderA))
+
+            let subfolderB = try folder.createSubfolder(named: "B")
+            XCTAssertTrue(folder.contains(subfolderB))
+        }
+    }
 
     // MARK: - Utilities
 
@@ -775,7 +797,9 @@ class FilesTests: XCTestCase {
         ("testCreateFolderIfNeeded", testCreateFolderIfNeeded),
         ("testCreateSubfolderIfNeeded", testCreateSubfolderIfNeeded),
         ("testCreatingFileWithString", testCreatingFileWithString),
-        ("testUsingCustomFileManager", testUsingCustomFileManager)
+        ("testUsingCustomFileManager", testUsingCustomFileManager),
+        ("testFolderContainsFile", testFolderContainsFile),
+        ("testFolderContainsSubfolder", testFolderContainsSubfolder)
     ]
 }