From 93bf4fd0dc39b1059de7c3dbc9921389488ee247 Mon Sep 17 00:00:00 2001 From: davidpersson Date: Sun, 15 Mar 2009 19:31:59 +0000 Subject: [PATCH] Fixing debug() test making it match truncated paths too. Adding skip to uses() test to make running all tests in sequence more smooth. git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8104 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/tests/cases/basics.test.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php index 14a5e99c4..06ef9a37c 100644 --- a/cake/tests/cases/basics.test.php +++ b/cake/tests/cases/basics.test.php @@ -119,6 +119,8 @@ class BasicsTest extends CakeTestCase { * @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 @@ class BasicsTest extends CakeTestCase { 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); } /**