simplify path logic

we know the category - use it to simplify some regexs
cakephp · May 28, 2011 · 8b1045a · 8b1045a
1 parent dcf14a7
commit 8b1045a
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/lib/Cake/Console/Command/TestShell.php b/lib/Cake/Console/Command/TestShell.php
@@ -337,6 +337,11 @@ protected function _mapFileToCase($file, $category) {
 			return false;
 		}
 
+		$_file = realpath($file);
+		if ($_file) {
+			$file = $_file;
+		}
+
 		$testFile = $testCase = null;
 
 		if (preg_match('@Test[\\\/]@', $file)) {
@@ -376,11 +381,15 @@ protected function _mapFileToCase($file, $category) {
 			return false;
 		}
 
-		$testFile = preg_replace(
-			'@(.*)((?:(?:Config|Console|Controller|Lib|Locale|Model|plugins|Plugin|Test|Vendor|View|webroot)[\\\/]).*$|App[-a-z]*$)@',
-			'\1Test/Case/\2Test.php',
-			$file
-		);
+		if ($category === 'app') {
+			$testFile = str_replace(APP, APP . 'Test/Case/', $file) . 'Test.php';
+		} else {
+			$testFile = preg_replace(
+				"@((?:plugins|Plugin)[\\/]{$category}[\\/])(.*)$@",
+				'\1Test/Case/\2Test.php',
+				$file
+			);
+		}
 
 		if (!file_exists($testFile)) {
 			throw new Exception(__d('cake_dev', 'Test case %s not found', $testFile));