Merge branch '3.2/develop' into 3.3/develop

kohana · Oct 23, 2012 · 18bb452 · 18bb452
2 parents e81c672 + b6b2ad8
commit 18bb452
Showing 1 changed file with 6 additions and 40 deletions.
diff --git a/classes/Kohana/Unittest/Tests.php b/classes/Kohana/Unittest/Tests.php
@@ -13,13 +13,6 @@
 class Kohana_Unittest_Tests {
 	static protected $cache = array();
 
-	/**
-	 * Flag to identify whether the installed version of phpunit
-	 * is greater than or equal to 3.5
-	 * @var boolean
-	 */
-	static protected $phpunit_v35 = FALSE;
-
 	/**
 	 * Loads test files if they cannot be found by kohana
 	 * @param <type> $class
@@ -50,9 +43,6 @@ static public function configure_environment($do_whitelist = TRUE, $do_blacklist
 
 		spl_autoload_register(array('Unittest_tests', 'autoload'));
 
-		// As of PHPUnit v3.5 there are slight differences in the way files are black|whitelisted
-		self::$phpunit_v35 = function_exists('phpunit_autoload');
-
 		Unittest_tests::$cache = (($cache = Kohana::cache('unittest_whitelist_cache')) === NULL) ? array() : $cache;
 
 	}
@@ -130,14 +120,7 @@ static function addTests(Unittest_TestSuite $suite, array $files)
 						require_once($file);
 					}
 
-					if (self::$phpunit_v35)
-					{
-						$suite->addFileToBlacklist($file);
-					}
-					else
-					{
-						PHPUnit_Util_Filter::addFileToFilter($file);
-					}
+					$suite->addFileToBlacklist($file);
 				}
 			}
 		}
@@ -151,32 +134,15 @@ static function addTests(Unittest_TestSuite $suite, array $files)
 	 */
 	static public function blacklist(array $blacklist_items, Unittest_TestSuite $suite = NULL)
 	{
-		if (self::$phpunit_v35)
+		foreach ($blacklist_items as $item)
 		{
-			foreach ($blacklist_items as $item)
+			if (is_dir($item))
 			{
-				if (is_dir($item))
-				{
-					$suite->addDirectoryToBlacklist($item);
-				}
-				else
-				{
-					$suite->addFileToBlacklist($item);
-				}
+				$suite->addDirectoryToBlacklist($item);
 			}
-		}
-		else
-		{
-			foreach ($blacklist_items as $item)
+			else
 			{
-				if (is_dir($item))
-				{
-					PHPUnit_Util_Filter::addDirectoryToFilter($item);
-				}
-				else
-				{
-					PHPUnit_Util_Filter::addFileToFilter($item);
-				}
+				$suite->addFileToBlacklist($item);
 			}
 		}
 	}