From f9f67a17598a4bea724a902820444d6a2ca60907 Mon Sep 17 00:00:00 2001 From: gwoo Date: Sun, 2 Aug 2009 15:18:44 -0700 Subject: [PATCH] fixing some test cases --- cake/tests/cases/basics.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/xml.test.php | 17 ----------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php index 0ddb5f17917..55d11964ba0 100644 --- a/cake/tests/cases/basics.test.php +++ b/cake/tests/cases/basics.test.php @@ -588,7 +588,7 @@ function testDebug() { ob_start(); debug('this-is-a-test'); $result = ob_get_clean(); - $pattern = '/.*\>(.+?cake(\/|\\\)tests(\/|\\\)cases(\/|\\\)basics\.test\.php|'; + $pattern = '/.*\>(.+?tests(\/|\\\)cases(\/|\\\)basics\.test\.php|'; $pattern .= preg_quote(substr(__FILE__, 1), '/') . ')'; $pattern .= '.*line.*' . (__LINE__ - 4) . '.*this-is-a-test.*/s'; $this->assertPattern($pattern, $result); @@ -596,7 +596,7 @@ function testDebug() { ob_start(); debug('
this-is-a-test
', true); $result = ob_get_clean(); - $pattern = '/.*\>(.+?cake(\/|\\\)tests(\/|\\\)cases(\/|\\\)basics\.test\.php|'; + $pattern = '/.*\>(.+?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); diff --git a/cake/tests/cases/libs/view/helpers/xml.test.php b/cake/tests/cases/libs/view/helpers/xml.test.php index 7fe0679e21a..437ca347cef 100644 --- a/cake/tests/cases/libs/view/helpers/xml.test.php +++ b/cake/tests/cases/libs/view/helpers/xml.test.php @@ -242,24 +242,7 @@ function testSerializeOnMultiDimensionalArray() { $this->assertIdentical($result, $expected); } -/** - * testSerializeOnMultiDimensionalArray method - * - * @access public - * @return void - */ - function testSerializeOnMultiDimensionalArray() { - $data = array( - 'Statuses' => array( - array('Status' => array('id' => 1)), - array('Status' => array('id' => 2)) - ) - ); - $result = $this->Xml->serialize($data, array('format' => 'tags')); - $expected = '12'; - $this->assertIdentical($result, $expected); - } /** * testHeader method *