Expanded File class testing

Shooting for 100%!

.travis.yml

@@ -13,7 +13,7 @@ install:
 
 script:
   - mkdir -p vendors/build/logs
-  - phpunit --coverage-clover /home/travis/build/joshtronic/pickles/vendors/build/logs/clover.xml --bootstrap ./tests/bootstrap.php ./tests
+  - phpunit --colors --coverage-clover /home/travis/build/joshtronic/pickles/vendors/build/logs/clover.xml --bootstrap ./tests/bootstrap.php ./tests
 
 after_script:
   - php vendors/composer/bin/coveralls --config ../.coveralls.yml -v

classes/File.php

@@ -61,10 +61,14 @@ class File
 					}
 				}
 			}
-		}
 
 			rmdir($directory);
 		}
+		else
+		{
+			unlink($directory);
+		}
+	}
 }
 
 ?>

tests/classes/FileTest.php

@@ -2,7 +2,7 @@
 
 class FileTest extends PHPUnit_Framework_TestCase
 {
-	function testRemoveDirectory()
+	public function testRemoveDirectory()
 	{
 		$directory = SITE_PATH . 'test/test/test/';
 
@@ -15,6 +15,33 @@ class FileTest extends PHPUnit_Framework_TestCase
 
 		$this->assertFalse(file_exists($directory));
 	}
+
+	public function testMissingTrailingSlash()
+	{
+		$directory = SITE_PATH . 'missing';
+
+		mkdir($directory, 0777, true);
+		touch(SITE_PATH . 'missing/slash');
+
+		File::removeDirectory($directory);
+
+		$this->assertFalse(file_exists($directory));
+	}
+
+	public function testRemoveFileNotDirectory()
+	{
+		$directory = SITE_PATH . 'dir';
+		$file      = SITE_PATH . 'dir/file';
+
+		mkdir($directory, 0777, true);
+		touch($file);
+
+		File::removeDirectory($file);
+
+		$this->assertFalse(file_exists($file));
+
+		File::removeDirectory($directory);
+	}
 }
 
 ?>