Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixing some test cases

  • Loading branch information...
commit f9f67a17598a4bea724a902820444d6a2ca60907 1 parent c1b919a
gwoo authored
View
4 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('<div>this-is-a-test</div>', 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) . '.*&lt;div&gt;this-is-a-test&lt;\/div&gt;.*/s';
$this->assertPattern($pattern, $result);
View
17 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 = '<statuses><status><id>1</id></status><status><id>2</id></status></statuses>';
- $this->assertIdentical($result, $expected);
- }
/**
* testHeader method
*
Please sign in to comment.
Something went wrong with that request. Please try again.