diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php index 14a5e99c4f1..06ef9a37ce1 100644 --- a/cake/tests/cases/basics.test.php +++ b/cake/tests/cases/basics.test.php @@ -119,6 +119,8 @@ function testEnv() { * @return void */ function testUses() { + $this->skipIf(class_exists('Security') || class_exists('Sanitize'), 'Security and/or Sanitize class already loaded'); + $this->assertFalse(class_exists('Security')); $this->assertFalse(class_exists('Sanitize')); @@ -532,15 +534,17 @@ function testDebug() { ob_start(); debug('this-is-a-test'); $result = ob_get_clean(); - $pattern = '/.*' . preg_quote(substr(__FILE__, 1), '/') - . '.*line.*' . (__LINE__ - 3) . '.*this-is-a-test.*/s'; + $pattern = '/.*\>(cake(\/|\\\)tests(\/|\\\)cases(\/|\\\)basics\.test\.php|'; + $pattern .= preg_quote(substr(__FILE__, 1), '/') . ')'; + $pattern .= '.*line.*' . (__LINE__ - 4) . '.*this-is-a-test.*/s'; $this->assertPattern($pattern, $result); ob_start(); debug('
this-is-a-test
', true); $result = ob_get_clean(); - $pattern = '/.*' . preg_quote(substr(__FILE__, 1), '/') - . '.*line.*' . (__LINE__ - 3) . '.*<div>this-is-a-test<\/div>.*/s'; + $pattern = '/.*\>(cake(\/|\\\)tests(\/|\\\)cases(\/|\\\)basics\.test\.php|'; + $pattern .= preg_quote(substr(__FILE__, 1), '/') . ')'; + $pattern .= '.*line.*' . (__LINE__ - 4) . '.*<div>this-is-a-test<\/div>.*/s'; $this->assertPattern($pattern, $result); } /**