Merge branch 'master' into apptheme

lib/Cake/Config/config.php

@@ -16,4 +16,4 @@
  * @since         CakePHP(tm) v 1.1.11.4062
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-return $config['Cake.version'] = '2.0.3';
+return $config['Cake.version'] = '2.0.4';

lib/Cake/Console/Command/AclShell.php

@@ -15,6 +15,8 @@
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
+App::uses('AppShell', 'Console/Command');
 App::uses('ComponentCollection', 'Controller');
 App::uses('AclComponent', 'Controller/Component');
 App::uses('DbAcl', 'Model');
@@ -25,7 +27,7 @@ App::uses('DbAcl', 'Model');
  *
  * @package       Cake.Console.Command
  */
-class AclShell extends Shell {
+class AclShell extends AppShell {
 
 /**
  * Contains instance of AclComponent

lib/Cake/Console/Command/ApiShell.php

@@ -17,6 +17,8 @@
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
+App::uses('AppShell', 'Console/Command');
 App::uses('File', 'Utility');
 
 /**
@@ -24,7 +26,7 @@ App::uses('File', 'Utility');
  *
  * @package       Cake.Console.Command
  */
-class ApiShell extends Shell {
+class ApiShell extends AppShell {
 
 /**
  * Map between short name for paths and real paths.

lib/Cake/Console/Command/AppShell.php

@@ -16,6 +16,8 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('Shell', 'Console');
+
 /**
  * This is a placeholder class.
  * Create the same file in app/Console/Command/AppShell.php

lib/Cake/Console/Command/BakeShell.php

@@ -20,6 +20,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
 App::uses('Model', 'Model');
 
 /**
@@ -28,7 +29,7 @@ App::uses('Model', 'Model');
  * @package       Cake.Console.Command
  * @link          http://book.cakephp.org/2.0/en/console-and-shells/code-generation-with-bake.html
  */
-class BakeShell extends Shell {
+class BakeShell extends AppShell {
 
 /**
  * Contains tasks to load and instantiate

lib/Cake/Console/Command/CommandListShell.php

@@ -17,6 +17,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
 App::uses('Inflector', 'Utility');
 
 /**
@@ -24,7 +25,7 @@ App::uses('Inflector', 'Utility');
  *
  * @package       Cake.Console.Command
  */
-class CommandListShell extends Shell {
+class CommandListShell extends AppShell {
 
 /**
  * startup
@@ -80,13 +81,15 @@ class CommandListShell extends Shell {
  */
 	protected function _getShellList() {
 		$shellList = array();
+		$skipFiles = array('AppShell');
 
 		$corePath = App::core('Console/Command');
 		$shells = App::objects('file', $corePath[0]);
+		$shells = array_diff($shells, $skipFiles);
 		$shellList = $this->_appendShells('CORE', $shells, $shellList);
 
 		$appShells = App::objects('Console/Command', null, false);
-		$appShells = array_diff($appShells, $shells);
+		$appShells = array_diff($appShells, $shells, $skipFiles);
 		$shellList = $this->_appendShells('app', $appShells, $shellList);
 
 		$plugins = CakePlugin::loaded();

lib/Cake/Console/Command/ConsoleShell.php

@@ -16,12 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
+
 /**
  * Provides a very basic 'interactive' console for CakePHP apps.
  *
  * @package       Cake.Console.Command
  */
-class ConsoleShell extends Shell {
+class ConsoleShell extends AppShell {
 
 /**
  * Available binding types

lib/Cake/Console/Command/I18nShell.php

@@ -16,12 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
+
 /**
  * Shell for I18N management.
  *
  * @package       Cake.Console.Command
  */
-class I18nShell extends Shell {
+class I18nShell extends AppShell {
 
 /**
  * Contains database source to use

lib/Cake/Console/Command/SchemaShell.php

@@ -18,6 +18,8 @@
  * @since         CakePHP(tm) v 1.2.0.5550
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
+App::uses('AppShell', 'Console/Command');
 App::uses('File', 'Utility');
 App::uses('Folder', 'Utility');
 App::uses('CakeSchema', 'Model');
@@ -28,7 +30,7 @@ App::uses('CakeSchema', 'Model');
  * @package       Cake.Console.Command
  * @link          http://book.cakephp.org/2.0/en/console-and-shells/schema-management-and-migrations.html
  */
-class SchemaShell extends Shell {
+class SchemaShell extends AppShell {
 
 /**
  * Schema class being used.
@@ -64,7 +66,7 @@ class SchemaShell extends Shell {
 		$name = $path = $connection = $plugin = null;
 		if (!empty($this->params['name'])) {
 			$name = $this->params['name'];
-		} elseif (!empty($this->args[0])) {
+		} elseif (!empty($this->args[0]) && $this->args[0] !== 'snapshot') {
 			$name = $this->params['name'] = $this->args[0];
 		}
 
@@ -158,6 +160,7 @@ class SchemaShell extends Shell {
 		Configure::write('Cache.disable', $cacheDisable);
 
 		if ($snapshot === true) {
+			$fileName = rtrim($this->params['file'], '.php');
 			$Folder = new Folder($this->Schema->path);
 			$result = $Folder->read();
 
@@ -169,7 +172,7 @@ class SchemaShell extends Shell {
 			$count = 0;
 			if (!empty($result[1])) {
 				foreach ($result[1] as $file) {
-					if (preg_match('/schema(?:[_\d]*)?\.php$/', $file)) {
+					if (preg_match('/'.preg_quote($fileName).'(?:[_\d]*)?\.php$/', $file)) {
 						$count++;
 					}
 				}
@@ -181,7 +184,6 @@ class SchemaShell extends Shell {
 				}
 			}
 
-			$fileName = rtrim($this->params['file'], '.php');
 			$content['file'] = $fileName . '_' . $count . '.php';
 		}
 
@@ -530,4 +532,4 @@ class SchemaShell extends Shell {
 		));
 		return $parser;
 	}
-}
+}

lib/Cake/Console/Command/Task/BakeTask.php

@@ -16,13 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::uses('Shell', 'Console');
+App::uses('AppShell', 'Console/Command');
+
 /**
  * Base class for Bake Tasks.
  *
  * @package       Cake.Console.Command.Task
  */
-class BakeTask extends Shell {
+class BakeTask extends AppShell {
 
 /**
  * Name of plugin

lib/Cake/Console/Command/Task/ControllerTask.php

@@ -16,6 +16,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
 App::uses('BakeTask', 'Console/Command/Task');
 App::uses('AppModel', 'Model');
 

lib/Cake/Console/Command/Task/DbConfigTask.php

@@ -16,12 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
+
 /**
  * Task class for creating and updating the database configuration file.
  *
  * @package       Cake.Console.Command.Task
  */
-class DbConfigTask extends Shell {
+class DbConfigTask extends AppShell {
 
 /**
  * path to CONFIG directory

lib/Cake/Console/Command/Task/ExtractTask.php

@@ -15,6 +15,8 @@
  * @since         CakePHP(tm) v 1.2.0.5012
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
+App::uses('AppShell', 'Console/Command');
 App::uses('File', 'Utility');
 App::uses('Folder', 'Utility');
 
@@ -23,7 +25,7 @@ App::uses('Folder', 'Utility');
  *
  * @package       Cake.Console.Command.Task
  */
-class ExtractTask extends Shell {
+class ExtractTask extends AppShell {
 
 /**
  * Paths to use when looking for strings
@@ -162,7 +164,7 @@ class ExtractTask extends Shell {
 		} else {
 			$message = __d('cake_console', "What is the path you would like to output?\n[Q]uit", $this->_paths[0] . DS . 'Locale');
 			while (true) {
-				$response = $this->in($message, null, $this->_paths[0] . DS . 'Locale');
+				$response = $this->in($message, null, rtrim($this->_paths[0], DS) . DS . 'Locale');
 				if (strtoupper($response) === 'Q') {
 					$this->out(__d('cake_console', 'Extract Aborted'));
 					$this->_stop();
@@ -187,6 +189,7 @@ class ExtractTask extends Shell {
 		if (empty($this->_files)) {
 			$this->_searchFiles();
 		}
+		$this->_output = rtrim($this->_output, DS) . DS;
 		$this->_extract();
 	}
 

lib/Cake/Console/Command/Task/FixtureTask.php

@@ -16,6 +16,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
 App::uses('BakeTask', 'Console/Command/Task');
 App::uses('Model', 'Model');
 
@@ -279,7 +280,7 @@ class FixtureTask extends BakeTask {
  */
 	protected function _generateSchema($tableInfo) {
 		$schema = $this->_Schema->generateTable('f', $tableInfo);
-		return substr($schema, 10, -2);
+		return substr($schema, 13, -2);
 	}
 
 /**

lib/Cake/Console/Command/Task/ModelTask.php

@@ -16,6 +16,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
 App::uses('BakeTask', 'Console/Command/Task');
 App::uses('ConnectionManager', 'Model');
 App::uses('Model', 'Model');

lib/Cake/Console/Command/Task/PluginTask.php

@@ -16,6 +16,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
 App::uses('File', 'Utility');
 App::uses('Folder', 'Utility');
 
@@ -24,7 +25,7 @@ App::uses('Folder', 'Utility');
  *
  * @package       Cake.Console.Command.Task
  */
-class PluginTask extends Shell {
+class PluginTask extends AppShell {
 
 /**
  * path to plugins directory

lib/Cake/Console/Command/Task/ProjectTask.php

@@ -17,6 +17,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
 App::uses('File', 'Utility');
 App::uses('Folder', 'Utility');
 App::uses('String', 'Utility');
@@ -27,7 +28,7 @@ App::uses('Security', 'Utility');
  *
  * @package       Cake.Console.Command.Task
  */
-class ProjectTask extends Shell {
+class ProjectTask extends AppShell {
 
 /**
  * configs path (used in testing).

lib/Cake/Console/Command/Task/TemplateTask.php

@@ -16,14 +16,16 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
 App::uses('Folder', 'Utility');
+
 /**
  * Template Task can generate templated output Used in other Tasks.
  * Acts like a simplified View class.
  *
  * @package       Cake.Console.Command.Task
  */
-class TemplateTask extends Shell {
+class TemplateTask extends AppShell {
 
 /**
  * variables to add to template scope

lib/Cake/Console/Command/Task/TestTask.php

@@ -16,6 +16,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
 App::uses('BakeTask', 'Console/Command/Task');
 App::uses('ClassRegistry', 'Utility');
 
@@ -205,12 +206,14 @@ class TestTask extends BakeTask {
 			$this->out(++$key . '. ' . $option);
 			$keys[] = $key;
 		}
-		$selection = $this->in(__d('cake_console', 'Choose an existing class, or enter the name of a class that does not exist'));
-		if (isset($options[$selection - 1])) {
-			$selection = $options[$selection - 1];
-		}
-		if ($type !== 'Model') {
-			$selection = substr($selection, 0, $typeLength * - 1);
+		while (empty($selection)) {
+			$selection = $this->in(__d('cake_console', 'Choose an existing class, or enter the name of a class that does not exist'));
+			if (is_numeric($selection) && isset($options[$selection - 1])) {
+				$selection = $options[$selection - 1];
+			}
+			if ($type !== 'Model') {
+				$selection = substr($selection, 0, $typeLength * - 1);
+			}
 		}
 		return $selection;
 	}
@@ -470,7 +473,7 @@ class TestTask extends BakeTask {
 			->addArgument('type', array(
 				'help' => __d('cake_console', 'Type of class to bake, can be any of the following: controller, model, helper, component or behavior.'),
 				'choices' => array(
-					'Controller', 'controller', 
+					'Controller', 'controller',
 					'Model', 'model',
 					'Helper', 'helper',
 					'Component', 'component',

lib/Cake/Console/Command/Task/ViewTask.php

@@ -16,6 +16,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
 App::uses('Controller', 'Controller');
 App::uses('BakeTask', 'Console/Command/Task');
 

lib/Cake/Console/Command/TestsuiteShell.php

@@ -18,7 +18,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::uses('Shell', 'Console');
+App::uses('AppShell', 'Console/Command');
 App::uses('CakeTestSuiteDispatcher', 'TestSuite');
 App::uses('CakeTestSuiteCommand', 'TestSuite');
 App::uses('CakeTestLoader', 'TestSuite');
@@ -29,7 +29,7 @@ App::uses('CakeTestLoader', 'TestSuite');
  *
  * @package       Cake.Console.Command
  */
-class TestsuiteShell extends Shell {
+class TestsuiteShell extends AppShell {
 
 /**
  * Dispatcher object for the run.

lib/Cake/Console/Command/UpgradeShell.php

@@ -17,6 +17,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppShell', 'Console/Command');
 App::uses('Folder', 'Utility');
 
 /**
@@ -24,7 +25,7 @@ App::uses('Folder', 'Utility');
  *
  * @package       Cake.Console.Command
  */
-class UpgradeShell extends Shell {
+class UpgradeShell extends AppShell {
 
 /**
  * Files

lib/Cake/Console/Shell.php

@@ -83,6 +83,7 @@ class Shell extends Object {
  * Contains tasks to load and instantiate
  *
  * @var array
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::$tasks
  */
 	public $tasks = array();
 
@@ -97,6 +98,7 @@ class Shell extends Object {
  * Contains models to load and instantiate
  *
  * @var array
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::$uses
  */
 	public $uses = array();
 
@@ -141,6 +143,7 @@ class Shell extends Object {
  * @param ConsoleOutput $stdout A ConsoleOutput object for stdout.
  * @param ConsoleOutput $stderr A ConsoleOutput object for stderr.
  * @param ConsoleInput $stdin A ConsoleInput object for stdin.
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell
  */
 	public function __construct($stdout = null, $stderr = null, $stdin = null) {
 		if ($this->name == null) {
@@ -176,6 +179,7 @@ class Shell extends Object {
  * allows configuration of tasks prior to shell execution
  *
  * @return void
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::initialize
  */
 	public function initialize() {
 		$this->_loadModels();
@@ -189,6 +193,7 @@ class Shell extends Object {
  * or otherwise modify the pre-command flow.
  *
  * @return void
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::startup
  */
 	public function startup() {
 		$this->_welcome();
@@ -261,6 +266,7 @@ class Shell extends Object {
  *
  * @param string $task The task name to check.
  * @return boolean Success
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::hasTask
  */
 	public function hasTask($task) {
 		return isset($this->_taskMap[Inflector::camelize($task)]);
@@ -271,6 +277,7 @@ class Shell extends Object {
  *
  * @param string $name The method name to check.
  * @return boolean
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::hasMethod
  */
 	public function hasMethod($name) {
 		try {
@@ -306,6 +313,7 @@ class Shell extends Object {
  * `return $this->dispatchShell('schema', 'create', 'i18n', '--dry');`
  *
  * @return mixed The return of the other shell.
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::dispatchShell
  */
 	public function dispatchShell() {
 		$args = func_get_args();
@@ -334,6 +342,7 @@ class Shell extends Object {
  *   and the shell has a `main()` method, that will be called instead.
  * @param array $argv Array of arguments to run the shell with. This array should be missing the shell name.
  * @return void
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::runCommand
  */
 	public function runCommand($command, $argv) {
 		$isTask = $this->hasTask($command);
@@ -397,6 +406,7 @@ class Shell extends Object {
  * By overriding this method you can configure the ConsoleOptionParser before returning it.
  *
  * @return ConsoleOptionParser
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::getOptionParser
  */
 	public function getOptionParser() {
 		$parser = new ConsoleOptionParser($this->name);
@@ -428,6 +438,7 @@ class Shell extends Object {
  * @param mixed $options Array or string of options.
  * @param string $default Default input value.
  * @return mixed Either the default value, or the user-provided input.
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::in
  */
 	public function in($prompt, $options = null, $default = null) {
 		if (!$this->interactive) {
@@ -499,6 +510,7 @@ class Shell extends Object {
  * @param mixed $options Array of options to use, or an integer to wrap the text to.
  * @return string Wrapped / indented text
  * @see String::wrap()
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::wrapText
  */
 	public function wrapText($text, $options = array()) {
 		return String::wrap($text, $options);
@@ -519,6 +531,7 @@ class Shell extends Object {
  * @param integer $newlines Number of newlines to append
  * @param integer $level The message's output level, see above.
  * @return integer|boolean Returns the number of bytes returned from writing to stdout.
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::out
  */
 	public function out($message = null, $newlines = 1, $level = Shell::NORMAL) {
 		$currentLevel = Shell::NORMAL;
@@ -541,6 +554,7 @@ class Shell extends Object {
  * @param mixed $message A string or a an array of strings to output
  * @param integer $newlines Number of newlines to append
  * @return void
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::err
  */
 	public function err($message = null, $newlines = 1) {
 		$this->stderr->write($message, $newlines);
@@ -551,6 +565,7 @@ class Shell extends Object {
  *
  * @param integer $multiplier Number of times the linefeed sequence should be repeated
  * @return string
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::nl
  */
 	public function nl($multiplier = 1) {
 		return str_repeat(ConsoleOutput::LF, $multiplier);
@@ -562,6 +577,7 @@ class Shell extends Object {
  * @param integer $newlines Number of newlines to pre- and append
  * @param integer $width Width of the line, defaults to 63
  * @return void
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::hr
  */
 	public function hr($newlines = 0, $width = 63) {
 		$this->out(null, $newlines);
@@ -576,6 +592,7 @@ class Shell extends Object {
  * @param string $title Title of the error
  * @param string $message An optional error message
  * @return void
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::error
  */
 	public function error($title, $message = null) {
 		$this->err(__d('cake_console', '<error>Error:</error> %s', $title));
@@ -590,6 +607,7 @@ class Shell extends Object {
  * Clear the console
  *
  * @return void
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::clear
  */
 	public function clear() {
 		if (empty($this->params['noclear'])) {
@@ -607,6 +625,7 @@ class Shell extends Object {
  * @param string $path Where to put the file.
  * @param string $contents Content to put in the file.
  * @return boolean Success
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::createFile
  */
 	public function createFile($path, $contents) {
 		$path = str_replace(DS . DS, DS, $path);
@@ -668,6 +687,7 @@ class Shell extends Object {
  *
  * @param string $file Absolute file path
  * @return string short path
+ * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::shortPath
  */
 	public function shortPath($file) {
 		$shortPath = str_replace(ROOT, null, $file);

lib/Cake/Console/ShellDispatcher.php

@@ -210,7 +210,7 @@ class ShellDispatcher {
 		$class = Inflector::camelize($shell) . 'Shell';
 
 		App::uses('Shell', 'Console');
-		App::uses('AppShell', 'Console');
+		App::uses('AppShell', 'Console/Command');
 		App::uses($class, $plugin . 'Console/Command');
 
 		if (!class_exists($class)) {

lib/Cake/Controller/Component/AuthComponent.php

@@ -268,8 +268,8 @@ class AuthComponent extends Component {
 			return true;
 		}
 
-		$methods = array_flip($controller->methods);
-		$action = $controller->request->params['action'];
+		$methods = array_flip(array_map('strtolower', $controller->methods));
+		$action = strtolower($controller->request->params['action']);
 
 		$isMissingAction = (
 			$controller->scaffold === false &&
@@ -296,7 +296,7 @@ class AuthComponent extends Component {
 		$allowedActions = $this->allowedActions;
 		$isAllowed = (
 			$this->allowedActions == array('*') ||
-			in_array($action, $allowedActions)
+			in_array($action, array_map('strtolower', $allowedActions))
 		);
 
 		if ($loginAction != $url && $isAllowed) {
@@ -337,8 +337,7 @@ class AuthComponent extends Component {
 	}
 
 /**
- * Attempts to introspect the correct values for object properties including
- * $userModel and $sessionKey.
+ * Attempts to introspect the correct values for object properties.
  *
  * @return boolean
  */

lib/Cake/Controller/Component/CookieComponent.php

@@ -198,6 +198,7 @@ class CookieComponent extends Component {
  * @param boolean $encrypt Set to true to encrypt value, false otherwise
  * @param string $expires Can be either Unix timestamp, or date string
  * @return void
+ * @link http://book.cakephp.org/2.0/en/core-libraries/components/cookie.html#CookieComponent::write
  */
 	public function write($key, $value = null, $encrypt = true, $expires = null) {
 		if (is_null($encrypt)) {
@@ -234,6 +235,7 @@ class CookieComponent extends Component {
  *
  * @param mixed $key Key of the value to be obtained. If none specified, obtain map key => values
  * @return string or null, value for specified key
+ * @link http://book.cakephp.org/2.0/en/core-libraries/components/cookie.html#CookieComponent::read
  */
 	public function read($key = null) {
 		if (empty($this->_values) && isset($_COOKIE[$this->name])) {
@@ -269,6 +271,7 @@ class CookieComponent extends Component {
  *
  * @param string $key Key of the value to be deleted
  * @return void
+ * @link http://book.cakephp.org/2.0/en/core-libraries/components/cookie.html#CookieComponent::delete
  */
 	public function delete($key) {
 		if (empty($this->_values)) {
@@ -298,6 +301,7 @@ class CookieComponent extends Component {
  * Failure to do so will result in header already sent errors.
  *
  * @return void
+ * @link http://book.cakephp.org/2.0/en/core-libraries/components/cookie.html#CookieComponent::destroy
  */
 	public function destroy() {
 		if (isset($_COOKIE[$this->name])) {
@@ -407,6 +411,7 @@ class CookieComponent extends Component {
 	protected function _setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly = false) {
 		setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
 	}
+
 /**
  * Encrypts $value using public $type method in Security class
  *

lib/Cake/Controller/Component/PaginatorComponent.php

@@ -353,7 +353,7 @@ class PaginatorComponent extends Component {
 					$order[$alias . '.' . $field] = $value;
 				} elseif ($object->hasField($key, true)) {
 					$order[$field] = $value;
-				} elseif (isset($object->{$alias}) && $object->{$alias}->hasField($field)) {
+				} elseif (isset($object->{$alias}) && $object->{$alias}->hasField($field, true)) {
 					$order[$alias . '.' . $field] = $value;
 				}
 			}

lib/Cake/Controller/Component/RequestHandlerComponent.php

@@ -139,9 +139,9 @@ class RequestHandlerComponent extends Component {
 		}
 		$extensions = Router::extensions();
 		$preferred = array_shift($accept);
-		$preferredTypes = $this->mapType($preferred);
+		$preferredTypes = $this->response->mapType($preferred);
 		$similarTypes = array_intersect($extensions, $preferredTypes);
-		if (count($similarTypes) === 1 && !in_array('html', $preferredTypes)) {
+		if (count($similarTypes) === 1 && !in_array('xhtml', $preferredTypes) && !in_array('html', $preferredTypes)) {
 			$this->ext = array_shift($similarTypes);
 		}
 	}

lib/Cake/Controller/Component/SecurityComponent.php

@@ -208,6 +208,9 @@ class SecurityComponent extends Component {
 			}
 		}
 		$this->_generateToken($controller);
+		if ($isPost) {
+			unset($controller->request->data['_Token']);
+		}
 	}
 
 /**

lib/Cake/Core/App.php

@@ -99,7 +99,7 @@ class App {
 		'view' => array('suffix' => 'View', 'extends' => null, 'core' => true),
 		'helper' => array('suffix' => 'Helper', 'extends' => 'AppHelper', 'core' => true),
 		'vendor' => array('extends' => null, 'core' => true),
-		'shell' => array('suffix' => 'Shell', 'extends' => 'Shell', 'core' => true),
+		'shell' => array('suffix' => 'Shell', 'extends' => 'AppShell', 'core' => true),
 		'plugin' => array('extends' => null, 'core' => true)
 	);
 
@@ -794,7 +794,7 @@ class App {
 
 /**
  * Sets then returns the templates for each customizable package path
- * 
+ *
  * @return array templates for each customizable package path
  */
 	protected static function _packageFormat() {

lib/Cake/Error/ExceptionRenderer.php

@@ -185,6 +185,8 @@ class ExceptionRenderer {
 		try {
 			$this->controller->set($error->getAttributes());
 			$this->_outputMessage($this->template);
+		} catch (MissingViewException $e) {
+			$this->_outputMessage('error500');
 		} catch (Exception $e) {
 			$this->_outputMessageSafe('error500');
 		}

lib/Cake/Model/CakeSchema.php

@@ -351,21 +351,21 @@ class CakeSchema extends Object {
 			get_object_vars($this), $options
 		));
 
-		$out = "class {$name}Schema extends CakeSchema {\n";
+		$out = "class {$name}Schema extends CakeSchema {\n\n";
 
 		if ($path !== $this->path) {
-			$out .= "\tvar \$path = '{$path}';\n\n";
+			$out .= "\tpublic \$path = '{$path}';\n\n";
 		}
 
 		if ($file !== $this->file) {
-			$out .= "\tvar \$file = '{$file}';\n\n";
+			$out .= "\tpublic \$file = '{$file}';\n\n";
 		}
 
 		if ($connection !== 'default') {
-			$out .= "\tvar \$connection = '{$connection}';\n\n";
+			$out .= "\tpublic \$connection = '{$connection}';\n\n";
 		}
 
-		$out .= "\tfunction before(\$event = array()) {\n\t\treturn true;\n\t}\n\n\tfunction after(\$event = array()) {\n\t}\n\n";
+		$out .= "\tpublic function before(\$event = array()) {\n\t\treturn true;\n\t}\n\n\tpublic function after(\$event = array()) {\n\t}\n\n";
 
 		if (empty($tables)) {
 			$this->read();
@@ -379,7 +379,7 @@ class CakeSchema extends Object {
 		$out .= "}\n";
 
 		$file = new SplFileObject($path . DS . $file, 'w+');
-		$content = "<?php \n/* {$name} schema generated on: " . date('Y-m-d H:i:s') . " : ". time() . "*/\n{$out}?>";
+		$content = "<?php \n/* generated on: " . date('Y-m-d H:i:s') . " : ". time() . " */\n{$out}";
 		if ($file->fwrite($content)) {
 			return $content;
 		}
@@ -395,7 +395,7 @@ class CakeSchema extends Object {
  * @return string Variable declaration for a schema class
  */
 	public function generateTable($table, $fields) {
-		$out = "\tvar \${$table} = array(\n";
+		$out = "\tpublic \${$table} = array(\n";
 		if (is_array($fields)) {
 			$cols = array();
 			foreach ($fields as $field => $value) {

lib/Cake/Model/Datasource/Database/Mysql.php

@@ -238,7 +238,7 @@ class Mysql extends DboSource {
  * @return mixed array with results fetched and mapped to column names or false if there is no results left to fetch
  */
 	public function fetchResult() {
-		if ($row = $this->_result->fetch()) {
+		if ($row = $this->_result->fetch(PDO::FETCH_NUM)) {
 			$resultRow = array();
 			foreach ($this->map as $col => $meta) {
 				list($table, $column, $type) = $meta;

lib/Cake/Model/Datasource/Database/Postgres.php

@@ -707,7 +707,7 @@ class Postgres extends DboSource {
  * @return array
  */
 	public function fetchResult() {
-		if ($row = $this->_result->fetch()) {
+		if ($row = $this->_result->fetch(PDO::FETCH_NUM)) {
 			$resultRow = array();
 
 			foreach ($this->map as $index => $meta) {

lib/Cake/Model/Datasource/Database/Sqlite.php

@@ -330,7 +330,7 @@ class Sqlite extends DboSource {
  * @return mixed array with results fetched and mapped to column names or false if there is no results left to fetch
  */
 	public function fetchResult() {
-		if ($row = $this->_result->fetch()) {
+		if ($row = $this->_result->fetch(PDO::FETCH_NUM)) {
 			$resultRow = array();
 			foreach ($this->map as $col => $meta) {
 				list($table, $column, $type) = $meta;

lib/Cake/Model/Datasource/Database/Sqlserver.php

@@ -607,7 +607,7 @@ class Sqlserver extends DboSource {
  * @return mixed
  */
 	public function fetchResult() {
-		if ($row = $this->_result->fetch()) {
+		if ($row = $this->_result->fetch(PDO::FETCH_NUM)) {
 			$resultRow = array();
 			foreach ($this->map as $col => $meta) {
 				list($table, $column, $type) = $meta;

lib/Cake/Model/Datasource/DboSource.php

@@ -2590,6 +2590,10 @@ class DboSource extends DataSource {
 			if (is_object($model) && $model->isVirtualField($key)) {
 				$key =  '(' . $this->_quoteFields($model->getVirtualField($key)) . ')';
 			}
+			list($alias, $field) = pluginSplit($key);
+			if (is_object($model) && $alias !== $model->alias && is_object($model->{$alias}) && $model->{$alias}->isVirtualField($key)) {
+				$key =  '(' . $this->_quoteFields($model->{$alias}->getVirtualField($key)) . ')';
+			}
 
 			if (strpos($key, '.')) {
 				$key = preg_replace_callback('/([a-zA-Z0-9_-]{1,})\\.([a-zA-Z0-9_-]{1,})/', array(&$this, '_quoteMatchedField'), $key);

lib/Cake/Network/CakeRequest.php

@@ -184,7 +184,7 @@ class CakeRequest implements ArrayAccess {
 			$query = $_GET;
 		}
 
-		unset($query['/' . $this->url]);
+		unset($query['/' . str_replace('.', '_', $this->url)]);
 		if (strpos($this->url, '?') !== false) {
 			list(, $querystr) = explode('?', $this->url);
 			parse_str($querystr, $queryArgs);
@@ -413,6 +413,17 @@ class CakeRequest implements ArrayAccess {
 		return null;
 	}
 
+/**
+ * Magic isset method allows isset/empty checks
+ * on routing parameters.
+ *
+ * @param string $name The property being accessed.
+ * @return bool Existence
+ */
+	public function __isset($name) {
+		return isset($this->params[$name]);
+	}
+
 /**
  * Check whether or not a Request is a certain type.  Uses the built in detection rules
  * as well as additional rules defined with CakeRequest::addDetector().  Any detector can be called

lib/Cake/Network/Email/CakeEmail.php

@@ -546,9 +546,9 @@ class CakeEmail {
 	}
 
 /**
- * Set Subject
+ * Get/Set Subject.
  *
- * @param string $subject
+ * @param null|string $subject
  * @return mixed
  */
 	public function subject($subject = null) {

lib/Cake/Network/Email/SmtpTransport.php

@@ -214,7 +214,8 @@ class SmtpTransport extends AbstractTransport {
 			if (substr($response, -2) !== "\r\n") {
 				throw new SocketException(__d('cake_dev', 'SMTP timeout.'));
 			}
-			$response = end(explode("\r\n", rtrim($response, "\r\n")));
+			$responseLines = explode("\r\n", rtrim($response, "\r\n"));
+			$response = end($responseLines);
 
 			if (preg_match('/^(' . $checkCode . ')(.)/', $response, $code)) {
 				if ($code[2] === '-') {

lib/Cake/Routing/Route/CakeRoute.php

@@ -388,6 +388,7 @@ class CakeRoute {
 		}
 
 		$namedConfig = Router::namedConfig();
+		$prefixes = Router::prefixes();
 		$greedyNamed = $namedConfig['greedyNamed'];
 		$allowedNamedParams = $namedConfig['rules'];
 
@@ -421,7 +422,8 @@ class CakeRoute {
 			// pull out named params if named params are greedy or a rule exists.
 			if (
 				($greedyNamed || isset($allowedNamedParams[$key])) &&
-				($value !== false && $value !== null)
+				($value !== false && $value !== null) &&
+				(!in_array($key, $prefixes))
 			) {
 				$named[$key] = $value;
 				continue;

lib/Cake/Test/Case/BasicsTest.php

@@ -60,24 +60,24 @@ class BasicsTest extends CakeTestCase {
 		$two = array('one' => 'one', 'two' => 'two');
 		$result = array_diff_key($one, $two);
 		$expected = array('three' => 3);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$one = array('one' => array('value', 'value-two'), 'two' => 2, 'three' => 3);
 		$two = array('two' => 'two');
 		$result = array_diff_key($one, $two);
 		$expected = array('one' => array('value', 'value-two'), 'three' => 3);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$one = array('one' => null, 'two' => 2, 'three' => '', 'four' => 0);
 		$two = array('two' => 'two');
 		$result = array_diff_key($one, $two);
 		$expected = array('one' => null, 'three' => '', 'four' => 0);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$one = array('minYear' => null, 'maxYear' => null, 'separator' => '-', 'interval' => 1, 'monthNames' => true);
 		$two = array('minYear' => null, 'maxYear' => null, 'separator' => '-', 'interval' => 1, 'monthNames' => true);
 		$result = array_diff_key($one, $two);
-		$this->assertEqual($result, array());
+		$this->assertEquals($result, array());
 
 	}
 /**
@@ -92,48 +92,48 @@ class BasicsTest extends CakeTestCase {
 		$__ENV = $_ENV;
 
 		$_SERVER['HTTP_HOST'] = 'localhost';
-		$this->assertEqual(env('HTTP_BASE'), '.localhost');
+		$this->assertEquals(env('HTTP_BASE'), '.localhost');
 
 		$_SERVER['HTTP_HOST'] = 'com.ar';
-		$this->assertEqual(env('HTTP_BASE'), '.com.ar');
+		$this->assertEquals(env('HTTP_BASE'), '.com.ar');
 
 		$_SERVER['HTTP_HOST'] = 'example.ar';
-		$this->assertEqual(env('HTTP_BASE'), '.example.ar');
+		$this->assertEquals(env('HTTP_BASE'), '.example.ar');
 
 		$_SERVER['HTTP_HOST'] = 'example.com';
-		$this->assertEqual(env('HTTP_BASE'), '.example.com');
+		$this->assertEquals(env('HTTP_BASE'), '.example.com');
 
 		$_SERVER['HTTP_HOST'] = 'www.example.com';
-		$this->assertEqual(env('HTTP_BASE'), '.example.com');
+		$this->assertEquals(env('HTTP_BASE'), '.example.com');
 
 		$_SERVER['HTTP_HOST'] = 'subdomain.example.com';
-		$this->assertEqual(env('HTTP_BASE'), '.example.com');
+		$this->assertEquals(env('HTTP_BASE'), '.example.com');
 
 		$_SERVER['HTTP_HOST'] = 'example.com.ar';
-		$this->assertEqual(env('HTTP_BASE'), '.example.com.ar');
+		$this->assertEquals(env('HTTP_BASE'), '.example.com.ar');
 
 		$_SERVER['HTTP_HOST'] = 'www.example.com.ar';
-		$this->assertEqual(env('HTTP_BASE'), '.example.com.ar');
+		$this->assertEquals(env('HTTP_BASE'), '.example.com.ar');
 
 		$_SERVER['HTTP_HOST'] = 'subdomain.example.com.ar';
-		$this->assertEqual(env('HTTP_BASE'), '.example.com.ar');
+		$this->assertEquals(env('HTTP_BASE'), '.example.com.ar');
 
 		$_SERVER['HTTP_HOST'] = 'double.subdomain.example.com';
-		$this->assertEqual(env('HTTP_BASE'), '.subdomain.example.com');
+		$this->assertEquals(env('HTTP_BASE'), '.subdomain.example.com');
 
 		$_SERVER['HTTP_HOST'] = 'double.subdomain.example.com.ar';
-		$this->assertEqual(env('HTTP_BASE'), '.subdomain.example.com.ar');
+		$this->assertEquals(env('HTTP_BASE'), '.subdomain.example.com.ar');
 
 		$_SERVER = $_ENV = array();
 
 		$_SERVER['SCRIPT_NAME'] = '/a/test/test.php';
-		$this->assertEqual(env('SCRIPT_NAME'), '/a/test/test.php');
+		$this->assertEquals(env('SCRIPT_NAME'), '/a/test/test.php');
 
 		$_SERVER = $_ENV = array();
 
 		$_ENV['CGI_MODE'] = 'BINARY';
 		$_ENV['SCRIPT_URL'] = '/a/test/test.php';
-		$this->assertEqual(env('SCRIPT_NAME'), '/a/test/test.php');
+		$this->assertEquals(env('SCRIPT_NAME'), '/a/test/test.php');
 
 		$_SERVER = $_ENV = array();
 
@@ -173,13 +173,13 @@ class BasicsTest extends CakeTestCase {
 		$this->assertNull(env('TEST_ME'));
 
 		$_ENV['TEST_ME'] = 'a';
-		$this->assertEqual(env('TEST_ME'), 'a');
+		$this->assertEquals(env('TEST_ME'), 'a');
 
 		$_SERVER['TEST_ME'] = 'b';
-		$this->assertEqual(env('TEST_ME'), 'b');
+		$this->assertEquals(env('TEST_ME'), 'b');
 
 		unset($_ENV['TEST_ME']);
-		$this->assertEqual(env('TEST_ME'), 'b');
+		$this->assertEquals(env('TEST_ME'), 'b');
 
 		$_SERVER = $__SERVER;
 		$_ENV = $__ENV;
@@ -193,24 +193,24 @@ class BasicsTest extends CakeTestCase {
 	public function testH() {
 		$string = '<foo>';
 		$result = h($string);
-		$this->assertEqual('&lt;foo&gt;', $result);
+		$this->assertEquals('&lt;foo&gt;', $result);
 
 		$in = array('this & that', '<p>Which one</p>');
 		$result = h($in);
 		$expected = array('this &amp; that', '&lt;p&gt;Which one&lt;/p&gt;');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$string = '<foo> & &nbsp;';
 		$result = h($string);
-		$this->assertEqual('&lt;foo&gt; &amp; &amp;nbsp;', $result);
+		$this->assertEquals('&lt;foo&gt; &amp; &amp;nbsp;', $result);
 
 		$string = '<foo> & &nbsp;';
 		$result = h($string, false);
-		$this->assertEqual('&lt;foo&gt; &amp; &nbsp;', $result);
+		$this->assertEquals('&lt;foo&gt; &amp; &nbsp;', $result);
 
 		$string = '<foo> & &nbsp;';
 		$result = h($string, 'UTF-8');
-		$this->assertEqual('&lt;foo&gt; &amp; &amp;nbsp;', $result);
+		$this->assertEquals('&lt;foo&gt; &amp; &amp;nbsp;', $result);
 
 		$arr = array('<foo>', '&nbsp;');
 		$result = h($arr);
@@ -218,7 +218,7 @@ class BasicsTest extends CakeTestCase {
 			'&lt;foo&gt;',
 			'&amp;nbsp;'
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$arr = array('<foo>', '&nbsp;');
 		$result = h($arr, false);
@@ -226,7 +226,7 @@ class BasicsTest extends CakeTestCase {
 			'&lt;foo&gt;',
 			'&nbsp;'
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$arr = array('f' => '<foo>', 'n' => '&nbsp;');
 		$result = h($arr, false);
@@ -234,7 +234,7 @@ class BasicsTest extends CakeTestCase {
 			'f' => '&lt;foo&gt;',
 			'n' => '&nbsp;'
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$obj = new stdClass();
 		$result = h($obj);
@@ -253,11 +253,11 @@ class BasicsTest extends CakeTestCase {
 	public function testAm() {
 		$result = am(array('one', 'two'), 2, 3, 4);
 		$expected = array('one', 'two', 2, 3, 4);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = am(array('one' => array(2, 3), 'two' => array('foo')), array('one' => array(4, 5)));
 		$expected = array('one' => array(4, 5),'two' => array('foo'));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -282,7 +282,7 @@ class BasicsTest extends CakeTestCase {
 		$this->assertTrue(file_exists(CACHE . 'basics_test'));
 
 		$result = cache('basics_test');
-		$this->assertEqual($result, 'simple cache write');
+		$this->assertEquals($result, 'simple cache write');
 		@unlink(CACHE . 'basics_test');
 
 		cache('basics_test', 'expired', '+1 second');
@@ -365,35 +365,35 @@ class BasicsTest extends CakeTestCase {
 
 		$result = __('Plural Rule 1');
 		$expected = 'Plural Rule 1 (translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __('Plural Rule 1 (from core)');
 		$expected = 'Plural Rule 1 (from core translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __('Some string with %s', 'arguments');
 		$expected = 'Some string with arguments';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __('Some string with %s %s', 'multiple', 'arguments');
 		$expected = 'Some string with multiple arguments';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __('Some string with %s %s', array('multiple', 'arguments'));
 		$expected = 'Some string with multiple arguments';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __('Testing %2$s %1$s', 'order', 'different');
 		$expected = 'Testing different order';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __('Testing %2$s %1$s', array('order', 'different'));
 		$expected = 'Testing different order';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __('Testing %.2f number', 1.2345);
 		$expected = 'Testing 1.23 number';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -406,27 +406,27 @@ class BasicsTest extends CakeTestCase {
 
 		$result = __n('%d = 1', '%d = 0 or > 1', 0);
 		$expected = '%d = 0 or > 1 (translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __n('%d = 1', '%d = 0 or > 1', 1);
 		$expected = '%d = 1 (translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __n('%d = 1 (from core)', '%d = 0 or > 1 (from core)', 2);
 		$expected = '%d = 0 or > 1 (from core translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __n('%d item.', '%d items.', 1, 1);
 		$expected = '1 item.';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __n('%d item for id %s', '%d items for id %s', 2, 2, '1234');
 		$expected = '2 items for id 1234';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __n('%d item for id %s', '%d items for id %s', 2, array(2, '1234'));
 		$expected = '2 items for id 1234';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -439,27 +439,27 @@ class BasicsTest extends CakeTestCase {
 
 		$result = __d('default', 'Plural Rule 1');
 		$expected = 'Plural Rule 1 (translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __d('core', 'Plural Rule 1');
 		$expected = 'Plural Rule 1';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __d('core', 'Plural Rule 1 (from core)');
 		$expected = 'Plural Rule 1 (from core translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __d('core', 'Some string with %s', 'arguments');
 		$expected = 'Some string with arguments';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __d('core', 'Some string with %s %s', 'multiple', 'arguments');
 		$expected = 'Some string with multiple arguments';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __d('core', 'Some string with %s %s', array('multiple', 'arguments'));
 		$expected = 'Some string with multiple arguments';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -472,31 +472,31 @@ class BasicsTest extends CakeTestCase {
 
 		$result = __dn('default', '%d = 1', '%d = 0 or > 1', 0);
 		$expected = '%d = 0 or > 1 (translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dn('core', '%d = 1', '%d = 0 or > 1', 0);
 		$expected = '%d = 0 or > 1';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dn('core', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 0);
 		$expected = '%d = 0 or > 1 (from core translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dn('default', '%d = 1', '%d = 0 or > 1', 1);
 		$expected = '%d = 1 (translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dn('core', '%d item.', '%d items.', 1, 1);
 		$expected = '1 item.';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dn('core', '%d item for id %s', '%d items for id %s', 2, 2, '1234');
 		$expected = '2 items for id 1234';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dn('core', '%d item for id %s', '%d items for id %s', 2, array(2, '1234'));
 		$expected = '2 items for id 1234';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -509,23 +509,23 @@ class BasicsTest extends CakeTestCase {
 
 		$result = __c('Plural Rule 1', 6);
 		$expected = 'Plural Rule 1 (translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __c('Plural Rule 1 (from core)', 6);
 		$expected = 'Plural Rule 1 (from core translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __c('Some string with %s', 6, 'arguments');
 		$expected = 'Some string with arguments';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __c('Some string with %s %s', 6, 'multiple', 'arguments');
 		$expected = 'Some string with multiple arguments';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __c('Some string with %s %s', 6, array('multiple', 'arguments'));
 		$expected = 'Some string with multiple arguments';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -538,31 +538,31 @@ class BasicsTest extends CakeTestCase {
 
 		$result = __dc('default', 'Plural Rule 1', 6);
 		$expected = 'Plural Rule 1 (translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dc('default', 'Plural Rule 1 (from core)', 6);
 		$expected = 'Plural Rule 1 (from core translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dc('core', 'Plural Rule 1', 6);
 		$expected = 'Plural Rule 1';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dc('core', 'Plural Rule 1 (from core)', 6);
 		$expected = 'Plural Rule 1 (from core translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dc('core', 'Some string with %s', 6, 'arguments');
 		$expected = 'Some string with arguments';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dc('core', 'Some string with %s %s', 6, 'multiple', 'arguments');
 		$expected = 'Some string with multiple arguments';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dc('core', 'Some string with %s %s', 6, array('multiple', 'arguments'));
 		$expected = 'Some string with multiple arguments';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -575,27 +575,27 @@ class BasicsTest extends CakeTestCase {
 
 		$result = __dcn('default', '%d = 1', '%d = 0 or > 1', 0, 6);
 		$expected = '%d = 0 or > 1 (translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dcn('default', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 1, 6);
 		$expected = '%d = 1 (from core translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dcn('core', '%d = 1', '%d = 0 or > 1', 0, 6);
 		$expected = '%d = 0 or > 1';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dcn('core', '%d item.', '%d items.', 1, 6, 1);
 		$expected = '1 item.';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dcn('core', '%d item for id %s', '%d items for id %s', 2, 6, 2, '1234');
 		$expected = '2 items for id 1234';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __dcn('core', '%d item for id %s', '%d items for id %s', 2, 6, array(2, '1234'));
 		$expected = '2 items for id 1234';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -610,9 +610,9 @@ class BasicsTest extends CakeTestCase {
 		LogError("Testing with\nmulti-line\nstring");
 
 		$result = file_get_contents(LOGS . 'error.log');
-		$this->assertPattern('/Error: Testing LogError\(\) basic function/', $result);
-		$this->assertNoPattern("/Error: Testing with\nmulti-line\nstring/", $result);
-		$this->assertPattern('/Error: Testing with multi-line string/', $result);
+		$this->assertRegExp('/Error: Testing LogError\(\) basic function/', $result);
+		$this->assertNotRegExp("/Error: Testing with\nmulti-line\nstring/", $result);
+		$this->assertRegExp('/Error: Testing with multi-line string/', $result);
 	}
 
 /**
@@ -621,7 +621,9 @@ class BasicsTest extends CakeTestCase {
  * @return void
  */
 	public function testFileExistsInPath() {
-		$this->skipUnless(function_exists('ini_set'), '%s ini_set function not available');
+		if (!function_exists('ini_set')) {
+			$this->markTestSkipped('%s ini_set function not available');
+		}
 
 		$_includePath = ini_get('include_path');
 
@@ -643,12 +645,12 @@ class BasicsTest extends CakeTestCase {
 
 		ini_set('include_path', $path . PATH_SEPARATOR . $folder1);
 
-		$this->assertEqual(fileExistsInPath('file1.php'), $file1);
-		$this->assertEqual(fileExistsInPath('file2.php'), $file2);
-		$this->assertEqual(fileExistsInPath('folder1' . DS . 'file2.php'), $file2);
-		$this->assertEqual(fileExistsInPath($file2), $file2);
-		$this->assertEqual(fileExistsInPath('file3.php'), $file3);
-		$this->assertEqual(fileExistsInPath($file4), $file4);
+		$this->assertEquals(fileExistsInPath('file1.php'), $file1);
+		$this->assertEquals(fileExistsInPath('file2.php'), $file2);
+		$this->assertEquals(fileExistsInPath('folder1' . DS . 'file2.php'), $file2);
+		$this->assertEquals(fileExistsInPath($file2), $file2);
+		$this->assertEquals(fileExistsInPath('file3.php'), $file3);
+		$this->assertEquals(fileExistsInPath($file4), $file4);
 
 		$this->assertFalse(fileExistsInPath('file1'));
 		$this->assertFalse(fileExistsInPath('file4.php'));
@@ -667,11 +669,11 @@ class BasicsTest extends CakeTestCase {
 	public function testConvertSlash() {
 		$result = convertSlash('\path\to\location\\');
 		$expected = '\path\to\location\\';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = convertSlash('/path/to/location/');
 		$expected = 'path_to_location';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -681,28 +683,142 @@ class BasicsTest extends CakeTestCase {
  */
 	public function testDebug() {
 		ob_start();
-			debug('this-is-a-test');
+			debug('this-is-a-test', false);
 		$result = ob_get_clean();
-		$pattern = '/(.+?Test(\/|\\\)Case(\/|\\\)BasicsTest\.php|';
-		$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
-		$pattern .= '.*line.*' . (__LINE__ - 4) . '.*this-is-a-test.*/s';
-		$this->assertRegExp($pattern, $result);
+$expectedText = <<<EXPECTED
+%s (line %d)
+########## DEBUG ##########
+this-is-a-test
+###########################
+EXPECTED;
+		$expected = sprintf($expectedText, substr(__FILE__, strlen(ROOT) + 1), __LINE__ - 8);
+		$this->assertEquals($expected, $result);
 
 		ob_start();
 			debug('<div>this-is-a-test</div>', true);
 		$result = ob_get_clean();
-		$pattern = '/(.+?Test(\/|\\\)Case(\/|\\\)BasicsTest\.php|';
-		$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
-		$pattern .= '.*line.*' . (__LINE__ -4) . '.*&lt;div&gt;this-is-a-test&lt;\/div&gt;.*/s';
-		$this->assertRegExp($pattern, $result);
+$expectedHtml = <<<EXPECTED
+<div class="cake-debug-output">
+<span><strong>%s</strong> (line <strong>%d</strong>)</span>
+<pre class="cake-debug">
+&lt;div&gt;this-is-a-test&lt;/div&gt;
+</pre>
+</div>
+EXPECTED;
+		$expected = sprintf($expectedHtml, substr(__FILE__, strlen(ROOT) + 1), __LINE__ - 10);
+		$this->assertEquals($expected, $result);
+
+		ob_start();
+			debug('<div>this-is-a-test</div>', true, true);
+		$result = ob_get_clean();
+$expected = <<<EXPECTED
+<div class="cake-debug-output">
+<span><strong>%s</strong> (line <strong>%d</strong>)</span>
+<pre class="cake-debug">
+&lt;div&gt;this-is-a-test&lt;/div&gt;
+</pre>
+</div>
+EXPECTED;
+		$expected = sprintf($expected, substr(__FILE__, strlen(ROOT) + 1), __LINE__ - 10);
+		$this->assertEquals($expected, $result);
+
+		ob_start();
+			debug('<div>this-is-a-test</div>', true, false);
+		$result = ob_get_clean();
+$expected = <<<EXPECTED
+<div class="cake-debug-output">
+
+<pre class="cake-debug">
+&lt;div&gt;this-is-a-test&lt;/div&gt;
+</pre>
+</div>
+EXPECTED;
+		$expected = sprintf($expected, substr(__FILE__, strlen(ROOT) + 1), __LINE__ - 10);
+		$this->assertEquals($expected, $result);
+
+		ob_start();
+			debug('<div>this-is-a-test</div>', null);
+		$result = ob_get_clean();
+$expectedHtml = <<<EXPECTED
+<div class="cake-debug-output">
+<span><strong>%s</strong> (line <strong>%d</strong>)</span>
+<pre class="cake-debug">
+&lt;div&gt;this-is-a-test&lt;/div&gt;
+</pre>
+</div>
+EXPECTED;
+$expectedText = <<<EXPECTED
+%s (line %d)
+########## DEBUG ##########
+<div>this-is-a-test</div>
+###########################
+EXPECTED;
+		if (php_sapi_name() == 'cli') {
+			$expected = sprintf($expectedText, substr(__FILE__, strlen(ROOT) + 1), __LINE__ - 17);
+		} else {
+			$expected = sprintf($expectedHtml, substr(__FILE__, strlen(ROOT) + 1), __LINE__ - 19);
+		}
+		$this->assertEquals($expected, $result);
+
+		ob_start();
+			debug('<div>this-is-a-test</div>', null, false);
+		$result = ob_get_clean();
+$expectedHtml = <<<EXPECTED
+<div class="cake-debug-output">
+
+<pre class="cake-debug">
+&lt;div&gt;this-is-a-test&lt;/div&gt;
+</pre>
+</div>
+EXPECTED;
+$expectedText = <<<EXPECTED
+
+########## DEBUG ##########
+<div>this-is-a-test</div>
+###########################
+EXPECTED;
+		if (php_sapi_name() == 'cli') {
+			$expected = sprintf($expectedText, substr(__FILE__, strlen(ROOT) + 1), __LINE__ - 17);
+		} else {
+			$expected = sprintf($expectedHtml, substr(__FILE__, strlen(ROOT) + 1), __LINE__ - 19);
+		}
+		$this->assertEquals($expected, $result);
 
 		ob_start();
 			debug('<div>this-is-a-test</div>', false);
 		$result = ob_get_clean();
-		$pattern = '/(.+?Test(\/|\\\)Case(\/|\\\)BasicsTest\.php|';
-		$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
-		$pattern .=	'.*line.*' . (__LINE__ - 4) . '.*\<div\>this-is-a-test\<\/div\>.*/s';
-		$this->assertRegExp($pattern, $result);
+$expected = <<<EXPECTED
+%s (line %d)
+########## DEBUG ##########
+<div>this-is-a-test</div>
+###########################
+EXPECTED;
+		$expected = sprintf($expected, substr(__FILE__, strlen(ROOT) + 1), __LINE__ - 8);
+		$this->assertEquals($expected, $result);
+
+		ob_start();
+			debug('<div>this-is-a-test</div>', false, true);
+		$result = ob_get_clean();
+$expected = <<<EXPECTED
+%s (line %d)
+########## DEBUG ##########
+<div>this-is-a-test</div>
+###########################
+EXPECTED;
+		$expected = sprintf($expected, substr(__FILE__, strlen(ROOT) + 1), __LINE__ - 8);
+		$this->assertEquals($expected, $result);
+
+		ob_start();
+			debug('<div>this-is-a-test</div>', false, false);
+		$result = ob_get_clean();
+$expected = <<<EXPECTED
+
+########## DEBUG ##########
+<div>this-is-a-test</div>
+###########################
+EXPECTED;
+		$expected = sprintf($expected, substr(__FILE__, strlen(ROOT) + 1), __LINE__ - 8);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -715,13 +831,13 @@ class BasicsTest extends CakeTestCase {
 			pr('this is a test');
 		$result = ob_get_clean();
 		$expected = "<pre>this is a test</pre>";
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		ob_start();
 			pr(array('this' => 'is', 'a' => 'test'));
 		$result = ob_get_clean();
 		$expected = "<pre>Array\n(\n    [this] => is\n    [a] => test\n)\n</pre>";
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -732,11 +848,11 @@ class BasicsTest extends CakeTestCase {
 	public function testStripslashesDeep() {
 		$this->skipIf(ini_get('magic_quotes_sybase') === '1', 'magic_quotes_sybase is on.');
 
-		$this->assertEqual(stripslashes_deep("tes\'t"), "tes't");
-		$this->assertEqual(stripslashes_deep('tes\\' . chr(0) .'t'), 'tes' . chr(0) .'t');
-		$this->assertEqual(stripslashes_deep('tes\"t'), 'tes"t');
-		$this->assertEqual(stripslashes_deep("tes\'t"), "tes't");
-		$this->assertEqual(stripslashes_deep('te\\st'), 'test');
+		$this->assertEquals(stripslashes_deep("tes\'t"), "tes't");
+		$this->assertEquals(stripslashes_deep('tes\\' . chr(0) .'t'), 'tes' . chr(0) .'t');
+		$this->assertEquals(stripslashes_deep('tes\"t'), 'tes"t');
+		$this->assertEquals(stripslashes_deep("tes\'t"), "tes't");
+		$this->assertEquals(stripslashes_deep('te\\st'), 'test');
 
 		$nested = array(
 			'a' => "tes\'t",
@@ -758,7 +874,7 @@ class BasicsTest extends CakeTestCase {
 				),
 			'g' => 'test'
 			);
-		$this->assertEqual(stripslashes_deep($nested), $expected);
+		$this->assertEquals(stripslashes_deep($nested), $expected);
 	}
 
 /**
@@ -767,9 +883,11 @@ class BasicsTest extends CakeTestCase {
  * @return void
  */
 	public function testStripslashesDeepSybase() {
-		$this->skipUnless(ini_get('magic_quotes_sybase') === '1', 'magic_quotes_sybase is off');
+		if (!(ini_get('magic_quotes_sybase') === '1')) {
+			$this->markTestSkipped('magic_quotes_sybase is off');
+		}
 
-		$this->assertEqual(stripslashes_deep("tes\'t"), "tes\'t");
+		$this->assertEquals(stripslashes_deep("tes\'t"), "tes\'t");
 
 		$nested = array(
 			'a' => "tes't",
@@ -791,7 +909,7 @@ class BasicsTest extends CakeTestCase {
 				),
 			'g' => "te'''st"
 			);
-		$this->assertEqual(stripslashes_deep($nested), $expected);
+		$this->assertEquals(stripslashes_deep($nested), $expected);
 	}
 
 /**
@@ -801,24 +919,24 @@ class BasicsTest extends CakeTestCase {
  */
 	public function testPluginSplit() {
 		$result = pluginSplit('Something.else');
-		$this->assertEqual($result, array('Something', 'else'));
+		$this->assertEquals($result, array('Something', 'else'));
 
 		$result = pluginSplit('Something.else.more.dots');
-		$this->assertEqual($result, array('Something', 'else.more.dots'));
+		$this->assertEquals($result, array('Something', 'else.more.dots'));
 
 		$result = pluginSplit('Somethingelse');
-		$this->assertEqual($result, array(null, 'Somethingelse'));
+		$this->assertEquals($result, array(null, 'Somethingelse'));
 
 		$result = pluginSplit('Something.else', true);
-		$this->assertEqual($result, array('Something.', 'else'));
+		$this->assertEquals($result, array('Something.', 'else'));
 
 		$result = pluginSplit('Something.else.more.dots', true);
-		$this->assertEqual($result, array('Something.', 'else.more.dots'));
+		$this->assertEquals($result, array('Something.', 'else.more.dots'));
 
 		$result = pluginSplit('Post', false, 'Blog');
-		$this->assertEqual($result, array('Blog', 'Post'));
+		$this->assertEquals($result, array('Blog', 'Post'));
 
 		$result = pluginSplit('Blog.Post', false, 'Ultimate');
-		$this->assertEqual($result, array('Blog', 'Post'));
+		$this->assertEquals($result, array('Blog', 'Post'));
 	}
 }

lib/Cake/Test/Case/Cache/CacheTest.php

@@ -57,7 +57,7 @@ class CacheTest extends CakeTestCase {
 	public function testConfig() {
 		$settings = array('engine' => 'File', 'path' => TMP . 'tests', 'prefix' => 'cake_test_');
 		$results = Cache::config('new', $settings);
-		$this->assertEqual($results, Cache::config('new'));
+		$this->assertEquals($results, Cache::config('new'));
 		$this->assertTrue(isset($results['engine']));
 		$this->assertTrue(isset($results['settings']));
 	}
@@ -93,11 +93,11 @@ class CacheTest extends CakeTestCase {
 
 		$settings = array('engine' => 'TestAppCache', 'path' => TMP, 'prefix' => 'cake_test_');
 		$result = Cache::config('libEngine', $settings);
-		$this->assertEqual($result, Cache::config('libEngine'));
+		$this->assertEquals($result, Cache::config('libEngine'));
 
 		$settings = array('engine' => 'TestPlugin.TestPluginCache', 'path' => TMP, 'prefix' => 'cake_test_');
 		$result = Cache::config('pluginLibEngine', $settings);
-		$this->assertEqual($result, Cache::config('pluginLibEngine'));
+		$this->assertEquals($result, Cache::config('pluginLibEngine'));
 
 		Cache::drop('libEngine');
 		Cache::drop('pluginLibEngine');
@@ -149,10 +149,10 @@ class CacheTest extends CakeTestCase {
 		$_cacheConfigTests = Cache::config('tests');
 
 		$result = Cache::config('sessions', array('engine'=> 'File', 'path' => TMP . 'sessions'));
-		$this->assertEqual($result['settings'], Cache::settings('sessions'));
+		$this->assertEquals($result['settings'], Cache::settings('sessions'));
 
 		$result = Cache::config('tests', array('engine'=> 'File', 'path' => TMP . 'tests'));
-		$this->assertEqual($result['settings'], Cache::settings('tests'));
+		$this->assertEquals($result['settings'], Cache::settings('tests'));
 
 		Cache::config('sessions', $_cacheConfigSessions['settings']);
 		Cache::config('tests', $_cacheConfigTests['settings']);
@@ -168,17 +168,17 @@ class CacheTest extends CakeTestCase {
 
 		Cache::write('value_one', 'I am cached', 'test_name');
 		$result = Cache::read('value_one', 'test_name');
-		$this->assertEqual($result, 'I am cached');
+		$this->assertEquals($result, 'I am cached');
 
 		$result = Cache::read('value_one');
-		$this->assertEqual($result, null);
+		$this->assertEquals($result, null);
 
 		Cache::write('value_one', 'I am in default config!');
 		$result = Cache::read('value_one');
-		$this->assertEqual($result, 'I am in default config!');
+		$this->assertEquals($result, 'I am in default config!');
 
 		$result = Cache::read('value_one', 'test_name');
-		$this->assertEqual($result, 'I am cached');
+		$this->assertEquals($result, 'I am cached');
 
 		Cache::delete('value_one', 'test_name');
 		Cache::delete('value_one', 'default');
@@ -205,7 +205,7 @@ class CacheTest extends CakeTestCase {
 			'isWindows' => DIRECTORY_SEPARATOR == '\\',
 			'mask' => 0664
 		);
-		$this->assertEqual($expected, Cache::settings('sessions'));
+		$this->assertEquals($expected, Cache::settings('sessions'));
 
 		Cache::config('sessions', $_cacheConfigSessions['settings']);
 	}
@@ -234,7 +234,7 @@ class CacheTest extends CakeTestCase {
 
 		$settings = Cache::settings();
 		$expecting = $override + $initial;
-		$this->assertEqual($settings, $expecting);
+		$this->assertEquals($settings, $expecting);
 	}
 
 /**
@@ -275,19 +275,19 @@ class CacheTest extends CakeTestCase {
  */
 	public function testWriteEmptyValues() {
 		Cache::write('App.falseTest', false);
-		$this->assertIdentical(Cache::read('App.falseTest'), false);
+		$this->assertSame(Cache::read('App.falseTest'), false);
 
 		Cache::write('App.trueTest', true);
-		$this->assertIdentical(Cache::read('App.trueTest'), true);
+		$this->assertSame(Cache::read('App.trueTest'), true);
 
 		Cache::write('App.nullTest', null);
-		$this->assertIdentical(Cache::read('App.nullTest'), null);
+		$this->assertSame(Cache::read('App.nullTest'), null);
 
 		Cache::write('App.zeroTest', 0);
-		$this->assertIdentical(Cache::read('App.zeroTest'), 0);
+		$this->assertSame(Cache::read('App.zeroTest'), 0);
 
 		Cache::write('App.zeroTest2', '0');
-		$this->assertIdentical(Cache::read('App.zeroTest2'), '0');
+		$this->assertSame(Cache::read('App.zeroTest2'), '0');
 	}
 
 /**
@@ -325,7 +325,7 @@ class CacheTest extends CakeTestCase {
 		Cache::config('test_cache_disable_1', array('engine'=> 'File', 'path' => TMP . 'tests'));
 
 		$this->assertTrue(Cache::write('key_1', 'hello', 'test_cache_disable_1'));
-		$this->assertIdentical(Cache::read('key_1', 'test_cache_disable_1'), 'hello');
+		$this->assertSame(Cache::read('key_1', 'test_cache_disable_1'), 'hello');
 
 		Configure::write('Cache.disable', true);
 
@@ -335,7 +335,7 @@ class CacheTest extends CakeTestCase {
 		Configure::write('Cache.disable', false);
 
 		$this->assertTrue(Cache::write('key_3', 'hello', 'test_cache_disable_1'));
-		$this->assertIdentical(Cache::read('key_3', 'test_cache_disable_1'), 'hello');
+		$this->assertSame(Cache::read('key_3', 'test_cache_disable_1'), 'hello');
 
 		Configure::write('Cache.disable', true);
 		Cache::config('test_cache_disable_2', array('engine'=> 'File', 'path' => TMP . 'tests'));
@@ -346,7 +346,7 @@ class CacheTest extends CakeTestCase {
 		Configure::write('Cache.disable', false);
 
 		$this->assertTrue(Cache::write('key_5', 'hello', 'test_cache_disable_2'));
-		$this->assertIdentical(Cache::read('key_5', 'test_cache_disable_2'), 'hello');
+		$this->assertSame(Cache::read('key_5', 'test_cache_disable_2'), 'hello');
 
 		Configure::write('Cache.disable', true);
 
@@ -372,7 +372,7 @@ class CacheTest extends CakeTestCase {
 
 		Cache::set(array('duration' => '+1 year'));
 		$data = Cache::read('test_cache');
-		$this->assertEqual($data, 'this is just a simple test of the cache system');
+		$this->assertEquals($data, 'this is just a simple test of the cache system');
 
 		Cache::delete('test_cache');
 

lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php

@@ -60,7 +60,7 @@ class ApcEngineTest extends CakeTestCase {
 
 		$result = Cache::read('test', 'apc');
 		$expecting = '';
-		$this->assertEqual($result, $expecting);
+		$this->assertEquals($result, $expecting);
 
 		$data = 'this is a test of the emergency broadcasting system';
 		$result = Cache::write('test', $data, 'apc');
@@ -68,7 +68,7 @@ class ApcEngineTest extends CakeTestCase {
 
 		$result = Cache::read('test', 'apc');
 		$expecting = $data;
-		$this->assertEqual($result, $expecting);
+		$this->assertEquals($result, $expecting);
 
 		Cache::delete('test', 'apc');
 	}
@@ -84,7 +84,7 @@ class ApcEngineTest extends CakeTestCase {
 		sleep(1);
 
 		$result = Cache::read('zero', 'apc');
-		$this->assertEqual('Should save', $result);
+		$this->assertEquals('Should save', $result);
 	}
 
 /**
@@ -147,16 +147,16 @@ class ApcEngineTest extends CakeTestCase {
 		$this->assertTrue($result);
 
 		$result = Cache::decrement('test_decrement', 1, 'apc');
-		$this->assertEqual(4, $result);
+		$this->assertEquals(4, $result);
 
 		$result = Cache::read('test_decrement', 'apc');
-		$this->assertEqual(4, $result);
+		$this->assertEquals(4, $result);
 
 		$result = Cache::decrement('test_decrement', 2, 'apc');
-		$this->assertEqual(2, $result);
+		$this->assertEquals(2, $result);
 
 		$result = Cache::read('test_decrement', 'apc');
-		$this->assertEqual(2, $result);
+		$this->assertEquals(2, $result);
 
 	}
 
@@ -172,16 +172,16 @@ class ApcEngineTest extends CakeTestCase {
 		$this->assertTrue($result);
 
 		$result = Cache::increment('test_increment', 1, 'apc');
-		$this->assertEqual(6, $result);
+		$this->assertEquals(6, $result);
 
 		$result = Cache::read('test_increment', 'apc');
-		$this->assertEqual(6, $result);
+		$this->assertEquals(6, $result);
 
 		$result = Cache::increment('test_increment', 2, 'apc');
-		$this->assertEqual(8, $result);
+		$this->assertEquals(8, $result);
 
 		$result = Cache::read('test_increment', 'apc');
-		$this->assertEqual(8, $result);
+		$this->assertEquals(8, $result);
 	}
 
 /**

lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php

@@ -62,11 +62,11 @@ class FileEngineTest extends CakeTestCase {
  */
 	public function testCacheDirChange() {
 		$result = Cache::config('sessions', array('engine'=> 'File', 'path' => TMP . 'sessions'));
-		$this->assertEqual($result['settings'], Cache::settings('sessions'));
+		$this->assertEquals($result['settings'], Cache::settings('sessions'));
 
 		$result = Cache::config('sessions', array('engine'=> 'File', 'path' => TMP . 'tests'));
-		$this->assertEqual($result['settings'], Cache::settings('sessions'));
-		$this->assertNotEqual($result['settings'], Cache::settings('default'));
+		$this->assertEquals($result['settings'], Cache::settings('sessions'));
+		$this->assertNotEquals($result['settings'], Cache::settings('default'));
 	}
 
 /**
@@ -84,7 +84,7 @@ class FileEngineTest extends CakeTestCase {
 
 		$result = Cache::read('test', 'file_test');
 		$expecting = '';
-		$this->assertEqual($result, $expecting);
+		$this->assertEquals($result, $expecting);
 
 		$data = 'this is a test of the emergency broadcasting system';
 		$result = Cache::write('test', $data, 'file_test');
@@ -92,7 +92,7 @@ class FileEngineTest extends CakeTestCase {
 
 		$result = Cache::read('test', 'file_test');
 		$expecting = $data;
-		$this->assertEqual($result, $expecting);
+		$this->assertEquals($result, $expecting);
 
 		Cache::delete('test', 'file_test');
 	}
@@ -180,9 +180,9 @@ class FileEngineTest extends CakeTestCase {
 
 		$delete = Cache::delete('serialize_test', 'file_test');
 
-		$this->assertIdentical($read, serialize($data));
+		$this->assertSame($read, serialize($data));
 
-		$this->assertIdentical(unserialize($newread), $data);
+		$this->assertSame(unserialize($newread), $data);
 	}
 
 /**
@@ -243,11 +243,11 @@ class FileEngineTest extends CakeTestCase {
 		$FileOne->write('prefix_one_key_one', $data1, DAY);
 		$FileTwo->write('prefix_two_key_two', $data2, DAY);
 
-		$this->assertEqual($FileOne->read('prefix_one_key_one'), $expected);
-		$this->assertEqual($FileTwo->read('prefix_two_key_two'), $expected);
+		$this->assertEquals($FileOne->read('prefix_one_key_one'), $expected);
+		$this->assertEquals($FileTwo->read('prefix_two_key_two'), $expected);
 
 		$FileOne->clear(false);
-		$this->assertEqual($FileTwo->read('prefix_two_key_two'), $expected, 'secondary config was cleared by accident.');
+		$this->assertEquals($FileTwo->read('prefix_two_key_two'), $expected, 'secondary config was cleared by accident.');
 		$FileTwo->clear(false);
 	}
 
@@ -262,7 +262,7 @@ class FileEngineTest extends CakeTestCase {
 		$this->assertTrue(file_exists(CACHE . 'cake_views_countries_something'));
 
 		$result = Cache::read('views.countries.something', 'file_test');
-		$this->assertEqual($result, 'here');
+		$this->assertEquals($result, 'here');
 
 		$result = Cache::clear(false, 'file_test');
 		$this->assertTrue($result);
@@ -308,7 +308,7 @@ class FileEngineTest extends CakeTestCase {
 		Cache::write('test_dir_map', $expected, 'windows_test');
 		$data = Cache::read('test_dir_map', 'windows_test');
 		Cache::delete('test_dir_map', 'windows_test');
-		$this->assertEqual($expected, $data);
+		$this->assertEquals($expected, $data);
 
 		Cache::drop('windows_test');
 	}
@@ -321,14 +321,14 @@ class FileEngineTest extends CakeTestCase {
 	public function testWriteQuotedString() {
 		Cache::config('file_test', array('engine' => 'File', 'path' => TMP . 'tests'));
 		Cache::write('App.doubleQuoteTest', '"this is a quoted string"', 'file_test');
-		$this->assertIdentical(Cache::read('App.doubleQuoteTest', 'file_test'), '"this is a quoted string"');
+		$this->assertSame(Cache::read('App.doubleQuoteTest', 'file_test'), '"this is a quoted string"');
 		Cache::write('App.singleQuoteTest', "'this is a quoted string'", 'file_test');
-		$this->assertIdentical(Cache::read('App.singleQuoteTest', 'file_test'), "'this is a quoted string'");
+		$this->assertSame(Cache::read('App.singleQuoteTest', 'file_test'), "'this is a quoted string'");
 
 		Cache::config('file_test', array('isWindows' => true, 'path' => TMP . 'tests'));
-		$this->assertIdentical(Cache::read('App.doubleQuoteTest', 'file_test'), '"this is a quoted string"');
+		$this->assertSame(Cache::read('App.doubleQuoteTest', 'file_test'), '"this is a quoted string"');
 		Cache::write('App.singleQuoteTest', "'this is a quoted string'", 'file_test');
-		$this->assertIdentical(Cache::read('App.singleQuoteTest', 'file_test'), "'this is a quoted string'");
+		$this->assertSame(Cache::read('App.singleQuoteTest', 'file_test'), "'this is a quoted string'");
 		Cache::delete('App.singleQuoteTest', 'file_test');
 		Cache::delete('App.doubleQuoteTest', 'file_test');
 	}
@@ -361,7 +361,7 @@ class FileEngineTest extends CakeTestCase {
 		$write = Cache::write('masking_test', $data, 'mask_test');
 		$result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS .'cake_masking_test')), -4);
 		$expected = '0664';
-		$this->assertEqual($result, $expected);
+		$this->assertEquals($result, $expected);
 		Cache::delete('masking_test', 'mask_test');
 		Cache::drop('mask_test');
 
@@ -369,7 +369,7 @@ class FileEngineTest extends CakeTestCase {
 		$write = Cache::write('masking_test', $data, 'mask_test');
 		$result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS .'cake_masking_test')), -4);
 		$expected = '0666';
-		$this->assertEqual($result, $expected);
+		$this->assertEquals($result, $expected);
 		Cache::delete('masking_test', 'mask_test');
 		Cache::drop('mask_test');
 
@@ -377,7 +377,7 @@ class FileEngineTest extends CakeTestCase {
 		$write = Cache::write('masking_test', $data, 'mask_test');
 		$result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS .'cake_masking_test')), -4);
 		$expected = '0644';
-		$this->assertEqual($result, $expected);
+		$this->assertEquals($result, $expected);
 		Cache::delete('masking_test', 'mask_test');
 		Cache::drop('mask_test');
 
@@ -385,7 +385,7 @@ class FileEngineTest extends CakeTestCase {
 		$write = Cache::write('masking_test', $data, 'mask_test');
 		$result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS .'cake_masking_test')), -4);
 		$expected = '0640';
-		$this->assertEqual($result, $expected);
+		$this->assertEquals($result, $expected);
 		Cache::delete('masking_test', 'mask_test');
 		Cache::drop('mask_test');
 	}

lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php

@@ -89,7 +89,7 @@ class MemcacheEngineTest extends CakeTestCase {
 			'engine' => 'Memcache',
 			'persistent' => true,
 		);
-		$this->assertEqual($settings, $expecting);
+		$this->assertEquals($settings, $expecting);
 	}
 
 /**
@@ -116,7 +116,7 @@ class MemcacheEngineTest extends CakeTestCase {
 
 		$servers = array_keys($Memcache->__Memcache->getExtendedStats());
 		$settings = $Memcache->settings();
-		$this->assertEqual($servers, $settings['servers']);
+		$this->assertEquals($servers, $settings['servers']);
 		Cache::drop('dual_server');
 	}
 
@@ -158,10 +158,10 @@ class MemcacheEngineTest extends CakeTestCase {
 	public function testParseServerStringNonLatin() {
 		$Memcache = new TestMemcacheEngine();
 		$result = $Memcache->parseServerString('schülervz.net:13211');
-		$this->assertEqual($result, array('schülervz.net', '13211'));
+		$this->assertEquals($result, array('schülervz.net', '13211'));
 
 		$result = $Memcache->parseServerString('sülül:1111');
-		$this->assertEqual($result, array('sülül', '1111'));
+		$this->assertEquals($result, array('sülül', '1111'));
 	}
 
 /**
@@ -172,7 +172,7 @@ class MemcacheEngineTest extends CakeTestCase {
     function testParseServerStringUnix() {
         $Memcache =& new TestMemcacheEngine();
         $result = $Memcache->parseServerString('unix:///path/to/memcached.sock');
-        $this->assertEqual($result, array('unix:///path/to/memcached.sock', 0));
+        $this->assertEquals($result, array('unix:///path/to/memcached.sock', 0));
     }
 
 /**
@@ -185,7 +185,7 @@ class MemcacheEngineTest extends CakeTestCase {
 
 		$result = Cache::read('test', 'memcache');
 		$expecting = '';
-		$this->assertEqual($result, $expecting);
+		$this->assertEquals($result, $expecting);
 
 		$data = 'this is a test of the emergency broadcasting system';
 		$result = Cache::write('test', $data, 'memcache');
@@ -193,7 +193,7 @@ class MemcacheEngineTest extends CakeTestCase {
 
 		$result = Cache::read('test', 'memcache');
 		$expecting = $data;
-		$this->assertEqual($result, $expecting);
+		$this->assertEquals($result, $expecting);
 
 		Cache::delete('test', 'memcache');
 	}
@@ -241,7 +241,7 @@ class MemcacheEngineTest extends CakeTestCase {
 		sleep(2);
 		$result = Cache::read('long_expiry_test', 'memcache');
 		$expecting = $data;
-		$this->assertEqual($result, $expecting);
+		$this->assertEquals($result, $expecting);
 
 		Cache::config('memcache', array('duration' => 3600));
 	}
@@ -270,16 +270,16 @@ class MemcacheEngineTest extends CakeTestCase {
 		$this->assertTrue($result);
 
 		$result = Cache::decrement('test_decrement', 1, 'memcache');
-		$this->assertEqual(4, $result);
+		$this->assertEquals(4, $result);
 
 		$result = Cache::read('test_decrement', 'memcache');
-		$this->assertEqual(4, $result);
+		$this->assertEquals(4, $result);
 
 		$result = Cache::decrement('test_decrement', 2, 'memcache');
-		$this->assertEqual(2, $result);
+		$this->assertEquals(2, $result);
 
 		$result = Cache::read('test_decrement', 'memcache');
-		$this->assertEqual(2, $result);
+		$this->assertEquals(2, $result);
 	}
 
 /**
@@ -292,16 +292,16 @@ class MemcacheEngineTest extends CakeTestCase {
 		$this->assertTrue($result);
 
 		$result = Cache::increment('test_increment', 1, 'memcache');
-		$this->assertEqual(6, $result);
+		$this->assertEquals(6, $result);
 
 		$result = Cache::read('test_increment', 'memcache');
-		$this->assertEqual(6, $result);
+		$this->assertEquals(6, $result);
 
 		$result = Cache::increment('test_increment', 2, 'memcache');
-		$this->assertEqual(8, $result);
+		$this->assertEquals(8, $result);
 
 		$result = Cache::read('test_increment', 'memcache');
-		$this->assertEqual(8, $result);
+		$this->assertEquals(8, $result);
 	}
 
 /**
@@ -325,11 +325,11 @@ class MemcacheEngineTest extends CakeTestCase {
 		$this->assertTrue(Cache::write('duration_test', 'yay', 'long_memcache'));
 		$this->assertTrue(Cache::write('short_duration_test', 'boo', 'short_memcache'));
 
-		$this->assertEqual(Cache::read('duration_test', 'long_memcache'), 'yay', 'Value was not read %s');
-		$this->assertEqual(Cache::read('short_duration_test', 'short_memcache'), 'boo', 'Value was not read %s');
+		$this->assertEquals(Cache::read('duration_test', 'long_memcache'), 'yay', 'Value was not read %s');
+		$this->assertEquals(Cache::read('short_duration_test', 'short_memcache'), 'boo', 'Value was not read %s');
 
 		sleep(1);
-		$this->assertEqual(Cache::read('duration_test', 'long_memcache'), 'yay', 'Value was not read %s');
+		$this->assertEquals(Cache::read('duration_test', 'long_memcache'), 'yay', 'Value was not read %s');
 
 		sleep(2);
 		$this->assertFalse(Cache::read('short_duration_test', 'short_memcache'), 'Cache was not invalidated %s');
@@ -375,7 +375,7 @@ class MemcacheEngineTest extends CakeTestCase {
 
 		$this->assertTrue($result, 'Could not write with duration 0');
 		$result = Cache::read('test_key', 'memcache');
-		$this->assertEqual($result, 'written!');
+		$this->assertEquals($result, 'written!');
 	}
 
 /**

lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php

@@ -59,7 +59,7 @@ class WincacheEngineTest extends CakeTestCase {
 
 		$result = Cache::read('test', 'wincache');
 		$expecting = '';
-		$this->assertEqual($result, $expecting);
+		$this->assertEquals($result, $expecting);
 
 		$data = 'this is a test of the emergency broadcasting system';
 		$result = Cache::write('test', $data, 'wincache');
@@ -67,7 +67,7 @@ class WincacheEngineTest extends CakeTestCase {
 
 		$result = Cache::read('test', 'wincache');
 		$expecting = $data;
-		$this->assertEqual($result, $expecting);
+		$this->assertEquals($result, $expecting);
 
 		Cache::delete('test', 'wincache');
 	}
@@ -135,16 +135,16 @@ class WincacheEngineTest extends CakeTestCase {
 		$this->assertTrue($result);
 
 		$result = Cache::decrement('test_decrement', 1, 'wincache');
-		$this->assertEqual(4, $result);
+		$this->assertEquals(4, $result);
 
 		$result = Cache::read('test_decrement', 'wincache');
-		$this->assertEqual(4, $result);
+		$this->assertEquals(4, $result);
 
 		$result = Cache::decrement('test_decrement', 2, 'wincache');
-		$this->assertEqual(2, $result);
+		$this->assertEquals(2, $result);
 
 		$result = Cache::read('test_decrement', 'wincache');
-		$this->assertEqual(2, $result);
+		$this->assertEquals(2, $result);
 
 	}
 
@@ -163,16 +163,16 @@ class WincacheEngineTest extends CakeTestCase {
 		$this->assertTrue($result);
 
 		$result = Cache::increment('test_increment', 1, 'wincache');
-		$this->assertEqual(6, $result);
+		$this->assertEquals(6, $result);
 
 		$result = Cache::read('test_increment', 'wincache');
-		$this->assertEqual(6, $result);
+		$this->assertEquals(6, $result);
 
 		$result = Cache::increment('test_increment', 2, 'wincache');
-		$this->assertEqual(8, $result);
+		$this->assertEquals(8, $result);
 
 		$result = Cache::read('test_increment', 'wincache');
-		$this->assertEqual(8, $result);
+		$this->assertEquals(8, $result);
 	}
 
 /**

lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php

@@ -32,7 +32,9 @@ class XcacheEngineTest extends CakeTestCase {
  * @return void
  */
 	public function setUp() {
-		$this->skipUnless(function_exists('xcache_set'), 'Xcache is not installed or configured properly');
+		if (!function_exists('xcache_set')) {
+			$this->markTestSkipped('Xcache is not installed or configured properly');
+		}
 		$this->_cacheDisable = Configure::read('Cache.disable');
 		Configure::write('Cache.disable', false);
 		Cache::config('xcache', array('engine' => 'Xcache', 'prefix' => 'cake_'));
@@ -65,7 +67,7 @@ class XcacheEngineTest extends CakeTestCase {
 		$this->assertTrue(isset($settings['PHP_AUTH_PW']));
 
 		unset($settings['PHP_AUTH_USER'], $settings['PHP_AUTH_PW']);
-		$this->assertEqual($settings, $expecting);
+		$this->assertEquals($settings, $expecting);
 	}
 
 /**
@@ -78,7 +80,7 @@ class XcacheEngineTest extends CakeTestCase {
 
 		$result = Cache::read('test');
 		$expecting = '';
-		$this->assertEqual($result, $expecting);
+		$this->assertEquals($result, $expecting);
 
 		$data = 'this is a test of the emergency broadcasting system';
 		$result = Cache::write('test', $data);
@@ -86,7 +88,7 @@ class XcacheEngineTest extends CakeTestCase {
 
 		$result = Cache::read('test');
 		$expecting = $data;
-		$this->assertEqual($result, $expecting);
+		$this->assertEquals($result, $expecting);
 
 		Cache::delete('test');
 	}
@@ -161,16 +163,16 @@ class XcacheEngineTest extends CakeTestCase {
 		$this->assertTrue($result);
 
 		$result = Cache::decrement('test_decrement');
-		$this->assertEqual(4, $result);
+		$this->assertEquals(4, $result);
 
 		$result = Cache::read('test_decrement');
-		$this->assertEqual(4, $result);
+		$this->assertEquals(4, $result);
 
 		$result = Cache::decrement('test_decrement', 2);
-		$this->assertEqual(2, $result);
+		$this->assertEquals(2, $result);
 
 		$result = Cache::read('test_decrement');
-		$this->assertEqual(2, $result);
+		$this->assertEquals(2, $result);
 	}
 
 /**
@@ -183,15 +185,15 @@ class XcacheEngineTest extends CakeTestCase {
 		$this->assertTrue($result);
 
 		$result = Cache::increment('test_increment');
-		$this->assertEqual(6, $result);
+		$this->assertEquals(6, $result);
 
 		$result = Cache::read('test_increment');
-		$this->assertEqual(6, $result);
+		$this->assertEquals(6, $result);
 
 		$result = Cache::increment('test_increment', 2);
-		$this->assertEqual(8, $result);
+		$this->assertEquals(8, $result);
 
 		$result = Cache::read('test_increment');
-		$this->assertEqual(8, $result);
+		$this->assertEquals(8, $result);
 	}
 }

lib/Cake/Test/Case/Console/Command/AclShellTest.php

@@ -114,10 +114,10 @@ class AclShellTest extends CakeTestCase {
 		$expected = array('model' => 'Model', 'foreign_key' => 'foreignKey');
 
 		$result = $this->Task->parseIdentifier('mySuperUser');
-		$this->assertEqual($result, 'mySuperUser');
+		$this->assertEquals($result, 'mySuperUser');
 
 		$result = $this->Task->parseIdentifier('111234');
-		$this->assertEqual($result, '111234');
+		$this->assertEquals($result, '111234');
 	}
 
 /**
@@ -136,9 +136,9 @@ class AclShellTest extends CakeTestCase {
 		$Aro = ClassRegistry::init('Aro');
 		$Aro->cacheQueries = false;
 		$result = $Aro->read();
-		$this->assertEqual($result['Aro']['model'], 'User');
-		$this->assertEqual($result['Aro']['foreign_key'], 1);
-		$this->assertEqual($result['Aro']['parent_id'], null);
+		$this->assertEquals($result['Aro']['model'], 'User');
+		$this->assertEquals($result['Aro']['foreign_key'], 1);
+		$this->assertEquals($result['Aro']['parent_id'], null);
 		$id = $result['Aro']['id'];
 
 		$this->Task->args = array('aro', 'User.1', 'User.3');
@@ -146,19 +146,19 @@ class AclShellTest extends CakeTestCase {
 
 		$Aro = ClassRegistry::init('Aro');
 		$result = $Aro->read();
-		$this->assertEqual($result['Aro']['model'], 'User');
-		$this->assertEqual($result['Aro']['foreign_key'], 3);
-		$this->assertEqual($result['Aro']['parent_id'], $id);
+		$this->assertEquals($result['Aro']['model'], 'User');
+		$this->assertEquals($result['Aro']['foreign_key'], 3);
+		$this->assertEquals($result['Aro']['parent_id'], $id);
 
 		$this->Task->args = array('aro', 'root', 'somealias');
 		$this->Task->create();
 
 		$Aro = ClassRegistry::init('Aro');
 		$result = $Aro->read();
-		$this->assertEqual($result['Aro']['alias'], 'somealias');
-		$this->assertEqual($result['Aro']['model'], null);
-		$this->assertEqual($result['Aro']['foreign_key'], null);
-		$this->assertEqual($result['Aro']['parent_id'], null);
+		$this->assertEquals($result['Aro']['alias'], 'somealias');
+		$this->assertEquals($result['Aro']['model'], null);
+		$this->assertEquals($result['Aro']['foreign_key'], null);
+		$this->assertEquals($result['Aro']['parent_id'], null);
 	}
 
 /**
@@ -188,7 +188,7 @@ class AclShellTest extends CakeTestCase {
 
 		$Aro = ClassRegistry::init('Aro');
 		$result = $Aro->read(null, 4);
-		$this->assertEqual($result['Aro']['parent_id'], null);
+		$this->assertEquals($result['Aro']['parent_id'], null);
 	}
 
 /**
@@ -205,7 +205,7 @@ class AclShellTest extends CakeTestCase {
 		$node = $this->Task->Acl->Aro->read(null, $node[0]['Aro']['id']);
 
 		$this->assertFalse(empty($node['Aco'][0]));
-		$this->assertEqual($node['Aco'][0]['Permission']['_create'], 1);
+		$this->assertEquals($node['Aco'][0]['Permission']['_create'], 1);
 	}
 
 /**
@@ -223,7 +223,7 @@ class AclShellTest extends CakeTestCase {
 		$node = $this->Task->Acl->Aro->node(array('model' => 'AuthUser', 'foreign_key' => 2));
 		$node = $this->Task->Acl->Aro->read(null, $node[0]['Aro']['id']);
 		$this->assertFalse(empty($node['Aco'][0]));
-		$this->assertEqual($node['Aco'][0]['Permission']['_create'], -1);
+		$this->assertEquals($node['Aco'][0]['Permission']['_create'], -1);
 	}
 
 /**
@@ -274,7 +274,7 @@ class AclShellTest extends CakeTestCase {
 		$node = $this->Task->Acl->Aro->node(array('model' => 'AuthUser', 'foreign_key' => 2));
 		$node = $this->Task->Acl->Aro->read(null, $node[0]['Aro']['id']);
 		$this->assertFalse(empty($node['Aco'][0]));
-		$this->assertEqual($node['Aco'][0]['Permission']['_create'], 0);
+		$this->assertEquals($node['Aco'][0]['Permission']['_create'], 0);
 	}
 
 /**

lib/Cake/Test/Case/Console/Command/CommandListShellTest.php

@@ -80,35 +80,35 @@ class CommandListShellTest extends CakeTestCase {
 		$output = $this->Shell->stdout->output;
 
 		$expected = "/example \[.*TestPlugin, TestPluginTwo.*\]/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 
 		$expected = "/welcome \[.*TestPluginTwo.*\]/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 
 
 		$expected = "/acl \[.*CORE.*\]/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 
 		$expected = "/api \[.*CORE.*\]/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 
 		$expected = "/bake \[.*CORE.*\]/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 
 		$expected = "/console \[.*CORE.*\]/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 
 		$expected = "/i18n \[.*CORE.*\]/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 
 		$expected = "/schema \[.*CORE.*\]/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 
 		$expected = "/testsuite \[.*CORE.*\]/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 
 		$expected = "/sample \[.*app.*\]/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 	}
 
 /**
@@ -123,16 +123,16 @@ class CommandListShellTest extends CakeTestCase {
 		$output = $this->Shell->stdout->output;
 
 		$expected = "/\[.*App.*\]\\v*[ ]+sample/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 
 		$expected = "/\[.*TestPluginTwo.*\]\\v*[ ]+example, welcome/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 
 		$expected = "/\[.*TestPlugin.*\]\\v*[ ]+example/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 
 		$expected = "/\[.*Core.*\]\\v*[ ]+acl, api, bake, command_list, console, i18n, schema, testsuite/";
-		$this->assertPattern($expected, $output);
+		$this->assertRegExp($expected, $output);
 	}
 
 /**

lib/Cake/Test/Case/Console/Command/SchemaShellTest.php

@@ -135,18 +135,18 @@ class SchemaShellTest extends CakeTestCase {
 		$this->Shell->startup();
 		$this->assertTrue(isset($this->Shell->Schema));
 		$this->assertTrue(is_a($this->Shell->Schema, 'CakeSchema'));
-		$this->assertEqual(strtolower($this->Shell->Schema->name), strtolower(APP_DIR));
-		$this->assertEqual($this->Shell->Schema->file, 'schema.php');
+		$this->assertEquals(strtolower($this->Shell->Schema->name), strtolower(APP_DIR));
+		$this->assertEquals($this->Shell->Schema->file, 'schema.php');
 
 		$this->Shell->Schema = null;
 		$this->Shell->params = array(
 			'name' => 'TestSchema'
 		);
 		$this->Shell->startup();
-		$this->assertEqual($this->Shell->Schema->name, 'TestSchema');
-		$this->assertEqual($this->Shell->Schema->file, 'test_schema.php');
-		$this->assertEqual($this->Shell->Schema->connection, 'default');
-		$this->assertEqual($this->Shell->Schema->path, APP . 'Config' . DS . 'Schema');
+		$this->assertEquals($this->Shell->Schema->name, 'TestSchema');
+		$this->assertEquals($this->Shell->Schema->file, 'test_schema.php');
+		$this->assertEquals($this->Shell->Schema->connection, 'default');
+		$this->assertEquals($this->Shell->Schema->path, APP . 'Config' . DS . 'Schema');
 
 		$this->Shell->Schema = null;
 		$this->Shell->params = array(
@@ -155,10 +155,10 @@ class SchemaShellTest extends CakeTestCase {
 			'path' => '/test/path'
 		);
 		$this->Shell->startup();
-		$this->assertEqual(strtolower($this->Shell->Schema->name), strtolower(APP_DIR));
-		$this->assertEqual($this->Shell->Schema->file, 'other_file.php');
-		$this->assertEqual($this->Shell->Schema->connection, 'test');
-		$this->assertEqual($this->Shell->Schema->path, '/test/path');
+		$this->assertEquals(strtolower($this->Shell->Schema->name), strtolower(APP_DIR));
+		$this->assertEquals($this->Shell->Schema->file, 'other_file.php');
+		$this->assertEquals($this->Shell->Schema->connection, 'test');
+		$this->assertEquals($this->Shell->Schema->path, '/test/path');
 	}
 
 /**
@@ -217,14 +217,14 @@ class SchemaShellTest extends CakeTestCase {
 
 		$this->file = new File(TMP . 'tests' . DS . 'i18n.sql');
 		$contents = $this->file->read();
-		$this->assertPattern('/DROP TABLE/', $contents);
-		$this->assertPattern('/CREATE TABLE.*?i18n/', $contents);
-		$this->assertPattern('/id/', $contents);
-		$this->assertPattern('/model/', $contents);
-		$this->assertPattern('/field/', $contents);
-		$this->assertPattern('/locale/', $contents);
-		$this->assertPattern('/foreign_key/', $contents);
-		$this->assertPattern('/content/', $contents);
+		$this->assertRegExp('/DROP TABLE/', $contents);
+		$this->assertRegExp('/CREATE TABLE.*?i18n/', $contents);
+		$this->assertRegExp('/id/', $contents);
+		$this->assertRegExp('/model/', $contents);
+		$this->assertRegExp('/field/', $contents);
+		$this->assertRegExp('/locale/', $contents);
+		$this->assertRegExp('/foreign_key/', $contents);
+		$this->assertRegExp('/content/', $contents);
 	}
 
 /**
@@ -249,9 +249,9 @@ class SchemaShellTest extends CakeTestCase {
 		$this->file = new File(TMP . 'tests' . DS . 'dump_test.sql');
 		$contents = $this->file->read();
 
-		$this->assertPattern('/CREATE TABLE.*?test_plugin_acos/', $contents);
-		$this->assertPattern('/id/', $contents);
-		$this->assertPattern('/model/', $contents);
+		$this->assertRegExp('/CREATE TABLE.*?test_plugin_acos/', $contents);
+		$this->assertRegExp('/id/', $contents);
+		$this->assertRegExp('/model/', $contents);
 
 		$this->file->delete();
 		App::build();
@@ -352,13 +352,13 @@ class SchemaShellTest extends CakeTestCase {
 		$this->file = new File(TMP . 'tests' . DS . 'schema.php');
 		$contents = $this->file->read();
 
-		$this->assertPattern('/class TestPluginSchema/', $contents);
-		$this->assertPattern('/var \$posts/', $contents);
-		$this->assertPattern('/var \$auth_users/', $contents);
-		$this->assertPattern('/var \$authors/', $contents);
-		$this->assertPattern('/var \$test_plugin_comments/', $contents);
-		$this->assertNoPattern('/var \$users/', $contents);
-		$this->assertNoPattern('/var \$articles/', $contents);
+		$this->assertRegExp('/class TestPluginSchema/', $contents);
+		$this->assertRegExp('/public \$posts/', $contents);
+		$this->assertRegExp('/public \$auth_users/', $contents);
+		$this->assertRegExp('/public \$authors/', $contents);
+		$this->assertRegExp('/public \$test_plugin_comments/', $contents);
+		$this->assertNotRegExp('/public \$users/', $contents);
+		$this->assertNotRegExp('/public \$articles/', $contents);
 		CakePlugin::unload();
 	}
 
@@ -459,7 +459,7 @@ class SchemaShellTest extends CakeTestCase {
 		);
 		$this->Shell->startup();
 		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'TestPlugin' . DS . 'Config' . DS . 'Schema';
-		$this->assertEqual($this->Shell->Schema->path, $expected);
+		$this->assertEquals($this->Shell->Schema->path, $expected);
 		CakePlugin::unload();
 	}
 

lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php

@@ -116,13 +116,13 @@ class ControllerTaskTest extends CakeTestCase {
 
 		$expected = array('BakeArticles', 'BakeArticlesBakeTags', 'BakeComments', 'BakeTags');
 		$result = $this->Task->listAll('test');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->Task->interactive = false;
 		$result = $this->Task->listAll();
 
 		$expected = array('bake_articles', 'bake_articles_bake_tags', 'bake_comments', 'bake_tags');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -142,11 +142,11 @@ class ControllerTaskTest extends CakeTestCase {
 
 		$result = $this->Task->getName('test');
 		$expected = 'BakeComments';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Task->getName('test');
 		$expected = 'BakeArticles';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -173,7 +173,7 @@ class ControllerTaskTest extends CakeTestCase {
 	public function testDoHelpersNo() {
 		$this->Task->expects($this->any())->method('in')->will($this->returnValue('n'));
 		$result = $this->Task->doHelpers();
-		$this->assertEqual($result, array());
+		$this->assertEquals($result, array());
 	}
 
 /**
@@ -186,7 +186,7 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->expects($this->at(1))->method('in')->will($this->returnValue(' Javascript, Ajax, CustomOne  '));
 		$result = $this->Task->doHelpers();
 		$expected = array('Javascript', 'Ajax', 'CustomOne');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -199,7 +199,7 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->expects($this->at(1))->method('in')->will($this->returnValue(' Javascript, Ajax, CustomOne, , '));
 		$result = $this->Task->doHelpers();
 		$expected = array('Javascript', 'Ajax', 'CustomOne');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -210,7 +210,7 @@ class ControllerTaskTest extends CakeTestCase {
 	public function testDoComponentsNo() {
 		$this->Task->expects($this->any())->method('in')->will($this->returnValue('n'));
 		$result = $this->Task->doComponents();
-		$this->assertEqual($result, array());
+		$this->assertEquals($result, array());
 	}
 
 /**
@@ -224,7 +224,7 @@ class ControllerTaskTest extends CakeTestCase {
 
 		$result = $this->Task->doComponents();
 		$expected = array('RequestHandler', 'Security');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -238,7 +238,7 @@ class ControllerTaskTest extends CakeTestCase {
 
 		$result = $this->Task->doComponents();
 		$expected = array('RequestHandler', 'Security');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -287,7 +287,7 @@ class ControllerTaskTest extends CakeTestCase {
 
 		$result = $this->Task->bake('Articles', '--actions--', array(), array());
 		$this->assertContains('class ArticlesController extends AppController', $result);
-		$this->assertIdentical(substr_count($result, '@property'), 1);
+		$this->assertSame(substr_count($result, '@property'), 1);
 		$this->assertNotContains('components', $result);
 		$this->assertNotContains('helpers', $result);
 		$this->assertContains('--actions--', $result);
@@ -415,9 +415,9 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->Test->expects($this->once())->method('bake')->with('Controller', 'BakeArticles');
 		$this->Task->bakeTest('BakeArticles');
 
-		$this->assertEqual($this->Task->plugin, $this->Task->Test->plugin);
-		$this->assertEqual($this->Task->connection, $this->Task->Test->connection);
-		$this->assertEqual($this->Task->interactive, $this->Task->Test->interactive);
+		$this->assertEquals($this->Task->plugin, $this->Task->Test->plugin);
+		$this->assertEquals($this->Task->connection, $this->Task->Test->connection);
+		$this->assertEquals($this->Task->interactive, $this->Task->Test->interactive);
 	}
 
 /**
@@ -494,7 +494,7 @@ class ControllerTaskTest extends CakeTestCase {
 		)->will($this->returnValue(true));
 
 		$result = $this->Task->execute();
-		$this->assertPattern('/admin_index/', $result);
+		$this->assertRegExp('/admin_index/', $result);
 	}
 
 /**

lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php

@@ -84,55 +84,55 @@ class ExtractTaskTest extends CakeTestCase {
 		$result = file_get_contents($this->path . DS . 'default.pot');
 
 		$pattern = '/"Content-Type\: text\/plain; charset\=utf-8/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 		$pattern = '/"Content-Transfer-Encoding\: 8bit/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 		$pattern = '/"Plural-Forms\: nplurals\=INTEGER; plural\=EXPRESSION;/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		// home.ctp
 		$pattern = '/msgid "Your tmp directory is writable."\nmsgstr ""\n/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 		$pattern = '/msgid "Your tmp directory is NOT writable."\nmsgstr ""\n/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 		$pattern = '/msgid "The %s is being used for caching. To change the config edit ';
 		$pattern .= 'APP\/config\/core.php "\nmsgstr ""\n/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 		$pattern = '/msgid "Your cache is NOT working. Please check ';
 		$pattern .= 'the settings in APP\/config\/core.php"\nmsgstr ""\n/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 		$pattern = '/msgid "Your database configuration file is present."\nmsgstr ""\n/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 		$pattern = '/msgid "Your database configuration file is NOT present."\nmsgstr ""\n/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 		$pattern = '/msgid "Rename config\/database.php.default to ';
 		$pattern .= 'config\/database.php"\nmsgstr ""\n/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 		$pattern = '/msgid "Cake is able to connect to the database."\nmsgstr ""\n/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 		$pattern = '/msgid "Cake is NOT able to connect to the database."\nmsgstr ""\n/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 		$pattern = '/msgid "Editing this Page"\nmsgstr ""\n/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 		$pattern = '/msgid "To change the content of this page, create: APP\/views\/pages\/home\.ctp/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '/To change its layout, create: APP\/views\/layouts\/default\.ctp\./s';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		// extract.ctp
 		$pattern = '/\#: (\\\\|\/)extract\.ctp:6\n';
 		$pattern .= 'msgid "You have %d new message."\nmsgid_plural "You have %d new messages."/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '/\#: (\\\\|\/)extract\.ctp:7\n';
 		$pattern .= 'msgid "You deleted %d message."\nmsgid_plural "You deleted %d messages."/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '/\#: (\\\\|\/)extract\.ctp:14\n';
 		$pattern .= '\#: (\\\\|\/)home\.ctp:99\n';
 		$pattern .= 'msgid "Editing this Page"\nmsgstr ""/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '/\#: (\\\\|\/)extract\.ctp:17\nmsgid "';
 		$pattern .= 'Hot features!';
@@ -140,20 +140,20 @@ class ExtractTaskTest extends CakeTestCase {
 		$pattern .= '\\\n - Extremely Simple: Just look at the name...It\'s Cake';
 		$pattern .= '\\\n - Active, Friendly Community: Join us #cakephp on IRC. We\'d love to help you get started';
 		$pattern .= '"\nmsgstr ""/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		// extract.ctp - reading the domain.pot
 		$result = file_get_contents($this->path . DS . 'domain.pot');
 
 		$pattern = '/msgid "You have %d new message."\nmsgid_plural "You have %d new messages."/';
-		$this->assertNoPattern($pattern, $result);
+		$this->assertNotRegExp($pattern, $result);
 		$pattern = '/msgid "You deleted %d message."\nmsgid_plural "You deleted %d messages."/';
-		$this->assertNoPattern($pattern, $result);
+		$this->assertNotRegExp($pattern, $result);
 
 		$pattern = '/msgid "You have %d new message \(domain\)."\nmsgid_plural "You have %d new messages \(domain\)."/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 		$pattern = '/msgid "You deleted %d message \(domain\)."\nmsgid_plural "You deleted %d messages \(domain\)."/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 	}
 
 /**
@@ -202,7 +202,7 @@ class ExtractTaskTest extends CakeTestCase {
 		$result = file_get_contents($this->path . DS . 'default.pot');
 
 		$pattern = '/msgid "Add User"/';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 	}
 
 /**
@@ -228,7 +228,7 @@ class ExtractTaskTest extends CakeTestCase {
 
 		$this->Task->execute();
 		$result = file_get_contents($this->path . DS . 'default.pot');
-		$this->assertNoPattern('#TestPlugin#', $result);
+		$this->assertNotRegExp('#TestPlugin#', $result);
 	}
 
 /**
@@ -253,7 +253,7 @@ class ExtractTaskTest extends CakeTestCase {
 
 		$this->Task->execute();
 		$result = file_get_contents($this->path . DS . 'default.pot');
-		$this->assertNoPattern('#Pages#', $result);
+		$this->assertNotRegExp('#Pages#', $result);
 		$this->assertContains('translate.ctp:1', $result);
 		$this->assertContains('This is a translatable string', $result);
 	}
@@ -285,22 +285,22 @@ class ExtractTaskTest extends CakeTestCase {
 		$result = file_get_contents($this->path . DS . 'default.pot');
 
 		$pattern = preg_quote('#Model' . DS . 'PersisterOne.php:validation for field title#', '\\');
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = preg_quote('#Model' . DS . 'PersisterOne.php:validation for field body#', '\\');
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '#msgid "Post title is required"#';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '#msgid "You may enter up to %s chars \(minimum is %s chars\)"#';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '#msgid "Post body is required"#';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '#msgid "Post body is super required"#';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 	}
 
 /**
@@ -330,19 +330,19 @@ class ExtractTaskTest extends CakeTestCase {
 		$result = file_get_contents($this->path . DS . 'test_plugin.pot');
 
 		$pattern = preg_quote('#Plugin' . DS. 'TestPlugin' . DS. 'Model' . DS. 'TestPluginPost.php:validation for field title#', '\\');
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = preg_quote('#Plugin' . DS. 'TestPlugin' . DS. 'Model' . DS. 'TestPluginPost.php:validation for field body#', '\\');
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '#msgid "Post title is required"#';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '#msgid "Post body is required"#';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '#msgid "Post body is super required"#';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 	}
 
 
@@ -370,21 +370,21 @@ class ExtractTaskTest extends CakeTestCase {
 		$result = file_get_contents($this->path . DS . 'test_plugin.pot');
 
 		$pattern =  preg_quote('#Model' . DS. 'TestPluginPost.php:validation for field title#', '\\');
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern =  preg_quote('#Model' . DS. 'TestPluginPost.php:validation for field body#', '\\');
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '#msgid "Post title is required"#';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '#msgid "Post body is required"#';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '#msgid "Post body is super required"#';
-		$this->assertPattern($pattern, $result);
+		$this->assertRegExp($pattern, $result);
 
 		$pattern = '#Plugin/TestPlugin/Model/TestPluginPost.php:validation for field title#';
-		$this->assertNoPattern($pattern, $result);
+		$this->assertNotRegExp($pattern, $result);
 	}
 }

lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php

@@ -21,6 +21,7 @@ App::uses('ShellDispatcher', 'Console');
 App::uses('Shell', 'Console');
 App::uses('ConsoleOutput', 'Console');
 App::uses('ConsoleInput', 'Console');
+App::uses('ModelTask', 'Console/Command/Task');
 App::uses('FixtureTask', 'Console/Command/Task');
 App::uses('TemplateTask', 'Console/Command/Task');
 App::uses('DbConfigTask', 'Console/Command/Task');
@@ -89,7 +90,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$in = $this->getMock('ConsoleInput', array(), array(), '', false);
 
 		$Task = new FixtureTask($out, $out, $in);
-		$this->assertEqual($Task->path, APP . 'Test' . DS . 'Fixture' . DS);
+		$this->assertEquals($Task->path, APP . 'Test' . DS . 'Fixture' . DS);
 	}
 
 /**
@@ -103,7 +104,7 @@ class FixtureTaskTest extends CakeTestCase {
 
 		$result = $this->Task->importOptions('Article');
 		$expected = array('schema' => 'Article', 'records' => true);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -118,7 +119,7 @@ class FixtureTaskTest extends CakeTestCase {
 
 		$result = $this->Task->importOptions('Article');
 		$expected = array();
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -132,7 +133,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->expects($this->at(2))->method('in')->will($this->returnValue('y'));
 		$result = $this->Task->importOptions('Article');
 		$expected = array('fromTable' => true);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**

lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php

@@ -109,33 +109,32 @@ class ModelTaskTest extends CakeTestCase {
  *
  * @return void
  */
-	public function testListAll() {
-		$count = count($this->Task->listAll('test'));
-		if ($count != count($this->fixtures)) {
-			$this->markTestSkipped('Additional tables detected.');
-		}
+	public function testListAllArgument() {
 		$this->_useMockedOut();
 
-		$this->Task->expects($this->at(1))->method('out')->with('1. BakeArticle');
-		$this->Task->expects($this->at(2))->method('out')->with('2. BakeArticlesBakeTag');
-		$this->Task->expects($this->at(3))->method('out')->with('3. BakeComment');
-		$this->Task->expects($this->at(4))->method('out')->with('4. BakeTag');
-		$this->Task->expects($this->at(5))->method('out')->with('5. CategoryThread');
-
-		$this->Task->expects($this->at(7))->method('out')->with('1. BakeArticle');
-		$this->Task->expects($this->at(8))->method('out')->with('2. BakeArticlesBakeTag');
-		$this->Task->expects($this->at(9))->method('out')->with('3. BakeComment');
-		$this->Task->expects($this->at(10))->method('out')->with('4. BakeTag');
-		$this->Task->expects($this->at(11))->method('out')->with('5. CategoryThread');
-
 		$result = $this->Task->listAll('test');
-		$expected = array('bake_articles', 'bake_articles_bake_tags', 'bake_comments', 'bake_tags', 'category_threads');
-		$this->assertEqual($expected, $result);
+		$this->assertContains('bake_articles', $result);
+		$this->assertContains('bake_articles_bake_tags', $result);
+		$this->assertContains('bake_tags', $result);
+		$this->assertContains('bake_comments', $result);
+		$this->assertContains('category_threads', $result);
+	}
+
+/**
+ * Test that listAll uses the connection property
+ *
+ * @return void
+ */
+	public function testListAllConnection() {
+		$this->_useMockedOut();
 
 		$this->Task->connection = 'test';
 		$result = $this->Task->listAll();
-		$expected = array('bake_articles', 'bake_articles_bake_tags', 'bake_comments', 'bake_tags', 'category_threads');
-		$this->assertEqual($expected, $result);
+		$this->assertContains('bake_articles', $result);
+		$this->assertContains('bake_articles_bake_tags', $result);
+		$this->assertContains('bake_tags', $result);
+		$this->assertContains('bake_comments', $result);
+		$this->assertContains('category_threads', $result);
 	}
 
 /**
@@ -186,7 +185,7 @@ class ModelTaskTest extends CakeTestCase {
 		$this->Task->expects($this->at(0))->method('in')->will($this->returnValue('y'));
 		$result = $this->Task->getTable('BakeArticle', 'test');
 		$expected = 'bake_articles';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -198,7 +197,7 @@ class ModelTaskTest extends CakeTestCase {
 		$this->Task->expects($this->any())->method('in')->will($this->onConsecutiveCalls('n', 'my_table'));
 		$result = $this->Task->getTable('BakeArticle', 'test');
 		$expected = 'my_table';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -253,7 +252,7 @@ class ModelTaskTest extends CakeTestCase {
 
 		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
 		$expected = array('notempty' => 'notempty', 'maxlength' => 'maxlength');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -274,7 +273,7 @@ class ModelTaskTest extends CakeTestCase {
 
 		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
 		$expected = array('notempty' => 'notempty');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -290,7 +289,7 @@ class ModelTaskTest extends CakeTestCase {
 
 		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
 		$expected = array('a_z_0_9' => '/^[a-z]{0,9}$/');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -351,7 +350,7 @@ class ModelTaskTest extends CakeTestCase {
 				'time' => 'time'
 			),
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -372,7 +371,7 @@ class ModelTaskTest extends CakeTestCase {
 
 		$result = $this->Task->findPrimaryKey($fields);
 		$expected = 'my_field';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -404,7 +403,7 @@ class ModelTaskTest extends CakeTestCase {
 			->will($this->onConsecutiveCalls('y', 2));
 
 		$result = $this->Task->findDisplayField($fields);
-		$this->assertEqual($result, 'tagname');
+		$this->assertEquals($result, 'tagname');
 	}
 
 /**
@@ -429,7 +428,7 @@ class ModelTaskTest extends CakeTestCase {
 				),
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$model = new Model(array('ds' => 'test', 'name' => 'CategoryThread'));
 		$result = $this->Task->findBelongsTo($model, array());
@@ -442,7 +441,7 @@ class ModelTaskTest extends CakeTestCase {
 				),
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -471,7 +470,7 @@ class ModelTaskTest extends CakeTestCase {
 				),
 			),
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$model = new Model(array('ds' => 'test', 'name' => 'CategoryThread'));
 		$result = $this->Task->findHasOneAndMany($model, array());
@@ -491,7 +490,7 @@ class ModelTaskTest extends CakeTestCase {
 				),
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -515,7 +514,7 @@ class ModelTaskTest extends CakeTestCase {
 				),
 			),
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -559,9 +558,9 @@ class ModelTaskTest extends CakeTestCase {
 		$this->Task->Fixture->expects($this->at(0))->method('bake')->with('BakeArticle', 'bake_articles');
 		$this->Task->bakeFixture('BakeArticle', 'bake_articles');
 
-		$this->assertEqual($this->Task->plugin, $this->Task->Fixture->plugin);
-		$this->assertEqual($this->Task->connection, $this->Task->Fixture->connection);
-		$this->assertEqual($this->Task->interactive, $this->Task->Fixture->interactive);
+		$this->assertEquals($this->Task->plugin, $this->Task->Fixture->plugin);
+		$this->assertEquals($this->Task->connection, $this->Task->Fixture->connection);
+		$this->assertEquals($this->Task->interactive, $this->Task->Fixture->interactive);
 	}
 
 /**
@@ -575,9 +574,9 @@ class ModelTaskTest extends CakeTestCase {
 		$this->Task->Test->expects($this->at(0))->method('bake')->with('Model', 'BakeArticle');
 		$this->Task->bakeTest('BakeArticle');
 
-		$this->assertEqual($this->Task->plugin, $this->Task->Test->plugin);
-		$this->assertEqual($this->Task->connection, $this->Task->Test->connection);
-		$this->assertEqual($this->Task->interactive, $this->Task->Test->interactive);
+		$this->assertEquals($this->Task->plugin, $this->Task->Test->plugin);
+		$this->assertEquals($this->Task->connection, $this->Task->Test->connection);
+		$this->assertEquals($this->Task->interactive, $this->Task->Test->interactive);
 	}
 
 /**
@@ -642,7 +641,7 @@ class ModelTaskTest extends CakeTestCase {
 		$this->Task->expects($this->at(6))->method('out')->with('3. three');
 		$this->Task->expects($this->at(7))->method('in')->will($this->returnValue(2));
 		$result = $this->Task->inOptions($options, 'Pick a number');
-		$this->assertEqual($result, 1);
+		$this->assertEquals($result, 1);
 	}
 
 /**
@@ -666,8 +665,8 @@ class ModelTaskTest extends CakeTestCase {
 			)
 		);
 		$result = $this->Task->bake('BakeArticle', compact('validate'));
-		$this->assertPattern('/class BakeArticle extends AppModel \{/', $result);
-		$this->assertPattern('/\$validate \= array\(/', $result);
+		$this->assertRegExp('/class BakeArticle extends AppModel \{/', $result);
+		$this->assertRegExp('/\$validate \= array\(/', $result);
 		$expected = <<< STRINGEND
 array(
 			'notempty' => array(
@@ -679,7 +678,7 @@ array(
 				//'on' => 'create', // Limit validation to 'create' or 'update' operations
 			),
 STRINGEND;
-		$this->assertPattern('/' . preg_quote(str_replace("\r\n", "\n", $expected), '/') . '/', $result);
+		$this->assertRegExp('/' . preg_quote(str_replace("\r\n", "\n", $expected), '/') . '/', $result);
 	}
 
 /**
@@ -730,14 +729,14 @@ STRINGEND;
 		$this->assertContains(' * @property OtherModel $OtherModel', $result);
 		$this->assertContains(' * @property BakeComment $BakeComment', $result);
 		$this->assertContains(' * @property BakeTag $BakeTag', $result);
-		$this->assertPattern('/\$hasAndBelongsToMany \= array\(/', $result);
-		$this->assertPattern('/\$hasMany \= array\(/', $result);
-		$this->assertPattern('/\$belongsTo \= array\(/', $result);
-		$this->assertPattern('/\$hasOne \= array\(/', $result);
-		$this->assertPattern('/BakeTag/', $result);
-		$this->assertPattern('/OtherModel/', $result);
-		$this->assertPattern('/SomethingElse/', $result);
-		$this->assertPattern('/BakeComment/', $result);
+		$this->assertRegExp('/\$hasAndBelongsToMany \= array\(/', $result);
+		$this->assertRegExp('/\$hasMany \= array\(/', $result);
+		$this->assertRegExp('/\$belongsTo \= array\(/', $result);
+		$this->assertRegExp('/\$hasOne \= array\(/', $result);
+		$this->assertRegExp('/BakeTag/', $result);
+		$this->assertRegExp('/OtherModel/', $result);
+		$this->assertRegExp('/SomethingElse/', $result);
+		$this->assertRegExp('/BakeComment/', $result);
 	}
 
 /**
@@ -757,8 +756,8 @@ STRINGEND;
 		$result = $this->Task->bake('BakeArticle', array(), array());
 		$this->assertContains("App::uses('ControllerTestAppModel', 'ControllerTest.Model');", $result);
 
-		$this->assertEqual(count(ClassRegistry::keys()), 0);
-		$this->assertEqual(count(ClassRegistry::mapKeys()), 0);
+		$this->assertEquals(count(ClassRegistry::keys()), 0);
+		$this->assertEquals(count(ClassRegistry::mapKeys()), 0);
 	}
 
 /**
@@ -778,8 +777,8 @@ STRINGEND;
 
 		$this->Task->execute();
 
-		$this->assertEqual(count(ClassRegistry::keys()), 0);
-		$this->assertEqual(count(ClassRegistry::mapKeys()), 0);
+		$this->assertEquals(count(ClassRegistry::keys()), 0);
+		$this->assertEquals(count(ClassRegistry::mapKeys()), 0);
 	}
 
 /**
@@ -871,8 +870,8 @@ STRINGEND;
 
 		$this->Task->execute();
 
-		$this->assertEqual(count(ClassRegistry::keys()), 0);
-		$this->assertEqual(count(ClassRegistry::mapKeys()), 0);
+		$this->assertEquals(count(ClassRegistry::keys()), 0);
+		$this->assertEquals(count(ClassRegistry::mapKeys()), 0);
 	}
 
 /**
@@ -920,10 +919,8 @@ STRINGEND;
  * @return void
  */
 	public function testExecuteIntoInteractive() {
-		$count = count($this->Task->listAll('test'));
-		if ($count != count($this->fixtures)) {
-			$this->markTestSkipped('Additional tables detected.');
-		}
+		$tables = $this->Task->listAll('test');
+		$article = array_search('bake_articles', $tables) + 1;
 
 		$this->Task->connection = 'test';
 		$this->Task->path = '/my/path/';
@@ -931,7 +928,7 @@ STRINGEND;
 
 		$this->Task->expects($this->any())->method('in')
 			->will($this->onConsecutiveCalls(
-				'1', // article
+				$article, // article
 				'n', // no validation
 				'y', // associations
 				'y', // comment relation
@@ -952,8 +949,8 @@ STRINGEND;
 
 		$this->Task->execute();
 
-		$this->assertEqual(count(ClassRegistry::keys()), 0);
-		$this->assertEqual(count(ClassRegistry::mapKeys()), 0);
+		$this->assertEquals(count(ClassRegistry::keys()), 0);
+		$this->assertEquals(count(ClassRegistry::mapKeys()), 0);
 	}
 
 /**

lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php

@@ -199,7 +199,7 @@ class ProjectTaskTest extends CakeTestCase {
 
 		$File = new File($path . 'Config' . DS . 'core.php');
 		$contents = $File->read();
-		$this->assertNoPattern('/DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi/', $contents, 'Default Salt left behind. %s');
+		$this->assertNotRegExp('/DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi/', $contents, 'Default Salt left behind. %s');
 	}
 
 /**
@@ -216,7 +216,7 @@ class ProjectTaskTest extends CakeTestCase {
 
 		$File = new File($path . 'Config' . DS . 'core.php');
 		$contents = $File->read();
-		$this->assertNoPattern('/76859309657453542496749683645/', $contents, 'Default CipherSeed left behind. %s');
+		$this->assertNotRegExp('/76859309657453542496749683645/', $contents, 'Default CipherSeed left behind. %s');
 	}
 
 /**
@@ -232,10 +232,10 @@ class ProjectTaskTest extends CakeTestCase {
 
 		$File = new File($path . 'webroot' . DS . 'index.php');
 		$contents = $File->read();
-		$this->assertNoPattern('/define\(\'CAKE_CORE_INCLUDE_PATH\', ROOT/', $contents);
+		$this->assertNotRegExp('/define\(\'CAKE_CORE_INCLUDE_PATH\', ROOT/', $contents);
 		$File = new File($path . 'webroot' . DS . 'test.php');
 		$contents = $File->read();
-		$this->assertNoPattern('/define\(\'CAKE_CORE_INCLUDE_PATH\', ROOT/', $contents);
+		$this->assertNotRegExp('/define\(\'CAKE_CORE_INCLUDE_PATH\', ROOT/', $contents);
 	}
 
 /**
@@ -246,7 +246,7 @@ class ProjectTaskTest extends CakeTestCase {
 	public function testGetPrefix() {
 		Configure::write('Routing.prefixes', array('admin'));
 		$result = $this->Task->getPrefix();
-		$this->assertEqual($result, 'admin_');
+		$this->assertEquals($result, 'admin_');
 
 		Configure::write('Routing.prefixes', null);
 		$this->_setupTestProject();
@@ -254,7 +254,7 @@ class ProjectTaskTest extends CakeTestCase {
 		$this->Task->expects($this->once())->method('in')->will($this->returnValue('super_duper_admin'));
 
 		$result = $this->Task->getPrefix();
-		$this->assertEqual($result, 'super_duper_admin_');
+		$this->assertEquals($result, 'super_duper_admin_');
 
 		$File = new File($this->Task->configPath . 'core.php');
 		$File->delete();
@@ -276,7 +276,7 @@ class ProjectTaskTest extends CakeTestCase {
 		$result = $this->Task->cakeAdmin('my_prefix');
 		$this->assertTrue($result);
 
-		$this->assertEqual(Configure::read('Routing.prefixes'), array('my_prefix'));
+		$this->assertEquals(Configure::read('Routing.prefixes'), array('my_prefix'));
 		$File->delete();
 	}
 
@@ -292,7 +292,7 @@ class ProjectTaskTest extends CakeTestCase {
 		$this->Task->expects($this->once())->method('in')->will($this->returnValue(2));
 
 		$result = $this->Task->getPrefix();
-		$this->assertEqual($result, 'ninja_');
+		$this->assertEquals($result, 'ninja_');
 	}
 
 /**
@@ -334,6 +334,6 @@ class ProjectTaskTest extends CakeTestCase {
 
 		$File = new File($path . 'Console' . DS . 'cake.php');
 		$contents = $File->read();
-		$this->assertNoPattern('/__CAKE_PATH__/', $contents, 'Console path placeholder left behind.');
+		$this->assertNotRegExp('/__CAKE_PATH__/', $contents, 'Console path placeholder left behind.');
 	}
 }

lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php

@@ -66,19 +66,19 @@ class TemplateTaskTest extends CakeTestCase {
 	public function testSet() {
 		$this->Task->set('one', 'two');
 		$this->assertTrue(isset($this->Task->templateVars['one']));
-		$this->assertEqual($this->Task->templateVars['one'], 'two');
+		$this->assertEquals($this->Task->templateVars['one'], 'two');
 
 		$this->Task->set(array('one' => 'three', 'four' => 'five'));
 		$this->assertTrue(isset($this->Task->templateVars['one']));
-		$this->assertEqual($this->Task->templateVars['one'], 'three');
+		$this->assertEquals($this->Task->templateVars['one'], 'three');
 		$this->assertTrue(isset($this->Task->templateVars['four']));
-		$this->assertEqual($this->Task->templateVars['four'], 'five');
+		$this->assertEquals($this->Task->templateVars['four'], 'five');
 
 		$this->Task->templateVars = array();
 		$this->Task->set(array(3 => 'three', 4 => 'four'));
 		$this->Task->set(array(1 => 'one', 2 => 'two'));
 		$expected = array(3 => 'three', 4 => 'four', 1 => 'one', 2 => 'two');
-		$this->assertEqual($this->Task->templateVars, $expected);
+		$this->assertEquals($this->Task->templateVars, $expected);
 	}
 
 /**
@@ -89,7 +89,7 @@ class TemplateTaskTest extends CakeTestCase {
 	public function testFindingInstalledThemesForBake() {
 		$consoleLibs = CAKE . 'Console' . DS;
 		$this->Task->initialize();
-		$this->assertEqual($this->Task->templatePaths['default'], $consoleLibs . 'Templates' . DS . 'default' . DS);
+		$this->assertEquals($this->Task->templatePaths['default'], $consoleLibs . 'Templates' . DS . 'default' . DS);
 	}
 
 /**
@@ -105,17 +105,17 @@ class TemplateTaskTest extends CakeTestCase {
 		$this->Task->expects($this->exactly(1))->method('in')->will($this->returnValue('1'));
 
 		$result = $this->Task->getThemePath();
-		$this->assertEqual($result, $defaultTheme);
+		$this->assertEquals($result, $defaultTheme);
 
 		$this->Task->templatePaths = array('default' => $defaultTheme, 'other' => '/some/path');
 		$this->Task->params['theme'] = 'other';
 		$result = $this->Task->getThemePath();
-		$this->assertEqual($result, '/some/path');
+		$this->assertEquals($result, '/some/path');
 
 		$this->Task->params = array();
 		$result = $this->Task->getThemePath();
-		$this->assertEqual($result, $defaultTheme);
-		$this->assertEqual($this->Task->params['theme'], 'default');
+		$this->assertEquals($result, $defaultTheme);
+		$this->assertEquals($this->Task->params['theme'], 'default');
 	}
 
 /**
@@ -134,7 +134,7 @@ class TemplateTaskTest extends CakeTestCase {
 
 		$result = $this->Task->generate('classes', 'test_object', array('test' => 'foo'));
 		$expected = "I got rendered\nfoo";
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -160,6 +160,6 @@ class TemplateTaskTest extends CakeTestCase {
 			'schema' => ''
 		));
 		$result = $this->Task->generate('classes', 'fixture');
-		$this->assertPattern('/ArticleFixture extends CakeTestFixture/', $result);
+		$this->assertRegExp('/ArticleFixture extends CakeTestFixture/', $result);
 	}
 }

lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php

@@ -263,14 +263,14 @@ class ViewTaskTest extends CakeTestCase {
 		);
 		$result = $this->Task->getContent('view', $vars);
 
-		$this->assertPattern('/Delete Test View Model/', $result);
-		$this->assertPattern('/Edit Test View Model/', $result);
-		$this->assertPattern('/List Test View Models/', $result);
-		$this->assertPattern('/New Test View Model/', $result);
+		$this->assertRegExp('/Delete Test View Model/', $result);
+		$this->assertRegExp('/Edit Test View Model/', $result);
+		$this->assertRegExp('/List Test View Models/', $result);
+		$this->assertRegExp('/New Test View Model/', $result);
 
-		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'id\'\]/', $result);
-		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'name\'\]/', $result);
-		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'body\'\]/', $result);
+		$this->assertRegExp('/testViewModel\[\'TestViewModel\'\]\[\'id\'\]/', $result);
+		$this->assertRegExp('/testViewModel\[\'TestViewModel\'\]\[\'name\'\]/', $result);
+		$this->assertRegExp('/testViewModel\[\'TestViewModel\'\]\[\'body\'\]/', $result);
 	}
 
 /**
@@ -295,19 +295,19 @@ class ViewTaskTest extends CakeTestCase {
 		);
 		$result = $this->Task->getContent('admin_view', $vars);
 
-		$this->assertPattern('/Delete Test View Model/', $result);
-		$this->assertPattern('/Edit Test View Model/', $result);
-		$this->assertPattern('/List Test View Models/', $result);
-		$this->assertPattern('/New Test View Model/', $result);
+		$this->assertRegExp('/Delete Test View Model/', $result);
+		$this->assertRegExp('/Edit Test View Model/', $result);
+		$this->assertRegExp('/List Test View Models/', $result);
+		$this->assertRegExp('/New Test View Model/', $result);
 
-		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'id\'\]/', $result);
-		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'name\'\]/', $result);
-		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'body\'\]/', $result);
+		$this->assertRegExp('/testViewModel\[\'TestViewModel\'\]\[\'id\'\]/', $result);
+		$this->assertRegExp('/testViewModel\[\'TestViewModel\'\]\[\'name\'\]/', $result);
+		$this->assertRegExp('/testViewModel\[\'TestViewModel\'\]\[\'body\'\]/', $result);
 
 		$result = $this->Task->getContent('admin_add', $vars);
-		$this->assertPattern("/input\('name'\)/", $result);
-		$this->assertPattern("/input\('body'\)/", $result);
-		$this->assertPattern('/List Test View Models/', $result);
+		$this->assertRegExp("/input\('name'\)/", $result);
+		$this->assertRegExp("/input\('body'\)/", $result);
+		$this->assertRegExp('/List Test View Models/', $result);
 
 		Configure::write('Routing', $_back);
 	}
@@ -711,12 +711,12 @@ class ViewTaskTest extends CakeTestCase {
 		$this->assertFalse($result);
 
 		$result = $this->Task->getTemplate('add');
-		$this->assertEqual($result, 'form');
+		$this->assertEquals($result, 'form');
 
 		Configure::write('Routing.prefixes', array('admin'));
 
 		$result = $this->Task->getTemplate('admin_add');
-		$this->assertEqual($result, 'form');
+		$this->assertEquals($result, 'form');
 
 		$this->Task->Template->templatePaths = array(
 			'test' => CAKE . 'Test' . DS .  'test_app' . DS . 'Console' . DS . 'Templates' . DS . 'test' .DS
@@ -724,7 +724,7 @@ class ViewTaskTest extends CakeTestCase {
 		$this->Task->Template->params['theme'] = 'test';
 
 		$result = $this->Task->getTemplate('admin_edit');
-		$this->assertEqual($result, 'admin_edit');
+		$this->assertEquals($result, 'admin_edit');
 	}
 
 }

lib/Cake/Test/Case/Console/ConsoleOutputTest.php

@@ -97,7 +97,7 @@ class ConsoleOutputTest extends CakeTestCase {
 	public function testStylesGet() {
 		$result = $this->output->styles('error');
 		$expected = array('text' => 'red', 'underline' => true);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->assertNull($this->output->styles('made_up_goop'));
 

lib/Cake/Test/Case/Console/ShellDispatcherTest.php

@@ -156,7 +156,7 @@ class ShellDispatcherTest extends CakeTestCase {
 			'root' => str_replace('/', DS,'/var/www/htdocs')
 		);
 		$Dispatcher->parseParams($params);
-		$this->assertEqual($expected, $Dispatcher->params);
+		$this->assertEquals($expected, $Dispatcher->params);
 
 		$params = array('cake.php');
 		$expected = array(
@@ -167,7 +167,7 @@ class ShellDispatcherTest extends CakeTestCase {
 		);
 		$Dispatcher->params = $Dispatcher->args = array();
 		$Dispatcher->parseParams($params);
-		$this->assertEqual($expected, $Dispatcher->params);
+		$this->assertEquals($expected, $Dispatcher->params);
 
 		$params = array(
 			'cake.php',
@@ -182,7 +182,7 @@ class ShellDispatcherTest extends CakeTestCase {
 		);
 		$Dispatcher->params = $Dispatcher->args = array();
 		$Dispatcher->parseParams($params);
-		$this->assertEqual($expected, $Dispatcher->params);
+		$this->assertEquals($expected, $Dispatcher->params);
 
 		$params = array(
 			'./cake.php',
@@ -202,7 +202,7 @@ class ShellDispatcherTest extends CakeTestCase {
 
 		$Dispatcher->params = $Dispatcher->args = array();
 		$Dispatcher->parseParams($params);
-		$this->assertEqual($expected, $Dispatcher->params);
+		$this->assertEquals($expected, $Dispatcher->params);
 
 		$params = array(
 			'./console/cake.php',
@@ -220,7 +220,7 @@ class ShellDispatcherTest extends CakeTestCase {
 		);
 		$Dispatcher->params = $Dispatcher->args = array();
 		$Dispatcher->parseParams($params);
-		$this->assertEqual($expected, $Dispatcher->params);
+		$this->assertEquals($expected, $Dispatcher->params);
 
 		$params = array(
 			'./console/cake.php',
@@ -261,12 +261,12 @@ class ShellDispatcherTest extends CakeTestCase {
 		);
 		$Dispatcher->params = $Dispatcher->args = array();
 		$Dispatcher->parseParams($params);
-		$this->assertEqual($expected, $Dispatcher->params);
+		$this->assertEquals($expected, $Dispatcher->params);
 
 		$expected = array(
 			'./console/cake.php', 'schema', 'run', 'create', '-dry', '-f', '-name', 'DbAcl'
 		);
-		$this->assertEqual($expected, $Dispatcher->args);
+		$this->assertEquals($expected, $Dispatcher->args);
 
 		$params = array(
 			'/cake/1.2.x.x/cake/console/cake.php',
@@ -287,7 +287,7 @@ class ShellDispatcherTest extends CakeTestCase {
 		);
 		$Dispatcher->params = $Dispatcher->args = array();
 		$Dispatcher->parseParams($params);
-		$this->assertEqual($expected, $Dispatcher->params);
+		$this->assertEquals($expected, $Dispatcher->params);
 
 		$params = array(
 			'cake.php',
@@ -306,7 +306,7 @@ class ShellDispatcherTest extends CakeTestCase {
 
 		$Dispatcher->params = $Dispatcher->args = array();
 		$Dispatcher->parseParams($params);
-		$this->assertEqual($expected, $Dispatcher->params);
+		$this->assertEquals($expected, $Dispatcher->params);
 
 		$params = array(
 			'cake.php',
@@ -324,7 +324,7 @@ class ShellDispatcherTest extends CakeTestCase {
 		);
 		$Dispatcher->params = $Dispatcher->args = array();
 		$Dispatcher->parseParams($params);
-		$this->assertEqual($expected, $Dispatcher->params);
+		$this->assertEquals($expected, $Dispatcher->params);
 
 		$params = array(
 			'cake.php',
@@ -344,7 +344,7 @@ class ShellDispatcherTest extends CakeTestCase {
 		);
 		$Dispatcher->params = $Dispatcher->args = array();
 		$Dispatcher->parseParams($params);
-		$this->assertEqual($expected, $Dispatcher->params);
+		$this->assertEquals($expected, $Dispatcher->params);
 
 		$params = array(
 			'/home/amelo/dev/cake-common/cake/console/cake.php',
@@ -363,7 +363,7 @@ class ShellDispatcherTest extends CakeTestCase {
 		);
 		$Dispatcher->params = $Dispatcher->args = array();
 		$Dispatcher->parseParams($params);
-		$this->assertEqual($expected, $Dispatcher->params);
+		$this->assertEquals($expected, $Dispatcher->params);
 
 		$params = array(
 			'/cake/1.2.x.x/cake/console/cake.php',
@@ -382,7 +382,7 @@ class ShellDispatcherTest extends CakeTestCase {
 			'root' => str_replace('/', DS,'/var/www/htdocs')
 		);
 		$Dispatcher->parseParams($params);
-		$this->assertEqual($expected, $Dispatcher->params);
+		$this->assertEquals($expected, $Dispatcher->params);
 
 		if (DS === '\\') {
 			$params = array(
@@ -401,7 +401,7 @@ class ShellDispatcherTest extends CakeTestCase {
 
 			$Dispatcher->params = $Dispatcher->args = array();
 			$Dispatcher->parseParams($params);
-			$this->assertEqual($expected, $Dispatcher->params);
+			$this->assertEquals($expected, $Dispatcher->params);
 		}
 	}
 
@@ -448,7 +448,7 @@ class ShellDispatcherTest extends CakeTestCase {
 		$Dispatcher->args = array('mock_with_main');
 		$result = $Dispatcher->dispatch();
 		$this->assertTrue($result);
-		$this->assertEqual($Dispatcher->args, array());
+		$this->assertEquals($Dispatcher->args, array());
 	}
 
 /**
@@ -496,7 +496,7 @@ class ShellDispatcherTest extends CakeTestCase {
 		$Dispatcher->args = array('mock_with_main_not_a');
 		$result = $Dispatcher->dispatch();
 		$this->assertTrue($result);
-		$this->assertEqual($Dispatcher->args, array());
+		$this->assertEquals($Dispatcher->args, array());
 
 		$Shell = new MockWithMainNotAShell($Dispatcher);
 		$this->mockObjects[] = $Shell;
@@ -529,7 +529,7 @@ class ShellDispatcherTest extends CakeTestCase {
 		$Dispatcher->args = array('mock_without_main_not_a');
 		$result = $Dispatcher->dispatch();
 		$this->assertTrue($result);
-		$this->assertEqual($Dispatcher->args, array());
+		$this->assertEquals($Dispatcher->args, array());
 
 		$Shell = new MockWithoutMainNotAShell($Dispatcher);
 		$this->mockObjects[] = $Shell;
@@ -551,24 +551,24 @@ class ShellDispatcherTest extends CakeTestCase {
 		$Dispatcher = new TestShellDispatcher();
 
 		$Dispatcher->args = array('a', 'b', 'c');
-		$this->assertEqual($Dispatcher->shiftArgs(), 'a');
-		$this->assertIdentical($Dispatcher->args, array('b', 'c'));
+		$this->assertEquals($Dispatcher->shiftArgs(), 'a');
+		$this->assertSame($Dispatcher->args, array('b', 'c'));
 
 		$Dispatcher->args = array('a' => 'b', 'c', 'd');
-		$this->assertEqual($Dispatcher->shiftArgs(), 'b');
-		$this->assertIdentical($Dispatcher->args, array('c', 'd'));
+		$this->assertEquals($Dispatcher->shiftArgs(), 'b');
+		$this->assertSame($Dispatcher->args, array('c', 'd'));
 
 		$Dispatcher->args = array('a', 'b' => 'c', 'd');
-		$this->assertEqual($Dispatcher->shiftArgs(), 'a');
-		$this->assertIdentical($Dispatcher->args, array('b' => 'c', 'd'));
+		$this->assertEquals($Dispatcher->shiftArgs(), 'a');
+		$this->assertSame($Dispatcher->args, array('b' => 'c', 'd'));
 
 		$Dispatcher->args = array(0 => 'a',  2 => 'b', 30 => 'c');
-		$this->assertEqual($Dispatcher->shiftArgs(), 'a');
-		$this->assertIdentical($Dispatcher->args, array(0 => 'b', 1 => 'c'));
+		$this->assertEquals($Dispatcher->shiftArgs(), 'a');
+		$this->assertSame($Dispatcher->args, array(0 => 'b', 1 => 'c'));
 
 		$Dispatcher->args = array();
 		$this->assertNull($Dispatcher->shiftArgs());
-		$this->assertIdentical($Dispatcher->args, array());
+		$this->assertSame($Dispatcher->args, array());
 	}
 
 }

lib/Cake/Test/Case/Console/ShellTest.php

@@ -134,7 +134,7 @@ class ShellTest extends CakeTestCase {
  * @return void
  */
 	public function testConstruct() {
-		$this->assertEqual($this->Shell->name, 'ShellTestShell');
+		$this->assertEquals($this->Shell->name, 'ShellTestShell');
 		$this->assertInstanceOf('ConsoleInput', $this->Shell->stdin);
 		$this->assertInstanceOf('ConsoleOutput', $this->Shell->stdout);
 		$this->assertInstanceOf('ConsoleOutput', $this->Shell->stderr);
@@ -176,14 +176,14 @@ class ShellTest extends CakeTestCase {
 
 		$this->assertTrue(isset($this->Shell->TestPluginPost));
 		$this->assertInstanceOf('TestPluginPost', $this->Shell->TestPluginPost);
-		$this->assertEqual($this->Shell->modelClass, 'TestPluginPost');
+		$this->assertEquals($this->Shell->modelClass, 'TestPluginPost');
 		CakePlugin::unload('TestPlugin');
 
 		$this->Shell->uses = array('Comment');
 		$this->Shell->initialize();
 		$this->assertTrue(isset($this->Shell->Comment));
 		$this->assertInstanceOf('Comment', $this->Shell->Comment);
-		$this->assertEqual($this->Shell->modelClass, 'Comment');
+		$this->assertEquals($this->Shell->modelClass, 'Comment');
 
 		App::build();
 	}
@@ -219,22 +219,22 @@ class ShellTest extends CakeTestCase {
 			->will($this->returnValue('0'));
 
 		$result = $this->Shell->in('Just a test?', array('y', 'n'), 'n');
-		$this->assertEqual($result, 'n');
+		$this->assertEquals($result, 'n');
 
 		$result = $this->Shell->in('Just a test?', array('y', 'n'), 'n');
-		$this->assertEqual($result, 'Y');
+		$this->assertEquals($result, 'Y');
 
 		$result = $this->Shell->in('Just a test?', 'y,n', 'n');
-		$this->assertEqual($result, 'y');
+		$this->assertEquals($result, 'y');
 
 		$result = $this->Shell->in('Just a test?', 'y/n', 'n');
-		$this->assertEqual($result, 'y');
+		$this->assertEquals($result, 'y');
 
 		$result = $this->Shell->in('Just a test?', 'y', 'y');
-		$this->assertEqual($result, 'y');
+		$this->assertEquals($result, 'y');
 
 		$result = $this->Shell->in('Just a test?', array(0, 1, 2), '0');
-		$this->assertEqual($result, '0');
+		$this->assertEquals($result, '0');
 	}
 
 /**
@@ -246,7 +246,7 @@ class ShellTest extends CakeTestCase {
 		$this->Shell->interactive = false;
 
 		$result = $this->Shell->in('Just a test?', 'y/n', 'n');
-		$this->assertEqual($result, 'n');
+		$this->assertEquals($result, 'n');
 	}
 
 /**
@@ -359,11 +359,11 @@ class ShellTest extends CakeTestCase {
 		if (DS === '\\') {
 			$newLine = "\r\n";
 		}
-		$this->assertEqual($this->Shell->nl(), $newLine);
-		$this->assertEqual($this->Shell->nl(true), $newLine);
-		$this->assertEqual($this->Shell->nl(false), "");
-		$this->assertEqual($this->Shell->nl(2), $newLine . $newLine);
-		$this->assertEqual($this->Shell->nl(1), $newLine);
+		$this->assertEquals($this->Shell->nl(), $newLine);
+		$this->assertEquals($this->Shell->nl(true), $newLine);
+		$this->assertEquals($this->Shell->nl(false), "");
+		$this->assertEquals($this->Shell->nl(2), $newLine . $newLine);
+		$this->assertEquals($this->Shell->nl(1), $newLine);
 	}
 
 /**
@@ -412,12 +412,12 @@ class ShellTest extends CakeTestCase {
 			->with("Searched all...", 1);
 
 		$this->Shell->error('Foo Not Found');
-		$this->assertIdentical($this->Shell->stopped, 1);
+		$this->assertSame($this->Shell->stopped, 1);
 
 		$this->Shell->stopped = null;
 
 		$this->Shell->error('Foo Not Found', 'Searched all...');
-		$this->assertIdentical($this->Shell->stopped, 1);
+		$this->assertSame($this->Shell->stopped, 1);
 	}
 
 /**
@@ -482,38 +482,38 @@ class ShellTest extends CakeTestCase {
  */
 	public function testShortPath() {
 		$path = $expected = DS . 'tmp' . DS . 'ab' . DS . 'cd';
-		$this->assertEqual($this->Shell->shortPath($path), $expected);
+		$this->assertEquals($this->Shell->shortPath($path), $expected);
 
 		$path = $expected = DS . 'tmp' . DS . 'ab' . DS . 'cd' . DS ;
-		$this->assertEqual($this->Shell->shortPath($path), $expected);
+		$this->assertEquals($this->Shell->shortPath($path), $expected);
 
 		$path = $expected = DS . 'tmp' . DS . 'ab' . DS . 'index.php';
-		$this->assertEqual($this->Shell->shortPath($path), $expected);
+		$this->assertEquals($this->Shell->shortPath($path), $expected);
 
 		// Shell::shortPath needs Folder::realpath
 		// $path = DS . 'tmp' . DS . 'ab' . DS . '..' . DS . 'cd';
 		// $expected = DS . 'tmp' . DS . 'cd';
-		// $this->assertEqual($this->Shell->shortPath($path), $expected);
+		// $this->assertEquals($this->Shell->shortPath($path), $expected);
 
 		$path = DS . 'tmp' . DS . 'ab' . DS . DS . 'cd';
 		$expected = DS . 'tmp' . DS . 'ab' . DS . 'cd';
-		$this->assertEqual($this->Shell->shortPath($path), $expected);
+		$this->assertEquals($this->Shell->shortPath($path), $expected);
 
 		$path = 'tmp' . DS . 'ab';
 		$expected = 'tmp' . DS . 'ab';
-		$this->assertEqual($this->Shell->shortPath($path), $expected);
+		$this->assertEquals($this->Shell->shortPath($path), $expected);
 
 		$path = 'tmp' . DS . 'ab';
 		$expected = 'tmp' . DS . 'ab';
-		$this->assertEqual($this->Shell->shortPath($path), $expected);
+		$this->assertEquals($this->Shell->shortPath($path), $expected);
 
 		$path = APP;
 		$expected = DS . basename(APP) . DS;
-		$this->assertEqual($this->Shell->shortPath($path), $expected);
+		$this->assertEquals($this->Shell->shortPath($path), $expected);
 
 		$path = APP . 'index.php';
 		$expected = DS . basename(APP) . DS . 'index.php';
-		$this->assertEqual($this->Shell->shortPath($path), $expected);
+		$this->assertEquals($this->Shell->shortPath($path), $expected);
 	}
 
 /**
@@ -535,13 +535,13 @@ class ShellTest extends CakeTestCase {
 		$result = $this->Shell->createFile($file, $contents);
 		$this->assertTrue($result);
 		$this->assertTrue(file_exists($file));
-		$this->assertEqual(file_get_contents($file), $contents);
+		$this->assertEquals(file_get_contents($file), $contents);
 
 		$contents = "<?php\necho 'another test';\n\$te = 'st';\n";
 		$result = $this->Shell->createFile($file, $contents);
 		$this->assertTrue($result);
 		$this->assertTrue(file_exists($file));
-		$this->assertEqual(file_get_contents($file), $contents);
+		$this->assertEquals(file_get_contents($file), $contents);
 
 		$Folder->delete();
 	}
@@ -573,14 +573,14 @@ class ShellTest extends CakeTestCase {
 		$result = $this->Shell->createFile($file, $contents);
 		$this->assertTrue($result);
 		$this->assertTrue(file_exists($file));
-		$this->assertEqual(file_get_contents($file), $contents);
+		$this->assertEquals(file_get_contents($file), $contents);
 
 		// no overwrite
 		$contents = 'new contents';
 		$result = $this->Shell->createFile($file, $contents);
 		$this->assertFalse($result);
 		$this->assertTrue(file_exists($file));
-		$this->assertNotEqual($contents, file_get_contents($file));
+		$this->assertNotEquals($contents, file_get_contents($file));
 
 		// overwrite
 		$contents = 'more new contents';
@@ -611,13 +611,13 @@ class ShellTest extends CakeTestCase {
 		$result = $this->Shell->createFile($file, $contents);
 		$this->assertTrue($result);
 		$this->assertTrue(file_exists($file));
-		$this->assertEqual(file_get_contents($file), $contents);
+		$this->assertEquals(file_get_contents($file), $contents);
 
 		$contents = "<?php\r\necho 'another test';\r\n\$te = 'st';\r\n";
 		$result = $this->Shell->createFile($file, $contents);
 		$this->assertTrue($result);
 		$this->assertTrue(file_exists($file));
-		$this->assertEqual(file_get_contents($file), $contents);
+		$this->assertEquals(file_get_contents($file), $contents);
 
 		$Folder = new Folder($path);
 		$Folder->delete();
@@ -649,14 +649,14 @@ class ShellTest extends CakeTestCase {
 		$result = $this->Shell->createFile($file, $contents);
 		$this->assertTrue($result);
 		$this->assertTrue(file_exists($file));
-		$this->assertEqual(file_get_contents($file), $contents);
+		$this->assertEquals(file_get_contents($file), $contents);
 
 		// no overwrite
 		$contents = 'new contents';
 		$result = $this->Shell->createFile($file, $contents);
 		$this->assertFalse($result);
 		$this->assertTrue(file_exists($file));
-		$this->assertNotEqual($contents, file_get_contents($file));
+		$this->assertNotEquals($contents, file_get_contents($file));
 
 		// overwrite
 		$contents = 'more new contents';
@@ -839,6 +839,6 @@ TEXT;
 		$this->Shell->tasks = array('TestApple');
 		$this->Shell->loadTasks();
 		$expected = 'TestApple';
-		$this->assertEqual($expected, $this->Shell->TestApple->name);
+		$this->assertEquals($expected, $this->Shell->TestApple->name);
 	}
 }

lib/Cake/Test/Case/Controller/Component/AclComponentTest.php

@@ -73,7 +73,7 @@ class AclComponentTest extends CakeTestCase {
 		$implementation->expects($this->once())->method('initialize')->with($this->Acl);
 		$this->assertNull($this->Acl->adapter($implementation));
 
-		$this->assertEqual($this->Acl->adapter(), $implementation, 'Returned object is different %s');
+		$this->assertEquals($this->Acl->adapter(), $implementation, 'Returned object is different %s');
 	}
 
 /**

lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php

@@ -290,7 +290,7 @@ DIGEST;
 			'opaque' => '5ccc069c403ebaf9f0171e9517f40e41'
 		);
 		$result = $this->auth->parseAuthData($digest);
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 /**

lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php

@@ -163,6 +163,7 @@ class FormAuthenticateTest extends CakeTestCase {
 		), true);
 		CakePlugin::load('TestPlugin');
 
+		$ts = date('Y-m-d H:i:s');
 		$PluginModel = ClassRegistry::init('TestPlugin.TestPluginAuthUser');
 		$user['id'] = 1;
 		$user['username'] = 'gwoo';
@@ -184,7 +185,7 @@ class FormAuthenticateTest extends CakeTestCase {
 			'username' => 'gwoo',
 			'created' => '2007-03-17 01:16:23'
 		);
-		$this->assertTrue($result['updated'] >= date('Y-m-d H:i:s'));
+		$this->assertTrue($result['updated'] >= $ts);
 		unset($result['updated']);
 		$this->assertEquals($expected, $result);
 		CakePlugin::unload();

lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php

@@ -671,6 +671,11 @@ class AuthComponentTest extends CakeTestCase {
 		$this->Controller->request->query['url'] = Router::normalize($url);
 
 		$this->assertFalse($this->Controller->Auth->startup($this->Controller));
+
+		$url = '/auth_test/CamelCase';
+		$this->Controller->request->addParams(Router::parse($url));
+		$this->Controller->request->query['url'] = Router::normalize($url);
+		$this->assertFalse($this->Controller->Auth->startup($this->Controller));
 	}
 
 /**
@@ -721,7 +726,7 @@ class AuthComponentTest extends CakeTestCase {
 		$this->Controller->request->query['url'] = Router::normalize($url);
 		$this->Controller->Auth->initialize($this->Controller);
 		$this->Controller->Auth->allow('action_name', 'anotherAction');
-		$this->assertEqual($this->Controller->Auth->allowedActions, array('action_name', 'anotherAction'));
+		$this->assertEquals($this->Controller->Auth->allowedActions, array('action_name', 'anotherAction'));
 	}
 
 /**
@@ -747,7 +752,7 @@ class AuthComponentTest extends CakeTestCase {
 		);
 		$this->Auth->startup($this->Controller);
 		$expected = Router::normalize($this->Auth->loginRedirect);
-		$this->assertEqual($expected, $this->Auth->redirect());
+		$this->assertEquals($expected, $this->Auth->redirect());
 
 		$this->Auth->Session->delete('Auth');
 
@@ -772,7 +777,7 @@ class AuthComponentTest extends CakeTestCase {
 		);
 		$this->Auth->startup($this->Controller);
 		$expected = Router::normalize('/AuthTest/login');
-		$this->assertEqual($expected, $this->Controller->testUrl);
+		$this->assertEquals($expected, $this->Controller->testUrl);
 
 		$this->Auth->Session->delete('Auth');
 		$_SERVER['HTTP_REFERER'] = $_ENV['HTTP_REFERER'] = Router::url('/admin', true);
@@ -786,7 +791,7 @@ class AuthComponentTest extends CakeTestCase {
 		$this->Auth->loginRedirect = false;
 		$this->Auth->startup($this->Controller);
 		$expected = Router::normalize('/admin');
-		$this->assertEqual($expected, $this->Auth->redirect());
+		$this->assertEquals($expected, $this->Auth->redirect());
 
 		//Ticket #4750
 		//named params
@@ -798,7 +803,7 @@ class AuthComponentTest extends CakeTestCase {
 		$this->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
 		$this->Auth->startup($this->Controller);
 		$expected = Router::normalize('posts/index/year:2008/month:feb');
-		$this->assertEqual($expected, $this->Auth->Session->read('Auth.redirect'));
+		$this->assertEquals($expected, $this->Auth->Session->read('Auth.redirect'));
 
 		//passed args
 		$this->Auth->Session->delete('Auth');
@@ -809,7 +814,7 @@ class AuthComponentTest extends CakeTestCase {
 		$this->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
 		$this->Auth->startup($this->Controller);
 		$expected = Router::normalize('posts/view/1');
-		$this->assertEqual($expected, $this->Auth->Session->read('Auth.redirect'));
+		$this->assertEquals($expected, $this->Auth->Session->read('Auth.redirect'));
 
         // QueryString parameters
 		$_back = $_GET;
@@ -827,7 +832,7 @@ class AuthComponentTest extends CakeTestCase {
 		$this->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
 		$this->Auth->startup($this->Controller);
 		$expected = Router::normalize('posts/index/29?print=true&refer=menu');
-		$this->assertEqual($expected, $this->Auth->Session->read('Auth.redirect'));
+		$this->assertEquals($expected, $this->Auth->Session->read('Auth.redirect'));
 
 		$_GET = array(
 			'url' => '/posts/index/29',
@@ -843,7 +848,7 @@ class AuthComponentTest extends CakeTestCase {
 		$this->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
 		$this->Auth->startup($this->Controller);
 		$expected = Router::normalize('posts/index/29?print=true&refer=menu');
-		$this->assertEqual($expected, $this->Auth->Session->read('Auth.redirect'));
+		$this->assertEquals($expected, $this->Auth->Session->read('Auth.redirect'));
 		$_GET = $_back;
 
 		//external authed action
@@ -860,7 +865,7 @@ class AuthComponentTest extends CakeTestCase {
 		$this->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
 		$this->Auth->startup($this->Controller);
 		$expected = Router::normalize('/posts/edit/1');
-		$this->assertEqual($expected, $this->Auth->Session->read('Auth.redirect'));
+		$this->assertEquals($expected, $this->Auth->Session->read('Auth.redirect'));
 
 		//external direct login link
 		$_SERVER['HTTP_REFERER'] = 'http://webmail.example.com/view/message';
@@ -873,7 +878,7 @@ class AuthComponentTest extends CakeTestCase {
 		$this->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
 		$this->Auth->startup($this->Controller);
 		$expected = Router::normalize('/');
-		$this->assertEqual($expected, $this->Auth->Session->read('Auth.redirect'));
+		$this->assertEquals($expected, $this->Auth->Session->read('Auth.redirect'));
 
 		$this->Auth->Session->delete('Auth');
 	}
@@ -937,7 +942,7 @@ class AuthComponentTest extends CakeTestCase {
 		);
 
 		$this->Auth->startup($this->Controller);
-		$this->assertEqual($this->Controller->testUrl, '/admin/auth_test/login');
+		$this->assertEquals($this->Controller->testUrl, '/admin/auth_test/login');
 
 		Configure::write('Routing.prefixes', $pref);
 	}
@@ -960,7 +965,7 @@ class AuthComponentTest extends CakeTestCase {
 		$Dispatcher->dispatch(new CakeRequest('/ajax_auth/add'), new CakeResponse(), array('return' => 1));
 		$result = ob_get_clean();
 
-		$this->assertEqual("Ajax!\nthis is the test element", str_replace("\r\n", "\n", $result));
+		$this->assertEquals("Ajax!\nthis is the test element", str_replace("\r\n", "\n", $result));
 		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
 	}
 
@@ -1060,8 +1065,8 @@ class AuthComponentTest extends CakeTestCase {
 			'loginAction' => array('controller' => 'people', 'action' => 'login'),
 			'logoutRedirect' => array('controller' => 'people', 'action' => 'login'),
 		);
-		$this->assertEqual($expected['loginAction'], $this->Controller->Auth->loginAction);
-		$this->assertEqual($expected['logoutRedirect'], $this->Controller->Auth->logoutRedirect);
+		$this->assertEquals($expected['loginAction'], $this->Controller->Auth->loginAction);
+		$this->assertEquals($expected['logoutRedirect'], $this->Controller->Auth->logoutRedirect);
 	}
 
 /**
@@ -1075,7 +1080,7 @@ class AuthComponentTest extends CakeTestCase {
 		$this->Auth->logoutRedirect = '/';
 		$result = $this->Auth->logout();
 
-		$this->assertEqual($result, '/');
+		$this->assertEquals($result, '/');
 		$this->assertNull($this->Auth->Session->read('Auth.AuthUser'));
 		$this->assertNull($this->Auth->Session->read('Auth.redirect'));
 	}

lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php

@@ -124,8 +124,8 @@ class CookieComponentTest extends CakeTestCase {
 			'path' => '/'
 		);
 		$Cookie = new CookieComponent(new ComponentCollection(), $settings);
-		$this->assertEqual($Cookie->time, $settings['time']);
-		$this->assertEqual($Cookie->path, $settings['path']);
+		$this->assertEquals($Cookie->time, $settings['time']);
+		$this->assertEquals($Cookie->path, $settings['path']);
 	}
 
 /**
@@ -134,7 +134,7 @@ class CookieComponentTest extends CakeTestCase {
  * @return void
  */
 	public function testCookieName() {
-		$this->assertEqual($this->Cookie->name, 'CakeTestCookie');
+		$this->assertEquals($this->Cookie->name, 'CakeTestCookie');
 	}
 
 /**
@@ -146,11 +146,11 @@ class CookieComponentTest extends CakeTestCase {
 		$this->_setCookieData();
 		$data = $this->Cookie->read('Encrytped_array');
 		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$data = $this->Cookie->read('Encrytped_multi_cookies');
 		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 	}
 
 /**
@@ -163,11 +163,11 @@ class CookieComponentTest extends CakeTestCase {
 
 		$data = $this->Cookie->read('Plain_array');
 		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$data = $this->Cookie->read('Plain_multi_cookies');
 		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 	}
 
 /**
@@ -220,9 +220,9 @@ class CookieComponentTest extends CakeTestCase {
 	public function testWritePlainCookieArray() {
 		$this->Cookie->write(array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!'), null, false);
 
-		$this->assertEqual($this->Cookie->read('name'), 'CakePHP');
-		$this->assertEqual($this->Cookie->read('version'), '1.2.0.x');
-		$this->assertEqual($this->Cookie->read('tag'), 'CakePHP Rocks!');
+		$this->assertEquals($this->Cookie->read('name'), 'CakePHP');
+		$this->assertEquals($this->Cookie->read('version'), '1.2.0.x');
+		$this->assertEquals($this->Cookie->read('tag'), 'CakePHP Rocks!');
 
 		$this->Cookie->delete('name');
 		$this->Cookie->delete('version');
@@ -267,7 +267,7 @@ class CookieComponentTest extends CakeTestCase {
 				'name' => 'CakePHP',
 				'version' => '1.2.0.x',
 				'tag' => 'CakePHP Rocks!'));
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 	}
 
 /**
@@ -280,7 +280,7 @@ class CookieComponentTest extends CakeTestCase {
 		$this->Cookie->delete('Encrytped_multi_cookies.name');
 		$data = $this->Cookie->read('Encrytped_multi_cookies');
 		$expected = array('version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$this->Cookie->delete('Encrytped_array');
 		$data = $this->Cookie->read('Encrytped_array');
@@ -289,7 +289,7 @@ class CookieComponentTest extends CakeTestCase {
 		$this->Cookie->delete('Plain_multi_cookies.name');
 		$data = $this->Cookie->read('Plain_multi_cookies');
 		$expected = array('version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$this->Cookie->delete('Plain_array');
 		$data = $this->Cookie->read('Plain_array');
@@ -306,51 +306,51 @@ class CookieComponentTest extends CakeTestCase {
 
 		$data = $this->Cookie->read('Encrytped_array.name');
 		$expected = 'CakePHP';
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$data = $this->Cookie->read('Encrytped_array.version');
 		$expected = '1.2.0.x';
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$data = $this->Cookie->read('Encrytped_array.tag');
 		$expected = 'CakePHP Rocks!';
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$data = $this->Cookie->read('Encrytped_multi_cookies.name');
 		$expected = 'CakePHP';
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$data = $this->Cookie->read('Encrytped_multi_cookies.version');
 		$expected = '1.2.0.x';
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$data = $this->Cookie->read('Encrytped_multi_cookies.tag');
 		$expected = 'CakePHP Rocks!';
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$data = $this->Cookie->read('Plain_array.name');
 		$expected = 'CakePHP';
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$data = $this->Cookie->read('Plain_array.version');
 		$expected = '1.2.0.x';
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$data = $this->Cookie->read('Plain_array.tag');
 		$expected = 'CakePHP Rocks!';
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$data = $this->Cookie->read('Plain_multi_cookies.name');
 		$expected = 'CakePHP';
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$data = $this->Cookie->read('Plain_multi_cookies.version');
 		$expected = '1.2.0.x';
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 
 		$data = $this->Cookie->read('Plain_multi_cookies.tag');
 		$expected = 'CakePHP Rocks!';
-		$this->assertEqual($data, $expected);
+		$this->assertEquals($data, $expected);
 	}
 
 /**
@@ -493,7 +493,7 @@ class CookieComponentTest extends CakeTestCase {
 			'User' => array('email' => 'example@example.com', 'name' => 'mark'),
 			'other' => 'value'
 		);
-		$this->assertEqual('mark', $this->Cookie->read('User.name'));
+		$this->assertEquals('mark', $this->Cookie->read('User.name'));
 
 		$this->Cookie->delete('User');
 		$this->assertNull($this->Cookie->read('User.email'));

lib/Cake/Test/Case/Controller/Component/DbAclTest.php

@@ -242,8 +242,8 @@ class DbAclTest extends CakeTestCase {
 			'parent_id' => $parent['AroTwoTest']['id']
 		));
 		$result = $this->Acl->Aro->findByAlias('Subordinate', null, null, -1);
-		$this->assertEqual($result['AroTwoTest']['lft'], 16);
-		$this->assertEqual($result['AroTwoTest']['rght'], 17);
+		$this->assertEquals($result['AroTwoTest']['lft'], 16);
+		$this->assertEquals($result['AroTwoTest']['rght'], 17);
 	}
 
 /**
@@ -384,7 +384,7 @@ class DbAclTest extends CakeTestCase {
 
 		$result = $this->Acl->Aro->Permission->find('all', array('conditions' => array('AroTwoTest.alias' => 'Samir')));
 		$expected = '-1';
-		$this->assertEqual($result[0]['PermissionTwoTest']['_delete'], $expected);
+		$this->assertEquals($result[0]['PermissionTwoTest']['_delete'], $expected);
 
 		$this->assertFalse($this->Acl->deny('Lumbergh', 'ROOT/tpsReports/DoesNotExist', 'create'));
 	}
@@ -401,7 +401,7 @@ class DbAclTest extends CakeTestCase {
 			array('AroTwoTest' => array('id' => '4', 'parent_id' => '1', 'model' => 'Group', 'foreign_key' => 3, 'alias' => 'users')),
 			array('AroTwoTest' => array('id' => '1', 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'root'))
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Acl->Aco->node('ROOT/tpsReports/view/current');
 		$expected = array(
@@ -410,7 +410,7 @@ class DbAclTest extends CakeTestCase {
 			array('AcoTwoTest' => array('id' => '2', 'parent_id' => '1', 'model' => null, 'foreign_key' => null, 'alias' => 'tpsReports')),
 			array('AcoTwoTest' => array('id' => '1', 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT')),
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**

lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php

@@ -61,6 +61,7 @@ class DebugCompTransport extends AbstractTransport {
  * @return boolean
  */
 	public function send(CakeEmail $email) {
+		$email->addHeaders(array('Date' => EmailComponentTest::$sentDate));
 		$headers = $email->getHeaders(array_fill_keys(array('from', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'bcc', 'subject'), true));
 		$to = $headers['To'];
 		$subject = $headers['Subject'];
@@ -134,6 +135,13 @@ class EmailComponentTest extends CakeTestCase {
  */
 	public $name = 'Email';
 
+/**
+ * sentDate
+ *
+ * @var string
+ */
+	public static $sentDate = null;
+
 /**
  * setUp method
  *
@@ -149,6 +157,8 @@ class EmailComponentTest extends CakeTestCase {
 
 		$this->Controller->EmailTest->initialize($this->Controller, array());
 
+		self::$sentDate = date(DATE_RFC2822);
+
 		App::build(array(
 			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
@@ -189,7 +199,7 @@ class EmailComponentTest extends CakeTestCase {
 		$this->Controller->EmailTest->delivery = 'DebugComp';
 		$this->Controller->EmailTest->messageId = false;
 
-		$date = date(DATE_RFC2822);
+		$date = self::$sentDate;
 		$message = <<<MSGBLOC
 <pre>To: postmaster@example.com
 From: noreply@example.com
@@ -212,18 +222,18 @@ MSGBLOC;
 		$this->Controller->EmailTest->sendAs = 'text';
 		$expect = str_replace('{CONTENTTYPE}', 'text/plain; charset=UTF-8', $message);
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
-		$this->assertEqual(DebugCompTransport::$lastEmail, $this->__osFix($expect));
+		$this->assertEquals(DebugCompTransport::$lastEmail, $this->__osFix($expect));
 
 		$this->Controller->EmailTest->sendAs = 'html';
 		$expect = str_replace('{CONTENTTYPE}', 'text/html; charset=UTF-8', $message);
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
-		$this->assertEqual(DebugCompTransport::$lastEmail, $this->__osFix($expect));
+		$this->assertEquals(DebugCompTransport::$lastEmail, $this->__osFix($expect));
 
 		// TODO: better test for format of message sent?
 		$this->Controller->EmailTest->sendAs = 'both';
 		$expect = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="alt-"', $message);
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
-		$this->assertEqual(preg_replace('/alt-[a-z0-9]{32}/i', 'alt-', DebugCompTransport::$lastEmail), $this->__osFix($expect));
+		$this->assertEquals(preg_replace('/alt-[a-z0-9]{32}/i', 'alt-', DebugCompTransport::$lastEmail), $this->__osFix($expect));
 	}
 
 /**
@@ -242,7 +252,7 @@ MSGBLOC;
 		$this->Controller->EmailTest->delivery = 'DebugComp';
 		$this->Controller->EmailTest->messageId = false;
 
-		$date = date(DATE_RFC2822);
+		$date = self::$sentDate;
 		$header = <<<HEADBLOC
 To: postmaster@example.com
 From: noreply@example.com
@@ -289,12 +299,12 @@ HTMLBLOC;
 		$this->Controller->EmailTest->sendAs = 'text';
 		$expect = '<pre>' . str_replace('{CONTENTTYPE}', 'text/plain; charset=UTF-8', $header) . $text . "\n" . '</pre>';
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
-		$this->assertEqual(DebugCompTransport::$lastEmail, $this->__osFix($expect));
+		$this->assertEquals(DebugCompTransport::$lastEmail, $this->__osFix($expect));
 
 		$this->Controller->EmailTest->sendAs = 'html';
 		$expect = '<pre>' . str_replace('{CONTENTTYPE}', 'text/html; charset=UTF-8', $header) . $html . "\n" . '</pre>';
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
-		$this->assertEqual(DebugCompTransport::$lastEmail, $this->__osFix($expect));
+		$this->assertEquals(DebugCompTransport::$lastEmail, $this->__osFix($expect));
 
 		$this->Controller->EmailTest->sendAs = 'both';
 		$expect = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="alt-"', $header);
@@ -303,7 +313,7 @@ HTMLBLOC;
 		$expect = '<pre>' . $expect . '--alt---' . "\n\n" . '</pre>';
 
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
-		$this->assertEqual(preg_replace('/alt-[a-z0-9]{32}/i', 'alt-', DebugCompTransport::$lastEmail), $this->__osFix($expect));
+		$this->assertEquals(preg_replace('/alt-[a-z0-9]{32}/i', 'alt-', DebugCompTransport::$lastEmail), $this->__osFix($expect));
 
 		$html = <<<HTMLBLOC
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -324,7 +334,7 @@ HTMLBLOC;
 		$this->Controller->EmailTest->sendAs = 'html';
 		$expect = '<pre>' . str_replace('{CONTENTTYPE}', 'text/html; charset=UTF-8', $header) . $html . '</pre>';
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message', 'default', 'thin'));
-		$this->assertEqual(DebugCompTransport::$lastEmail, $this->__osFix($expect));
+		$this->assertEquals(DebugCompTransport::$lastEmail, $this->__osFix($expect));
 	}
 
 /**
@@ -347,8 +357,8 @@ HTMLBLOC;
 
 		$this->Controller->EmailTest->send();
 		$result = DebugCompTransport::$lastEmail;
-		$this->assertPattern('/Test/', $result);
-		$this->assertPattern('/http\:\/\/example\.com/', $result);
+		$this->assertRegExp('/Test/', $result);
+		$this->assertRegExp('/http\:\/\/example\.com/', $result);
 	}
 
 /**
@@ -369,17 +379,17 @@ HTMLBLOC;
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 		$result = DebugCompTransport::$lastEmail;
 
-		$this->assertPattern('/To: postmaster@example.com\n/', $result);
-		$this->assertPattern('/Subject: Cake Debug Test\n/', $result);
-		$this->assertPattern('/Reply-To: noreply@example.com\n/', $result);
-		$this->assertPattern('/From: noreply@example.com\n/', $result);
-		$this->assertPattern('/Cc: cc@example.com\n/', $result);
-		$this->assertPattern('/Bcc: bcc@example.com\n/', $result);
-		$this->assertPattern('/Date: ' . preg_quote(date(DATE_RFC2822)) . '\n/', $result);
-		$this->assertPattern('/X-Mailer: CakePHP Email Component\n/', $result);
-		$this->assertPattern('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
-		$this->assertPattern('/Content-Transfer-Encoding: 8bitMessage:\n/', $result);
-		$this->assertPattern('/This is the body of the message/', $result);
+		$this->assertRegExp('/To: postmaster@example.com\n/', $result);
+		$this->assertRegExp('/Subject: Cake Debug Test\n/', $result);
+		$this->assertRegExp('/Reply-To: noreply@example.com\n/', $result);
+		$this->assertRegExp('/From: noreply@example.com\n/', $result);
+		$this->assertRegExp('/Cc: cc@example.com\n/', $result);
+		$this->assertRegExp('/Bcc: bcc@example.com\n/', $result);
+		$this->assertRegExp('/Date: ' . preg_quote(self::$sentDate) . '\n/', $result);
+		$this->assertRegExp('/X-Mailer: CakePHP Email Component\n/', $result);
+		$this->assertRegExp('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
+		$this->assertRegExp('/Content-Transfer-Encoding: 8bitMessage:\n/', $result);
+		$this->assertRegExp('/This is the body of the message/', $result);
 	}
 
 /**
@@ -400,15 +410,15 @@ HTMLBLOC;
 		$this->Controller->EmailTest->send('This is the body of the message');
 		$result = DebugCompTransport::$lastEmail;
 
-		$this->assertPattern('/To: postmaster@example.com\n/', $result);
-		$this->assertPattern('/Subject: Cake Debug Test\n/', $result);
-		$this->assertPattern('/Reply-To: noreply@example.com\n/', $result);
-		$this->assertPattern('/From: noreply@example.com\n/', $result);
-		$this->assertPattern('/Date: ' . preg_quote(date(DATE_RFC2822)) . '\n/', $result);
-		$this->assertPattern('/X-Mailer: CakePHP Email Component\n/', $result);
-		$this->assertPattern('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
-		$this->assertPattern('/Content-Transfer-Encoding: 8bitMessage:\n/', $result);
-		$this->assertPattern('/This is the body of the message/', $result);
+		$this->assertRegExp('/To: postmaster@example.com\n/', $result);
+		$this->assertRegExp('/Subject: Cake Debug Test\n/', $result);
+		$this->assertRegExp('/Reply-To: noreply@example.com\n/', $result);
+		$this->assertRegExp('/From: noreply@example.com\n/', $result);
+		$this->assertRegExp('/Date: ' . preg_quote(self::$sentDate) . '\n/', $result);
+		$this->assertRegExp('/X-Mailer: CakePHP Email Component\n/', $result);
+		$this->assertRegExp('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
+		$this->assertRegExp('/Content-Transfer-Encoding: 8bitMessage:\n/', $result);
+		$this->assertRegExp('/This is the body of the message/', $result);
 		$this->Controller->Session = $session;
 	}
 
@@ -435,18 +445,18 @@ HTMLBLOC;
 
 		$this->Controller->EmailTest->sendAs = 'both';
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
-		$this->assertEqual($this->Controller->EmailTest->textMessage, $this->__osFix($text));
-		$this->assertEqual($this->Controller->EmailTest->htmlMessage, $this->__osFix($html));
+		$this->assertEquals($this->Controller->EmailTest->textMessage, $this->__osFix($text));
+		$this->assertEquals($this->Controller->EmailTest->htmlMessage, $this->__osFix($html));
 
 		$this->Controller->EmailTest->sendAs = 'text';
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
-		$this->assertEqual($this->Controller->EmailTest->textMessage, $this->__osFix($text));
+		$this->assertEquals($this->Controller->EmailTest->textMessage, $this->__osFix($text));
 		$this->assertNull($this->Controller->EmailTest->htmlMessage);
 
 		$this->Controller->EmailTest->sendAs = 'html';
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 		$this->assertNull($this->Controller->EmailTest->textMessage);
-		$this->assertEqual($this->Controller->EmailTest->htmlMessage, $this->__osFix($html));
+		$this->assertEquals($this->Controller->EmailTest->htmlMessage, $this->__osFix($html));
 	}
 
 /**
@@ -495,18 +505,18 @@ HTMLBLOC;
 
 		$this->Controller->EmailTest->sendAs = 'both';
 		$this->assertTrue($this->Controller->EmailTest->send());
-		$this->assertEqual($this->Controller->EmailTest->textMessage, $this->__osFix($text));
-		$this->assertEqual($this->Controller->EmailTest->htmlMessage, $this->__osFix($html));
+		$this->assertEquals($this->Controller->EmailTest->textMessage, $this->__osFix($text));
+		$this->assertEquals($this->Controller->EmailTest->htmlMessage, $this->__osFix($html));
 
 		$this->Controller->EmailTest->sendAs = 'text';
 		$this->assertTrue($this->Controller->EmailTest->send());
-		$this->assertEqual($this->Controller->EmailTest->textMessage, $this->__osFix($text));
+		$this->assertEquals($this->Controller->EmailTest->textMessage, $this->__osFix($text));
 		$this->assertNull($this->Controller->EmailTest->htmlMessage);
 
 		$this->Controller->EmailTest->sendAs = 'html';
 		$this->assertTrue($this->Controller->EmailTest->send());
 		$this->assertNull($this->Controller->EmailTest->textMessage);
-		$this->assertEqual($this->Controller->EmailTest->htmlMessage, $this->__osFix($html));
+		$this->assertEquals($this->Controller->EmailTest->htmlMessage, $this->__osFix($html));
 	}
 
 /**
@@ -554,16 +564,16 @@ HTMLBLOC;
 		$this->assertTrue($this->Controller->EmailTest->send($content));
 		$result = DebugCompTransport::$lastEmail;
 
-		$this->assertPattern('/To: postmaster@example.com\n/', $result);
-		$this->assertPattern('/Subject: Cake Debug Test\n/', $result);
-		$this->assertPattern('/Reply-To: noreply@example.com\n/', $result);
-		$this->assertPattern('/From: noreply@example.com\n/', $result);
-		$this->assertPattern('/X-Mailer: CakePHP Email Component\n/', $result);
-		$this->assertPattern('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
-		$this->assertPattern('/Content-Transfer-Encoding: 8bitMessage:\n/', $result);
-		$this->assertPattern('/First line\n/', $result);
-		$this->assertPattern('/Second line\n/', $result);
-		$this->assertPattern('/Third line\n/', $result);
+		$this->assertRegExp('/To: postmaster@example.com\n/', $result);
+		$this->assertRegExp('/Subject: Cake Debug Test\n/', $result);
+		$this->assertRegExp('/Reply-To: noreply@example.com\n/', $result);
+		$this->assertRegExp('/From: noreply@example.com\n/', $result);
+		$this->assertRegExp('/X-Mailer: CakePHP Email Component\n/', $result);
+		$this->assertRegExp('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
+		$this->assertRegExp('/Content-Transfer-Encoding: 8bitMessage:\n/', $result);
+		$this->assertRegExp('/First line\n/', $result);
+		$this->assertRegExp('/Second line\n/', $result);
+		$this->assertRegExp('/Third line\n/', $result);
 	}
 
 /**
@@ -575,13 +585,13 @@ HTMLBLOC;
 		$this->Controller->EmailTest->to = 'postmaster@example.com';
 		$this->Controller->EmailTest->from = 'noreply@example.com';
 		$this->Controller->EmailTest->subject = 'Cake Debug Test';
-		$this->Controller->EmailTest->date = 'Today!';
+		$this->Controller->EmailTest->date = self::$sentDate = 'Today!';
 		$this->Controller->EmailTest->template = null;
 		$this->Controller->EmailTest->delivery = 'DebugComp';
 
 		$this->assertTrue($this->Controller->EmailTest->send('test message'));
 		$result = DebugCompTransport::$lastEmail;
-		$this->assertPattern('/Date: Today!\n/', $result);
+		$this->assertRegExp('/Date: Today!\n/', $result);
 	}
 
 /**
@@ -595,18 +605,18 @@ HTMLBLOC;
 
 		$result = $this->Controller->EmailTest->strip($content, true);
 		$expected = "Previous content\n--alt-\n text/html; utf-8\n 8bit\n\n<p>My own html content</p>";
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$content = '<p>Some HTML content with an <a href="mailto:test@example.com">email link</a>';
 		$result  = $this->Controller->EmailTest->strip($content, true);
 		$expected = $content;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$content  = '<p>Some HTML content with an ';
 		$content .= '<a href="mailto:test@example.com,test2@example.com">email link</a>';
 		$result  = $this->Controller->EmailTest->strip($content, true);
 		$expected = $content;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -634,10 +644,10 @@ HTMLBLOC;
 		$subject = '=?UTF-8?B?2YfYsNmHINix2LPYp9mE2Kkg2KjYudmG2YjYp9mGINi32YjZitmEINmF2LE=?=' . "\r\n" . ' =?UTF-8?B?2LPZhCDZhNmE2YXYs9iq2YTZhQ==?=';
 
 		preg_match('/Subject: (.*)Header:/s', DebugCompTransport::$lastEmail, $matches);
-		$this->assertEqual(trim($matches[1]), $subject);
+		$this->assertEquals(trim($matches[1]), $subject);
 
 		$result = mb_internal_encoding();
-		$this->assertEqual($result, 'ISO-8859-1');
+		$this->assertEquals($result, 'ISO-8859-1');
 
 		mb_internal_encoding($restore);
 	}
@@ -661,17 +671,17 @@ HTMLBLOC;
 		$this->Controller->EmailTest->sendAs = 'text';
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 		preg_match('/Subject: (.*)Header:/s', DebugCompTransport::$lastEmail, $matches);
-		$this->assertEqual(trim($matches[1]), $subject);
+		$this->assertEquals(trim($matches[1]), $subject);
 
 		$this->Controller->EmailTest->sendAs = 'html';
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 		preg_match('/Subject: (.*)Header:/s', DebugCompTransport::$lastEmail, $matches);
-		$this->assertEqual(trim($matches[1]), $subject);
+		$this->assertEquals(trim($matches[1]), $subject);
 
 		$this->Controller->EmailTest->sendAs = 'both';
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 		preg_match('/Subject: (.*)Header:/s', DebugCompTransport::$lastEmail, $matches);
-		$this->assertEqual(trim($matches[1]), $subject);
+		$this->assertEquals(trim($matches[1]), $subject);
 	}
 
 /**
@@ -695,8 +705,8 @@ HTMLBLOC;
 		$this->Controller->EmailTest->sendAs = 'text';
 		$this->assertTrue($this->Controller->EmailTest->send($body));
 		$msg = DebugCompTransport::$lastEmail;
-		$this->assertPattern('/' . preg_quote('Content-Disposition: attachment; filename="EmailComponentTest.php"') . '/', $msg);
-		$this->assertPattern('/' . preg_quote('Content-Disposition: attachment; filename="some-name.php"') . '/', $msg);
+		$this->assertRegExp('/' . preg_quote('Content-Disposition: attachment; filename="EmailComponentTest.php"') . '/', $msg);
+		$this->assertRegExp('/' . preg_quote('Content-Disposition: attachment; filename="some-name.php"') . '/', $msg);
 	}
 
 /**
@@ -717,22 +727,22 @@ HTMLBLOC;
 		$this->Controller->EmailTest->sendAs = 'html';
 		$this->assertTrue($this->Controller->EmailTest->send($body));
 		$msg = DebugCompTransport::$lastEmail;
-		$this->assertNoPattern('/text\/plain/', $msg);
-		$this->assertPattern('/text\/html/', $msg);
+		$this->assertNotRegExp('/text\/plain/', $msg);
+		$this->assertRegExp('/text\/html/', $msg);
 
 		$this->Controller->EmailTest->sendAs = 'text';
 		$this->assertTrue($this->Controller->EmailTest->send($body));
 		$msg = DebugCompTransport::$lastEmail;
-		$this->assertPattern('/text\/plain/', $msg);
-		$this->assertNoPattern('/text\/html/', $msg);
+		$this->assertRegExp('/text\/plain/', $msg);
+		$this->assertNotRegExp('/text\/html/', $msg);
 
 		$this->Controller->EmailTest->sendAs = 'both';
 		$this->assertTrue($this->Controller->EmailTest->send($body));
 		$msg = DebugCompTransport::$lastEmail;
 
-		$this->assertNoPattern('/text\/plain/', $msg);
-		$this->assertNoPattern('/text\/html/', $msg);
-		$this->assertPattern('/multipart\/alternative/', $msg);
+		$this->assertNotRegExp('/text\/plain/', $msg);
+		$this->assertNotRegExp('/text\/html/', $msg);
+		$this->assertRegExp('/multipart\/alternative/', $msg);
 	}
 
 /**
@@ -753,8 +763,8 @@ HTMLBLOC;
 		$this->assertTrue($this->Controller->EmailTest->send($body));
 		$msg = DebugCompTransport::$lastEmail;
 
-		$this->assertNoPattern('/\n\nContent-Transfer-Encoding/', $msg);
-		$this->assertPattern('/\nContent-Transfer-Encoding/', $msg);
+		$this->assertNotRegExp('/\n\nContent-Transfer-Encoding/', $msg);
+		$this->assertRegExp('/\nContent-Transfer-Encoding/', $msg);
 	}
 
 /**
@@ -791,17 +801,17 @@ HTMLBLOC;
 		$this->Controller->EmailTest->reset();
 
 		$this->assertNull($this->Controller->EmailTest->template);
-		$this->assertIdentical($this->Controller->EmailTest->to, array());
+		$this->assertSame($this->Controller->EmailTest->to, array());
 		$this->assertNull($this->Controller->EmailTest->from);
 		$this->assertNull($this->Controller->EmailTest->replyTo);
 		$this->assertNull($this->Controller->EmailTest->return);
-		$this->assertIdentical($this->Controller->EmailTest->cc, array());
-		$this->assertIdentical($this->Controller->EmailTest->bcc, array());
+		$this->assertSame($this->Controller->EmailTest->cc, array());
+		$this->assertSame($this->Controller->EmailTest->bcc, array());
 		$this->assertNull($this->Controller->EmailTest->date);
 		$this->assertNull($this->Controller->EmailTest->subject);
 		$this->assertNull($this->Controller->EmailTest->additionalParams);
 		$this->assertNull($this->Controller->EmailTest->smtpError);
-		$this->assertIdentical($this->Controller->EmailTest->attachments, array());
+		$this->assertSame($this->Controller->EmailTest->attachments, array());
 		$this->assertNull($this->Controller->EmailTest->textMessage);
 		$this->assertTrue($this->Controller->EmailTest->messageId);
 	}
@@ -823,7 +833,7 @@ HTMLBLOC;
 		$this->assertTrue($this->Controller->EmailTest->send($body));
 		$result = DebugCompTransport::$lastEmail;
 
-		$this->assertPattern('/Body of message/', $result);
+		$this->assertRegExp('/Body of message/', $result);
 
 	}
 
@@ -852,21 +862,21 @@ HTMLBLOC;
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 		$result = DebugCompTransport::$lastEmail;
 
-		$this->assertPattern('/Message-ID: \<[a-f0-9]{8}[a-f0-9]{4}[a-f0-9]{4}[a-f0-9]{4}[a-f0-9]{12}@' . env('HTTP_HOST') . '\>\n/', $result);
+		$this->assertRegExp('/Message-ID: \<[a-f0-9]{8}[a-f0-9]{4}[a-f0-9]{4}[a-f0-9]{4}[a-f0-9]{12}@' . env('HTTP_HOST') . '\>\n/', $result);
 
 		$this->Controller->EmailTest->messageId = '<22091985.998877@example.com>';
 
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 		$result = DebugCompTransport::$lastEmail;
 
-		$this->assertPattern('/Message-ID: <22091985.998877@example.com>\n/', $result);
+		$this->assertRegExp('/Message-ID: <22091985.998877@example.com>\n/', $result);
 
 		$this->Controller->EmailTest->messageId = false;
 
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 		$result = DebugCompTransport::$lastEmail;
 
-		$this->assertNoPattern('/Message-ID:/', $result);
+		$this->assertNotRegExp('/Message-ID:/', $result);
 	}
 
 }

lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php

@@ -87,6 +87,13 @@ class PaginatorControllerPost extends CakeTestModel {
  */
 	public $lastQueries = array();
 
+/**
+ * belongsTo property
+ *
+ * @var array
+ */
+	public $belongsTo = array('PaginatorAuthor' => array('foreignKey' => 'author_id'));
+
 /**
  * beforeFind method
  *
@@ -183,6 +190,45 @@ class PaginatorControllerComment extends CakeTestModel {
 	public $alias = 'PaginatorControllerComment';
 }
 
+/**
+ * PaginatorAuthorclass
+ *
+ * @package       Cake.Test.Case.Controller.Component
+ */
+class PaginatorAuthor extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'PaginatorAuthor'
+ */
+	public $name = 'PaginatorAuthor';
+
+/**
+ * useTable property
+ *
+ * @var string 'authors'
+ */
+	public $useTable = 'authors';
+
+/**
+ * alias property
+ *
+ * @var string 'PaginatorAuthor'
+ */
+	public $alias = 'PaginatorAuthor';
+
+/**
+ * alias property
+ *
+ * @var string 'PaginatorAuthor'
+ */
+	public $virtualFields = array(
+			'joined_offset' => 'PaginatorAuthor.id + 1'
+		);
+
+}
+
 class PaginatorComponentTest extends CakeTestCase {
 
 /**
@@ -190,7 +236,7 @@ class PaginatorComponentTest extends CakeTestCase {
  *
  * @var array
  */
-	public $fixtures = array('core.post', 'core.comment');
+	public $fixtures = array('core.post', 'core.comment', 'core.author');
 
 /**
  * setup
@@ -221,74 +267,74 @@ class PaginatorComponentTest extends CakeTestCase {
 		$Controller->constructClasses();
 
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
-		$this->assertEqual($results, array(1, 2, 3));
+		$this->assertEquals($results, array(1, 2, 3));
 
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerComment'), '{n}.PaginatorControllerComment.id');
-		$this->assertEqual($results, array(1, 2, 3, 4, 5, 6));
+		$this->assertEquals($results, array(1, 2, 3, 4, 5, 6));
 
 		$Controller->modelClass = null;
 
 		$Controller->uses[0] = 'Plugin.PaginatorControllerPost';
 		$results = Set::extract($Controller->Paginator->paginate(), '{n}.PaginatorControllerPost.id');
-		$this->assertEqual($results, array(1, 2, 3));
+		$this->assertEquals($results, array(1, 2, 3));
 
 		$Controller->request->params['named'] = array('page' => '-1');
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
-		$this->assertEqual($results, array(1, 2, 3));
+		$this->assertEquals($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
+		$this->assertEquals($results, array(1, 2, 3));
 
 		$Controller->request->params['named'] = array('sort' => 'PaginatorControllerPost.id', 'direction' => 'asc');
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
-		$this->assertEqual($results, array(1, 2, 3));
+		$this->assertEquals($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
+		$this->assertEquals($results, array(1, 2, 3));
 
 		$Controller->request->params['named'] = array('sort' => 'PaginatorControllerPost.id', 'direction' => 'desc');
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
-		$this->assertEqual($results, array(3, 2, 1));
+		$this->assertEquals($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
+		$this->assertEquals($results, array(3, 2, 1));
 
 		$Controller->request->params['named'] = array('sort' => 'id', 'direction' => 'desc');
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
-		$this->assertEqual($results, array(3, 2, 1));
+		$this->assertEquals($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
+		$this->assertEquals($results, array(3, 2, 1));
 
 		$Controller->request->params['named'] = array('sort' => 'NotExisting.field', 'direction' => 'desc');
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1, 'Invalid field in query %s');
-		$this->assertEqual($results, array(1, 2, 3));
+		$this->assertEquals($Controller->params['paging']['PaginatorControllerPost']['page'], 1, 'Invalid field in query %s');
+		$this->assertEquals($results, array(1, 2, 3));
 
 		$Controller->request->params['named'] = array(
 			'sort' => 'PaginatorControllerPost.author_id', 'direction' => 'allYourBase'
 		);
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
-		$this->assertEqual($Controller->PaginatorControllerPost->lastQueries[1]['order'][0], array('PaginatorControllerPost.author_id' => 'asc'));
-		$this->assertEqual($results, array(1, 3, 2));
+		$this->assertEquals($Controller->PaginatorControllerPost->lastQueries[1]['order'][0], array('PaginatorControllerPost.author_id' => 'asc'));
+		$this->assertEquals($results, array(1, 3, 2));
 
 		$Controller->request->params['named'] = array();
 		$Controller->Paginator->settings = array('limit' => 0, 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['prevPage'], false);
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
+		$this->assertSame($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
+		$this->assertSame($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
+		$this->assertSame($Controller->params['paging']['PaginatorControllerPost']['prevPage'], false);
+		$this->assertSame($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
 
 		$Controller->request->params['named'] = array();
 		$Controller->Paginator->settings = array('limit' => 'garbage!', 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['prevPage'], false);
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
+		$this->assertSame($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
+		$this->assertSame($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
+		$this->assertSame($Controller->params['paging']['PaginatorControllerPost']['prevPage'], false);
+		$this->assertSame($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
 
 		$Controller->request->params['named'] = array();
 		$Controller->Paginator->settings = array('limit' => '-1', 'maxLimit' => 10, 'paramType' => 'named');
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['limit'], 1);
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['prevPage'], false);
-		$this->assertIdentical($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
+		$this->assertSame($Controller->params['paging']['PaginatorControllerPost']['limit'], 1);
+		$this->assertSame($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
+		$this->assertSame($Controller->params['paging']['PaginatorControllerPost']['pageCount'], 3);
+		$this->assertSame($Controller->params['paging']['PaginatorControllerPost']['prevPage'], false);
+		$this->assertSame($Controller->params['paging']['PaginatorControllerPost']['nextPage'], true);
 	}
 
 /**
@@ -336,8 +382,8 @@ class PaginatorComponentTest extends CakeTestCase {
 
 		$Controller->request->params['named'] = array('page' => '-1', 'contain' => array('PaginatorControllerComment'));
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
-		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(1, 2, 3));
+		$this->assertEquals($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
+		$this->assertEquals(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(1, 2, 3));
 		$this->assertTrue(!isset($Controller->PaginatorControllerPost->lastQueries[1]['contain']));
 
 		$Controller->request->params['named'] = array('page' => '-1');
@@ -349,8 +395,8 @@ class PaginatorComponentTest extends CakeTestCase {
 			),
 		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
-		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(1, 2, 3));
+		$this->assertEquals($Controller->params['paging']['PaginatorControllerPost']['page'], 1);
+		$this->assertEquals(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(1, 2, 3));
 		$this->assertTrue(isset($Controller->PaginatorControllerPost->lastQueries[1]['contain']));
 
 		$Controller->Paginator->settings = array(
@@ -359,16 +405,16 @@ class PaginatorComponentTest extends CakeTestCase {
 			),
 		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
-		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(2, 3));
-		$this->assertEqual($Controller->PaginatorControllerPost->lastQueries[1]['conditions'], array('PaginatorControllerPost.id > ' => '1'));
+		$this->assertEquals(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(2, 3));
+		$this->assertEquals($Controller->PaginatorControllerPost->lastQueries[1]['conditions'], array('PaginatorControllerPost.id > ' => '1'));
 
 		$Controller->request->params['named'] = array('limit' => 12);
 		$Controller->Paginator->settings = array('limit' => 30, 'maxLimit' => 100, 'paramType' => 'named');
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$paging = $Controller->params['paging']['PaginatorControllerPost'];
 
-		$this->assertEqual($Controller->PaginatorControllerPost->lastQueries[1]['limit'], 12);
-		$this->assertEqual($paging['options']['limit'], 12);
+		$this->assertEquals($Controller->PaginatorControllerPost->lastQueries[1]['limit'], 12);
+		$this->assertEquals($paging['options']['limit'], 12);
 
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('ControllerPaginateModel');
@@ -389,8 +435,8 @@ class PaginatorComponentTest extends CakeTestCase {
 			'maxLimit' => 10,
 			'paramType' => 'named'
 		);
-		$this->assertEqual($Controller->ControllerPaginateModel->extra, $expected);
-		$this->assertEqual($Controller->ControllerPaginateModel->extraCount, $expected);
+		$this->assertEquals($Controller->ControllerPaginateModel->extra, $expected);
+		$this->assertEquals($Controller->ControllerPaginateModel->extraCount, $expected);
 
 		$Controller->Paginator->settings = array(
 			'ControllerPaginateModel' => array(
@@ -408,8 +454,8 @@ class PaginatorComponentTest extends CakeTestCase {
 			'maxLimit' => 10,
 			'paramType' => 'named'
 		);
-		$this->assertEqual($Controller->ControllerPaginateModel->extra, $expected);
-		$this->assertEqual($Controller->ControllerPaginateModel->extraCount, $expected);
+		$this->assertEquals($Controller->ControllerPaginateModel->extra, $expected);
+		$this->assertEquals($Controller->ControllerPaginateModel->extraCount, $expected);
 	}
 
 /**
@@ -434,8 +480,8 @@ class PaginatorComponentTest extends CakeTestCase {
 		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 
-		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(2, 3));
-		$this->assertEqual(
+		$this->assertEquals(Set::extract($result, '{n}.PaginatorControllerPost.id'), array(2, 3));
+		$this->assertEquals(
 			$Controller->PaginatorControllerPost->lastQueries[1]['conditions'],
 			array('PaginatorControllerPost.id > ' => '1')
 		);
@@ -458,8 +504,8 @@ class PaginatorComponentTest extends CakeTestCase {
 			'paramType' => 'named'
 		);
 		$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['order'], 'PaginatorControllerPost.id DESC');
-		$this->assertEqual($results, array(3, 2, 1));
+		$this->assertEquals($Controller->params['paging']['PaginatorControllerPost']['order'], 'PaginatorControllerPost.id DESC');
+		$this->assertEquals($results, array(3, 2, 1));
 	}
 
 /**
@@ -483,11 +529,35 @@ class PaginatorComponentTest extends CakeTestCase {
 			'paramType' => 'named'
 		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
-		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.offset_test'), array(4, 3, 2));
+		$this->assertEquals(Set::extract($result, '{n}.PaginatorControllerPost.offset_test'), array(4, 3, 2));
 
 		$Controller->request->params['named'] = array('sort' => 'offset_test', 'direction' => 'asc');
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
-		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerPost.offset_test'), array(2, 3, 4));
+		$this->assertEquals(Set::extract($result, '{n}.PaginatorControllerPost.offset_test'), array(2, 3, 4));
+	}
+
+/**
+ * test paginate() and virtualField on joined model
+ *
+ * @return void
+ */
+	public function testPaginateOrderVirtualFieldJoinedModel() {
+		$Controller = new PaginatorTestController($this->request);
+		$Controller->uses = array('PaginatorControllerPost');
+		$Controller->params['url'] = array();
+		$Controller->constructClasses();
+		$Controller->PaginatorControllerPost->recursive = 0;
+		$Controller->Paginator->settings = array(
+			'order' => array('PaginatorAuthor.joined_offset' => 'DESC'),
+			'maxLimit' => 10,
+			'paramType' => 'named'
+		);
+		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
+		$this->assertEquals(Set::extract($result, '{n}.PaginatorAuthor.joined_offset'), array(4, 2, 2));
+
+		$Controller->request->params['named'] = array('sort' => 'PaginatorAuthor.joined_offset', 'direction' => 'asc');
+		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
+		$this->assertEquals(Set::extract($result, '{n}.PaginatorAuthor.joined_offset'), array(2, 2, 4));
 	}
 
 /**
@@ -744,26 +814,26 @@ class PaginatorComponentTest extends CakeTestCase {
 			'contain' => array('ControllerComment'), 'limit' => '1000'
 		);
 		$result = $Controller->paginate('PaginatorControllerPost');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 100);
+		$this->assertEquals($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 100);
 
 		$Controller->request->params['named'] = array(
 			'contain' => array('ControllerComment'), 'limit' => '1000', 'maxLimit' => 1000
 		);
 		$result = $Controller->paginate('PaginatorControllerPost');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 100);
+		$this->assertEquals($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 100);
 
 		$Controller->request->params['named'] = array('contain' => array('ControllerComment'), 'limit' => '10');
 		$result = $Controller->paginate('PaginatorControllerPost');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 10);
+		$this->assertEquals($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 10);
 
 		$Controller->request->params['named'] = array('contain' => array('ControllerComment'), 'limit' => '1000');
 		$Controller->paginate = array('maxLimit' => 2000, 'paramType' => 'named');
 		$result = $Controller->paginate('PaginatorControllerPost');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 1000);
+		$this->assertEquals($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 1000);
 
 		$Controller->request->params['named'] = array('contain' => array('ControllerComment'), 'limit' => '5000');
 		$result = $Controller->paginate('PaginatorControllerPost');
-		$this->assertEqual($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 2000);
+		$this->assertEquals($Controller->params['paging']['PaginatorControllerPost']['options']['limit'], 2000);
 	 }
 
 /**
@@ -792,7 +862,7 @@ class PaginatorComponentTest extends CakeTestCase {
 		);
 		$Controller->passedArgs = array('sort' => 'PaginatorControllerPost.title', 'dir' => 'asc');
 		$result = $Controller->paginate('PaginatorControllerComment');
-		$this->assertEqual(Set::extract($result, '{n}.PaginatorControllerComment.id'), array(1, 2, 3, 4, 5, 6));
+		$this->assertEquals(Set::extract($result, '{n}.PaginatorControllerComment.id'), array(1, 2, 3, 4, 5, 6));
 	}
 
 }

lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php

@@ -142,7 +142,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$Collection = new ComponentCollection();
 		$Collection->init($this->Controller);
 		$RequestHandler = new RequestHandlerComponent($Collection, $settings);
-		$this->assertEqual($RequestHandler->ajaxLayout, 'test_ajax');
+		$this->assertEquals($RequestHandler->ajaxLayout, 'test_ajax');
 	}
 
 /**
@@ -154,7 +154,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->assertNull($this->RequestHandler->ext);
 		$this->Controller->request->params['ext'] = 'rss';
 		$this->RequestHandler->initialize($this->Controller);
-		$this->assertEqual($this->RequestHandler->ext, 'rss');
+		$this->assertEquals($this->RequestHandler->ext, 'rss');
 	}
 
 /**
@@ -214,6 +214,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->RequestHandler->initialize($this->Controller);
 		$this->assertNull($this->RequestHandler->ext);
 	}
+
 /**
  * Test that ext is not set with multiple accepted content types.
  *
@@ -227,6 +228,20 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->RequestHandler->initialize($this->Controller);
 		$this->assertNull($this->RequestHandler->ext);
 	}
+	
+/**
+ * Test that ext is not set with confusing android accepts headers.
+ *
+ * @return void
+ */
+	public function testInitializeAmbiguousAndroidAccepts() {
+		$_SERVER['HTTP_ACCEPT'] = 'application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5';
+		$this->assertNull($this->RequestHandler->ext);
+		Router::parseExtensions('html', 'xml');
+
+		$this->RequestHandler->initialize($this->Controller);
+		$this->assertNull($this->RequestHandler->ext);
+	}
 
 /**
  * Test that a type mismatch doesn't incorrectly set the ext
@@ -260,7 +275,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->RequestHandler->initialize($this->Controller);
 		$this->Controller->beforeFilter();
 		$this->RequestHandler->startup($this->Controller);
-		$this->assertEqual($this->Controller->params['isAjax'], true);
+		$this->assertEquals($this->Controller->params['isAjax'], true);
 	}
 
 /**
@@ -273,7 +288,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->Controller->request->params['ext'] = 'rss';
 		$this->RequestHandler->initialize($this->Controller);
 		$this->RequestHandler->startup($this->Controller);
-		$this->assertEqual($this->Controller->ext, '.ctp');
+		$this->assertEquals($this->Controller->ext, '.ctp');
 	}
 
 
@@ -291,7 +306,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->Controller->request->params['ext'] = 'js';
 		$this->RequestHandler->initialize($this->Controller);
 		$this->RequestHandler->startup($this->Controller);
-		$this->assertNotEqual($this->Controller->layout, 'ajax');
+		$this->assertNotEquals($this->Controller->layout, 'ajax');
 
 		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
 	}
@@ -370,7 +385,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 
 		$this->Controller->viewPath = 'request_handler_test\\rss';
 		$this->RequestHandler->renderAs($this->Controller, 'js');
-		$this->assertEqual($this->Controller->viewPath, 'request_handler_test' . DS . 'js');
+		$this->assertEquals($this->Controller->viewPath, 'request_handler_test' . DS . 'js');
 	}
 
 /**
@@ -455,12 +470,12 @@ class RequestHandlerComponentTest extends CakeTestCase {
  */
 	public function testRenderAsCalledTwice() {
 		$this->RequestHandler->renderAs($this->Controller, 'xml');
-		$this->assertEqual($this->Controller->viewPath, 'RequestHandlerTest' . DS . 'xml');
-		$this->assertEqual($this->Controller->layoutPath, 'xml');
+		$this->assertEquals($this->Controller->viewPath, 'RequestHandlerTest' . DS . 'xml');
+		$this->assertEquals($this->Controller->layoutPath, 'xml');
 
 		$this->RequestHandler->renderAs($this->Controller, 'js');
-		$this->assertEqual($this->Controller->viewPath, 'RequestHandlerTest' . DS . 'js');
-		$this->assertEqual($this->Controller->layoutPath, 'js');
+		$this->assertEquals($this->Controller->viewPath, 'RequestHandlerTest' . DS . 'js');
+		$this->assertEquals($this->Controller->layoutPath, 'js');
 		$this->assertTrue(in_array('Js', $this->Controller->helpers));
 	}
 
@@ -471,7 +486,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  */
 	public function testRequestClientTypes() {
 		$_SERVER['HTTP_X_PROTOTYPE_VERSION'] = '1.5';
-		$this->assertEqual($this->RequestHandler->getAjaxVersion(), '1.5');
+		$this->assertEquals($this->RequestHandler->getAjaxVersion(), '1.5');
 
 		unset($_SERVER['HTTP_X_REQUESTED_WITH'], $_SERVER['HTTP_X_PROTOTYPE_VERSION']);
 		$this->assertFalse($this->RequestHandler->getAjaxVersion());
@@ -503,10 +518,10 @@ class RequestHandlerComponentTest extends CakeTestCase {
 
 		$_SERVER['REQUEST_METHOD'] = 'POST';
 		$_SERVER['CONTENT_TYPE'] = 'application/json';
-		$this->assertEqual($this->RequestHandler->requestedWith(), 'json');
+		$this->assertEquals($this->RequestHandler->requestedWith(), 'json');
 
 		$result = $this->RequestHandler->requestedWith(array('json', 'xml'));
-		$this->assertEqual($result, 'json');
+		$this->assertEquals($result, 'json');
 
 		$result =$this->RequestHandler->requestedWith(array('rss', 'atom'));
 		$this->assertFalse($result);
@@ -539,7 +554,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 	public function testResponseContentType() {
 		$this->assertEquals('html', $this->RequestHandler->responseType());
 		$this->assertTrue($this->RequestHandler->respondAs('atom'));
-		$this->assertEqual($this->RequestHandler->responseType(), 'atom');
+		$this->assertEquals($this->RequestHandler->responseType(), 'atom');
 	}
 
 /**
@@ -643,22 +658,22 @@ class RequestHandlerComponentTest extends CakeTestCase {
  */
 	public function testPrefers() {
 		$_SERVER['HTTP_ACCEPT'] = 'text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,*/*';
-		$this->assertNotEqual($this->RequestHandler->prefers(), 'rss');
+		$this->assertNotEquals($this->RequestHandler->prefers(), 'rss');
 		$this->RequestHandler->ext = 'rss';
-		$this->assertEqual($this->RequestHandler->prefers(), 'rss');
+		$this->assertEquals($this->RequestHandler->prefers(), 'rss');
 		$this->assertFalse($this->RequestHandler->prefers('xml'));
-		$this->assertEqual($this->RequestHandler->prefers(array('js', 'xml', 'xhtml')), 'xml');
+		$this->assertEquals($this->RequestHandler->prefers(array('js', 'xml', 'xhtml')), 'xml');
 		$this->assertFalse($this->RequestHandler->prefers(array('red', 'blue')));
-		$this->assertEqual($this->RequestHandler->prefers(array('js', 'json', 'xhtml')), 'xhtml');
+		$this->assertEquals($this->RequestHandler->prefers(array('js', 'json', 'xhtml')), 'xhtml');
 		$this->assertTrue($this->RequestHandler->prefers(array('rss')), 'Should return true if input matches ext.');
 		$this->assertFalse($this->RequestHandler->prefers(array('html')), 'No match with ext, return false.');
 
 		$_SERVER['HTTP_ACCEPT'] = 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5';
 		$this->_init();
-		$this->assertEqual($this->RequestHandler->prefers(), 'xml');
+		$this->assertEquals($this->RequestHandler->prefers(), 'xml');
 
 		$_SERVER['HTTP_ACCEPT'] = '*/*;q=0.5';
-		$this->assertEqual($this->RequestHandler->prefers(), 'html');
+		$this->assertEquals($this->RequestHandler->prefers(), 'html');
 		$this->assertFalse($this->RequestHandler->prefers('rss'));
 	}
 
@@ -671,7 +686,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$_SERVER['HTTP_ACCEPT'] = 'text/x-mobile,text/html;q=0.9,text/plain;q=0.8,*/*;q=0.5';
 		$this->RequestHandler->setContent('mobile', 'text/x-mobile');
 		$this->RequestHandler->startup($this->Controller);
-		$this->assertEqual($this->RequestHandler->prefers(), 'mobile');
+		$this->assertEquals($this->RequestHandler->prefers(), 'mobile');
 	}
 
 /**
@@ -713,7 +728,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 			$this->Controller, array('controller' => 'request_handler_test', 'action' => 'destination')
 		);
 		$result = ob_get_clean();
-		$this->assertPattern('/posts index/', $result, 'RequestAction redirect failed.');
+		$this->assertRegExp('/posts index/', $result, 'RequestAction redirect failed.');
 
 		App::build();
 	}
@@ -742,8 +757,8 @@ class RequestHandlerComponentTest extends CakeTestCase {
 			$this->Controller, array('controller' => 'request_handler_test', 'action' => 'ajax2_layout')
 		);
 		$result = ob_get_clean();
-		$this->assertPattern('/posts index/', $result, 'RequestAction redirect failed.');
-		$this->assertPattern('/Ajax!/', $result, 'Layout was not rendered.');
+		$this->assertRegExp('/posts index/', $result, 'RequestAction redirect failed.');
+		$this->assertRegExp('/Ajax!/', $result, 'Layout was not rendered.');
 
 		App::build();
 	}
@@ -775,7 +790,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 			array('controller' => 'request_handler_test', 'action' => 'param_method', 'first', 'second')
 		);
 		$result = ob_get_clean();
-		$this->assertEqual($result, 'one: first two: second');
+		$this->assertEquals($result, 'one: first two: second');
 	}
 
 /**

lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php

@@ -175,10 +175,10 @@ class SecurityComponentTest extends CakeTestCase {
 		);
 		$Security = new SecurityComponent($this->Controller->Components, $settings);
 		$this->Controller->Security->initialize($this->Controller, $settings);
-		$this->assertEqual($Security->requirePost, $settings['requirePost']);
-		$this->assertEqual($Security->requireSecure, $settings['requireSecure']);
-		$this->assertEqual($Security->requireGet, $settings['requireGet']);
-		$this->assertEqual($Security->validatePost, $settings['validatePost']);
+		$this->assertEquals($Security->requirePost, $settings['requirePost']);
+		$this->assertEquals($Security->requireSecure, $settings['requireSecure']);
+		$this->assertEquals($Security->requireGet, $settings['requireGet']);
+		$this->assertEquals($Security->validatePost, $settings['validatePost']);
 	}
 
 /**
@@ -1038,7 +1038,7 @@ class SecurityComponentTest extends CakeTestCase {
 		unset($this->Controller->request->params['_Token']);
 
 		$this->Controller->Security->startup($this->Controller);
-		$this->assertEqual($this->Controller->request->params['_Token']['key'], $key);
+		$this->assertEquals($this->Controller->request->params['_Token']['key'], $key);
 	}
 
 /**

lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php

@@ -142,10 +142,10 @@ class SessionComponentTest extends CakeTestCase {
 		$expected = $Session->id();
 
 		$result = $Object->requestAction('/session_test/session_id');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $Object->requestAction('/orange_session_test/session_id');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -188,25 +188,25 @@ class SessionComponentTest extends CakeTestCase {
 		$this->assertNull($Session->read('Test'));
 
 		$this->assertTrue($Session->write('Test', 'some value'));
-		$this->assertEqual($Session->read('Test'), 'some value');
+		$this->assertEquals($Session->read('Test'), 'some value');
 		$this->assertFalse($Session->write('Test.key', 'some value'));
 		$Session->delete('Test');
 
 		$this->assertTrue($Session->write('Test.key.path', 'some value'));
-		$this->assertEqual($Session->read('Test.key.path'), 'some value');
-		$this->assertEqual($Session->read('Test.key'), array('path' => 'some value'));
+		$this->assertEquals($Session->read('Test.key.path'), 'some value');
+		$this->assertEquals($Session->read('Test.key'), array('path' => 'some value'));
 		$this->assertTrue($Session->write('Test.key.path2', 'another value'));
-		$this->assertEqual($Session->read('Test.key'), array('path' => 'some value', 'path2' => 'another value'));
+		$this->assertEquals($Session->read('Test.key'), array('path' => 'some value', 'path2' => 'another value'));
 		$Session->delete('Test');
 
 		$array = array('key1' => 'val1', 'key2' => 'val2', 'key3' => 'val3');
 		$this->assertTrue($Session->write('Test', $array));
-		$this->assertEqual($Session->read('Test'), $array);
+		$this->assertEquals($Session->read('Test'), $array);
 		$Session->delete('Test');
 
 		$this->assertFalse($Session->write(array('Test'), 'some value'));
 		$this->assertTrue($Session->write(array('Test' => 'some value')));
-		$this->assertEqual($Session->read('Test'), 'some value');
+		$this->assertEquals($Session->read('Test'), 'some value');
 		$Session->delete('Test');
 	}
 
@@ -250,16 +250,16 @@ class SessionComponentTest extends CakeTestCase {
 		$this->assertNull($Session->read('Message.flash'));
 
 		$Session->setFlash('This is a test message');
-		$this->assertEqual($Session->read('Message.flash'), array('message' => 'This is a test message', 'element' => 'default', 'params' => array()));
+		$this->assertEquals($Session->read('Message.flash'), array('message' => 'This is a test message', 'element' => 'default', 'params' => array()));
 
 		$Session->setFlash('This is a test message', 'test', array('name' => 'Joel Moss'));
-		$this->assertEqual($Session->read('Message.flash'), array('message' => 'This is a test message', 'element' => 'test', 'params' => array('name' => 'Joel Moss')));
+		$this->assertEquals($Session->read('Message.flash'), array('message' => 'This is a test message', 'element' => 'test', 'params' => array('name' => 'Joel Moss')));
 
 		$Session->setFlash('This is a test message', 'default', array(), 'myFlash');
-		$this->assertEqual($Session->read('Message.myFlash'), array('message' => 'This is a test message', 'element' => 'default', 'params' => array()));
+		$this->assertEquals($Session->read('Message.myFlash'), array('message' => 'This is a test message', 'element' => 'default', 'params' => array()));
 
 		$Session->setFlash('This is a test message', 'non_existing_layout');
-		$this->assertEqual($Session->read('Message.myFlash'), array('message' => 'This is a test message', 'element' => 'default', 'params' => array()));
+		$this->assertEquals($Session->read('Message.myFlash'), array('message' => 'This is a test message', 'element' => 'default', 'params' => array()));
 
 		$Session->delete('Message');
 	}
@@ -285,7 +285,7 @@ class SessionComponentTest extends CakeTestCase {
 		$Session = new SessionComponent($this->ComponentCollection);
 
 		$Session->write('Test', 'some value');
-		$this->assertEqual($Session->read('Test'), 'some value');
+		$this->assertEquals($Session->read('Test'), 'some value');
 		$Session->destroy('Test');
 		$this->assertNull($Session->read('Test'));
 	}

lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php

@@ -150,7 +150,7 @@ class ControllerMergeVarsTest extends CakeTestCase {
 		$Controller->constructClasses();
 
 		$expected = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => false));
-		$this->assertEqual($Controller->components, $expected, 'Duplication of settings occured. %s');
+		$this->assertEquals($Controller->components, $expected, 'Duplication of settings occured. %s');
 	}
 
 /**
@@ -164,7 +164,7 @@ class ControllerMergeVarsTest extends CakeTestCase {
 		$Controller->constructClasses();
 
 		$expected = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => true, 'remote'));
-		$this->assertEqual($Controller->components, $expected, 'Merging of settings is wrong. %s');
+		$this->assertEquals($Controller->components, $expected, 'Merging of settings is wrong. %s');
 	}
 
 /**
@@ -177,7 +177,7 @@ class ControllerMergeVarsTest extends CakeTestCase {
 		$Controller->constructClasses();
 
 		$expected = array('MergeVar' => array('format' => 'html', 'terse'));
-		$this->assertEqual($Controller->helpers, $expected, 'Duplication of settings occured. %s');
+		$this->assertEquals($Controller->helpers, $expected, 'Duplication of settings occured. %s');
 	}
 
 /**

lib/Cake/Test/Case/Controller/ControllerTest.php

@@ -462,7 +462,7 @@ class ControllerTest extends CakeTestCase {
 		$this->assertTrue(is_a($Controller->ControllerPost, 'ControllerPost'));
 		$this->assertTrue(is_a($Controller->ControllerComment, 'ControllerComment'));
 
-		$this->assertEqual($Controller->ControllerComment->name, 'Comment');
+		$this->assertEquals($Controller->ControllerComment->name, 'Comment');
 
 		unset($Controller);
 
@@ -490,8 +490,8 @@ class ControllerTest extends CakeTestCase {
 		$Controller->uses = array('NameTest');
 		$Controller->constructClasses();
 
-		$this->assertEqual($Controller->NameTest->name, 'Name');
-		$this->assertEqual($Controller->NameTest->alias, 'Name');
+		$this->assertEquals($Controller->NameTest->name, 'Name');
+		$this->assertEquals($Controller->NameTest->alias, 'Name');
 
 		unset($Controller);
 	}
@@ -527,7 +527,7 @@ class ControllerTest extends CakeTestCase {
 		</html>';
 		$result = str_replace(array("\t", "\r\n", "\n"), "", $result);
 		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $expected);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		App::build(array(
 			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
@@ -536,7 +536,7 @@ class ControllerTest extends CakeTestCase {
 		$Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
 		$Controller->flash('this should work', '/flash', 1, 'ajax2');
 		$result = $Controller->response->body();
-		$this->assertPattern('/Ajax!/', $result);
+		$this->assertRegExp('/Ajax!/', $result);
 		App::build();
 	}
 
@@ -567,19 +567,19 @@ class ControllerTest extends CakeTestCase {
 		$this->assertTrue(array_key_exists('ModelName', $Controller->viewVars));
 
 		$Controller->set('title', 'someTitle');
-		$this->assertIdentical($Controller->viewVars['title'], 'someTitle');
+		$this->assertSame($Controller->viewVars['title'], 'someTitle');
 		$this->assertTrue(empty($Controller->pageTitle));
 
 		$Controller->viewVars = array();
 		$expected = array('ModelName' => 'name', 'ModelName2' => 'name2');
 		$Controller->set(array('ModelName', 'ModelName2'), array('name', 'name2'));
-		$this->assertIdentical($Controller->viewVars, $expected);
+		$this->assertSame($Controller->viewVars, $expected);
 
 		$Controller->viewVars = array();
 		$Controller->set(array(3 => 'three', 4 => 'four'));
 		$Controller->set(array(1 => 'one', 2 => 'two'));
 		$expected = array(3 => 'three', 4 => 'four', 1 => 'one', 2 => 'two');
-		$this->assertEqual($Controller->viewVars, $expected);
+		$this->assertEquals($Controller->viewVars, $expected);
 
 	}
 
@@ -600,14 +600,14 @@ class ControllerTest extends CakeTestCase {
 		$Controller->viewPath = 'Posts';
 
 		$result = $Controller->render('index');
-		$this->assertPattern('/posts index/', (string)$result);
+		$this->assertRegExp('/posts index/', (string)$result);
 
 		$Controller->view = 'index';
 		$result = $Controller->render();
-		$this->assertPattern('/posts index/', (string)$result);
+		$this->assertRegExp('/posts index/', (string)$result);
 
 		$result = $Controller->render('/Elements/test_element');
-		$this->assertPattern('/this is the test element/', (string)$result);
+		$this->assertRegExp('/this is the test element/', (string)$result);
 		$Controller->view = null;
 
 		$Controller = new TestController($request, new CakeResponse());
@@ -621,14 +621,14 @@ class ControllerTest extends CakeTestCase {
 		$result = $Controller->render('index');
 		$View = $Controller->View;
 		$this->assertTrue(isset($View->validationErrors['ControllerComment']));
-		$this->assertEqual($expected, $View->validationErrors['ControllerComment']);
+		$this->assertEquals($expected, $View->validationErrors['ControllerComment']);
 
 		$expectedModels = array(
 			'ControllerAlias' => array('plugin' => null, 'className' => 'ControllerAlias'),
 			'ControllerComment' => array('plugin' => 'TestPlugin', 'className' => 'ControllerComment'),
 			'ControllerPost' => array('plugin' => null, 'className' => 'ControllerPost')
 		);
-		$this->assertEqual($expectedModels, $Controller->request->params['models']);
+		$this->assertEquals($expectedModels, $Controller->request->params['models']);
 
 		ClassRegistry::flush();
 		App::build();
@@ -653,7 +653,7 @@ class ControllerTest extends CakeTestCase {
 		$Controller->viewPath = 'Posts';
 		$Controller->theme = 'TestTheme';
 		$result = $Controller->render('index');
-		$this->assertPattern('/default test_theme layout/', (string)$result);
+		$this->assertRegExp('/default test_theme layout/', (string)$result);
 		App::build();
 	}
 
@@ -853,9 +853,9 @@ class ControllerTest extends CakeTestCase {
 					? array_merge($appVars['uses'], $testVars['uses'])
 					: $testVars['uses'];
 
-		$this->assertEqual(count(array_diff_key($TestController->helpers, array_flip($helpers))), 0);
-		$this->assertEqual(count(array_diff($TestController->uses, $uses)), 0);
-		$this->assertEqual(count(array_diff_assoc(Set::normalize($TestController->components), Set::normalize($components))), 0);
+		$this->assertEquals(count(array_diff_key($TestController->helpers, array_flip($helpers))), 0);
+		$this->assertEquals(count(array_diff($TestController->uses, $uses)), 0);
+		$this->assertEquals(count(array_diff_assoc(Set::normalize($TestController->components), Set::normalize($components))), 0);
 
 		$expected = array('ControllerComment', 'ControllerAlias', 'ControllerPost');
 		$this->assertEquals($expected, $TestController->uses, '$uses was merged incorrectly, ControllerTestAppController models should be last.');
@@ -881,7 +881,7 @@ class ControllerTest extends CakeTestCase {
 
 
 		$this->assertTrue(in_array('ControllerPost', $appVars['uses']));
-		$this->assertEqual(array('ControllerPost'), $testVars['uses']);
+		$this->assertEquals(array('ControllerPost'), $testVars['uses']);
 
 		$this->assertTrue(isset($TestController->ControllerPost));
 		$this->assertTrue(isset($TestController->ControllerComment));
@@ -900,7 +900,7 @@ class ControllerTest extends CakeTestCase {
 		$expected = array('foo');
 		$TestController->components = array('Cookie' => $expected);
 		$TestController->constructClasses();
-		$this->assertEqual($TestController->components['Cookie'], $expected);
+		$this->assertEquals($TestController->components['Cookie'], $expected);
 	}
 
 /**
@@ -934,12 +934,12 @@ class ControllerTest extends CakeTestCase {
 
 		$Controller = new Controller($request);
 		$result = $Controller->referer(null, true);
-		$this->assertEqual($result, '/posts/index');
+		$this->assertEquals($result, '/posts/index');
 
 		$Controller = new Controller($request);
 		$request->setReturnValue('referer', '/', array(true));
 		$result = $Controller->referer(array('controller' => 'posts', 'action' => 'index'), true);
-		$this->assertEqual($result, '/posts/index');
+		$this->assertEquals($result, '/posts/index');
 
 		$request = $this->getMock('CakeRequest');
 
@@ -949,11 +949,11 @@ class ControllerTest extends CakeTestCase {
 
 		$Controller = new Controller($request);
 		$result = $Controller->referer();
-		$this->assertEqual($result, 'http://localhost/posts/index');
+		$this->assertEquals($result, 'http://localhost/posts/index');
 
 		$Controller = new Controller(null);
 		$result = $Controller->referer();
-		$this->assertEqual($result, '/');
+		$this->assertEquals($result, '/');
 	}
 
 /**
@@ -983,7 +983,7 @@ class ControllerTest extends CakeTestCase {
 		$TestController = new TestController($request);
 		$TestController->constructClasses();
 		$this->assertFalse($TestController->validateErrors());
-		$this->assertEqual($TestController->validate(), 0);
+		$this->assertEquals($TestController->validate(), 0);
 
 		$TestController->ControllerComment->invalidate('some_field', 'error_message');
 		$TestController->ControllerComment->invalidate('some_field2', 'error_message2');
@@ -992,8 +992,8 @@ class ControllerTest extends CakeTestCase {
 		$comment->set('someVar', 'data');
 		$result = $TestController->validateErrors($comment);
 		$expected = array('some_field' => array('error_message'), 'some_field2' => array('error_message2'));
-		$this->assertIdentical($expected, $result);
-		$this->assertEqual($TestController->validate($comment), 2);
+		$this->assertSame($expected, $result);
+		$this->assertEquals($TestController->validate($comment), 2);
 	}
 
 /**
@@ -1010,7 +1010,7 @@ class ControllerTest extends CakeTestCase {
 		$result = $TestController->validateErrors($Post);
 
 		$expected = array('title' => array('This field cannot be left blank'));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -1034,7 +1034,7 @@ class ControllerTest extends CakeTestCase {
 			'Model3.field3' => '23',
 		);
 		$result = $Controller->postConditions($data);
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 
 
 		$data = array();
@@ -1049,7 +1049,7 @@ class ControllerTest extends CakeTestCase {
 			'Model3.field3' => '23',
 		);
 		$result = $Controller->postConditions($data);
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 
 
 		$data = array();
@@ -1075,7 +1075,7 @@ class ControllerTest extends CakeTestCase {
 			'Model3.field3 <=' => '23',
 		);
 		$result = $Controller->postConditions($data, $ops);
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 /**
@@ -1187,19 +1187,19 @@ class ControllerTest extends CakeTestCase {
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
 		$expected = array('page' => 1, 'limit' => 20, 'maxLimit' => 100, 'paramType' => 'named');
-		$this->assertEqual($Controller->paginate, $expected);
+		$this->assertEquals($Controller->paginate, $expected);
 
 		$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
-		$this->assertEqual($results, array(1, 2, 3));
+		$this->assertEquals($results, array(1, 2, 3));
 
 		$Controller->passedArgs = array();
 		$Controller->paginate = array('limit' => '-1');
-		$this->assertEqual($Controller->paginate, array('limit' => '-1'));
+		$this->assertEquals($Controller->paginate, array('limit' => '-1'));
 		$Controller->paginate('ControllerPost');
-		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1);
-		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 3);
-		$this->assertIdentical($Controller->params['paging']['ControllerPost']['prevPage'], false);
-		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], true);
+		$this->assertSame($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertSame($Controller->params['paging']['ControllerPost']['pageCount'], 3);
+		$this->assertSame($Controller->params['paging']['ControllerPost']['prevPage'], false);
+		$this->assertSame($Controller->params['paging']['ControllerPost']['nextPage'], true);
 	}
 
 /**

lib/Cake/Test/Case/Controller/PagesControllerTest.php

@@ -41,13 +41,13 @@ class PagesControllerTest extends CakeTestCase {
 
 		$Pages->viewPath = 'Posts';
 		$Pages->display('index');
-		$this->assertPattern('/posts index/', $Pages->response->body());
-		$this->assertEqual($Pages->viewVars['page'], 'index');
+		$this->assertRegExp('/posts index/', $Pages->response->body());
+		$this->assertEquals($Pages->viewVars['page'], 'index');
 
 		$Pages->viewPath = 'Themed';
 		$Pages->display('TestTheme', 'Posts', 'index');
-		$this->assertPattern('/posts index themed view/', $Pages->response->body());
-		$this->assertEqual($Pages->viewVars['page'], 'TestTheme');
-		$this->assertEqual($Pages->viewVars['subpage'], 'Posts');
+		$this->assertRegExp('/posts index themed view/', $Pages->response->body());
+		$this->assertEquals($Pages->viewVars['page'], 'TestTheme');
+		$this->assertEquals($Pages->viewVars['subpage'], 'Posts');
 	}
 }

lib/Cake/Test/Case/Controller/ScaffoldTest.php

@@ -177,7 +177,7 @@ class ScaffoldTest extends CakeTestCase {
 		$this->Controller->constructClasses();
 		$Scaffold = new TestScaffoldMock($this->Controller, $this->Controller->request);
 		$result = $Scaffold->getParams();
-		$this->assertEqual($result['action'], 'admin_edit');
+		$this->assertEquals($result['action'], 'admin_edit');
 	}
 
 /**
@@ -208,15 +208,15 @@ class ScaffoldTest extends CakeTestCase {
 		$Scaffold = new TestScaffoldMock($this->Controller, $this->Controller->request);
 		$result = $Scaffold->controller->viewVars;
 
-		$this->assertEqual($result['title_for_layout'], 'Scaffold :: Admin Edit :: Scaffold Mock');
-		$this->assertEqual($result['singularHumanName'], 'Scaffold Mock');
-		$this->assertEqual($result['pluralHumanName'], 'Scaffold Mock');
-		$this->assertEqual($result['modelClass'], 'ScaffoldMock');
-		$this->assertEqual($result['primaryKey'], 'id');
-		$this->assertEqual($result['displayField'], 'title');
-		$this->assertEqual($result['singularVar'], 'scaffoldMock');
-		$this->assertEqual($result['pluralVar'], 'scaffoldMock');
-		$this->assertEqual($result['scaffoldFields'], array('id', 'user_id', 'title', 'body', 'published', 'created', 'updated'));
+		$this->assertEquals($result['title_for_layout'], 'Scaffold :: Admin Edit :: Scaffold Mock');
+		$this->assertEquals($result['singularHumanName'], 'Scaffold Mock');
+		$this->assertEquals($result['pluralHumanName'], 'Scaffold Mock');
+		$this->assertEquals($result['modelClass'], 'ScaffoldMock');
+		$this->assertEquals($result['primaryKey'], 'id');
+		$this->assertEquals($result['displayField'], 'title');
+		$this->assertEquals($result['singularVar'], 'scaffoldMock');
+		$this->assertEquals($result['pluralVar'], 'scaffoldMock');
+		$this->assertEquals($result['scaffoldFields'], array('id', 'user_id', 'title', 'body', 'published', 'created', 'updated'));
 	}
 
 /**
@@ -231,7 +231,7 @@ class ScaffoldTest extends CakeTestCase {
 		$this->Controller->constructClasses();
 		$Scaffold = new TestScaffoldMock($this->Controller, $this->Controller->request);
 
-		$this->assertEqual($this->Controller->viewClass, 'Scaffold');
+		$this->assertEquals($this->Controller->viewClass, 'Scaffold');
 	}
 
 /**
@@ -271,7 +271,7 @@ class ScaffoldTest extends CakeTestCase {
 		new Scaffold($this->Controller, $this->Controller->request);
 		$this->Controller->response->send();
 		$result = ob_get_clean();
-		$this->assertPattern('/Scaffold Mock has been updated/', $result);
+		$this->assertRegExp('/Scaffold Mock has been updated/', $result);
 	}
 /**
  * test that habtm relationship keys get added to scaffoldFields.
@@ -303,10 +303,10 @@ class ScaffoldTest extends CakeTestCase {
 		$Scaffold = new Scaffold($this->Controller, $this->Controller->request);
 		$this->Controller->response->send();
 		$result = ob_get_clean();
-		$this->assertPattern('/name="data\[ScaffoldTag\]\[ScaffoldTag\]"/', $result);
+		$this->assertRegExp('/name="data\[ScaffoldTag\]\[ScaffoldTag\]"/', $result);
 
 		$result = $Scaffold->controller->viewVars;
-		$this->assertEqual($result['scaffoldFields'], array('id', 'user_id', 'title', 'body', 'published', 'created', 'updated', 'ScaffoldTag'));
+		$this->assertEquals($result['scaffoldFields'], array('id', 'user_id', 'title', 'body', 'published', 'created', 'updated', 'ScaffoldTag'));
 	}
 /**
  * test that the proper names and variable values are set by Scaffold
@@ -342,6 +342,6 @@ class ScaffoldTest extends CakeTestCase {
 		$this->Controller->response->send();
 		$result = ob_get_clean();
 
-		$this->assertNoPattern('/textarea name="data\[ScaffoldMock\]\[body\]" cols="30" rows="6" id="ScaffoldMockBody"/', $result);
+		$this->assertNotRegExp('/textarea name="data\[ScaffoldMock\]\[body\]" cols="30" rows="6" id="ScaffoldMockBody"/', $result);
 	}
 }

lib/Cake/Test/Case/Core/AppTest.php

@@ -44,7 +44,7 @@ class AppTest extends CakeTestCase {
 			APP . 'Model' . DS,
 			APP . 'models' . DS
 		);
-		$this->assertEqual($expected, $old);
+		$this->assertEquals($expected, $old);
 
 		App::build(array('Model' => array('/path/to/models/')));
 		$new = App::path('Model');
@@ -53,7 +53,7 @@ class AppTest extends CakeTestCase {
 			APP . 'Model' . DS,
 			APP . 'models' . DS
 		);
-		$this->assertEqual($expected, $new);
+		$this->assertEquals($expected, $new);
 
 		App::build();
 		App::build(array('Model' => array('/path/to/models/')), App::PREPEND);
@@ -63,7 +63,7 @@ class AppTest extends CakeTestCase {
 			APP . 'Model' . DS,
 			APP . 'models' . DS
 		);
-		$this->assertEqual($expected, $new);
+		$this->assertEquals($expected, $new);
 
 		App::build();
 		App::build(array('Model' => array('/path/to/models/')), App::APPEND);
@@ -73,7 +73,7 @@ class AppTest extends CakeTestCase {
 			APP . 'models' . DS,
 			'/path/to/models/'
 		);
-		$this->assertEqual($expected, $new);
+		$this->assertEquals($expected, $new);
 
 		App::build();
 		App::build(array(
@@ -86,18 +86,18 @@ class AppTest extends CakeTestCase {
 			APP . 'models' . DS,
 			'/path/to/models/'
 		);
-		$this->assertEqual($expected, $new);
+		$this->assertEquals($expected, $new);
 		$new = App::path('Controller');
 		$expected = array(
 			APP . 'Controller' . DS,
 			APP . 'controllers' . DS,
 			'/path/to/controllers/'
 		);
-		$this->assertEqual($expected, $new);
+		$this->assertEquals($expected, $new);
 
 		App::build(); //reset defaults
 		$defaults = App::path('Model');
-		$this->assertEqual($old, $defaults);
+		$this->assertEquals($old, $defaults);
 	}
 
 /**
@@ -111,7 +111,7 @@ class AppTest extends CakeTestCase {
 			APP . 'Model' . DS,
 			APP . 'models' . DS
 		);
-		$this->assertEqual($expected, $old);
+		$this->assertEquals($expected, $old);
 
 		App::build(array('models' => array('/path/to/models/')));
 
@@ -122,8 +122,8 @@ class AppTest extends CakeTestCase {
 			APP . 'Model' . DS,
 			APP . 'models' . DS
 		);
-		$this->assertEqual($expected, $new);
-		$this->assertEqual($expected, App::path('Model'));
+		$this->assertEquals($expected, $new);
+		$this->assertEquals($expected, App::path('Model'));
 
 		App::build(array('datasources' => array('/path/to/datasources/')));
 		$expected = array(
@@ -132,8 +132,8 @@ class AppTest extends CakeTestCase {
 			APP . 'models' . DS . 'datasources' . DS
 		);
 		$result = App::path('datasources');
-		$this->assertEqual($expected, $result);
-		$this->assertEqual($expected, App::path('Model/Datasource'));
+		$this->assertEquals($expected, $result);
+		$this->assertEquals($expected, App::path('Model/Datasource'));
 
 		App::build(array('behaviors' => array('/path/to/behaviors/')));
 		$expected = array(
@@ -142,8 +142,8 @@ class AppTest extends CakeTestCase {
 			APP . 'models' . DS . 'behaviors' . DS
 		);
 		$result = App::path('behaviors');
-		$this->assertEqual($expected, $result);
-		$this->assertEqual($expected, App::path('Model/Behavior'));
+		$this->assertEquals($expected, $result);
+		$this->assertEquals($expected, App::path('Model/Behavior'));
 
 		App::build(array('controllers' => array('/path/to/controllers/')));
 		$expected = array(
@@ -152,8 +152,8 @@ class AppTest extends CakeTestCase {
 			APP . 'controllers' . DS
 		);
 		$result = App::path('controllers');
-		$this->assertEqual($expected, $result);
-		$this->assertEqual($expected, App::path('Controller'));
+		$this->assertEquals($expected, $result);
+		$this->assertEquals($expected, App::path('Controller'));
 
 		App::build(array('components' => array('/path/to/components/')));
 		$expected = array(
@@ -162,8 +162,8 @@ class AppTest extends CakeTestCase {
 			APP . 'controllers' . DS . 'components' . DS
 		);
 		$result = App::path('components');
-		$this->assertEqual($expected, $result);
-		$this->assertEqual($expected, App::path('Controller/Component'));
+		$this->assertEquals($expected, $result);
+		$this->assertEquals($expected, App::path('Controller/Component'));
 
 		App::build(array('views' => array('/path/to/views/')));
 		$expected = array(
@@ -172,8 +172,8 @@ class AppTest extends CakeTestCase {
 			APP . 'views' . DS
 		);
 		$result = App::path('views');
-		$this->assertEqual($expected, $result);
-		$this->assertEqual($expected, App::path('View'));
+		$this->assertEquals($expected, $result);
+		$this->assertEquals($expected, App::path('View'));
 
 		App::build(array('helpers' => array('/path/to/helpers/')));
 		$expected = array(
@@ -182,8 +182,8 @@ class AppTest extends CakeTestCase {
 			APP . 'views' . DS . 'helpers' . DS
 		);
 		$result = App::path('helpers');
-		$this->assertEqual($expected, $result);
-		$this->assertEqual($expected, App::path('View/Helper'));
+		$this->assertEquals($expected, $result);
+		$this->assertEquals($expected, App::path('View/Helper'));
 
 		App::build(array('shells' => array('/path/to/shells/')));
 		$expected = array(
@@ -192,12 +192,12 @@ class AppTest extends CakeTestCase {
 			APP . 'console' . DS . 'shells' . DS,
 		);
 		$result = App::path('shells');
-		$this->assertEqual($expected, $result);
-		$this->assertEqual($expected, App::path('Console/Command'));
+		$this->assertEquals($expected, $result);
+		$this->assertEquals($expected, App::path('Console/Command'));
 
 		App::build(); //reset defaults
 		$defaults = App::path('Model');
-		$this->assertEqual($old, $defaults);
+		$this->assertEquals($old, $defaults);
 	}
 
 /**
@@ -227,7 +227,7 @@ class AppTest extends CakeTestCase {
 			APP . 'Model' . DS,
 			APP . 'models' . DS
 		);
-		$this->assertEqual($expected, $old);
+		$this->assertEquals($expected, $old);
 
 		App::build(array('Model' => array('/path/to/models/')), App::RESET);
 
@@ -236,11 +236,11 @@ class AppTest extends CakeTestCase {
 		$expected = array(
 			'/path/to/models/'
 		);
-		$this->assertEqual($expected, $new);
+		$this->assertEquals($expected, $new);
 
 		App::build(); //reset defaults
 		$defaults = App::path('Model');
-		$this->assertEqual($old, $defaults);
+		$this->assertEquals($old, $defaults);
 	}
 
 /**
@@ -250,22 +250,22 @@ class AppTest extends CakeTestCase {
  */
 	public function testCore() {
 		$model = App::core('Model');
-		$this->assertEqual(array(CAKE . 'Model' . DS), $model);
+		$this->assertEquals(array(CAKE . 'Model' . DS), $model);
 
 		$view = App::core('View');
-		$this->assertEqual(array(CAKE . 'View' . DS), $view);
+		$this->assertEquals(array(CAKE . 'View' . DS), $view);
 
 		$controller = App::core('Controller');
-		$this->assertEqual(array(CAKE . 'Controller' . DS), $controller);
+		$this->assertEquals(array(CAKE . 'Controller' . DS), $controller);
 
 		$component = App::core('Controller/Component');
-		$this->assertEqual(array(CAKE . 'Controller' . DS . 'Component' . DS), str_replace('/', DS, $component));
+		$this->assertEquals(array(CAKE . 'Controller' . DS . 'Component' . DS), str_replace('/', DS, $component));
 
 		$auth = App::core('Controller/Component/Auth');
-		$this->assertEqual(array(CAKE . 'Controller' . DS . 'Component' . DS . 'Auth' . DS), str_replace('/', DS, $auth));
+		$this->assertEquals(array(CAKE . 'Controller' . DS . 'Component' . DS . 'Auth' . DS), str_replace('/', DS, $auth));
 
 		$datasource = App::core('Model/Datasource');
-		$this->assertEqual(array(CAKE . 'Model' . DS . 'Datasource' . DS), str_replace('/', DS, $datasource));
+		$this->assertEquals(array(CAKE . 'Model' . DS . 'Datasource' . DS), str_replace('/', DS, $datasource));
 	}
 
 /**
@@ -321,10 +321,10 @@ class AppTest extends CakeTestCase {
 
 		$result = App::objects('file', 'non_existing_configure');
 		$expected = array();
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = App::objects('NonExistingType');
-		$this->assertEqual($result, array());
+		$this->assertEquals($result, array());
 
 		App::build(array(
 			'plugins' => array(
@@ -343,6 +343,9 @@ class AppTest extends CakeTestCase {
  */
 	public function testListObjectsIgnoreDotDirectories() {
 		$path = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS;
+
+		$this->skipIf(!is_writable($path), $path . ' is not writable.');
+
 		App::build(array(
 			'plugins' => array($path)
 		), App::RESET);
@@ -416,11 +419,11 @@ class AppTest extends CakeTestCase {
 
 		$path = App::pluginPath('TestPlugin');
 		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'TestPlugin' . DS;
-		$this->assertEqual($path, $expected);
+		$this->assertEquals($path, $expected);
 
 		$path = App::pluginPath('TestPluginTwo');
 		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'TestPluginTwo' . DS;
-		$this->assertEqual($path, $expected);
+		$this->assertEquals($path, $expected);
 		App::build();
 	}
 
@@ -435,11 +438,11 @@ class AppTest extends CakeTestCase {
 		));
 		$path = App::themePath('test_theme');
 		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS;
-		$this->assertEqual($path, $expected);
+		$this->assertEquals($path, $expected);
 
 		$path = App::themePath('TestTheme');
 		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS;
-		$this->assertEqual($path, $expected);
+		$this->assertEquals($path, $expected);
 
 		App::build();
 	}
@@ -711,7 +714,7 @@ class AppTest extends CakeTestCase {
 		$result = App::import('Vendor', 'css/TestAsset', array('ext' => 'css'));
 		$text = ob_get_clean();
 		$this->assertTrue($result);
-		$this->assertEqual($text, 'this is the test asset css file');
+		$this->assertEquals($text, 'this is the test asset css file');
 
 		$result = App::import('Vendor', 'TestPlugin.sample/SamplePlugin');
 		$this->assertTrue($result);
@@ -725,31 +728,31 @@ class AppTest extends CakeTestCase {
 		$result = App::import('Vendor', 'SomeNameInSubfolder', array('file' => 'somename/some.name.php'));
 		$text = ob_get_clean();
 		$this->assertTrue($result);
-		$this->assertEqual($text, 'This is a file with dot in file name');
+		$this->assertEquals($text, 'This is a file with dot in file name');
 
 		ob_start();
 		$result = App::import('Vendor', 'TestHello', array('file' => 'Test'.DS.'hello.php'));
 		$text = ob_get_clean();
 		$this->assertTrue($result);
-		$this->assertEqual($text, 'This is the hello.php file in Test directory');
+		$this->assertEquals($text, 'This is the hello.php file in Test directory');
 
 		ob_start();
 		$result = App::import('Vendor', 'MyTest', array('file' => 'Test'.DS.'MyTest.php'));
 		$text = ob_get_clean();
 		$this->assertTrue($result);
-		$this->assertEqual($text, 'This is the MyTest.php file');
+		$this->assertEquals($text, 'This is the MyTest.php file');
 
 		ob_start();
 		$result = App::import('Vendor', 'Welcome');
 		$text = ob_get_clean();
 		$this->assertTrue($result);
-		$this->assertEqual($text, 'This is the welcome.php file in vendors directory');
+		$this->assertEquals($text, 'This is the welcome.php file in vendors directory');
 
 		ob_start();
 		$result = App::import('Vendor', 'TestPlugin.Welcome');
 		$text = ob_get_clean();
 		$this->assertTrue($result);
-		$this->assertEqual($text, 'This is the welcome.php file in test_plugin/vendors directory');
+		$this->assertEquals($text, 'This is the welcome.php file in test_plugin/vendors directory');
 	}
 
 /**

lib/Cake/Test/Case/Core/ConfigureTest.php

@@ -80,10 +80,10 @@ class ConfigureTest extends CakeTestCase {
 		Configure::write('level1.level2.level3_1', $expected);
 		Configure::write('level1.level2.level3_2', 'something_else');
 		$result = Configure::read('level1.level2.level3_1');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = Configure::read('level1.level2.level3_2');
-		$this->assertEqual($result, 'something_else');
+		$this->assertEquals($result, 'something_else');
 
 		$result = Configure::read('debug');
 		$this->assertTrue($result >= 0);
@@ -106,28 +106,28 @@ class ConfigureTest extends CakeTestCase {
 		$writeResult = Configure::write('SomeName.someKey', 'myvalue');
 		$this->assertTrue($writeResult);
 		$result = Configure::read('SomeName.someKey');
-		$this->assertEqual($result, 'myvalue');
+		$this->assertEquals($result, 'myvalue');
 
 		$writeResult = Configure::write('SomeName.someKey', null);
 		$this->assertTrue($writeResult);
 		$result = Configure::read('SomeName.someKey');
-		$this->assertEqual($result, null);
+		$this->assertEquals($result, null);
 
 		$expected = array('One' => array('Two' => array('Three' => array('Four' => array('Five' => 'cool')))));
 		$writeResult = Configure::write('Key', $expected);
 		$this->assertTrue($writeResult);
 
 		$result = Configure::read('Key');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = Configure::read('Key.One');
-		$this->assertEqual($expected['One'], $result);
+		$this->assertEquals($expected['One'], $result);
 
 		$result = Configure::read('Key.One.Two');
-		$this->assertEqual($expected['One']['Two'], $result);
+		$this->assertEquals($expected['One']['Two'], $result);
 
 		$result = Configure::read('Key.One.Two.Three.Four.Five');
-		$this->assertEqual('cool', $result);
+		$this->assertEquals('cool', $result);
 
 		Configure::write('one.two.three.four', '4');
 		$result = Configure::read('one.two.three.four');
@@ -142,11 +142,11 @@ class ConfigureTest extends CakeTestCase {
 	public function testDebugSettingDisplayErrors() {
 		Configure::write('debug', 0);
 		$result = ini_get('display_errors');
-		$this->assertEqual($result, 0);
+		$this->assertEquals($result, 0);
 
 		Configure::write('debug', 2);
 		$result = ini_get('display_errors');
-		$this->assertEqual($result, 1);
+		$this->assertEquals($result, 1);
 	}
 
 /**
@@ -157,7 +157,7 @@ class ConfigureTest extends CakeTestCase {
 	public function testDelete() {
 		Configure::write('SomeName.someKey', 'myvalue');
 		$result = Configure::read('SomeName.someKey');
-		$this->assertEqual($result, 'myvalue');
+		$this->assertEquals($result, 'myvalue');
 
 		Configure::delete('SomeName.someKey');
 		$result = Configure::read('SomeName.someKey');
@@ -166,10 +166,10 @@ class ConfigureTest extends CakeTestCase {
 		Configure::write('SomeName', array('someKey' => 'myvalue', 'otherKey' => 'otherValue'));
 
 		$result = Configure::read('SomeName.someKey');
-		$this->assertEqual($result, 'myvalue');
+		$this->assertEquals($result, 'myvalue');
 
 		$result = Configure::read('SomeName.otherKey');
-		$this->assertEqual($result, 'otherValue');
+		$this->assertEquals($result, 'otherValue');
 
 		Configure::delete('SomeName');
 
@@ -260,13 +260,13 @@ class ConfigureTest extends CakeTestCase {
 		$this->assertTrue($result);
 		$expected = '/test_app/plugins/test_plugin/config/load.php';
 		$config = Configure::read('plugin_load');
-		$this->assertEqual($config, $expected);
+		$this->assertEquals($config, $expected);
 
 		$result = Configure::load('TestPlugin.more.load', 'test');
 		$this->assertTrue($result);
 		$expected = '/test_app/plugins/test_plugin/config/more.load.php';
 		$config = Configure::read('plugin_more_load');
-		$this->assertEqual($config, $expected);
+		$this->assertEquals($config, $expected);
 		CakePlugin::unload();
 	}
 

lib/Cake/Test/Case/Core/ObjectTest.php

@@ -325,21 +325,21 @@ class ObjectTest extends CakeTestCase {
 		$this->assertTrue($this->object->log('Test warning 1'));
 		$this->assertTrue($this->object->log(array('Test' => 'warning 2')));
 		$result = file(LOGS . 'error.log');
-		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Error: Test warning 1$/', $result[0]);
-		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Error: Array$/', $result[1]);
-		$this->assertPattern('/^\($/', $result[2]);
-		$this->assertPattern('/\[Test\] => warning 2$/', $result[3]);
-		$this->assertPattern('/^\)$/', $result[4]);
+		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Error: Test warning 1$/', $result[0]);
+		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Error: Array$/', $result[1]);
+		$this->assertRegExp('/^\($/', $result[2]);
+		$this->assertRegExp('/\[Test\] => warning 2$/', $result[3]);
+		$this->assertRegExp('/^\)$/', $result[4]);
 		unlink(LOGS . 'error.log');
 
 		$this->assertTrue($this->object->log('Test warning 1', LOG_WARNING));
 		$this->assertTrue($this->object->log(array('Test' => 'warning 2'), LOG_WARNING));
 		$result = file(LOGS . 'error.log');
-		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning 1$/', $result[0]);
-		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Array$/', $result[1]);
-		$this->assertPattern('/^\($/', $result[2]);
-		$this->assertPattern('/\[Test\] => warning 2$/', $result[3]);
-		$this->assertPattern('/^\)$/', $result[4]);
+		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning 1$/', $result[0]);
+		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Array$/', $result[1]);
+		$this->assertRegExp('/^\($/', $result[2]);
+		$this->assertRegExp('/\[Test\] => warning 2$/', $result[3]);
+		$this->assertRegExp('/^\)$/', $result[4]);
 		unlink(LOGS . 'error.log');
 	}
 
@@ -350,17 +350,17 @@ class ObjectTest extends CakeTestCase {
  */
 	public function testSet() {
 		$this->object->set('a string');
-		$this->assertEqual($this->object->firstName, 'Joel');
+		$this->assertEquals($this->object->firstName, 'Joel');
 
 		$this->object->set(array('firstName'));
-		$this->assertEqual($this->object->firstName, 'Joel');
+		$this->assertEquals($this->object->firstName, 'Joel');
 
 		$this->object->set(array('firstName' => 'Ashley'));
-		$this->assertEqual($this->object->firstName, 'Ashley');
+		$this->assertEquals($this->object->firstName, 'Ashley');
 
 		$this->object->set(array('firstName' => 'Joel', 'lastName' => 'Moose'));
-		$this->assertEqual($this->object->firstName, 'Joel');
-		$this->assertEqual($this->object->lastName, 'Moose');
+		$this->assertEquals($this->object->firstName, 'Joel');
+		$this->assertEquals($this->object->lastName, 'Moose');
 	}
 
 /**
@@ -370,7 +370,7 @@ class ObjectTest extends CakeTestCase {
  */
 	public function testToString() {
 		$result = strtolower($this->object->toString());
-		$this->assertEqual($result, 'testobject');
+		$this->assertEquals($result, 'testobject');
 	}
 
 /**
@@ -381,62 +381,62 @@ class ObjectTest extends CakeTestCase {
 	public function testMethodDispatching() {
 		$this->object->emptyMethod();
 		$expected = array('emptyMethod');
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 
 		$this->object->oneParamMethod('Hello');
 		$expected[] = array('oneParamMethod' => array('Hello'));
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 
 		$this->object->twoParamMethod(true, false);
 		$expected[] = array('twoParamMethod' => array(true, false));
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 
 		$this->object->threeParamMethod(true, false, null);
 		$expected[] = array('threeParamMethod' => array(true, false, null));
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 
 		$this->object->crazyMethod(1, 2, 3, 4, 5, 6, 7);
 		$expected[] = array('crazyMethod' => array(1, 2, 3, 4, 5, 6, 7));
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 
 		$this->object = new TestObject();
-		$this->assertIdentical($this->object->methodCalls, array());
+		$this->assertSame($this->object->methodCalls, array());
 
 		$this->object->dispatchMethod('emptyMethod');
 		$expected = array('emptyMethod');
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 
 		$this->object->dispatchMethod('oneParamMethod', array('Hello'));
 		$expected[] = array('oneParamMethod' => array('Hello'));
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 
 		$this->object->dispatchMethod('twoParamMethod', array(true, false));
 		$expected[] = array('twoParamMethod' => array(true, false));
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 
 		$this->object->dispatchMethod('threeParamMethod', array(true, false, null));
 		$expected[] = array('threeParamMethod' => array(true, false, null));
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 
 		$this->object->dispatchMethod('fourParamMethod', array(1, 2, 3, 4));
 		$expected[] = array('fourParamMethod' => array(1, 2, 3, 4));
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 
 		$this->object->dispatchMethod('fiveParamMethod', array(1, 2, 3, 4, 5));
 		$expected[] = array('fiveParamMethod' => array(1, 2, 3, 4, 5));
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 
 		$this->object->dispatchMethod('crazyMethod', array(1, 2, 3, 4, 5, 6, 7));
 		$expected[] = array('crazyMethod' => array(1, 2, 3, 4, 5, 6, 7));
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 
 		$this->object->dispatchMethod('methodWithOptionalParam', array('Hello'));
 		$expected[] = array('methodWithOptionalParam' => array("Hello"));
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 
 		$this->object->dispatchMethod('methodWithOptionalParam');
 		$expected[] = array('methodWithOptionalParam' => array(null));
-		$this->assertIdentical($this->object->methodCalls, $expected);
+		$this->assertSame($this->object->methodCalls, $expected);
 	}
 
 /**
@@ -457,26 +457,26 @@ class ObjectTest extends CakeTestCase {
 
 		$result = $this->object->requestAction('/request_action/test_request_action');
 		$expected = 'This is a test';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction('/request_action/another_ra_test/2/5');
 		$expected = 7;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction('/tests_apps/index', array('return'));
 		$expected = 'This is the TestsAppsController index view ';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction('/tests_apps/some_method');
 		$expected = 5;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction('/request_action/paginate_request_action');
 		$this->assertTrue($result);
 
 		$result = $this->object->requestAction('/request_action/normal_request_action');
 		$expected = 'Hello World';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->assertNull(Router::getRequest(), 'requests were not popped off the stack, this will break url generation');
 	}
@@ -495,27 +495,27 @@ class ObjectTest extends CakeTestCase {
 
 		$result = $this->object->requestAction('/test_plugin/tests/index', array('return'));
 		$expected = 'test plugin index';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction('/test_plugin/tests/index/some_param', array('return'));
 		$expected = 'test plugin index';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction(
 			array('controller' => 'tests', 'action' => 'index', 'plugin' => 'test_plugin'), array('return')
 		);
 		$expected = 'test plugin index';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction('/test_plugin/tests/some_method');
 		$expected = 25;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction(
 			array('controller' => 'tests', 'action' => 'some_method', 'plugin' => 'test_plugin')
 		);
 		$expected = 25;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -536,30 +536,30 @@ class ObjectTest extends CakeTestCase {
 			array('controller' => 'request_action', 'action' => 'test_request_action')
 		);
 		$expected = 'This is a test';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction(
 			array('controller' => 'request_action', 'action' => 'another_ra_test'),
 			array('pass' => array('5', '7'))
 		);
 		$expected = 12;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction(
 			array('controller' => 'tests_apps', 'action' => 'index'), array('return')
 		);
 		$expected = 'This is the TestsAppsController index view ';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction(array('controller' => 'tests_apps', 'action' => 'some_method'));
 		$expected = 5;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction(
 			array('controller' => 'request_action', 'action' => 'normal_request_action')
 		);
 		$expected = 'Hello World';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction(
 			array('controller' => 'request_action', 'action' => 'paginate_request_action')
@@ -592,20 +592,20 @@ class ObjectTest extends CakeTestCase {
  */
 	public function testRequestActionParamParseAndPass() {
 		$result = $this->object->requestAction('/request_action/params_pass');
-		$this->assertEqual($result->url, 'request_action/params_pass');
-		$this->assertEqual($result['controller'], 'request_action');
-		$this->assertEqual($result['action'], 'params_pass');
-		$this->assertEqual($result['plugin'], null);
+		$this->assertEquals($result->url, 'request_action/params_pass');
+		$this->assertEquals($result['controller'], 'request_action');
+		$this->assertEquals($result['action'], 'params_pass');
+		$this->assertEquals($result['plugin'], null);
 
 		$result = $this->object->requestAction('/request_action/params_pass/sort:desc/limit:5');
 		$expected = array('sort' => 'desc', 'limit' => 5,);
-		$this->assertEqual($result['named'], $expected);
+		$this->assertEquals($result['named'], $expected);
 
 		$result = $this->object->requestAction(
 			array('controller' => 'request_action', 'action' => 'params_pass'),
 			array('named' => array('sort' => 'desc', 'limit' => 5))
 		);
-		$this->assertEqual($result['named'], $expected);
+		$this->assertEquals($result['named'], $expected);
 	}
 
 /**
@@ -629,11 +629,11 @@ class ObjectTest extends CakeTestCase {
 			array('data' => $_POST['data'])
 		);
 		$expected = $_POST['data'];
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction('/request_action/post_pass');
 		$expected = $_POST['data'];
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$_POST = $_tmp;
 	}

lib/Cake/Test/Case/Error/ErrorHandlerTest.php

@@ -77,9 +77,9 @@ class ErrorHandlerTest extends CakeTestCase {
 		$wrong .= '';
 		$result = ob_get_clean();
 
-		$this->assertPattern('/<pre class="cake-error">/', $result);
-		$this->assertPattern('/<b>Notice<\/b>/', $result);
-		$this->assertPattern('/variable:\s+wrong/', $result);
+		$this->assertRegExp('/<pre class="cake-error">/', $result);
+		$this->assertRegExp('/<b>Notice<\/b>/', $result);
+		$this->assertRegExp('/variable:\s+wrong/', $result);
 	}
 
 /**
@@ -109,7 +109,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		trigger_error('Test error', $error);
 
 		$result = ob_get_clean();
-		$this->assertPattern('/<b>' . $expected . '<\/b>/', $result);
+		$this->assertRegExp('/<b>' . $expected . '<\/b>/', $result);
 	}
 
 /**
@@ -145,8 +145,8 @@ class ErrorHandlerTest extends CakeTestCase {
 		$out .= '';
 
 		$result = file(LOGS . 'debug.log');
-		$this->assertEqual(count($result), 1);
-		$this->assertPattern(
+		$this->assertEquals(count($result), 1);
+		$this->assertRegExp(
 			'/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} (Notice|Debug): Notice \(8\): Undefined variable:\s+out in \[.+ line \d+\]$/',
 			$result[0]
 		);
@@ -171,12 +171,12 @@ class ErrorHandlerTest extends CakeTestCase {
 		$out .= '';
 
 		$result = file(LOGS . 'debug.log');
-		$this->assertPattern(
+		$this->assertRegExp(
 			'/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} (Notice|Debug): Notice \(8\): Undefined variable:\s+out in \[.+ line \d+\]$/',
 			$result[0]
 		);
-		$this->assertPattern('/^Trace:/', $result[1]);
-		$this->assertPattern('/^ErrorHandlerTest\:\:testHandleErrorLoggingTrace\(\)/', $result[2]);
+		$this->assertRegExp('/^Trace:/', $result[1]);
+		$this->assertRegExp('/^ErrorHandlerTest\:\:testHandleErrorLoggingTrace\(\)/', $result[2]);
 		@unlink(LOGS . 'debug.log');
 	}
 
@@ -192,7 +192,7 @@ class ErrorHandlerTest extends CakeTestCase {
 		ob_start();
 		ErrorHandler::handleException($error);
 		$result = ob_get_clean();
-		$this->assertPattern('/Kaboom!/', $result, 'message missing.');
+		$this->assertRegExp('/Kaboom!/', $result, 'message missing.');
 	}
 
 /**
@@ -212,11 +212,11 @@ class ErrorHandlerTest extends CakeTestCase {
 		ob_start();
 		ErrorHandler::handleException($error);
 		$result = ob_get_clean();
-		$this->assertPattern('/Kaboom!/', $result, 'message missing.');
+		$this->assertRegExp('/Kaboom!/', $result, 'message missing.');
 
 		$log = file(LOGS . 'error.log');
-		$this->assertPattern('/\[NotFoundException\] Kaboom!/', $log[0], 'message missing.');
-		$this->assertPattern('/\#0.*ErrorHandlerTest->testHandleExceptionLog/', $log[1], 'Stack trace missing.');
+		$this->assertRegExp('/\[NotFoundException\] Kaboom!/', $log[0], 'message missing.');
+		$this->assertRegExp('/\#0.*ErrorHandlerTest->testHandleExceptionLog/', $log[1], 'Stack trace missing.');
 	}
 
 /**

lib/Cake/Test/Case/Error/ExceptionRendererTest.php

@@ -203,7 +203,7 @@ class ExceptionRendererTest extends CakeTestCase {
 		$ExceptionRenderer->render();
 		$result = ob_get_clean();
 
-		$this->assertEqual($result, 'widget thing is missing');
+		$this->assertEquals($result, 'widget thing is missing');
 	}
 
 /**
@@ -216,13 +216,13 @@ class ExceptionRendererTest extends CakeTestCase {
 		$exception = new MissingWidgetThingException('Widget not found');
 		$ExceptionRenderer = $this->_mockResponse(new MyCustomExceptionRenderer($exception));
 
-		$this->assertEqual('missingWidgetThing', $ExceptionRenderer->method);
+		$this->assertEquals('missingWidgetThing', $ExceptionRenderer->method);
 
 		ob_start();
 		$ExceptionRenderer->render();
 		$result = ob_get_clean();
 
-		$this->assertEqual($result, 'widget thing is missing', 'Method declared in subclass converted to error400');
+		$this->assertEquals($result, 'widget thing is missing', 'Method declared in subclass converted to error400');
 	}
 
 /**
@@ -236,13 +236,13 @@ class ExceptionRendererTest extends CakeTestCase {
 		$exception = new MissingControllerException('PostsController');
 		$ExceptionRenderer = $this->_mockResponse(new MyCustomExceptionRenderer($exception));
 
-		$this->assertEqual('error400', $ExceptionRenderer->method);
+		$this->assertEquals('error400', $ExceptionRenderer->method);
 
 		ob_start();
 		$ExceptionRenderer->render();
 		$result = ob_get_clean();
 
-		$this->assertPattern('/Not Found/', $result, 'Method declared in error handler not converted to error400. %s');
+		$this->assertRegExp('/Not Found/', $result, 'Method declared in error handler not converted to error400. %s');
 	}
 
 /**
@@ -378,8 +378,8 @@ class ExceptionRendererTest extends CakeTestCase {
 		$ExceptionRenderer->render();
 		$result = ob_get_clean();
 
-		$this->assertPattern('/<h2>Custom message<\/h2>/', $result);
-		$this->assertPattern("/<strong>'.*?\/posts\/view\/1000'<\/strong>/", $result);
+		$this->assertRegExp('/<h2>Custom message<\/h2>/', $result);
+		$this->assertRegExp("/<strong>'.*?\/posts\/view\/1000'<\/strong>/", $result);
 	}
 
 /**
@@ -424,8 +424,8 @@ class ExceptionRendererTest extends CakeTestCase {
 		$ExceptionRenderer->render();
 		$result = ob_get_clean();
 
-		$this->assertNoPattern('#<script>document#', $result);
-		$this->assertNoPattern('#alert\(t\);</script>#', $result);
+		$this->assertNotRegExp('#<script>document#', $result);
+		$this->assertNotRegExp('#alert\(t\);</script>#', $result);
 	}
 
 /**
@@ -443,7 +443,7 @@ class ExceptionRendererTest extends CakeTestCase {
 		$ExceptionRenderer->render();
 		$result = ob_get_clean();
 
-		$this->assertPattern('/<h2>An Internal Error Has Occurred<\/h2>/', $result);
+		$this->assertRegExp('/<h2>An Internal Error Has Occurred<\/h2>/', $result);
 	}
 
 /**
@@ -459,8 +459,8 @@ class ExceptionRendererTest extends CakeTestCase {
 		$ExceptionRenderer->render();
 		$result = ob_get_clean();
 
-		$this->assertPattern('/<h2>Missing Controller<\/h2>/', $result);
-		$this->assertPattern('/<em>PostsController<\/em>/', $result);
+		$this->assertRegExp('/<h2>Missing Controller<\/h2>/', $result);
+		$this->assertRegExp('/<em>PostsController<\/em>/', $result);
 	}
 
 /**
@@ -614,7 +614,7 @@ class ExceptionRendererTest extends CakeTestCase {
 		$result = ob_get_clean();
 
 		foreach ($patterns as $pattern) {
-			$this->assertPattern($pattern, $result);
+			$this->assertRegExp($pattern, $result);
 		}
 	}
 
@@ -687,9 +687,9 @@ class ExceptionRendererTest extends CakeTestCase {
 		$ExceptionRenderer->render();
 		$result = ob_get_clean();
 
-		$this->assertPattern('/<h2>Database Error<\/h2>/', $result);
-		$this->assertPattern('/There was an error in the SQL query/', $result);
-		$this->assertPattern('/SELECT \* from poo_query < 5 and :seven/', $result);
-		$this->assertPattern('/"seven" => 7/', $result);
+		$this->assertRegExp('/<h2>Database Error<\/h2>/', $result);
+		$this->assertRegExp('/There was an error in the SQL query/', $result);
+		$this->assertRegExp('/SELECT \* from poo_query < 5 and :seven/', $result);
+		$this->assertRegExp('/"seven" => 7/', $result);
 	}
 }

lib/Cake/Test/Case/I18n/I18nTest.php

@@ -64,33 +64,33 @@ class I18nTest extends CakeTestCase {
 		Cache::config('_cake_core_', Cache::config('default'));
 
 		// make some calls to translate using different domains
-		$this->assertEqual('Dom 1 Foo', I18n::translate('dom1.foo', false, 'dom1'));
-		$this->assertEqual('Dom 1 Bar', I18n::translate('dom1.bar', false, 'dom1'));
+		$this->assertEquals('Dom 1 Foo', I18n::translate('dom1.foo', false, 'dom1'));
+		$this->assertEquals('Dom 1 Bar', I18n::translate('dom1.bar', false, 'dom1'));
 		$domains = I18n::domains();
-		$this->assertEqual('Dom 1 Foo', $domains['dom1']['cache_test_po']['LC_MESSAGES']['dom1.foo']);
+		$this->assertEquals('Dom 1 Foo', $domains['dom1']['cache_test_po']['LC_MESSAGES']['dom1.foo']);
 
 		// reset internally stored entries
 		I18n::clear();
 
 		// now only dom1 should be in cache
 		$cachedDom1 = Cache::read('dom1_' . $lang, '_cake_core_');
-		$this->assertEqual('Dom 1 Foo', $cachedDom1['LC_MESSAGES']['dom1.foo']);
-		$this->assertEqual('Dom 1 Bar', $cachedDom1['LC_MESSAGES']['dom1.bar']);
+		$this->assertEquals('Dom 1 Foo', $cachedDom1['LC_MESSAGES']['dom1.foo']);
+		$this->assertEquals('Dom 1 Bar', $cachedDom1['LC_MESSAGES']['dom1.bar']);
 		// dom2 not in cache
 		$this->assertFalse(Cache::read('dom2_' . $lang, '_cake_core_'));
 
 		// translate a item of dom2 (adds dom2 to cache)
-		$this->assertEqual('Dom 2 Foo', I18n::translate('dom2.foo', false, 'dom2'));
+		$this->assertEquals('Dom 2 Foo', I18n::translate('dom2.foo', false, 'dom2'));
 
 		// verify dom2 was cached through manual read from cache
 		$cachedDom2 = Cache::read('dom2_' . $lang, '_cake_core_');
-		$this->assertEqual('Dom 2 Foo', $cachedDom2['LC_MESSAGES']['dom2.foo']);
-		$this->assertEqual('Dom 2 Bar', $cachedDom2['LC_MESSAGES']['dom2.bar']);
+		$this->assertEquals('Dom 2 Foo', $cachedDom2['LC_MESSAGES']['dom2.foo']);
+		$this->assertEquals('Dom 2 Bar', $cachedDom2['LC_MESSAGES']['dom2.bar']);
 
 		// modify cache entry manually to verify that dom1 entries now will be read from cache
 		$cachedDom1['LC_MESSAGES']['dom1.foo'] = 'FOO';
 		Cache::write('dom1_' . $lang, $cachedDom1, '_cake_core_');
-		$this->assertEqual('FOO', I18n::translate('dom1.foo', false, 'dom1'));
+		$this->assertEquals('FOO', I18n::translate('dom1.foo', false, 'dom1'));
 	}
 
 
@@ -101,7 +101,7 @@ class I18nTest extends CakeTestCase {
  */
 	public function testDefaultStrings() {
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 1', $singular);
+		$this->assertEquals('Plural Rule 1', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 = 0 or > 1', $plurals));
@@ -132,7 +132,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 = 0 or > 1', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 1 (from core)', $coreSingular);
+		$this->assertEquals('Plural Rule 1 (from core)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 = 0 or > 1 (from core)', $corePlurals));
@@ -172,7 +172,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_0_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 0 (translated)', $singular);
+		$this->assertEquals('Plural Rule 0 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 ends with any # (translated)', $plurals));
@@ -203,7 +203,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 ends with any # (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 0 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 0 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 ends with any # (from core translated)', $corePlurals));
@@ -243,7 +243,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_0_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 0 (translated)', $singular);
+		$this->assertEquals('Plural Rule 0 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 ends with any # (translated)', $plurals));
@@ -274,7 +274,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 ends with any # (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 0 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 0 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 ends with any # (from core translated)', $corePlurals));
@@ -314,7 +314,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_1_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 1 (translated)', $singular);
+		$this->assertEquals('Plural Rule 1 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 = 0 or > 1 (translated)', $plurals));
@@ -345,7 +345,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 = 0 or > 1 (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 1 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 1 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 = 0 or > 1 (from core translated)', $corePlurals));
@@ -385,7 +385,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_1_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 1 (translated)', $singular);
+		$this->assertEquals('Plural Rule 1 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 = 0 or > 1 (translated)', $plurals));
@@ -416,7 +416,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 = 0 or > 1 (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 1 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 1 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 = 0 or > 1 (from core translated)', $corePlurals));
@@ -456,7 +456,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_2_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 2 (translated)', $singular);
+		$this->assertEquals('Plural Rule 2 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 = 0 or 1 (translated)', $plurals));
@@ -487,7 +487,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 > 1 (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 2 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 2 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 = 0 or 1 (from core translated)', $corePlurals));
@@ -527,7 +527,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_2_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 2 (translated)', $singular);
+		$this->assertEquals('Plural Rule 2 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 = 0 or 1 (translated)', $plurals));
@@ -558,7 +558,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 > 1 (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 2 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 2 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 = 0 or 1 (from core translated)', $corePlurals));
@@ -598,7 +598,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_3_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 3 (translated)', $singular);
+		$this->assertEquals('Plural Rule 3 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 = 0 (translated)', $plurals));
@@ -629,7 +629,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 3 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 3 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 = 0 (from core translated)', $corePlurals));
@@ -669,7 +669,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_3_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 3 (translated)', $singular);
+		$this->assertEquals('Plural Rule 3 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 = 0 (translated)', $plurals));
@@ -700,7 +700,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 3 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 3 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 = 0 (from core translated)', $corePlurals));
@@ -740,7 +740,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_4_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 4 (translated)', $singular);
+		$this->assertEquals('Plural Rule 4 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -771,7 +771,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 4 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 4 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -811,7 +811,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_4_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 4 (translated)', $singular);
+		$this->assertEquals('Plural Rule 4 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -842,7 +842,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 4 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 4 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -882,7 +882,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_5_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 5 (translated)', $singular);
+		$this->assertEquals('Plural Rule 5 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 = 0 or ends in 01-19 (translated)', $plurals));
@@ -914,7 +914,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 5 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 5 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 = 0 or ends in 01-19 (from core translated)', $corePlurals));
@@ -955,7 +955,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_5_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 5 (translated)', $singular);
+		$this->assertEquals('Plural Rule 5 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 = 0 or ends in 01-19 (translated)', $plurals));
@@ -987,7 +987,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 5 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 5 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 = 0 or ends in 01-19 (from core translated)', $corePlurals));
@@ -1028,7 +1028,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_6_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 6 (translated)', $singular);
+		$this->assertEquals('Plural Rule 6 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 ends in 0 or ends in 10-20 (translated)', $plurals));
@@ -1059,7 +1059,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 6 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 6 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
@@ -1099,7 +1099,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_6_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 6 (translated)', $singular);
+		$this->assertEquals('Plural Rule 6 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 ends in 0 or ends in 10-20 (translated)', $plurals));
@@ -1130,7 +1130,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 6 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 6 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
@@ -1170,7 +1170,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_7_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 7 (translated)', $singular);
+		$this->assertEquals('Plural Rule 7 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -1201,7 +1201,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 7 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 7 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -1241,7 +1241,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_7_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 7 (translated)', $singular);
+		$this->assertEquals('Plural Rule 7 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -1272,7 +1272,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 7 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 7 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -1312,7 +1312,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_8_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 8 (translated)', $singular);
+		$this->assertEquals('Plural Rule 8 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -1343,7 +1343,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 8 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 8 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -1383,7 +1383,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_8_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 8 (translated)', $singular);
+		$this->assertEquals('Plural Rule 8 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -1414,7 +1414,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 8 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 8 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -1454,7 +1454,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_9_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 9 (translated)', $singular);
+		$this->assertEquals('Plural Rule 9 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -1486,7 +1486,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 9 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 9 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -1528,7 +1528,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_9_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 9 (translated)', $singular);
+		$this->assertEquals('Plural Rule 9 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -1560,7 +1560,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 9 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 9 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -1602,7 +1602,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_10_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 10 (translated)', $singular);
+		$this->assertEquals('Plural Rule 10 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -1634,7 +1634,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 10 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 10 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -1675,7 +1675,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_10_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 10 (translated)', $singular);
+		$this->assertEquals('Plural Rule 10 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -1707,7 +1707,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 10 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 10 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -1748,7 +1748,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_11_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 11 (translated)', $singular);
+		$this->assertEquals('Plural Rule 11 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -1779,7 +1779,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 11 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 11 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -1819,7 +1819,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_11_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 11 (translated)', $singular);
+		$this->assertEquals('Plural Rule 11 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -1850,7 +1850,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 11 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 11 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -1890,7 +1890,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_12_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 12 (translated)', $singular);
+		$this->assertEquals('Plural Rule 12 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 is 0 or 3-10 (translated)', $plurals));
@@ -1921,7 +1921,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 12 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 12 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 is 0 or 3-10 (from core translated)', $corePlurals));
@@ -1961,7 +1961,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_12_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 12 (translated)', $singular);
+		$this->assertEquals('Plural Rule 12 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 is 0 or 3-10 (translated)', $plurals));
@@ -1992,7 +1992,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 12 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 12 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 is 0 or 3-10 (from core translated)', $corePlurals));
@@ -2032,7 +2032,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_13_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 13 (translated)', $singular);
+		$this->assertEquals('Plural Rule 13 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 is 0 or ends in 01-10 (translated)', $plurals));
@@ -2063,7 +2063,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 13 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 13 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 is 0 or ends in 01-10 (from core translated)', $corePlurals));
@@ -2103,7 +2103,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_13_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 13 (translated)', $singular);
+		$this->assertEquals('Plural Rule 13 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 is 0 or ends in 01-10 (translated)', $plurals));
@@ -2134,7 +2134,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 13 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 13 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 is 0 or ends in 01-10 (from core translated)', $corePlurals));
@@ -2174,7 +2174,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_14_po');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 14 (translated)', $singular);
+		$this->assertEquals('Plural Rule 14 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -2205,7 +2205,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 14 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 14 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -2245,7 +2245,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'rule_14_mo');
 
 		$singular = $this->__singular();
-		$this->assertEqual('Plural Rule 14 (translated)', $singular);
+		$this->assertEquals('Plural Rule 14 (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
@@ -2276,7 +2276,7 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertEqual('Plural Rule 14 (from core translated)', $coreSingular);
+		$this->assertEquals('Plural Rule 14 (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
@@ -2315,7 +2315,7 @@ class I18nTest extends CakeTestCase {
 	public function testSetLanguageWithSession () {
 		$_SESSION['Config']['language'] = 'po';
 		$singular = $this->__singular();
-		$this->assertEqual('Po (translated)', $singular);
+		$this->assertEquals('Po (translated)', $singular);
 
 		$plurals = $this->__plural();
 		$this->assertTrue(in_array('0 everything else (po translated)', $plurals));
@@ -2355,10 +2355,10 @@ class I18nTest extends CakeTestCase {
 	public function testNoCoreTranslation () {
 		Configure::write('Config.language', 'po');
 		$singular = $this->__singular();
-		$this->assertEqual('Po (translated)', $singular);
+		$this->assertEquals('Po (translated)', $singular);
 
 		$coreSingular = $this->__singularFromCore();
-		$this->assertNotEqual('Po (from core translated)', $coreSingular);
+		$this->assertNotEquals('Po (from core translated)', $coreSingular);
 
 		$corePlurals = $this->__pluralFromCore();
 		$this->assertFalse(in_array('0 everything else (from core translated)', $corePlurals));
@@ -2401,7 +2401,7 @@ class I18nTest extends CakeTestCase {
 
 		Configure::write('Config.language', 'po');
 		$singular = $this->__domainSingular();
-		$this->assertEqual('Plural Rule 1 (from plugin)', $singular);
+		$this->assertEquals('Plural Rule 1 (from plugin)', $singular);
 
 		$plurals = $this->__domainPlural();
 		$this->assertTrue(in_array('0 = 0 or > 1 (from plugin)', $plurals));
@@ -2450,7 +2450,7 @@ class I18nTest extends CakeTestCase {
 		$expected .= "broken up over multiple lines.\n";
 		$expected .= "This is the third line.\n";
 		$expected .= "This is the forth line. (translated)";
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		// Windows Newline is \r\n
 		$string = "This is a multiline translation\r\n";
@@ -2458,18 +2458,18 @@ class I18nTest extends CakeTestCase {
 		$string .= "This is the third line.\r\n";
 		$string .= "This is the forth line.";
 		$result = __($string);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$singular = "valid\nsecond line";
 		$plural = "valids\nsecond line";
 
 		$result = __n($singular, $plural, 1);
 		$expected = "v\nsecond line";
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __n($singular, $plural, 2);
 		$expected = "vs\nsecond line";
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$string = "This is a multiline translation\n";
 		$string .= "broken up over multiple lines.\n";
@@ -2481,11 +2481,11 @@ class I18nTest extends CakeTestCase {
 
 		$result = __n($singular, $plural, 1);
 		$expected = "%d is 1\n" . $string;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __n($singular, $plural, 2);
 		$expected = "%d is 2-4\n" . $string;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		// Windows Newline is \r\n
 		$string = "This is a multiline translation\r\n";
@@ -2498,11 +2498,11 @@ class I18nTest extends CakeTestCase {
 
 		$result = __n($singular, $plural, 1);
 		$expected = "%d is 1\n" . str_replace("\r\n", "\n", $string);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __n($singular, $plural, 2);
 		$expected = "%d is 2-4\n" . str_replace("\r\n", "\n", $string);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -2513,7 +2513,7 @@ class I18nTest extends CakeTestCase {
 	public function testPoNoTranslationNeeded () {
 		Configure::write('Config.language', 'po');
 		$result = __('No Translation needed');
-		$this->assertEqual('No Translation needed', $result);
+		$this->assertEquals('No Translation needed', $result);
 	}
 
 /**
@@ -2523,7 +2523,7 @@ class I18nTest extends CakeTestCase {
  */
 	public function testPoQuotedString () {
 		$expected = 'this is a "quoted string" (translated)';
-		$this->assertEqual($expected, __('this is a "quoted string"'));
+		$this->assertEquals($expected, __('this is a "quoted string"'));
 	}
 
 /**
@@ -2536,15 +2536,15 @@ class I18nTest extends CakeTestCase {
 
 		$result = __n('%d = 1', '%d = 0 or > 1', (float)1);
 		$expected = '%d is 1 (translated)';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __n('%d = 1', '%d = 0 or > 1', (float)2);
 		$expected = "%d ends in 2-4, not 12-14 (translated)";
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __n('%d = 1', '%d = 0 or > 1', (float)5);
 		$expected = "%d everything else (translated)";
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -2555,7 +2555,7 @@ class I18nTest extends CakeTestCase {
 	public function testCategory() {
 		Configure::write('Config.language', 'po');
 		$category = $this->__category();
-		$this->assertEqual('Monetary Po (translated)', $category);
+		$this->assertEquals('Monetary Po (translated)', $category);
 	}
 
 /**
@@ -2567,7 +2567,7 @@ class I18nTest extends CakeTestCase {
 		Configure::write('Config.language', 'po');
 
 		$singular = $this->__domainCategorySingular();
-		$this->assertEqual('Monetary Plural Rule 1 (from plugin)', $singular);
+		$this->assertEquals('Monetary Plural Rule 1 (from plugin)', $singular);
 
 		$plurals = $this->__domainCategoryPlural();
 		$this->assertTrue(in_array('Monetary 0 = 0 or > 1 (from plugin)', $plurals));
@@ -2582,25 +2582,25 @@ class I18nTest extends CakeTestCase {
 	public function testCategoryThenSingular() {
 		Configure::write('Config.language', 'po');
 		$category = $this->__category();
-		$this->assertEqual('Monetary Po (translated)', $category);
+		$this->assertEquals('Monetary Po (translated)', $category);
 
 		$singular = $this->__singular();
-		$this->assertEqual('Po (translated)', $singular);
+		$this->assertEquals('Po (translated)', $singular);
 	}
 
 	public function testTimeDefinition() {
 		Configure::write('Config.language', 'po');
 		$result = __c('d_fmt', 5);
 		$expected = '%m/%d/%Y';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __c('am_pm', 5);
 		$expected = array('AM', 'PM');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __c('abmon', 5);
 		$expected = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 	public function testTimeDefinitionJapanese(){
@@ -2609,15 +2609,15 @@ class I18nTest extends CakeTestCase {
 
 		$expected = "%Y年%m月%d日";
 
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __c('am_pm', 5);
 		$expected = array("午前", "午後");
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = __c('abmon', 5);
 		$expected = array(" 1月", " 2月", " 3月", " 4月", " 5月", " 6月", " 7月", " 8月", " 9月", "10月", "11月", "12月");
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**

lib/Cake/Test/Case/Log/CakeLogTest.php

@@ -56,13 +56,13 @@ class CakeLogTest extends CakeTestCase {
 			'engine' => 'TestAppLog'
 		));
 		$this->assertTrue($result);
-		$this->assertEqual(CakeLog::configured(), array('libtest'));
+		$this->assertEquals(CakeLog::configured(), array('libtest'));
 
 		$result = CakeLog::config('plugintest', array(
 			'engine' => 'TestPlugin.TestPluginLog'
 		));
 		$this->assertTrue($result);
-		$this->assertEqual(CakeLog::configured(), array('libtest', 'plugintest'));
+		$this->assertEquals(CakeLog::configured(), array('libtest', 'plugintest'));
 
 		App::build();
 		CakePlugin::unload();
@@ -102,7 +102,7 @@ class CakeLogTest extends CakeTestCase {
 		$this->assertTrue(file_exists(LOGS . 'error.log'));
 
 		$result = CakeLog::configured();
-		$this->assertEqual($result, array('default'));
+		$this->assertEquals($result, array('default'));
 		unlink(LOGS . 'error.log');
 	}
 
@@ -117,7 +117,7 @@ class CakeLogTest extends CakeTestCase {
 			'path' => LOGS
 		));
 		$result = CakeLog::configured();
-		$this->assertEqual($result, array('file'));
+		$this->assertEquals($result, array('file'));
 
 		if (file_exists(LOGS . 'error.log')) {
 			@unlink(LOGS . 'error.log');
@@ -126,7 +126,7 @@ class CakeLogTest extends CakeTestCase {
 		$this->assertTrue(file_exists(LOGS . 'error.log'));
 
 		$result = file_get_contents(LOGS . 'error.log');
-		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning/', $result);
+		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning/', $result);
 		unlink(LOGS . 'error.log');
 	}
 
@@ -141,11 +141,11 @@ class CakeLogTest extends CakeTestCase {
 			'path' => LOGS
 		));
 		$result = CakeLog::configured();
-		$this->assertEqual($result, array('file'));
+		$this->assertEquals($result, array('file'));
 
 		CakeLog::drop('file');
 		$result = CakeLog::configured();
-		$this->assertEqual($result, array());
+		$this->assertEquals($result, array());
 	}
 
 /**
@@ -165,8 +165,8 @@ class CakeLogTest extends CakeTestCase {
 		CakeLog::write(LOG_WARNING, 'Test warning 1');
 		CakeLog::write(LOG_WARNING, 'Test warning 2');
 		$result = file_get_contents(LOGS . 'error.log');
-		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning 1/', $result);
-		$this->assertPattern('/2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning 2$/', $result);
+		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning 1/', $result);
+		$this->assertRegExp('/2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning 2$/', $result);
 		unlink(LOGS . 'error.log');
 	}
 

lib/Cake/Test/Case/Log/Engine/FileLogTest.php

@@ -39,7 +39,7 @@ class FileLogTest extends CakeTestCase {
 		$this->assertTrue(file_exists(LOGS . 'error.log'));
 
 		$result = file_get_contents(LOGS . 'error.log');
-		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning/', $result);
+		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning/', $result);
 		unlink(LOGS . 'error.log');
 
 		if (file_exists(LOGS . 'debug.log')) {
@@ -49,7 +49,7 @@ class FileLogTest extends CakeTestCase {
 		$this->assertTrue(file_exists(LOGS . 'debug.log'));
 
 		$result = file_get_contents(LOGS . 'debug.log');
-		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Debug: Test warning/', $result);
+		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Debug: Test warning/', $result);
 		unlink(LOGS . 'debug.log');
 
 		if (file_exists(LOGS . 'random.log')) {
@@ -59,7 +59,7 @@ class FileLogTest extends CakeTestCase {
 		$this->assertTrue(file_exists(LOGS . 'random.log'));
 
 		$result = file_get_contents(LOGS . 'random.log');
-		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Random: Test warning/', $result);
+		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Random: Test warning/', $result);
 		unlink(LOGS . 'random.log');
 	}
 

lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php

@@ -236,12 +236,12 @@ class AclBehaviorTest extends CakeTestCase {
 	public function testSetup() {
 		$User = new AclUser();
 		$this->assertTrue(isset($User->Behaviors->Acl->settings['User']));
-		$this->assertEqual($User->Behaviors->Acl->settings['User']['type'], 'requester');
+		$this->assertEquals($User->Behaviors->Acl->settings['User']['type'], 'requester');
 		$this->assertTrue(is_object($User->Aro));
 
 		$Post = new AclPost();
 		$this->assertTrue(isset($Post->Behaviors->Acl->settings['Post']));
-		$this->assertEqual($Post->Behaviors->Acl->settings['Post']['type'], 'controlled');
+		$this->assertEquals($Post->Behaviors->Acl->settings['Post']['type'], 'controlled');
 		$this->assertTrue(is_object($Post->Aco));
 	}
 
@@ -253,7 +253,7 @@ class AclBehaviorTest extends CakeTestCase {
 	public function testSetupMulti() {
 		$User = new AclPerson();
 		$this->assertTrue(isset($User->Behaviors->Acl->settings['AclPerson']));
-		$this->assertEqual($User->Behaviors->Acl->settings['AclPerson']['type'], 'both');
+		$this->assertEquals($User->Behaviors->Acl->settings['AclPerson']['type'], 'both');
 		$this->assertTrue(is_object($User->Aro));
 		$this->assertTrue(is_object($User->Aco));
 	}
@@ -278,8 +278,8 @@ class AclBehaviorTest extends CakeTestCase {
 			'conditions' => array('Aco.model' => 'Post', 'Aco.foreign_key' => $Post->id)
 		));
 		$this->assertTrue(is_array($result));
-		$this->assertEqual($result['Aco']['model'], 'Post');
-		$this->assertEqual($result['Aco']['foreign_key'], $Post->id);
+		$this->assertEquals($result['Aco']['model'], 'Post');
+		$this->assertEquals($result['Aco']['foreign_key'], $Post->id);
 
 		$aroData = array(
 			'Aro' => array(
@@ -312,12 +312,12 @@ class AclBehaviorTest extends CakeTestCase {
 			'conditions' => array('Aro.model' => 'AclPerson', 'Aro.foreign_key' => $Person->id)
 		));
 		$this->assertTrue(is_array($result));
-		$this->assertEqual($result['Aro']['parent_id'], 5);
+		$this->assertEquals($result['Aro']['parent_id'], 5);
 
 		$node = $Person->node(array('model' => 'AclPerson', 'foreign_key' => 8), 'Aro');
-		$this->assertEqual(count($node), 2);
-		$this->assertEqual($node[0]['Aro']['parent_id'], 5);
-		$this->assertEqual($node[1]['Aro']['parent_id'], null);
+		$this->assertEquals(count($node), 2);
+		$this->assertEquals($node[0]['Aro']['parent_id'], 5);
+		$this->assertEquals($node[1]['Aro']['parent_id'], null);
 
 		$aroData = array(
 			'Aro' => array(
@@ -343,12 +343,12 @@ class AclBehaviorTest extends CakeTestCase {
 			'conditions' => array('Aro.model' => 'AclPerson', 'Aro.foreign_key' => $Person->id)
 		));
 		$this->assertTrue(is_array($result));
-		$this->assertEqual($result['Aro']['parent_id'], 7);
+		$this->assertEquals($result['Aro']['parent_id'], 7);
 
 		$node = $Person->node(array('model' => 'AclPerson', 'foreign_key' => 8), 'Aro');
-		$this->assertEqual(sizeof($node), 2);
-		$this->assertEqual($node[0]['Aro']['parent_id'], 7);
-		$this->assertEqual($node[1]['Aro']['parent_id'], null);
+		$this->assertEquals(sizeof($node), 2);
+		$this->assertEquals($node[0]['Aro']['parent_id'], 7);
+		$this->assertEquals($node[1]['Aro']['parent_id'], null);
 	}
 
 /**
@@ -389,13 +389,13 @@ class AclBehaviorTest extends CakeTestCase {
 			'conditions' => array('Aro.model' => 'AclPerson', 'Aro.foreign_key' => $Person->id)
 		));
 		$this->assertTrue(is_array($result));
-		$this->assertEqual($result['Aro']['parent_id'], 5);
+		$this->assertEquals($result['Aro']['parent_id'], 5);
 
 		$Person->save(array('id' => $Person->id, 'name' => 'Bruce'));
 		$result = $this->Aro->find('first', array(
 			'conditions' => array('Aro.model' => 'AclPerson', 'Aro.foreign_key' => $Person->id)
 		));
-		$this->assertEqual($result['Aro']['parent_id'], 5);
+		$this->assertEquals($result['Aro']['parent_id'], 5);
 	}
 
 /**
@@ -433,9 +433,9 @@ class AclBehaviorTest extends CakeTestCase {
 		$Person->save($data);
 		$id = $Person->id;
 		$node = $Person->node(null, 'Aro');
-		$this->assertEqual(count($node), 2);
-		$this->assertEqual($node[0]['Aro']['parent_id'], 5);
-		$this->assertEqual($node[1]['Aro']['parent_id'], null);
+		$this->assertEquals(count($node), 2);
+		$this->assertEquals($node[0]['Aro']['parent_id'], 5);
+		$this->assertEquals($node[1]['Aro']['parent_id'], null);
 
 		$Person->delete($id);
 		$result = $this->Aro->find('first', array(
@@ -487,6 +487,6 @@ class AclBehaviorTest extends CakeTestCase {
 		$Person->id = 2;
 		$result = $Person->node(null, 'Aro');
 		$this->assertTrue(is_array($result));
-		$this->assertEqual(count($result), 1);
+		$this->assertEquals(count($result), 1);
 	}
 }

lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php

@@ -92,7 +92,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 					'Category' => 'name'
 				)
 		)));
-		$this->assertEqual(Set::extract('/ArticleFeatured/keep/Featured/fields', $r), array('id'));
+		$this->assertEquals(Set::extract('/ArticleFeatured/keep/Featured/fields', $r), array('id'));
 
 		$r = $this->__containments($this->Article, array(
 			'Comment' => array(
@@ -109,37 +109,37 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->assertTrue(Set::matches('/User', $r));
 		$this->assertTrue(Set::matches('/Article/keep/Comment', $r));
 		$this->assertTrue(Set::matches('/Article/keep/User', $r));
-		$this->assertEqual(Set::extract('/Article/keep/Comment/fields', $r), array('comment', 'published'));
-		$this->assertEqual(Set::extract('/Article/keep/User/fields', $r), array('user'));
+		$this->assertEquals(Set::extract('/Article/keep/Comment/fields', $r), array('comment', 'published'));
+		$this->assertEquals(Set::extract('/Article/keep/User/fields', $r), array('user'));
 		$this->assertTrue(Set::matches('/Comment/keep/Attachment', $r));
-		$this->assertEqual(Set::extract('/Comment/keep/Attachment/fields', $r), array('attachment'));
+		$this->assertEquals(Set::extract('/Comment/keep/Attachment/fields', $r), array('attachment'));
 
 		$r = $this->__containments($this->Article, array('Comment' => array('limit' => 1)));
-		$this->assertEqual(array_keys($r), array('Comment', 'Article'));
+		$this->assertEquals(array_keys($r), array('Comment', 'Article'));
 		$result = Set::extract('/Comment/keep', $r);
-		$this->assertEqual(array_shift($result), array('keep' => array()));
+		$this->assertEquals(array_shift($result), array('keep' => array()));
 		$this->assertTrue(Set::matches('/Article/keep/Comment', $r));
 		$result = Set::extract('/Article/keep/Comment/.', $r);
-		$this->assertEqual(array_shift($result), array('limit' => 1));
+		$this->assertEquals(array_shift($result), array('limit' => 1));
 
 		$r = $this->__containments($this->Article, array('Comment.User'));
-		$this->assertEqual(array_keys($r), array('User', 'Comment', 'Article'));
+		$this->assertEquals(array_keys($r), array('User', 'Comment', 'Article'));
 
 		$result = Set::extract('/User/keep', $r);
-		$this->assertEqual(array_shift($result), array('keep' => array()));
+		$this->assertEquals(array_shift($result), array('keep' => array()));
 
 		$result = Set::extract('/Comment/keep', $r);
-		$this->assertEqual(array_shift($result), array('keep' => array('User' => array())));
+		$this->assertEquals(array_shift($result), array('keep' => array('User' => array())));
 
 		$result = Set::extract('/Article/keep', $r);
-		$this->assertEqual(array_shift($result), array('keep' => array('Comment' => array())));
+		$this->assertEquals(array_shift($result), array('keep' => array('Comment' => array())));
 
 		$r = $this->__containments($this->Tag, array('Article' => array('User' => array('Comment' => array(
 			'Attachment' => array('conditions' => array('Attachment.id >' => 1))
 		)))));
 		$this->assertTrue(Set::matches('/Attachment', $r));
 		$this->assertTrue(Set::matches('/Comment/keep/Attachment/conditions', $r));
-		$this->assertEqual($r['Comment']['keep']['Attachment']['conditions'], array('Attachment.id >' => 1));
+		$this->assertEquals($r['Comment']['keep']['Attachment']['conditions'], array('Attachment.id >' => 1));
 		$this->assertTrue(Set::matches('/User/keep/Comment', $r));
 		$this->assertTrue(Set::matches('/Article/keep/User', $r));
 		$this->assertTrue(Set::matches('/Tag/keep/Article', $r));
@@ -148,7 +148,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 /**
  * testInvalidContainments method
  *
- * @expectedException PHPUnit_Framework_Error_Warning
+ * @expectedException PHPUnit_Framework_Error
  * @return void
  */
 	public function testInvalidContainments() {
@@ -194,7 +194,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$r = $this->Article->find('all', array('contain' => 'Comment.id DESC'));
 		$ids = $descIds = Set::extract('/Comment[1]/id', $r);
 		rsort($descIds);
-		$this->assertEqual($ids, $descIds);
+		$this->assertEquals($ids, $descIds);
 
 		$r = $this->Article->find('all', array('contain' => 'Comment'));
 		$this->assertTrue(Set::matches('/Comment[user_id!=2]', $r));
@@ -239,7 +239,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 /**
  * testBeforeFindWithNonExistingBinding method
  *
- * @expectedException PHPUnit_Framework_Error_Warning
+ * @expectedException PHPUnit_Framework_Error
  * @return void
  */
 	public function testBeforeFindWithNonExistingBinding() {
@@ -282,7 +282,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
 			))
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -325,7 +325,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				)
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->Article->contain('User', 'Comment');
 		$result = $this->Article->find('all', array('recursive' => 1));
@@ -390,7 +390,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'Comment' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -432,7 +432,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				)
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Article->find('all', array('contain' => array('User', 'Comment')));
 		$expected = array(
@@ -496,7 +496,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'Comment' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -580,7 +580,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'Comment' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->Article->contain(array('User' => 'ArticleFeatured'));
 		$result = $this->Article->find('all', array('recursive' => 2));
@@ -642,7 +642,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				)
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->Article->contain(array('User' => array('ArticleFeatured', 'Comment')));
 		$result = $this->Article->find('all', array('recursive' => 2));
@@ -733,7 +733,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				)
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->Article->contain(array('User' => array('ArticleFeatured')), 'Tag', array('Comment' => 'Attachment'));
 		$result = $this->Article->find('all', array('recursive' => 2));
@@ -842,7 +842,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'Tag' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -925,7 +925,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'Comment' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Article->find('all', array('contain' => array('User' => 'ArticleFeatured')));
 		$expected = array(
@@ -986,7 +986,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				)
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Article->find('all', array('contain' => array('User' => array('ArticleFeatured', 'Comment'))));
 		$expected = array(
@@ -1076,7 +1076,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				)
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Article->find('all', array('contain' => array('User' => 'ArticleFeatured', 'Tag', 'Comment' => 'Attachment')));
 		$expected = array(
@@ -1184,7 +1184,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'Tag' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -1256,7 +1256,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->User->contain(array('ArticleFeatured' => array('Featured' => 'Category', 'Comment' => array('Article', 'Attachment'))));
 		$result = $this->User->find('all', array('recursive' => 3));
@@ -1383,7 +1383,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->User->contain(array('ArticleFeatured' => array('Featured' => 'Category', 'Comment' => 'Attachment'), 'Article'));
 		$result = $this->User->find('all', array('recursive' => 3));
@@ -1504,7 +1504,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -1575,7 +1575,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->User->find('all', array('contain' => array('ArticleFeatured' => array('Featured' => 'Category', 'Comment' => array('Article', 'Attachment')))));
 		$expected = array(
@@ -1701,7 +1701,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->User->find('all', array('contain' => array('ArticleFeatured' => array('Featured' => 'Category', 'Comment' => 'Attachment'), 'Article')));
 		$expected = array(
@@ -1821,7 +1821,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -1890,7 +1890,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$r = $this->User->find('all', array('contain' => array(
 			'ArticleFeatured' => array(
@@ -1996,7 +1996,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$orders = array(
 			'title DESC', 'title DESC, published DESC',
@@ -2066,7 +2066,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 					'ArticleFeatured' => array()
 				)
 			);
-			$this->assertEqual($expected, $result);
+			$this->assertEquals($expected, $result);
 		}
 	}
 
@@ -2139,7 +2139,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->User->resetBindings();
 
@@ -2268,7 +2268,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->User->resetBindings();
 
@@ -2391,7 +2391,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -2462,7 +2462,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->__assertBindings($this->User, array('hasMany' => array('ArticleFeatured')));
 		$this->__assertBindings($this->User->ArticleFeatured, array('hasOne' => array('Featured')));
@@ -2599,7 +2599,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->__assertBindings($this->User, array('hasMany' => array('ArticleFeatured')));
 		$this->__assertBindings($this->User->ArticleFeatured, array('hasOne' => array('Featured'), 'hasMany' => array('Comment')));
@@ -2736,7 +2736,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->__assertBindings($this->User, array('hasMany' => array('ArticleFeatured')));
 		$this->__assertBindings($this->User->ArticleFeatured, array('hasOne' => array('Featured'), 'hasMany' => array('Comment')));
@@ -2867,7 +2867,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'ArticleFeatured' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->__assertBindings($this->User, array('hasMany' => array('Article', 'ArticleFeatured')));
 		$this->__assertBindings($this->User->Article);
@@ -2891,31 +2891,34 @@ class ContainableBehaviorTest extends CakeTestCase {
 	public function testEmbeddedFindFields() {
 		$result = $this->Article->find('all', array(
 			'contain' => array('User(user)'),
-			'fields' => array('title')
+			'fields' => array('title'),
+			'order' => array('Article.id' => 'ASC')
 		));
 		$expected = array(
 			array('Article' => array('title' => 'First Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
 			array('Article' => array('title' => 'Second Article'), 'User' => array('user' => 'larry', 'id' => 3)),
 			array('Article' => array('title' => 'Third Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Article->find('all', array(
 			'contain' => array('User(id, user)'),
-			'fields' => array('title')
+			'fields' => array('title'),
+			'order' => array('Article.id' => 'ASC')
 		));
 		$expected = array(
 			array('Article' => array('title' => 'First Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
 			array('Article' => array('title' => 'Second Article'), 'User' => array('user' => 'larry', 'id' => 3)),
 			array('Article' => array('title' => 'Third Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Article->find('all', array(
 			'contain' => array(
 				'Comment(comment, published)' => 'Attachment(attachment)', 'User(user)'
 			),
-			'fields' => array('title')
+			'fields' => array('title'),
+			'order' => array('Article.id' => 'ASC')
 		));
 		if (!empty($result)) {
 			foreach($result as $i=>$article) {
@@ -2951,7 +2954,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'Comment' => array()
 			),
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -2999,7 +3002,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'conditions' => array('created >=' => '2007-03-18 12:24')
 			)
 		));
-		$result = $this->Article->find('all', array('fields' => array('title')));
+		$result = $this->Article->find('all', array('fields' => array('title'), 'order' => array('Article.id' => 'ASC')));
 		$expected = array(
 			array(
 				'Article' => array('id' => 1, 'title' => 'First Article'),
@@ -3017,10 +3020,10 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'Tag' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->Article->contain(array('User(id,user)', 'Tag' => array('fields' => array('tag', 'created'))));
-		$result = $this->Article->find('all', array('fields' => array('title')));
+		$result = $this->Article->find('all', array('fields' => array('title'), 'order' => array('Article.id' => 'ASC')));
 		$expected = array(
 			array(
 				'Article' => array('id' => 1, 'title' => 'First Article'),
@@ -3044,11 +3047,12 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'Tag' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Article->find('all', array(
 			'fields' => array('title'),
-			'contain' => array('User(id,user)', 'Tag' => array('fields' => array('tag', 'created')))
+			'contain' => array('User(id,user)', 'Tag' => array('fields' => array('tag', 'created'))),
+			'order' => array('Article.id' => 'ASC')
 		));
 		$expected = array(
 			array(
@@ -3073,7 +3077,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'Tag' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->Article->contain(array(
 			'User(id,user)',
@@ -3082,7 +3086,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'conditions' => array('created >=' => '2007-03-18 12:24')
 			)
 		));
-		$result = $this->Article->find('all', array('fields' => array('title')));
+		$result = $this->Article->find('all', array('fields' => array('title'), 'order' => array('Article.id' => 'ASC')));
 		$expected = array(
 			array(
 				'Article' => array('id' => 1, 'title' => 'First Article'),
@@ -3100,7 +3104,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'Tag' => array()
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->assertTrue(empty($this->User->Article->hasAndBelongsToMany['Tag']['conditions']));
 
@@ -3133,15 +3137,15 @@ class ContainableBehaviorTest extends CakeTestCase {
 	public function testOtherFinds() {
 		$result = $this->Article->find('count');
 		$expected = 3;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Article->find('count', array('conditions' => array('Article.id >' => '1')));
 		$expected = 2;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Article->find('count', array('contain' => array()));
 		$expected = 3;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->Article->contain(array('User(id,user)', 'Tag' => array('fields' => array('tag', 'created'), 'conditions' => array('created >=' => '2007-03-18 12:24'))));
 		$result = $this->Article->find('first', array('fields' => array('title')));
@@ -3150,7 +3154,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 			'User' => array('id' => 1, 'user' => 'mariano'),
 			'Tag' => array(array('tag' => 'tag2', 'created' => '2007-03-18 12:24:23'))
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->Article->contain(array('User(id,user)', 'Tag' => array('fields' => array('tag', 'created'))));
 		$result = $this->Article->find('first', array('fields' => array('title')));
@@ -3162,7 +3166,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				array('tag' => 'tag2', 'created' => '2007-03-18 12:24:23')
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Article->find('first', array(
 			'fields' => array('title'),
@@ -3174,7 +3178,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 			'User' => array('id' => 1, 'user' => 'mariano'),
 			'Tag' => array()
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Article->find('list', array(
 			'contain' => array('User(id,user)'),
@@ -3185,7 +3189,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 			2 => 'Second Article',
 			3 => 'Third Article'
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -3215,7 +3219,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		));
 
 		$result = $this->Article->Comment->find('all', $options);
-		$this->assertEqual($result, $firstResult);
+		$this->assertEquals($result, $firstResult);
 
 		$this->Article->unbindModel(array('hasMany' => array('Comment'), 'belongsTo' => array('User'), 'hasAndBelongsToMany' => array('Tag')), false);
 		$this->Article->bindModel(array('hasMany' => array('Comment'), 'belongsTo' => array('User')), false);
@@ -3244,7 +3248,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				array('comment' => 'Fourth Comment for First Article', 'article_id' => 1)
 			)
 		));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Article->find('all', array('fields' => array('title', 'User.id', 'User.user'), 'limit' => 1, 'page' => 2, 'order' => 'Article.id ASC'));
 		$expected = array(array(
@@ -3255,7 +3259,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				array('comment' => 'Second Comment for Second Article', 'article_id' => 2)
 			)
 		));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Article->find('all', array('fields' => array('title', 'User.id', 'User.user'), 'limit' => 1, 'page' => 3, 'order' => 'Article.id ASC'));
 		$expected = array(array(
@@ -3263,7 +3267,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 			'User' => array('id' => 1, 'user' => 'mariano'),
 			'Comment' => array()
 		));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->Article->contain(false, array('User' => array('fields' => 'user'), 'Comment'));
 		$result = $this->Article->find('all');
@@ -3299,9 +3303,9 @@ class ContainableBehaviorTest extends CakeTestCase {
 
 		$expected = array('Article', 'ArticlesTag');
 		$this->assertTrue(!empty($result));
-		$this->assertEqual('First Article', $result['Article']['title']);
+		$this->assertEquals('First Article', $result['Article']['title']);
 		$this->assertTrue(!empty($result['ArticlesTag']));
-		$this->assertEqual($expected, array_keys($result));
+		$this->assertEquals($expected, array_keys($result));
 
 		$this->assertTrue(empty($this->Article->hasMany['ArticlesTag']));
 
@@ -3318,7 +3322,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$result = $this->JoinA->hasOne;
 		$this->JoinA->find('all');
 		$resultAfter = $this->JoinA->hasOne;
-		$this->assertEqual($result, $resultAfter);
+		$this->assertEquals($result, $resultAfter);
 	}
 
 /**
@@ -3349,7 +3353,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		);
 		$result = $this->Article->Comment->find('all', $findOptions);
 		$result = $this->Article->Comment->find('all', $initialOptions);
-		$this->assertEqual($result, $initialModels);
+		$this->assertEquals($result, $initialModels);
 	}
 
 /**
@@ -3365,7 +3369,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->Article->User->bindModel($userHasOne, false);
 		$expected = $this->Article->User->hasOne;
 		$this->Article->find('all');
-		$this->assertEqual($expected, $this->Article->User->hasOne);
+		$this->assertEquals($expected, $this->Article->User->hasOne);
 
 		$this->Article->User->bindModel($userHasOne, false);
 		$expected = $this->Article->User->hasOne;
@@ -3374,7 +3378,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'User' => array('ArticleFeatured', 'Comment')
 			)
 		));
-		$this->assertEqual($expected, $this->Article->User->hasOne);
+		$this->assertEquals($expected, $this->Article->User->hasOne);
 
 		$this->Article->User->bindModel($userHasOne, false);
 		$expected = $this->Article->User->hasOne;
@@ -3386,7 +3390,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				)
 			)
 		));
-		$this->assertEqual($expected, $this->Article->User->hasOne);
+		$this->assertEquals($expected, $this->Article->User->hasOne);
 
 		$this->Article->User->bindModel($userHasOne, false);
 		$expected = $this->Article->User->hasOne;
@@ -3397,7 +3401,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				)
 			)
 		));
-		$this->assertEqual($expected, $this->Article->User->hasOne);
+		$this->assertEquals($expected, $this->Article->User->hasOne);
 
 		$this->Article->User->bindModel($userHasOne, false);
 		$expected = $this->Article->User->hasOne;
@@ -3409,7 +3413,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 				'User.Comment'
 			)
 		));
-		$this->assertEqual($expected, $this->Article->User->hasOne);
+		$this->assertEquals($expected, $this->Article->User->hasOne);
 	}
 
 /**
@@ -3440,67 +3444,67 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->Article->bindModel($articleHabtm, false);
 		$expected = $this->Article->hasAndBelongsToMany;
 		$this->Article->find('all');
-		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+		$this->assertEquals($expected, $this->Article->hasAndBelongsToMany);
 
 		$this->Article->resetBindings();
 		$this->Article->bindModel($articleHabtm, false);
 		$expected = $this->Article->hasAndBelongsToMany;
 		$this->Article->find('all', array('contain' => 'Tag.tag'));
-		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+		$this->assertEquals($expected, $this->Article->hasAndBelongsToMany);
 
 		$this->Article->resetBindings();
 		$this->Article->bindModel($articleHabtm, false);
 		$expected = $this->Article->hasAndBelongsToMany;
 		$this->Article->find('all', array('contain' => 'Tag'));
-		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+		$this->assertEquals($expected, $this->Article->hasAndBelongsToMany);
 
 		$this->Article->resetBindings();
 		$this->Article->bindModel($articleHabtm, false);
 		$expected = $this->Article->hasAndBelongsToMany;
 		$this->Article->find('all', array('contain' => array('Tag' => array('fields' => array(null)))));
-		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+		$this->assertEquals($expected, $this->Article->hasAndBelongsToMany);
 
 		$this->Article->resetBindings();
 		$this->Article->bindModel($articleHabtm, false);
 		$expected = $this->Article->hasAndBelongsToMany;
 		$this->Article->find('all', array('contain' => array('Tag' => array('fields' => array('Tag.tag')))));
-		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+		$this->assertEquals($expected, $this->Article->hasAndBelongsToMany);
 
 		$this->Article->resetBindings();
 		$this->Article->bindModel($articleHabtm, false);
 		$expected = $this->Article->hasAndBelongsToMany;
 		$this->Article->find('all', array('contain' => array('Tag' => array('fields' => array('Tag.tag', 'Tag.created')))));
-		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+		$this->assertEquals($expected, $this->Article->hasAndBelongsToMany);
 
 		$this->Article->resetBindings();
 		$this->Article->bindModel($articleHabtm, false);
 		$expected = $this->Article->hasAndBelongsToMany;
 		$this->Article->find('all', array('contain' => 'ShortTag.tag'));
-		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+		$this->assertEquals($expected, $this->Article->hasAndBelongsToMany);
 
 		$this->Article->resetBindings();
 		$this->Article->bindModel($articleHabtm, false);
 		$expected = $this->Article->hasAndBelongsToMany;
 		$this->Article->find('all', array('contain' => 'ShortTag'));
-		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+		$this->assertEquals($expected, $this->Article->hasAndBelongsToMany);
 
 		$this->Article->resetBindings();
 		$this->Article->bindModel($articleHabtm, false);
 		$expected = $this->Article->hasAndBelongsToMany;
 		$this->Article->find('all', array('contain' => array('ShortTag' => array('fields' => array(null)))));
-		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+		$this->assertEquals($expected, $this->Article->hasAndBelongsToMany);
 
 		$this->Article->resetBindings();
 		$this->Article->bindModel($articleHabtm, false);
 		$expected = $this->Article->hasAndBelongsToMany;
 		$this->Article->find('all', array('contain' => array('ShortTag' => array('fields' => array('ShortTag.tag')))));
-		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+		$this->assertEquals($expected, $this->Article->hasAndBelongsToMany);
 
 		$this->Article->resetBindings();
 		$this->Article->bindModel($articleHabtm, false);
 		$expected = $this->Article->hasAndBelongsToMany;
 		$this->Article->find('all', array('contain' => array('ShortTag' => array('fields' => array('ShortTag.tag', 'ShortTag.created')))));
-		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+		$this->assertEquals($expected, $this->Article->hasAndBelongsToMany);
 	}
 
 /**
@@ -3534,7 +3538,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$result = $this->Article->find('all', array('limit' => 1, 'contain' => array('ArticlesTag', 'Tag')));
 
 		$associated = $this->Article->getAssociated();
-		$this->assertEqual('hasAndBelongsToMany', $associated['Tag']);
+		$this->assertEquals('hasAndBelongsToMany', $associated['Tag']);
 		$this->assertFalse(isset($associated['ArticleTag']));
 	}
 
@@ -3573,7 +3577,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$this->Article->recursive = -1;
 		$result = $this->Article->field('title', array('Article.title' => 'First Article'));
 		$this->assertNoErrors();
-		$this->assertEqual($result, 'First Article', 'Field is wrong');
+		$this->assertEquals($result, 'First Article', 'Field is wrong');
 	}
 
 /**
@@ -3643,7 +3647,7 @@ class ContainableBehaviorTest extends CakeTestCase {
 		$expected = array_merge(array('belongsTo' => array(), 'hasOne' => array(), 'hasMany' => array(), 'hasAndBelongsToMany' => array()), $expected);
 
 		foreach($expected as $binding => $expect) {
-			$this->assertEqual(array_keys($Model->$binding), $expect);
+			$this->assertEquals(array_keys($Model->$binding), $expect);
 		}
 	}
 

lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php

@@ -69,24 +69,24 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$TestModel->translateTable = 'another_i18n';
 		$TestModel->Behaviors->attach('Translate', array('title'));
 		$translateModel = $TestModel->Behaviors->Translate->translateModel($TestModel);
-		$this->assertEqual($translateModel->name, 'I18nModel');
-		$this->assertEqual($translateModel->useTable, 'another_i18n');
+		$this->assertEquals($translateModel->name, 'I18nModel');
+		$this->assertEquals($translateModel->useTable, 'another_i18n');
 
 		$TestModel = new User();
 		$TestModel->Behaviors->attach('Translate', array('title'));
 		$translateModel = $TestModel->Behaviors->Translate->translateModel($TestModel);
-		$this->assertEqual($translateModel->name, 'I18nModel');
-		$this->assertEqual($translateModel->useTable, 'i18n');
+		$this->assertEquals($translateModel->name, 'I18nModel');
+		$this->assertEquals($translateModel->useTable, 'i18n');
 
 		$TestModel = new TranslatedArticle();
 		$translateModel = $TestModel->Behaviors->Translate->translateModel($TestModel);
-		$this->assertEqual($translateModel->name, 'TranslateArticleModel');
-		$this->assertEqual($translateModel->useTable, 'article_i18n');
+		$this->assertEquals($translateModel->name, 'TranslateArticleModel');
+		$this->assertEquals($translateModel->useTable, 'article_i18n');
 
 		$TestModel = new TranslatedItem();
 		$translateModel = $TestModel->Behaviors->Translate->translateModel($TestModel);
-		$this->assertEqual($translateModel->name, 'TranslateTestModel');
-		$this->assertEqual($translateModel->useTable, 'i18n');
+		$this->assertEquals($translateModel->name, 'TranslateTestModel');
+		$this->assertEquals($translateModel->useTable, 'i18n');
 	}
 
 /**
@@ -102,7 +102,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 
 		$result = $TestModel->read(null, 1);
 		$expected = array('TranslatedItem' => array('id' => 1, 'slug' => 'first_translated'));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $TestModel->find('all', array('fields' => array('slug')));
 		$expected = array(
@@ -110,7 +110,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 			array('TranslatedItem' => array('slug' => 'second_translated')),
 			array('TranslatedItem' => array('slug' => 'third_translated'))
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -141,7 +141,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				array('id' => 6, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Obsah #1')
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$TestModel->hasMany['Title']['fields'] = $TestModel->hasMany['Content']['fields'] = array('content');
 		$TestModel->hasMany['Title']['conditions']['locale'] = $TestModel->hasMany['Content']['conditions']['locale'] = 'eng';
@@ -164,7 +164,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				'Content' => array(array('foreign_key' => 3, 'content' => 'Content #3'))
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -188,7 +188,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				'content' => 'Content #1'
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $TestModel->find('all');
 		$expected = array(
@@ -220,7 +220,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				)
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -245,7 +245,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				)
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $TestModel->find('all', array('conditions' => "TranslatedItem.slug = 'first_translated'"));
 		$expected = array(
@@ -259,7 +259,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				)
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -296,7 +296,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				array('id' => 6, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Obsah #1')
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$TestModel->hasMany['Title']['fields'] = $TestModel->hasMany['Content']['fields'] = array('content');
 		$TestModel->hasMany['Title']['conditions']['locale'] = $TestModel->hasMany['Content']['conditions']['locale'] = 'eng';
@@ -319,7 +319,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				'Content' => array(array('foreign_key' => 3, 'content' => 'Content #3'))
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -344,7 +344,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				'content' => 'Inhalt #1'
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $TestModel->find('all', array('fields' => array('slug', 'title', 'content')));
 		$expected = array(
@@ -401,7 +401,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				'content' => ''
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -417,7 +417,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$TestModel->displayField = 'title';
 		$result = $TestModel->find('list', array('recursive' => 1));
 		$expected = array(1 => 'Titel #1', 2 => 'Titel #2', 3 => 'Titel #3');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		// SQL Server trigger an error and stops the page even if the debug = 0
 		if ($this->db instanceof Sqlserver) {
@@ -425,16 +425,16 @@ class TranslateBehaviorTest extends CakeTestCase {
 			Configure::write('debug', 0);
 
 			$result = $TestModel->find('list', array('recursive' => 1, 'callbacks' => false));
-			$this->assertEqual($result, array());
+			$this->assertEquals($result, array());
 
 			$result = $TestModel->find('list', array('recursive' => 1, 'callbacks' => 'after'));
-			$this->assertEqual($result, array());
+			$this->assertEquals($result, array());
 			Configure::write('debug', $debug);
 		}
 
 		$result = $TestModel->find('list', array('recursive' => 1, 'callbacks' => 'before'));
 		$expected = array(1 => null, 2 => null, 3 => null);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -453,10 +453,10 @@ class TranslateBehaviorTest extends CakeTestCase {
 			array('TranslatedItem' => array('slug' => 'second_translated', 'locale' => 'eng', 'content' => 'Content #2')),
 			array('TranslatedItem' => array('slug' => 'third_translated', 'locale' => 'eng', 'content' => 'Content #3'))
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $TestModel->find('all', array('fields' => array('TranslatedItem.slug', 'content')));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$TestModel->locale = array('eng', 'deu', 'cze');
 		$delete = array(array('locale' => 'deu'), array('field' => 'content', 'locale' => 'eng'));
@@ -469,7 +469,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 			array('TranslatedItem' => array('locale' => 'eng', 'title' => 'Title #2', 'content' => 'Obsah #2')),
 			array('TranslatedItem' => array('locale' => 'eng', 'title' => 'Title #3', 'content' => 'Obsah #3'))
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -487,7 +487,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$TestModel->save();
 		$result = $TestModel->read();
 		$expected = array('TranslatedItem' => array_merge($data, array('id' => $TestModel->id, 'locale' => 'spa')));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -509,7 +509,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$TestModel->save();
 		$result = $TestModel->read(null, $id);
 		$expected = array('TranslatedItem' => array_merge($oldData, $newData, array('locale' => 'spa')));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -547,7 +547,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				array('id' => 20, 'locale' => 'spa', 'model' => 'TranslatedItem', 'foreign_key' => 4, 'field' => 'content', 'content' => 'Nuevo contenido')
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -586,7 +586,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				array('id' => 6, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Novy Obsah #1')
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$TestModel->unbindTranslation($translations);
 		$TestModel->bindTranslation(array('title', 'content'), false);
@@ -630,7 +630,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				array('id' => 6, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Upraveny obsah #1')
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -651,7 +651,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		));
 		$TestModel->create();
 		$this->assertFalse($TestModel->save($data));
-		$this->assertEqual($TestModel->validationErrors['title'], array('This field cannot be left blank'));
+		$this->assertEquals($TestModel->validationErrors['title'], array('This field cannot be left blank'));
 
 		$TestModel->locale = 'eng';
 		$TestModel->validate['title'] = '/Only this title/';
@@ -681,12 +681,12 @@ class TranslateBehaviorTest extends CakeTestCase {
 
 		$result = array_keys($TestModel->hasMany);
 		$expected = array('Title', 'Content');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$TestModel->Behaviors->detach('Translate');
 		$result = array_keys($TestModel->hasMany);
 		$expected = array();
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = isset($TestModel->Behaviors->Translate);
 		$this->assertFalse($result);
@@ -700,7 +700,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$TestModel->Behaviors->attach('Translate', array('title' => 'Title', 'content' => 'Content'));
 		$result = array_keys($TestModel->hasMany);
 		$expected = array('Title', 'Content');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = isset($TestModel->Behaviors->Translate);
 		$this->assertTrue($result);
@@ -734,7 +734,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				'content' => 'Another Content #1'
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -769,7 +769,7 @@ class TranslateBehaviorTest extends CakeTestCase {
             	'updated' => '2007-03-17 01:18:31'
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $TestModel->find('all', array('recursive' => -1));
 		$expected = array(
@@ -810,8 +810,8 @@ class TranslateBehaviorTest extends CakeTestCase {
 				)
 			)
 		);
-		$this->assertEqual($expected, $result);
-		$this->assertEqual($TestModel->recursive, $recursive);
+		$this->assertEquals($expected, $result);
+		$this->assertEquals($TestModel->recursive, $recursive);
 
 		$TestModel->recursive = -1;
 		$result = $TestModel->read(null, 1);
@@ -827,7 +827,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 				'body' => 'Body (eng) #1'
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 /**
  * testTranslateTableWithPrefix method
@@ -847,7 +847,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 			'content' => 'Content #1',
 			'title' => 'Title #1'
 		));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**

lib/Cake/Test/Case/Model/Behavior/TreeBehaviorAfterTest.php

@@ -66,11 +66,11 @@ class TreeBehaviorAfterTest extends CakeTestCase {
 		$expected = array('AfterTree' => array('name' => 'Six and One Half Changed in AfterTree::afterSave() but not in database', 'parent_id' => 6, 'lft' => 11, 'rght' => 12));
 		$result = $this->Tree->save(array('AfterTree' => array('name' => 'Six and One Half', 'parent_id' => 6)));
 		$expected['AfterTree']['id'] = $this->Tree->id;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$expected = array('AfterTree' => array('name' => 'Six and One Half', 'parent_id' => 6, 'lft' => 11, 'rght' => 12, 'id' => 8));
 		$result = $this->Tree->find('all');
-		$this->assertEqual($result[7], $expected);
+		$this->assertEquals($result[7], $expected);
 	}
 }
 

lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php

@@ -67,10 +67,10 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->initialize(2, 2);
 
 		$result = $this->Tree->find('count');
-		$this->assertEqual($result, 7);
+		$this->assertEquals($result, 7);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -90,13 +90,13 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 
 		$this->Tree->save($save);
 		$result = $this->Tree->verify();
-		$this->assertNotIdentical($result, true);
+		$this->assertNotSame($result, true);
 
 		$result = $this->Tree->recover();
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 
 		$result = $this->Tree->verify();
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 	}
 
 /**
@@ -116,13 +116,13 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 
 		$this->Tree->save($save);
 		$result = $this->Tree->verify();
-		$this->assertNotIdentical($result, true);
+		$this->assertNotSame($result, true);
 
 		$result = $this->Tree->recover();
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 
 		$result = $this->Tree->verify();
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 	}
 
 /**
@@ -141,13 +141,13 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->updateAll(array($parentField => null), array('id' => $result[$modelClass]['id']));
 
 		$result = $this->Tree->verify();
-		$this->assertNotIdentical($result, true);
+		$this->assertNotSame($result, true);
 
 		$result = $this->Tree->recover();
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 
 		$result = $this->Tree->verify();
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 	}
 
 /**
@@ -164,13 +164,13 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->updateAll(array($parentField => 999999), array('id' => $result[$modelClass]['id']));
 
 		$result = $this->Tree->verify();
-		$this->assertNotIdentical($result, true);
+		$this->assertNotSame($result, true);
 
 		$result = $this->Tree->recover('MPTT');
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 
 		$result = $this->Tree->verify();
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 	}
 
 /**
@@ -187,13 +187,13 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->updateAll(array($parentField => 999999), array('id' => $result[$modelClass]['id']));
 
 		$result = $this->Tree->verify();
-		$this->assertNotIdentical($result, true);
+		$this->assertNotSame($result, true);
 
 		$result = $this->Tree->recover();
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 
 		$result = $this->Tree->verify();
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 	}
 
 /**
@@ -209,13 +209,13 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->updateAll(array($parentField => null));
 
 		$result = $this->Tree->verify();
-		$this->assertNotIdentical($result, true);
+		$this->assertNotSame($result, true);
 
 		$result = $this->Tree->recover();
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 
 		$result = $this->Tree->verify();
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 	}
 
 /**
@@ -231,12 +231,12 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->updateAll(array($leftField => 0, $rightField => 0));
 
 		$result = $this->Tree->verify();
-		$this->assertNotIdentical($result, true);
+		$this->assertNotSame($result, true);
 
 		$this->Tree->recover();
 
 		$result = $this->Tree->verify();
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 	}
 
 /**
@@ -257,7 +257,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 			array($rightField . ' >' => $result[$modelClass][$leftField]));
 
 		$result = $this->Tree->verify();
-		$this->assertNotIdentical($result, true);
+		$this->assertNotSame($result, true);
 
 		$result = $this->Tree->recover();
 		$this->assertTrue($result);
@@ -279,10 +279,10 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->save(array($modelClass => array('name' => 'testAddOrphan', $parentField => null)));
 		$result = $this->Tree->find('first', array('fields' => array('name', $parentField), 'order' => $modelClass . '.' . $leftField . ' desc'));
 		$expected = array($modelClass => array('name' => 'testAddOrphan', $parentField => null));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -301,21 +301,21 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->create();
 		$result = $this->Tree->save(array($modelClass => array('name' => 'testAddMiddle', $parentField => $data[$modelClass]['id'])));
 		$expected = array_merge(array($modelClass => array('name' => 'testAddMiddle', $parentField => '2')), $result);
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 
 		$laterCount = $this->Tree->find('count');
 
 		$laterCount = $this->Tree->find('count');
-		$this->assertEqual($initialCount + 1, $laterCount);
+		$this->assertEquals($initialCount + 1, $laterCount);
 
 		$children = $this->Tree->children($data[$modelClass]['id'], true, array('name'));
 		$expects = array(array($modelClass => array('name' => '1.1.1')),
 			array($modelClass => array('name' => '1.1.2')),
 			array($modelClass => array('name' => 'testAddMiddle')));
-		$this->assertIdentical($children, $expects);
+		$this->assertSame($children, $expects);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -333,13 +333,13 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		//$this->expectError('Trying to save a node under a none-existant node in TreeBehavior::beforeSave');
 
 		$saveSuccess = $this->Tree->save(array($modelClass => array('name' => 'testAddInvalid', $parentField => 99999)));
-		$this->assertIdentical($saveSuccess, false);
+		$this->assertSame($saveSuccess, false);
 
 		$laterCount = $this->Tree->find('count');
-		$this->assertIdentical($initialCount, $laterCount);
+		$this->assertSame($initialCount, $laterCount);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -355,10 +355,10 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->save(array('name' => 'testAddNotIndexed', $parentField => null));
 		$result = $this->Tree->find('first', array('fields' => array('name', $parentField), 'order' => $modelClass . '.' . $leftField . ' desc'));
 		$expected = array($modelClass => array('name' => 'testAddNotIndexed', $parentField => null));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 }
 
 /**
@@ -382,9 +382,9 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$expects = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 5)),
 			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 6, $rightField => 11)),
 			array($modelClass => array('id' => 3, 'name' => '1.1.1', $parentField => 1, $leftField => 12, $rightField => 13)));
-		$this->assertEqual($direct, $expects);
+		$this->assertEquals($direct, $expects);
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -410,7 +410,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$expected = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 5)),
 			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 6, $rightField => 11)),
 			array($modelClass => array('id' => 3, 'name' => '1.1.1', $parentField => 1, $leftField => 12, $rightField => 13)));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 		$this->assertTrue($this->Tree->verify());
 	}
 
@@ -428,8 +428,8 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->save(array($modelClass => array('name' => 'testAddOrphan', $parentField => null)));
 		$result = $this->Tree->findByName('testAddOrphan', array('name', $parentField, $leftField, $rightField));
 		$expected = array('name' => 'testAddOrphan', $parentField => null, $leftField => '15', $rightField => 16);
-		$this->assertEqual($result[$modelClass], $expected);
-		$this->assertIdentical($this->Tree->verify(), true);
+		$this->assertEquals($result[$modelClass], $expected);
+		$this->assertSame($this->Tree->verify(), true);
 	}
 
 /**
@@ -454,10 +454,10 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$expects = array(array($modelClass => array('name' => '1.1.1')),
 			array($modelClass => array('name' => '1.1.2')),
 			array($modelClass => array('name' => '1.2')));
-		$this->assertEqual($result, $expects);
+		$this->assertEquals($result, $expects);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -482,10 +482,10 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$expects = array(array($modelClass => array('name' => '1.2.1')),
 			array($modelClass => array('name' => '1.2.2')),
 			array($modelClass => array('name' => '1.1')));
-		$this->assertEqual($result, $expects);
+		$this->assertEquals($result, $expects);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -514,11 +514,11 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$results = $this->Tree->find('all');
 		$after = $this->Tree->read(null, $data[$modelClass]['id']);
 
-		$this->assertEqual($results, $expects);
-		$this->assertEqual($before, $after);
+		$this->assertEquals($results, $expects);
+		$this->assertEquals($before, $after);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -539,12 +539,12 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->id = $data[$modelClass]['id'];
 		$this->Tree->saveField($parentField, 999999);
 
-		//$this->assertIdentical($saveSuccess, false);
+		//$this->assertSame($saveSuccess, false);
 		$laterCount = $this->Tree->find('count');
-		$this->assertIdentical($initialCount, $laterCount);
+		$this->assertSame($initialCount, $laterCount);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -565,12 +565,12 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->id = $data[$modelClass]['id'];
 		$saveSuccess = $this->Tree->saveField($parentField, $this->Tree->id);
 
-		$this->assertIdentical($saveSuccess, false);
+		$this->assertSame($saveSuccess, false);
 		$laterCount = $this->Tree->find('count');
-		$this->assertIdentical($initialCount, $laterCount);
+		$this->assertSame($initialCount, $laterCount);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -591,7 +591,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$result = $this->Tree->children(null, true, array('name'));
 		$expected = array(array($modelClass => array('name' => '1.2', )),
 			array($modelClass => array('name' => '1.1', )));
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 /**
@@ -613,7 +613,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$result = $this->Tree->children(null, true, array('name'));
 		$expected = array(array($modelClass => array('name' => '1.1', )),
 			array($modelClass => array('name' => '1.2', )));
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 /**
@@ -643,7 +643,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.8', )),
 			array($modelClass => array('name' => '1.9', )),
 			array($modelClass => array('name' => '1.10', )));
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 /**
@@ -673,7 +673,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.8', )),
 			array($modelClass => array('name' => '1.9', )),
 			array($modelClass => array('name' => '1.10', )));
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 /**
@@ -694,7 +694,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$result = $this->Tree->children(null, true, array('name'));
 		$expected = array(array($modelClass => array('name' => '1.2', )),
 			array($modelClass => array('name' => '1.1', )));
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 /**
@@ -715,7 +715,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$result = $this->Tree->children(null, true, array('name'));
 		$expected = array(array($modelClass => array('name' => '1.1', )),
 			array($modelClass => array('name' => '1.2', )));
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 /**
@@ -745,7 +745,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.9', )),
 			array($modelClass => array('name' => '1.10', )),
 			array($modelClass => array('name' => '1.5', )));
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 /**
@@ -775,7 +775,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.8', )),
 			array($modelClass => array('name' => '1.9', )),
 			array($modelClass => array('name' => '1.10', )));
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 /**
@@ -805,7 +805,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.8', )),
 			array($modelClass => array('name' => '1.9', )),
 			array($modelClass => array('name' => '1.10', )));
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 /**
@@ -822,14 +822,14 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->save(array($parentField => null));
 
 		$result = $this->Tree->verify();
-		$this->assertIdentical($result, true);
+		$this->assertSame($result, true);
 
 		$this->Tree->moveUp();
 
 		$result = $this->Tree->find('all', array('fields' => 'name', 'order' => $modelClass . '.' . $leftField . ' ASC'));
 		$expected = array(array($modelClass => array('name' => '1.1')),
 			array($modelClass => array('name' => '1. Root')));
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 /**
@@ -846,25 +846,25 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$result = $this->Tree->findByName('1.1.1');
 
 		$return = $this->Tree->delete($result[$modelClass]['id']);
-		$this->assertEqual($return, true);
+		$this->assertEquals($return, true);
 
 		$laterCount = $this->Tree->find('count');
-		$this->assertEqual($initialCount - 1, $laterCount);
+		$this->assertEquals($initialCount - 1, $laterCount);
 
 		$validTree= $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 
 		$initialCount = $this->Tree->find('count');
 		$result= $this->Tree->findByName('1.1');
 
 		$return = $this->Tree->delete($result[$modelClass]['id']);
-		$this->assertEqual($return, true);
+		$this->assertEquals($return, true);
 
 		$laterCount = $this->Tree->find('count');
-		$this->assertEqual($initialCount - 2, $laterCount);
+		$this->assertEquals($initialCount - 2, $laterCount);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -882,21 +882,21 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->removeFromTree($result[$modelClass]['id']);
 
 		$laterCount = $this->Tree->find('count');
-		$this->assertEqual($initialCount, $laterCount);
+		$this->assertEquals($initialCount, $laterCount);
 
 		$children = $this->Tree->children($result[$modelClass][$parentField], true, array('name'));
 		$expects = array(array($modelClass => array('name' => '1.1.1')),
 			array($modelClass => array('name' => '1.1.2')),
 			array($modelClass => array('name' => '1.2')));
-		$this->assertEqual($children, $expects);
+		$this->assertEquals($children, $expects);
 
 		$topNodes = $this->Tree->children(false, true,array('name'));
 		$expects = array(array($modelClass => array('name' => '1. Root')),
 			array($modelClass => array('name' => '1.1')));
-		$this->assertEqual($topNodes, $expects);
+		$this->assertEquals($topNodes, $expects);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -918,18 +918,18 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$laterCount = $this->Tree->find('count');
 		$laterTopNodes = $this->Tree->childCount(false);
 
-		$this->assertEqual($initialCount, $laterCount);
-		$this->assertEqual($initialTopNodes, $laterTopNodes);
+		$this->assertEquals($initialCount, $laterCount);
+		$this->assertEquals($initialTopNodes, $laterTopNodes);
 
 		$topNodes = $this->Tree->children(false, true,array('name'));
 		$expects = array(array($modelClass => array('name' => '1.1')),
 			array($modelClass => array('name' => '1.2')),
 			array($modelClass => array('name' => '1. Root')));
 
-		$this->assertEqual($topNodes, $expects);
+		$this->assertEquals($topNodes, $expects);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -947,7 +947,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->removeFromTree($result[$modelClass]['id']);
 
 		$laterCount = $this->Tree->find('count');
-		$this->assertEqual($initialCount, $laterCount);
+		$this->assertEquals($initialCount, $laterCount);
 
 		$nodes = $this->Tree->find('list', array('order' => $leftField));
 		$expects = array(
@@ -960,10 +960,10 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 			3 => '1.1.1',
 		);
 
-		$this->assertEqual($nodes, $expects);
+		$this->assertEquals($nodes, $expects);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -982,20 +982,20 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->removeFromTree($result[$modelClass]['id'], true);
 
 		$laterCount = $this->Tree->find('count');
-		$this->assertEqual($initialCount-1, $laterCount);
+		$this->assertEquals($initialCount-1, $laterCount);
 
 		$children = $this->Tree->children($result[$modelClass][$parentField], true, array('name'), $leftField . ' asc');
 		$expects= array(array($modelClass => array('name' => '1.1.1')),
 			array($modelClass => array('name' => '1.1.2')),
 			array($modelClass => array('name' => '1.2')));
-		$this->assertEqual($children, $expects);
+		$this->assertEquals($children, $expects);
 
 		$topNodes = $this->Tree->children(false, true,array('name'));
 		$expects = array(array($modelClass => array('name' => '1. Root')));
-		$this->assertEqual($topNodes, $expects);
+		$this->assertEquals($topNodes, $expects);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -1013,7 +1013,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->removeFromTree($result[$modelClass]['id'], true);
 
 		$laterCount = $this->Tree->find('count');
-		$this->assertEqual($initialCount - 1, $laterCount);
+		$this->assertEquals($initialCount - 1, $laterCount);
 
 		$nodes = $this->Tree->find('list', array('order' => $leftField));
 		$expects = array(
@@ -1024,10 +1024,10 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 			6 => '1.2.1',
 			7 => '1.2.2',
 		);
-		$this->assertEqual($nodes, $expects);
+		$this->assertEquals($nodes, $expects);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -1046,7 +1046,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$direct = $this->Tree->children(null, true, array('id', 'name', $parentField, $leftField, $rightField));
 		$expects = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)),
 			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 8, $rightField => 13)));
-		$this->assertEqual($direct, $expects);
+		$this->assertEquals($direct, $expects);
 
 		$total = $this->Tree->children(null, null, array('id', 'name', $parentField, $leftField, $rightField));
 		$expects = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)),
@@ -1055,9 +1055,9 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 8, $rightField => 13)),
 			array($modelClass => array( 'id' => 6, 'name' => '1.2.1', $parentField => 5, $leftField => 9, $rightField => 10)),
 			array($modelClass => array('id' => 7, 'name' => '1.2.2', $parentField => 5, $leftField => 11, $rightField => 12)));
-		$this->assertEqual($total, $expects);
+		$this->assertEquals($total, $expects);
 
-		$this->assertEqual(array(), $this->Tree->children(10000));
+		$this->assertEquals(array(), $this->Tree->children(10000));
 	}
 
 /**
@@ -1074,15 +1074,15 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->id = $data[$modelClass]['id'];
 
 		$direct = $this->Tree->childCount(null, true);
-		$this->assertEqual($direct, 2);
+		$this->assertEquals($direct, 2);
 
 		$total = $this->Tree->childCount();
-		$this->assertEqual($total, 6);
+		$this->assertEquals($total, 6);
 
 		$this->Tree->read(null, $data[$modelClass]['id']);
 		$id = $this->Tree->field('id', array($modelClass . '.name' => '1.2'));
 		$total = $this->Tree->childCount($id);
-		$this->assertEqual($total, 2);
+		$this->assertEquals($total, 2);
 	}
 
 /**
@@ -1100,7 +1100,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 
 		$result = $this->Tree->getParentNode(null, array('name'));
 		$expects = array($modelClass => array('name' => '1.2'));
-		$this->assertIdentical($result, $expects);
+		$this->assertSame($result, $expects);
 	}
 
 /**
@@ -1120,7 +1120,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$expects = array(array($modelClass => array('name' => '1. Root')),
 			array($modelClass => array('name' => '1.2')),
 			array($modelClass => array('name' => '1.2.2')));
-		$this->assertIdentical($result, $expects);
+		$this->assertSame($result, $expects);
 	}
 
 /**
@@ -1141,7 +1141,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$direct = $this->Tree->children(null, true, array('id', 'name', $parentField, $leftField, $rightField));
 		$expects = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)),
 			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 8, $rightField => 13)));
-		$this->assertEqual($direct, $expects);
+		$this->assertEquals($direct, $expects);
 
 		$total = $this->Tree->children(null, null, array('id', 'name', $parentField, $leftField, $rightField));
 		$expects = array(
@@ -1152,7 +1152,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 			array($modelClass => array( 'id' => 6, 'name' => '1.2.1', $parentField => 5, $leftField => 9, $rightField => 10)),
 			array($modelClass => array('id' => 7, 'name' => '1.2.2', $parentField => 5, $leftField => 11, $rightField => 12))
 		);
-		$this->assertEqual($total, $expects);
+		$this->assertEquals($total, $expects);
 	}
 
 /**
@@ -1181,7 +1181,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 
 		$this->Tree->reorder();
 		$sortedNodes = $this->Tree->find('list', array('order' => $leftField));
-		$this->assertIdentical($nodes, $sortedNodes);
+		$this->assertSame($nodes, $sortedNodes);
 	}
 
 /**
@@ -1216,7 +1216,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 
 		$result = $this->Tree->generateTreeList();
 		$expected = array(1 => '1. Root', 2 => '_1.1', 3 => '__1.1.1', 4 => '__1.1.2', 5 => '_1.2', 6 => '__1.2.1', 7 => '__1.2.2');
-		$this->assertIdentical($expected, $result);
+		$this->assertSame($expected, $result);
 	}
 
 /**
@@ -1228,8 +1228,8 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
 		$this->Tree->initialize(3, 3);
-		$this->assertIdentical($this->Tree->childCount(2), $this->Tree->childCount(array('id' => 2)));
-		$this->assertIdentical($this->Tree->getParentNode(2), $this->Tree->getParentNode(array('id' => 2)));
-		$this->assertIdentical($this->Tree->getPath(4), $this->Tree->getPath(array('id' => 4)));
+		$this->assertSame($this->Tree->childCount(2), $this->Tree->childCount(array('id' => 2)));
+		$this->assertSame($this->Tree->getParentNode(2), $this->Tree->getParentNode(array('id' => 2)));
+		$this->assertSame($this->Tree->getPath(4), $this->Tree->getPath(array('id' => 4)));
 	}
 }

lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php

@@ -76,20 +76,20 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 			array('FlagTree' => array('id' => '4', 'name' => '1.1.2', 'parent_id' => '2', 'lft' => '5', 'rght' => '6', 'flag' => '0')),
 			array('FlagTree' => array('id' => '5', 'name' => '1.1.3', 'parent_id' => '2', 'lft' => '7', 'rght' => '8', 'flag' => '0'))
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->Tree->Behaviors->attach('Tree', array('scope' => 'FlagTree.flag = 1'));
-		$this->assertEqual($this->Tree->children(), array());
+		$this->assertEquals($this->Tree->children(), array());
 
 		$this->Tree->id = 1;
 		$this->Tree->Behaviors->attach('Tree', array('scope' => 'FlagTree.flag = 1'));
 
 		$result = $this->Tree->children();
 		$expected = array(array('FlagTree' => array('id' => '2', 'name' => '1.1', 'parent_id' => '1', 'lft' => '2', 'rght' => '9', 'flag' => '1')));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->assertTrue($this->Tree->delete());
-		$this->assertEqual($this->Tree->find('count'), 11);
+		$this->assertEquals($this->Tree->find('count'), 11);
 	}
 
 /**
@@ -112,20 +112,20 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 			array('FlagTree' => array('id' => '4', 'name' => '1.1.2', 'parent_id' => '2', 'lft' => '5', 'rght' => '6', 'flag' => '0')),
 			array('FlagTree' => array('id' => '5', 'name' => '1.1.3', 'parent_id' => '2', 'lft' => '7', 'rght' => '8', 'flag' => '0'))
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->Tree->Behaviors->attach('Tree', array('scope' => array('FlagTree.flag' => 1)));
-		$this->assertEqual($this->Tree->children(), array());
+		$this->assertEquals($this->Tree->children(), array());
 
 		$this->Tree->id = 1;
 		$this->Tree->Behaviors->attach('Tree', array('scope' => array('FlagTree.flag' => 1)));
 
 		$result = $this->Tree->children();
 		$expected = array(array('FlagTree' => array('id' => '2', 'name' => '1.1', 'parent_id' => '1', 'lft' => '2', 'rght' => '9', 'flag' => '1')));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->assertTrue($this->Tree->delete());
-		$this->assertEqual($this->Tree->find('count'), 11);
+		$this->assertEquals($this->Tree->find('count'), 11);
 	}
 
 /**
@@ -140,8 +140,8 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 
 		$this->Ad->id = 4;
 		$result = $this->Ad->children();
-		$this->assertEqual(Set::extract('/Ad/id', $result), array(6, 5));
-		$this->assertEqual(Set::extract('/Campaign/id', $result), array(2, 2));
+		$this->assertEquals(Set::extract('/Ad/id', $result), array(6, 5));
+		$this->assertEquals(Set::extract('/Campaign/id', $result), array(2, 2));
 	}
 
 /**
@@ -156,8 +156,8 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 
 		$this->Ad->id = 4;
 		$result = $this->Ad->children();
-		$this->assertEqual(Set::extract('/Ad/id', $result), array(5, 6));
-		$this->assertEqual(Set::extract('/Campaign/id', $result), array(2, 2));
+		$this->assertEquals(Set::extract('/Ad/id', $result), array(5, 6));
+		$this->assertEquals(Set::extract('/Campaign/id', $result), array(2, 2));
 	}
 
 /**
@@ -189,7 +189,7 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 			'flag' => 0,
 			'locale' => 'eng',
 		)));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		//update existing record, same locale
 		$this->Tree->create();
@@ -206,7 +206,7 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 			'flag' => 0,
 			'locale' => 'eng',
 		)));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		//update different locale, same record
 		$this->Tree->create();
@@ -231,7 +231,7 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 			'flag' => 0,
 			'locale' => 'deu',
 		)));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		//Save with bindTranslation
 		$this->Tree->locale = 'eng';
@@ -255,7 +255,7 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 			array('id' => 22, 'locale' => 'spa', 'model' => 'FlagTree', 'foreign_key' => 2, 'field' => 'name', 'content' => 'Nuevo leyenda')
 			),
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -311,6 +311,6 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 			'lft' => 1,
 			'rght' => 2
 		));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 }

lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php

@@ -77,9 +77,9 @@ class TreeBehaviorUuidTest extends CakeTestCase {
 		$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 5)),
 			array($modelClass => array('name' => '1.2', $leftField => 6, $rightField => 11)),
 			array($modelClass => array('name' => '1.1.1', $leftField => 12, $rightField => 13)));
-		$this->assertEqual($direct, $expects);
+		$this->assertEquals($direct, $expects);
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -105,7 +105,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
 		$expected = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 5)),
 			array($modelClass => array('name' => '1.2', $leftField => 6, $rightField => 11)),
 			array($modelClass => array('name' => '1.1.1', $leftField => 12, $rightField => 13)));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 		$this->assertTrue($this->Tree->verify());
 	}
 
@@ -124,7 +124,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
 		$this->Tree->removeFromTree($result[$modelClass]['id']);
 
 		$laterCount = $this->Tree->find('count');
-		$this->assertEqual($initialCount, $laterCount);
+		$this->assertEquals($initialCount, $laterCount);
 
 		$nodes = $this->Tree->find('list', array('order' => $leftField));
 		$expects = array(
@@ -137,10 +137,10 @@ class TreeBehaviorUuidTest extends CakeTestCase {
 			'1.1.1',
 		);
 
-		$this->assertEqual(array_values($nodes), $expects);
+		$this->assertEquals(array_values($nodes), $expects);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -158,7 +158,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
 		$this->Tree->removeFromTree($result[$modelClass]['id'], true);
 
 		$laterCount = $this->Tree->find('count');
-		$this->assertEqual($initialCount - 1, $laterCount);
+		$this->assertEquals($initialCount - 1, $laterCount);
 
 		$nodes = $this->Tree->find('list', array('order' => $leftField));
 		$expects = array(
@@ -169,10 +169,10 @@ class TreeBehaviorUuidTest extends CakeTestCase {
 			'1.2.1',
 			'1.2.2',
 		);
-		$this->assertEqual(array_values($nodes), $expects);
+		$this->assertEquals(array_values($nodes), $expects);
 
 		$validTree = $this->Tree->verify();
-		$this->assertIdentical($validTree, true);
+		$this->assertSame($validTree, true);
 	}
 
 /**
@@ -191,7 +191,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
 		$direct = $this->Tree->children(null, true, array('name', $leftField, $rightField));
 		$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
 			array($modelClass => array('name' => '1.2', $leftField => 8, $rightField => 13)));
-		$this->assertEqual($direct, $expects);
+		$this->assertEquals($direct, $expects);
 
 		$total = $this->Tree->children(null, null, array('name', $leftField, $rightField));
 		$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
@@ -200,7 +200,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.2', $leftField => 8, $rightField => 13)),
 			array($modelClass => array('name' => '1.2.1', $leftField => 9, $rightField => 10)),
 			array($modelClass => array('name' => '1.2.2', $leftField => 11, $rightField => 12)));
-		$this->assertEqual($total, $expects);
+		$this->assertEquals($total, $expects);
 	}
 
 /**
@@ -222,7 +222,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
 		$direct = $this->Tree->children(null, true, array('name', $leftField, $rightField));
 		$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
 			array($modelClass => array('name' => '1.2', $leftField => 8, $rightField => 13)));
-		$this->assertEqual($direct, $expects);
+		$this->assertEquals($direct, $expects);
 
 		$total = $this->Tree->children(null, null, array('name', $leftField, $rightField));
 		$expects = array(
@@ -233,7 +233,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
 			array($modelClass => array('name' => '1.2.1', $leftField => 9, $rightField => 10)),
 			array($modelClass => array('name' => '1.2.2', $leftField => 11, $rightField => 12))
 		);
-		$this->assertEqual($total, $expects);
+		$this->assertEquals($total, $expects);
 	}
 
 /**
@@ -250,6 +250,6 @@ class TreeBehaviorUuidTest extends CakeTestCase {
 
 		$result = $this->Tree->generateTreeList();
 		$expected = array('1. Root', '_1.1', '__1.1.1', '__1.1.2', '_1.2', '__1.2.1', '__1.2.2');
-		$this->assertIdentical(array_values($result), $expected);
+		$this->assertSame(array_values($result), $expected);
 	}
 }

lib/Cake/Test/Case/Model/BehaviorCollectionTest.php

@@ -426,10 +426,10 @@ class BehaviorCollectionTest extends CakeTestCase {
  */
 	public function testLoadAlias() {
 		$Apple = new Apple();
-		$this->assertIdentical($Apple->Behaviors->attached(), array());
+		$this->assertSame($Apple->Behaviors->attached(), array());
 
 		$Apple->Behaviors->load('Test', array('className' => 'TestAlias', 'somesetting' => true));
-		$this->assertIdentical($Apple->Behaviors->attached(), array('Test'));
+		$this->assertSame($Apple->Behaviors->attached(), array('Test'));
 		$this->assertInstanceOf('TestAliasBehavior', $Apple->Behaviors->Test);
 		$this->assertTrue($Apple->Behaviors->Test->settings['Apple']['somesetting']);
 
@@ -455,62 +455,62 @@ class BehaviorCollectionTest extends CakeTestCase {
  */
 	public function testBehaviorBinding() {
 		$Apple = new Apple();
-		$this->assertIdentical($Apple->Behaviors->attached(), array());
+		$this->assertSame($Apple->Behaviors->attached(), array());
 
 		$Apple->Behaviors->attach('Test', array('key' => 'value'));
-		$this->assertIdentical($Apple->Behaviors->attached(), array('Test'));
-		$this->assertEqual(strtolower(get_class($Apple->Behaviors->Test)), 'testbehavior');
+		$this->assertSame($Apple->Behaviors->attached(), array('Test'));
+		$this->assertEquals(strtolower(get_class($Apple->Behaviors->Test)), 'testbehavior');
 		$expected = array('beforeFind' => 'on', 'afterFind' => 'off', 'key' => 'value');
-		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $expected);
-		$this->assertEqual(array_keys($Apple->Behaviors->Test->settings), array('Apple'));
+		$this->assertEquals($Apple->Behaviors->Test->settings['Apple'], $expected);
+		$this->assertEquals(array_keys($Apple->Behaviors->Test->settings), array('Apple'));
 
-		$this->assertIdentical($Apple->Sample->Behaviors->attached(), array());
+		$this->assertSame($Apple->Sample->Behaviors->attached(), array());
 		$Apple->Sample->Behaviors->attach('Test', array('key2' => 'value2'));
-		$this->assertIdentical($Apple->Sample->Behaviors->attached(), array('Test'));
-		$this->assertEqual($Apple->Sample->Behaviors->Test->settings['Sample'], array('beforeFind' => 'on', 'afterFind' => 'off', 'key2' => 'value2'));
+		$this->assertSame($Apple->Sample->Behaviors->attached(), array('Test'));
+		$this->assertEquals($Apple->Sample->Behaviors->Test->settings['Sample'], array('beforeFind' => 'on', 'afterFind' => 'off', 'key2' => 'value2'));
 
-		$this->assertEqual(array_keys($Apple->Behaviors->Test->settings), array('Apple', 'Sample'));
-		$this->assertIdentical(
+		$this->assertEquals(array_keys($Apple->Behaviors->Test->settings), array('Apple', 'Sample'));
+		$this->assertSame(
 			$Apple->Sample->Behaviors->Test->settings,
 			$Apple->Behaviors->Test->settings
 		);
-		$this->assertNotIdentical($Apple->Behaviors->Test->settings['Apple'], $Apple->Sample->Behaviors->Test->settings['Sample']);
+		$this->assertNotSame($Apple->Behaviors->Test->settings['Apple'], $Apple->Sample->Behaviors->Test->settings['Sample']);
 
 		$Apple->Behaviors->attach('Test', array('key2' => 'value2', 'key3' => 'value3', 'beforeFind' => 'off'));
 		$Apple->Sample->Behaviors->attach('Test', array('key' => 'value', 'key3' => 'value3', 'beforeFind' => 'off'));
-		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], array('beforeFind' => 'off', 'afterFind' => 'off', 'key' => 'value', 'key2' => 'value2', 'key3' => 'value3'));
-		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $Apple->Sample->Behaviors->Test->settings['Sample']);
+		$this->assertEquals($Apple->Behaviors->Test->settings['Apple'], array('beforeFind' => 'off', 'afterFind' => 'off', 'key' => 'value', 'key2' => 'value2', 'key3' => 'value3'));
+		$this->assertEquals($Apple->Behaviors->Test->settings['Apple'], $Apple->Sample->Behaviors->Test->settings['Sample']);
 
 		$this->assertFalse(isset($Apple->Child->Behaviors->Test));
 		$Apple->Child->Behaviors->attach('Test', array('key' => 'value', 'key2' => 'value2', 'key3' => 'value3', 'beforeFind' => 'off'));
-		$this->assertEqual($Apple->Child->Behaviors->Test->settings['Child'], $Apple->Sample->Behaviors->Test->settings['Sample']);
+		$this->assertEquals($Apple->Child->Behaviors->Test->settings['Child'], $Apple->Sample->Behaviors->Test->settings['Sample']);
 
 		$this->assertFalse(isset($Apple->Parent->Behaviors->Test));
 		$Apple->Parent->Behaviors->attach('Test', array('key' => 'value', 'key2' => 'value2', 'key3' => 'value3', 'beforeFind' => 'off'));
-		$this->assertEqual($Apple->Parent->Behaviors->Test->settings['Parent'], $Apple->Sample->Behaviors->Test->settings['Sample']);
+		$this->assertEquals($Apple->Parent->Behaviors->Test->settings['Parent'], $Apple->Sample->Behaviors->Test->settings['Sample']);
 
 		$Apple->Parent->Behaviors->attach('Test', array('key' => 'value', 'key2' => 'value', 'key3' => 'value', 'beforeFind' => 'off'));
-		$this->assertNotEqual($Apple->Parent->Behaviors->Test->settings['Parent'], $Apple->Sample->Behaviors->Test->settings['Sample']);
+		$this->assertNotEquals($Apple->Parent->Behaviors->Test->settings['Parent'], $Apple->Sample->Behaviors->Test->settings['Sample']);
 
 		$Apple->Behaviors->attach('Plugin.Test', array('key' => 'new value'));
 		$expected = array(
 			'beforeFind' => 'off', 'afterFind' => 'off', 'key' => 'new value',
 			'key2' => 'value2', 'key3' => 'value3'
 		);
-		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $expected);
+		$this->assertEquals($Apple->Behaviors->Test->settings['Apple'], $expected);
 
 		$current = $Apple->Behaviors->Test->settings['Apple'];
 		$expected = array_merge($current, array('mangle' => 'trigger mangled'));
 		$Apple->Behaviors->attach('Test', array('mangle' => 'trigger'));
-		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $expected);
+		$this->assertEquals($Apple->Behaviors->Test->settings['Apple'], $expected);
 
 		$Apple->Behaviors->attach('Test');
 		$expected = array_merge($current, array('mangle' => 'trigger mangled mangled'));
 
-		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $expected);
+		$this->assertEquals($Apple->Behaviors->Test->settings['Apple'], $expected);
 		$Apple->Behaviors->attach('Test', array('mangle' => 'trigger'));
 		$expected = array_merge($current, array('mangle' => 'trigger mangled'));
-		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $expected);
+		$this->assertEquals($Apple->Behaviors->Test->settings['Apple'], $expected);
 	}
 
 /**
@@ -522,17 +522,17 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$Apple = new Apple();
 		$Apple->Behaviors->attach('Plugin.Test');
 		$this->assertTrue(isset($Apple->Behaviors->Test), 'Missing behavior');
-		$this->assertEqual($Apple->Behaviors->attached(), array('Test'));
+		$this->assertEquals($Apple->Behaviors->attached(), array('Test'));
 
 		$Apple->Behaviors->detach('Plugin.Test');
-		$this->assertEqual($Apple->Behaviors->attached(), array());
+		$this->assertEquals($Apple->Behaviors->attached(), array());
 
 		$Apple->Behaviors->attach('Plugin.Test');
 		$this->assertTrue(isset($Apple->Behaviors->Test), 'Missing behavior');
-		$this->assertEqual($Apple->Behaviors->attached(), array('Test'));
+		$this->assertEquals($Apple->Behaviors->attached(), array('Test'));
 
 		$Apple->Behaviors->detach('Test');
-		$this->assertEqual($Apple->Behaviors->attached(), array());
+		$this->assertEquals($Apple->Behaviors->attached(), array());
 	}
 
 /**
@@ -554,31 +554,31 @@ class BehaviorCollectionTest extends CakeTestCase {
 	public function testBehaviorToggling() {
 		$Apple = new Apple();
 		$expected = $Apple->find('all');
-		$this->assertIdentical($Apple->Behaviors->enabled(), array());
+		$this->assertSame($Apple->Behaviors->enabled(), array());
 
 		$Apple->Behaviors->init('Apple', array('Test' => array('key' => 'value')));
-		$this->assertIdentical($Apple->Behaviors->enabled(), array('Test'));
+		$this->assertSame($Apple->Behaviors->enabled(), array('Test'));
 
 		$Apple->Behaviors->disable('Test');
-		$this->assertIdentical($Apple->Behaviors->attached(), array('Test'));
-		$this->assertIdentical($Apple->Behaviors->enabled(), array());
+		$this->assertSame($Apple->Behaviors->attached(), array('Test'));
+		$this->assertSame($Apple->Behaviors->enabled(), array());
 
 		$Apple->Sample->Behaviors->attach('Test');
-		$this->assertIdentical($Apple->Sample->Behaviors->enabled('Test'), true);
-		$this->assertIdentical($Apple->Behaviors->enabled(), array());
+		$this->assertSame($Apple->Sample->Behaviors->enabled('Test'), true);
+		$this->assertSame($Apple->Behaviors->enabled(), array());
 
 		$Apple->Behaviors->enable('Test');
-		$this->assertIdentical($Apple->Behaviors->attached('Test'), true);
-		$this->assertIdentical($Apple->Behaviors->enabled(), array('Test'));
+		$this->assertSame($Apple->Behaviors->attached('Test'), true);
+		$this->assertSame($Apple->Behaviors->enabled(), array('Test'));
 
 		$Apple->Behaviors->disable('Test');
-		$this->assertIdentical($Apple->Behaviors->enabled(), array());
+		$this->assertSame($Apple->Behaviors->enabled(), array());
 		$Apple->Behaviors->attach('Test', array('enabled' => true));
-		$this->assertIdentical($Apple->Behaviors->enabled(), array('Test'));
+		$this->assertSame($Apple->Behaviors->enabled(), array('Test'));
 		$Apple->Behaviors->attach('Test', array('enabled' => false));
-		$this->assertIdentical($Apple->Behaviors->enabled(), array());
+		$this->assertSame($Apple->Behaviors->enabled(), array());
 		$Apple->Behaviors->detach('Test');
-		$this->assertIdentical($Apple->Behaviors->enabled(), array());
+		$this->assertSame($Apple->Behaviors->enabled(), array());
 	}
 
 /**
@@ -593,13 +593,13 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$expected = $Apple->find('all');
 
 		$Apple->Behaviors->attach('Test');
-		$this->assertIdentical($Apple->find('all'), null);
+		$this->assertSame($Apple->find('all'), null);
 
 		$Apple->Behaviors->attach('Test', array('beforeFind' => 'off'));
-		$this->assertIdentical($Apple->find('all'), $expected);
+		$this->assertSame($Apple->find('all'), $expected);
 
 		$Apple->Behaviors->attach('Test', array('beforeFind' => 'test'));
-		$this->assertIdentical($Apple->find('all'), $expected);
+		$this->assertSame($Apple->find('all'), $expected);
 
 		$Apple->Behaviors->attach('Test', array('beforeFind' => 'modify'));
 		$expected2 = array(
@@ -608,23 +608,23 @@ class BehaviorCollectionTest extends CakeTestCase {
 			array('Apple' => array('id' => '3', 'name' => 'green blue', 'mytime' => '22:57:17'))
 		);
 		$result = $Apple->find('all', array('conditions' => array('Apple.id <' => '4')));
-		$this->assertEqual($expected2, $result);
+		$this->assertEquals($expected2, $result);
 
 		$Apple->Behaviors->disable('Test');
 		$result = $Apple->find('all');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$Apple->Behaviors->attach('Test', array('beforeFind' => 'off', 'afterFind' => 'on'));
-		$this->assertIdentical($Apple->find('all'), array());
+		$this->assertSame($Apple->find('all'), array());
 
 		$Apple->Behaviors->attach('Test', array('afterFind' => 'off'));
-		$this->assertEqual($Apple->find('all'), $expected);
+		$this->assertEquals($Apple->find('all'), $expected);
 
 		$Apple->Behaviors->attach('Test', array('afterFind' => 'test'));
-		$this->assertEqual($Apple->find('all'), $expected);
+		$this->assertEquals($Apple->find('all'), $expected);
 
 		$Apple->Behaviors->attach('Test', array('afterFind' => 'test2'));
-		$this->assertEqual($Apple->find('all'), $expected);
+		$this->assertEquals($Apple->find('all'), $expected);
 
 		$Apple->Behaviors->attach('Test', array('afterFind' => 'modify'));
 		$expected = array(
@@ -636,7 +636,7 @@ class BehaviorCollectionTest extends CakeTestCase {
 			array('id' => '6', 'apple_id' => '4', 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
 			array('id' => '7', 'apple_id' => '6', 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17')
 		);
-		$this->assertEqual($Apple->find('all'), $expected);
+		$this->assertEquals($Apple->find('all'), $expected);
 	}
 
 /**
@@ -653,13 +653,13 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$wellBehaved = $Apple->find('all');
 		$Apple->Child->Behaviors->attach('Test', array('afterFind' => 'modify'));
 		$Apple->unbindModel(array('hasMany' => array('Child')));
-		$this->assertIdentical($Apple->find('all'), $wellBehaved);
+		$this->assertSame($Apple->find('all'), $wellBehaved);
 
 		$Apple->Child->Behaviors->attach('Test', array('before' => 'off'));
-		$this->assertIdentical($Apple->find('all'), $expected);
+		$this->assertSame($Apple->find('all'), $expected);
 
 		$Apple->Child->Behaviors->attach('Test', array('before' => 'test'));
-		$this->assertIdentical($Apple->find('all'), $expected);
+		$this->assertSame($Apple->find('all'), $expected);
 
 		$expected2 = array(
 			array(
@@ -679,23 +679,23 @@ class BehaviorCollectionTest extends CakeTestCase {
 
 		$Apple->Child->Behaviors->attach('Test', array('before' => 'modify'));
 		$result = $Apple->find('all', array('fields' => array('Apple.id'), 'conditions' => array('Apple.id <' => '4')));
-		//$this->assertEqual($expected, $result2);
+		//$this->assertEquals($expected, $result2);
 
 		$Apple->Child->Behaviors->disable('Test');
 		$result = $Apple->find('all');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$Apple->Child->Behaviors->attach('Test', array('before' => 'off', 'after' => 'on'));
-		//$this->assertIdentical($Apple->find('all'), array());
+		//$this->assertSame($Apple->find('all'), array());
 
 		$Apple->Child->Behaviors->attach('Test', array('after' => 'off'));
-		$this->assertEqual($Apple->find('all'), $expected);
+		$this->assertEquals($Apple->find('all'), $expected);
 
 		$Apple->Child->Behaviors->attach('Test', array('after' => 'test'));
-		$this->assertEqual($Apple->find('all'), $expected);
+		$this->assertEquals($Apple->find('all'), $expected);
 
 		$Apple->Child->Behaviors->attach('Test', array('after' => 'test2'));
-		$this->assertEqual($Apple->find('all'), $expected);
+		$this->assertEquals($Apple->find('all'), $expected);
 
 		$Apple->Child->Behaviors->attach('Test', array('after' => 'modify'));
 		$expected = array(
@@ -707,7 +707,7 @@ class BehaviorCollectionTest extends CakeTestCase {
 			array('id' => '6', 'apple_id' => '4', 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
 			array('id' => '7', 'apple_id' => '6', 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17')
 		);
-		//$this->assertEqual($Apple->find('all'), $expected);
+		//$this->assertEquals($Apple->find('all'), $expected);
 
 	}
 	/**
@@ -724,13 +724,13 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$wellBehaved = $Apple->find('all');
 		$Apple->Sample->Behaviors->attach('Test');
 		$Apple->unbindModel(array('hasOne' => array('Sample')));
-		$this->assertIdentical($Apple->find('all'), $wellBehaved);
+		$this->assertSame($Apple->find('all'), $wellBehaved);
 
 		$Apple->Sample->Behaviors->attach('Test', array('before' => 'off'));
-		$this->assertIdentical($Apple->find('all'), $expected);
+		$this->assertSame($Apple->find('all'), $expected);
 
 		$Apple->Sample->Behaviors->attach('Test', array('before' => 'test'));
-		$this->assertIdentical($Apple->find('all'), $expected);
+		$this->assertSame($Apple->find('all'), $expected);
 
 		$Apple->Sample->Behaviors->attach('Test', array('before' => 'modify'));
 		$expected2 = array(
@@ -749,23 +749,23 @@ class BehaviorCollectionTest extends CakeTestCase {
 				'Child' => array())
 		);
 		$result = $Apple->find('all', array('fields' => array('Apple.id'), 'conditions' => array('Apple.id <' => '4')));
-		//$this->assertEqual($expected, $result2);
+		//$this->assertEquals($expected, $result2);
 
 		$Apple->Sample->Behaviors->disable('Test');
 		$result = $Apple->find('all');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$Apple->Sample->Behaviors->attach('Test', array('before' => 'off', 'after' => 'on'));
-		//$this->assertIdentical($Apple->find('all'), array());
+		//$this->assertSame($Apple->find('all'), array());
 
 		$Apple->Sample->Behaviors->attach('Test', array('after' => 'off'));
-		$this->assertEqual($Apple->find('all'), $expected);
+		$this->assertEquals($Apple->find('all'), $expected);
 
 		$Apple->Sample->Behaviors->attach('Test', array('after' => 'test'));
-		$this->assertEqual($Apple->find('all'), $expected);
+		$this->assertEquals($Apple->find('all'), $expected);
 
 		$Apple->Sample->Behaviors->attach('Test', array('after' => 'test2'));
-		$this->assertEqual($Apple->find('all'), $expected);
+		$this->assertEquals($Apple->find('all'), $expected);
 
 		$Apple->Sample->Behaviors->attach('Test', array('after' => 'modify'));
 		$expected = array(
@@ -777,7 +777,7 @@ class BehaviorCollectionTest extends CakeTestCase {
 			array('id' => '6', 'apple_id' => '4', 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
 			array('id' => '7', 'apple_id' => '6', 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17')
 		);
-		//$this->assertEqual($Apple->find('all'), $expected);
+		//$this->assertEquals($Apple->find('all'), $expected);
 	}
 	/**
  * testBehaviorBelongsToFindCallbacks method
@@ -795,13 +795,13 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$wellBehaved = $Apple->find('all');
 		$Apple->Parent->Behaviors->attach('Test');
 		$Apple->unbindModel(array('belongsTo' => array('Parent')));
-		$this->assertIdentical($Apple->find('all'), $wellBehaved);
+		$this->assertSame($Apple->find('all'), $wellBehaved);
 
 		$Apple->Parent->Behaviors->attach('Test', array('before' => 'off'));
-		$this->assertIdentical($Apple->find('all'), $expected);
+		$this->assertSame($Apple->find('all'), $expected);
 
 		$Apple->Parent->Behaviors->attach('Test', array('before' => 'test'));
-		$this->assertIdentical($Apple->find('all'), $expected);
+		$this->assertSame($Apple->find('all'), $expected);
 
 		$Apple->Parent->Behaviors->attach('Test', array('before' => 'modify'));
 		$expected2 = array(
@@ -819,20 +819,20 @@ class BehaviorCollectionTest extends CakeTestCase {
 			'fields' => array('Apple.id', 'Parent.id', 'Parent.name', 'Parent.mytime'),
 			'conditions' => array('Apple.id <' => '4')
 		));
-		$this->assertEqual($expected2, $result2);
+		$this->assertEquals($expected2, $result2);
 
 		$Apple->Parent->Behaviors->disable('Test');
 		$result = $Apple->find('all');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$Apple->Parent->Behaviors->attach('Test', array('after' => 'off'));
-		$this->assertEqual($Apple->find('all'), $expected);
+		$this->assertEquals($Apple->find('all'), $expected);
 
 		$Apple->Parent->Behaviors->attach('Test', array('after' => 'test'));
-		$this->assertEqual($Apple->find('all'), $expected);
+		$this->assertEquals($Apple->find('all'), $expected);
 
 		$Apple->Parent->Behaviors->attach('Test', array('after' => 'test2'));
-		$this->assertEqual($Apple->find('all'), $expected);
+		$this->assertEquals($Apple->find('all'), $expected);
 
 		$Apple->Parent->Behaviors->attach('Test', array('after' => 'modify'));
 		$expected = array(
@@ -844,7 +844,7 @@ class BehaviorCollectionTest extends CakeTestCase {
 			array('id' => '6', 'apple_id' => '4', 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
 			array('id' => '7', 'apple_id' => '6', 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17')
 		);
-		//$this->assertEqual($Apple->find('all'), $expected);
+		//$this->assertEquals($Apple->find('all'), $expected);
 	}
 
 /**
@@ -858,59 +858,59 @@ class BehaviorCollectionTest extends CakeTestCase {
 
 		$Sample->Behaviors->attach('Test', array('beforeSave' => 'on'));
 		$Sample->create();
-		$this->assertIdentical($Sample->save($record), false);
+		$this->assertSame($Sample->save($record), false);
 
 		$Sample->Behaviors->attach('Test', array('beforeSave' => 'off'));
 		$Sample->create();
 		$result = $Sample->save($record);
 		$expected = $record;
 		$expected['Sample']['id'] = $Sample->id;
-		$this->assertIdentical($result, $expected);
+		$this->assertSame($result, $expected);
 
 		$Sample->Behaviors->attach('Test', array('beforeSave' => 'test'));
 		$Sample->create();
 		$result = $Sample->save($record);
 		$expected = $record;
 		$expected['Sample']['id'] = $Sample->id;
-		$this->assertIdentical($result, $expected);
+		$this->assertSame($result, $expected);
 
 		$Sample->Behaviors->attach('Test', array('beforeSave' => 'modify'));
 		$expected = Set::insert($record, 'Sample.name', 'sample99 modified before');
 		$Sample->create();
 		$result = $Sample->save($record);
 		$expected['Sample']['id'] = $Sample->id;
-		$this->assertIdentical($result, $expected);
+		$this->assertSame($result, $expected);
 
 		$Sample->Behaviors->disable('Test');
-		$this->assertIdentical($Sample->save($record), $record);
+		$this->assertSame($Sample->save($record), $record);
 
 		$Sample->Behaviors->attach('Test', array('beforeSave' => 'off', 'afterSave' => 'on'));
 		$expected = Set::merge($record, array('Sample' => array('aftersave' => 'modified after on create')));
 		$Sample->create();
 		$result = $Sample->save($record);
 		$expected['Sample']['id'] = $Sample->id;
-		$this->assertEqual($result, $expected);
+		$this->assertEquals($result, $expected);
 
 		$Sample->Behaviors->attach('Test', array('beforeSave' => 'modify', 'afterSave' => 'modify'));
 		$expected = Set::merge($record, array('Sample' => array('name' => 'sample99 modified before modified after on create')));
 		$Sample->create();
 		$result = $Sample->save($record);
 		$expected['Sample']['id'] = $Sample->id;
-		$this->assertIdentical($result, $expected);
+		$this->assertSame($result, $expected);
 
 		$Sample->Behaviors->attach('Test', array('beforeSave' => 'off', 'afterSave' => 'test'));
 		$Sample->create();
 		$expected = $record;
 		$result = $Sample->save($record);
 		$expected['Sample']['id'] = $Sample->id;
-		$this->assertIdentical($result, $expected);
+		$this->assertSame($result, $expected);
 
 		$Sample->Behaviors->attach('Test', array('afterSave' => 'test2'));
 		$Sample->create();
 		$expected = $record;
 		$result = $Sample->save($record);
 		$expected['Sample']['id'] = $Sample->id;
-		$this->assertIdentical($result, $expected);
+		$this->assertSame($result, $expected);
 
 		$Sample->Behaviors->attach('Test', array('beforeFind' => 'off', 'afterFind' => 'off'));
 		$Sample->recursive = -1;
@@ -919,12 +919,12 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$Sample->Behaviors->attach('Test', array('afterSave' => 'on'));
 		$expected = Set::merge($record2, array('Sample' => array('aftersave' => 'modified after')));
 		$Sample->create();
-		$this->assertIdentical($Sample->save($record2), $expected);
+		$this->assertSame($Sample->save($record2), $expected);
 
 		$Sample->Behaviors->attach('Test', array('afterSave' => 'modify'));
 		$expected = Set::merge($record2, array('Sample' => array('name' => 'sample1 modified after')));
 		$Sample->create();
-		$this->assertIdentical($Sample->save($record2), $expected);
+		$this->assertSame($Sample->save($record2), $expected);
 	}
 
 /**
@@ -936,29 +936,29 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$Apple = new Apple();
 
 		$Apple->Behaviors->attach('Test', array('beforeFind' => 'off', 'beforeDelete' => 'off'));
-		$this->assertIdentical($Apple->delete(6), true);
+		$this->assertSame($Apple->delete(6), true);
 
 		$Apple->Behaviors->attach('Test', array('beforeDelete' => 'on'));
-		$this->assertIdentical($Apple->delete(4), false);
+		$this->assertSame($Apple->delete(4), false);
 
 		$Apple->Behaviors->attach('Test', array('beforeDelete' => 'test2'));
 
 		ob_start();
 		$results = $Apple->delete(4);
-		$this->assertIdentical(trim(ob_get_clean()), 'beforeDelete success (cascading)');
-		$this->assertIdentical($results, true);
+		$this->assertSame(trim(ob_get_clean()), 'beforeDelete success (cascading)');
+		$this->assertSame($results, true);
 
 		ob_start();
 		$results = $Apple->delete(3, false);
-		$this->assertIdentical(trim(ob_get_clean()), 'beforeDelete success');
-		$this->assertIdentical($results, true);
+		$this->assertSame(trim(ob_get_clean()), 'beforeDelete success');
+		$this->assertSame($results, true);
 
 
 		$Apple->Behaviors->attach('Test', array('beforeDelete' => 'off', 'afterDelete' => 'on'));
 		ob_start();
 		$results = $Apple->delete(2, false);
-		$this->assertIdentical(trim(ob_get_clean()), 'afterDelete success');
-		$this->assertIdentical($results, true);
+		$this->assertSame(trim(ob_get_clean()), 'afterDelete success');
+		$this->assertSame($results, true);
 	}
 
 /**
@@ -972,7 +972,7 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$Apple->Behaviors->attach('Test', array('beforeFind' => 'off', 'onError' => 'on'));
 		ob_start();
 		$Apple->Behaviors->Test->onError($Apple, '');
-		$this->assertIdentical(trim(ob_get_clean()), 'onError trigger success');
+		$this->assertSame(trim(ob_get_clean()), 'onError trigger success');
 	}
 
 /**
@@ -984,23 +984,23 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$Apple = new Apple();
 
 		$Apple->Behaviors->attach('Test');
-		$this->assertIdentical($Apple->validates(), true);
+		$this->assertSame($Apple->validates(), true);
 
 		$Apple->Behaviors->attach('Test', array('validate' => 'on'));
-		$this->assertIdentical($Apple->validates(), false);
-		$this->assertIdentical($Apple->validationErrors, array('name' => array(true)));
+		$this->assertSame($Apple->validates(), false);
+		$this->assertSame($Apple->validationErrors, array('name' => array(true)));
 
 		$Apple->Behaviors->attach('Test', array('validate' => 'stop'));
-		$this->assertIdentical($Apple->validates(), false);
-		$this->assertIdentical($Apple->validationErrors, array('name' => array(true, true)));
+		$this->assertSame($Apple->validates(), false);
+		$this->assertSame($Apple->validationErrors, array('name' => array(true, true)));
 
 		$Apple->Behaviors->attach('Test', array('validate' => 'whitelist'));
 		$Apple->validates();
-		$this->assertIdentical($Apple->whitelist, array());
+		$this->assertSame($Apple->whitelist, array());
 
 		$Apple->whitelist = array('unknown');
 		$Apple->validates();
-		$this->assertIdentical($Apple->whitelist, array('unknown', 'name'));
+		$this->assertSame($Apple->whitelist, array('unknown', 'name'));
 	}
 
 /**
@@ -1014,7 +1014,7 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$Apple->validate['color'] = 'validateField';
 
 		$result = $Apple->save(array('name' => 'Genetically Modified Apple', 'color' => 'Orange'));
-		$this->assertEqual(array_keys($result['Apple']), array('name', 'color', 'modified', 'created', 'id'));
+		$this->assertEquals(array_keys($result['Apple']), array('name', 'color', 'modified', 'created', 'id'));
 
 		$Apple->create();
 		$result = $Apple->save(array('name' => 'Regular Apple', 'color' => 'Red'));
@@ -1031,19 +1031,19 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$Apple->Behaviors->attach('Test');
 
 		$expected = 'working';
-		$this->assertEqual($Apple->testMethod(), $expected);
-		$this->assertEqual($Apple->Behaviors->dispatchMethod($Apple, 'testMethod'), $expected);
+		$this->assertEquals($Apple->testMethod(), $expected);
+		$this->assertEquals($Apple->Behaviors->dispatchMethod($Apple, 'testMethod'), $expected);
 
 		$result = $Apple->Behaviors->dispatchMethod($Apple, 'wtf');
-		$this->assertEqual($result, array('unhandled'));
+		$this->assertEquals($result, array('unhandled'));
 
 		$result = $Apple->{'look for the remote'}('in the couch');
 		$expected = "Item.name = 'the remote' AND Location.name = 'the couch'";
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $Apple->{'look for THE REMOTE'}('in the couch');
 		$expected = "Item.name = 'THE REMOTE' AND Location.name = 'the couch'";
-		$this->assertEqual($expected, $result, 'Mapped method was lowercased.');
+		$this->assertEquals($expected, $result, 'Mapped method was lowercased.');
 	}
 
 /**

lib/Cake/Test/Case/Model/CakeSchemaTest.php

@@ -505,11 +505,11 @@ class CakeSchemaTest extends CakeTestCase {
  */
 	public function testSchemaName() {
 		$Schema = new CakeSchema();
-		$this->assertEqual(strtolower($Schema->name), strtolower(APP_DIR));
+		$this->assertEquals(strtolower($Schema->name), strtolower(APP_DIR));
 
 		Configure::write('App.dir', 'Some.name.with.dots');
 		$Schema = new CakeSchema();
-		$this->assertEqual($Schema->name, 'SomeNameWithDots');
+		$this->assertEquals($Schema->name, 'SomeNameWithDots');
 
 		Configure::write('App.dir', 'app');
 	}
@@ -532,22 +532,22 @@ class CakeSchemaTest extends CakeTestCase {
 			$this->assertTrue(isset($read['tables'][$table]), 'Missing table ' . $table);
 		}
 		foreach ($this->Schema->tables as $table => $fields) {
-			$this->assertEqual(array_keys($fields), array_keys($read['tables'][$table]));
+			$this->assertEquals(array_keys($fields), array_keys($read['tables'][$table]));
 		}
 
 		if (isset($read['tables']['datatypes']['float_field']['length'])) {
-			$this->assertEqual(
+			$this->assertEquals(
 				$read['tables']['datatypes']['float_field']['length'],
 				$this->Schema->tables['datatypes']['float_field']['length']
 			);
 		}
 
-		$this->assertEqual(
+		$this->assertEquals(
 			$read['tables']['datatypes']['float_field']['type'],
 			$this->Schema->tables['datatypes']['float_field']['type']
 		);
 
-		$this->assertEqual(
+		$this->assertEquals(
 			$read['tables']['datatypes']['float_field']['null'],
 			$this->Schema->tables['datatypes']['float_field']['null']
 		);
@@ -741,7 +741,7 @@ class CakeSchemaTest extends CakeTestCase {
 			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
 		);
 		$result = $this->Schema->generateTable('posts', $posts);
-		$this->assertPattern('/var \$posts/', $result);
+		$this->assertRegExp('/public \$posts/', $result);
 	}
 /**
  * testSchemaWrite method
@@ -751,11 +751,11 @@ class CakeSchemaTest extends CakeTestCase {
 	public function testSchemaWrite() {
 		$write = $this->Schema->write(array('name' => 'MyOtherApp', 'tables' => $this->Schema->tables, 'path' => TMP . 'tests'));
 		$file = file_get_contents(TMP . 'tests' . DS .'schema.php');
-		$this->assertEqual($write, $file);
+		$this->assertEquals($write, $file);
 
 		require_once( TMP . 'tests' . DS .'schema.php');
 		$OtherSchema = new MyOtherAppSchema();
-		$this->assertEqual($this->Schema->tables, $OtherSchema->tables);
+		$this->assertEquals($this->Schema->tables, $OtherSchema->tables);
 	}
 
 /**
@@ -794,9 +794,9 @@ class CakeSchemaTest extends CakeTestCase {
 				)
 			),
 		);
-		$this->assertEqual($expected, $compare);
+		$this->assertEquals($expected, $compare);
 		$this->assertNull($New->getVar('comments'));
-		$this->assertEqual($New->getVar('_foo'), array('bar'));
+		$this->assertEquals($New->getVar('_foo'), array('bar'));
 
 		$tables = array(
 			'missing' => array(
@@ -835,7 +835,7 @@ class CakeSchemaTest extends CakeTestCase {
 				)
 			)
 		);
-		$this->assertEqual($expected, $compare);
+		$this->assertEquals($expected, $compare);
 	}
 
 /**
@@ -864,7 +864,7 @@ class CakeSchemaTest extends CakeTestCase {
 				)
 			)
 		);
-		$this->assertEqual($expected, $compare);
+		$this->assertEquals($expected, $compare);
 	}
 
 /**
@@ -965,8 +965,8 @@ class CakeSchemaTest extends CakeTestCase {
  */
 	public function testSchemaLoading() {
 		$Other = $this->Schema->load(array('name' => 'MyOtherApp', 'path' => TMP . 'tests'));
-		$this->assertEqual($Other->name, 'MyOtherApp');
-		$this->assertEqual($Other->tables, $this->Schema->tables);
+		$this->assertEquals($Other->name, 'MyOtherApp');
+		$this->assertEquals($Other->tables, $this->Schema->tables);
 	}
 
 /**
@@ -980,8 +980,8 @@ class CakeSchemaTest extends CakeTestCase {
 		));
 		CakePlugin::load('TestPlugin');
 		$Other = $this->Schema->load(array('name' => 'TestPluginApp', 'plugin' => 'TestPlugin'));
-		$this->assertEqual($Other->name, 'TestPluginApp');
-		$this->assertEqual(array_keys($Other->tables), array('test_plugin_acos'));
+		$this->assertEquals($Other->name, 'TestPluginApp');
+		$this->assertEquals(array_keys($Other->tables), array('test_plugin_acos'));
 
 		App::build();
 	}
@@ -1008,11 +1008,11 @@ class CakeSchemaTest extends CakeTestCase {
 		$col = $Schema->tables['testdescribes']['int_null'];
 		$col['name'] = 'int_null';
 		$column = $this->db->buildColumn($col);
-		$this->assertPattern('/' . preg_quote($column, '/') . '/', $sql);
+		$this->assertRegExp('/' . preg_quote($column, '/') . '/', $sql);
 
 		$col = $Schema->tables['testdescribes']['int_not_null'];
 		$col['name'] = 'int_not_null';
 		$column = $this->db->buildColumn($col);
-		$this->assertPattern('/' . preg_quote($column, '/') . '/', $sql);
+		$this->assertRegExp('/' . preg_quote($column, '/') . '/', $sql);
 	}
 }

lib/Cake/Test/Case/Model/ConnectionManagerTest.php

@@ -96,8 +96,8 @@ class ConnectionManagerTest extends CakeTestCase {
 		$connection = ConnectionManager::create($name, $config);
 
 		$this->assertTrue(class_exists('TestSource'));
-		$this->assertEqual($connection->configKeyName, $name);
-		$this->assertEqual($connection->config, $config);
+		$this->assertEquals($connection->configKeyName, $name);
+		$this->assertEquals($connection->config, $config);
 
 		ConnectionManager::drop($name);
 	}
@@ -119,8 +119,8 @@ class ConnectionManagerTest extends CakeTestCase {
 
 		$this->assertTrue(class_exists('TestSource'));
 		$this->assertTrue(class_exists('TestDriver'));
-		$this->assertEqual($connection->configKeyName, $name);
-		$this->assertEqual($connection->config, $config);
+		$this->assertEquals($connection->configKeyName, $name);
+		$this->assertEquals($connection->config, $config);
 
 		ConnectionManager::drop($name);
 	}
@@ -142,7 +142,7 @@ class ConnectionManagerTest extends CakeTestCase {
 
 		$this->assertTrue(class_exists('DboSource'));
 		$this->assertTrue(class_exists('DboDummy'));
-		$this->assertEqual($connection->configKeyName, $name);
+		$this->assertEquals($connection->configKeyName, $name);
 
 		ConnectionManager::drop($name);
 	}
@@ -167,8 +167,8 @@ class ConnectionManagerTest extends CakeTestCase {
 
 		$this->assertTrue(class_exists('TestSource'));
 		$this->assertTrue(class_exists('TestLocalDriver'));
-		$this->assertEqual($connection->configKeyName, $name);
-		$this->assertEqual($connection->config, $config);
+		$this->assertEquals($connection->configKeyName, $name);
+		$this->assertEquals($connection->config, $config);
 		ConnectionManager::drop($name);
 	}
 
@@ -194,7 +194,7 @@ class ConnectionManagerTest extends CakeTestCase {
 		$source = ConnectionManager::getDataSource('test');
 		$result = ConnectionManager::getSourceName($source);
 
-		$this->assertEqual('test', $result);
+		$this->assertEquals('test', $result);
 
 		$source = new StdClass();
 		$result = ConnectionManager::getSourceName($source);
@@ -216,7 +216,7 @@ class ConnectionManagerTest extends CakeTestCase {
 		foreach ($connections as $connection) {
 			$exists = class_exists($connection['classname']);
 			$loaded = ConnectionManager::loadDataSource($connection);
-			$this->assertEqual($loaded, !$exists, "Failed loading the {$connection['classname']} datasource");
+			$this->assertEquals($loaded, !$exists, "Failed loading the {$connection['classname']} datasource");
 		}
 	}
 
@@ -249,18 +249,18 @@ class ConnectionManagerTest extends CakeTestCase {
 		$connection = ConnectionManager::create($name, $config);
 
 		$this->assertTrue(is_object($connection));
-		$this->assertEqual($name, $connection->configKeyName);
-		$this->assertEqual($name, ConnectionManager::getSourceName($connection));
+		$this->assertEquals($name, $connection->configKeyName);
+		$this->assertEquals($name, ConnectionManager::getSourceName($connection));
 
 		$source = ConnectionManager::create(null, array());
-		$this->assertEqual($source, null);
+		$this->assertEquals($source, null);
 
 		$source = ConnectionManager::create('another_test', array());
-		$this->assertEqual($source, null);
+		$this->assertEquals($source, null);
 
 		$config = array('classname' => 'DboMysql', 'filename' => 'dbo' . DS . 'dbo_mysql');
 		$source = ConnectionManager::create(null, $config);
-		$this->assertEqual($source, null);
+		$this->assertEquals($source, null);
 	}
 
 /**
@@ -282,45 +282,45 @@ class ConnectionManagerTest extends CakeTestCase {
 
 		ConnectionManager::create('connection1', array('datasource' => 'Test2Source'));
 		$connections = ConnectionManager::enumConnectionObjects();
-		$this->assertEqual($expected, $connections['connection1']);
+		$this->assertEquals($expected, $connections['connection1']);
 		ConnectionManager::drop('connection1');
 
 		ConnectionManager::create('connection2', array('datasource' => 'Test2Source'));
 		$connections = ConnectionManager::enumConnectionObjects();
-		$this->assertEqual($expected, $connections['connection2']);
+		$this->assertEquals($expected, $connections['connection2']);
 		ConnectionManager::drop('connection2');
 
 		ConnectionManager::create('connection3', array('datasource' => 'TestPlugin.TestSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
 		$expected['datasource'] = 'TestPlugin.TestSource';
-		$this->assertEqual($expected, $connections['connection3']);
+		$this->assertEquals($expected, $connections['connection3']);
 		ConnectionManager::drop('connection3');
 
 		ConnectionManager::create('connection4', array('datasource' => 'TestPlugin.TestSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
-		$this->assertEqual($expected, $connections['connection4']);
+		$this->assertEquals($expected, $connections['connection4']);
 		ConnectionManager::drop('connection4');
 
 		ConnectionManager::create('connection5', array('datasource' => 'Test2OtherSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
 		$expected['datasource'] = 'Test2OtherSource';
-		$this->assertEqual($expected, $connections['connection5']);
+		$this->assertEquals($expected, $connections['connection5']);
 		ConnectionManager::drop('connection5');
 
 		ConnectionManager::create('connection6', array('datasource' => 'Test2OtherSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
-		$this->assertEqual($expected, $connections['connection6']);
+		$this->assertEquals($expected, $connections['connection6']);
 		ConnectionManager::drop('connection6');
 
 		ConnectionManager::create('connection7', array('datasource' => 'TestPlugin.TestOtherSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
 		$expected['datasource'] = 'TestPlugin.TestOtherSource';
-		$this->assertEqual($expected, $connections['connection7']);
+		$this->assertEquals($expected, $connections['connection7']);
 		ConnectionManager::drop('connection7');
 
 		ConnectionManager::create('connection8', array('datasource' => 'TestPlugin.TestOtherSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
-		$this->assertEqual($expected, $connections['connection8']);
+		$this->assertEquals($expected, $connections['connection8']);
 		ConnectionManager::drop('connection8');
 	}
 
@@ -337,7 +337,7 @@ class ConnectionManagerTest extends CakeTestCase {
 		));
 		ConnectionManager::create('droppable', array('datasource' => 'Test2Source'));
 		$connections = ConnectionManager::enumConnectionObjects();
-		$this->assertEqual(array('datasource' => 'Test2Source'), $connections['droppable']);
+		$this->assertEquals(array('datasource' => 'Test2Source'), $connections['droppable']);
 
 		$this->assertTrue(ConnectionManager::drop('droppable'));
 		$connections = ConnectionManager::enumConnectionObjects();

lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php

@@ -353,7 +353,7 @@ class CakeSessionTest extends CakeTestCase {
 		TestCakeSession::destroy();
 
 		$this->assertFalse(TestCakeSession::check('bulletProof'));
-		$this->assertNotEqual($id, TestCakeSession::id());
+		$this->assertNotEquals($id, TestCakeSession::id());
 	}
 
 /**

lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php

@@ -269,17 +269,17 @@ class PostgresTest extends CakeTestCase {
 
 		$result = $this->Dbo->fields($this->model);
 		$expected = $fields;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Dbo->fields($this->model, null, 'PostgresTestModel.*');
 		$expected = $fields;
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Dbo->fields($this->model, null, array('*', 'AnotherModel.id', 'AnotherModel.name'));
 		$expected = array_merge($fields, array(
 			'"AnotherModel"."id" AS "AnotherModel__id"',
 			'"AnotherModel"."name" AS "AnotherModel__name"'));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Dbo->fields($this->model, null, array('*', 'PostgresClientTestModel.*'));
 		$expected = array_merge($fields, array(
@@ -288,7 +288,7 @@ class PostgresTest extends CakeTestCase {
     		'"PostgresClientTestModel"."email" AS "PostgresClientTestModel__email"',
     		'"PostgresClientTestModel"."created" AS "PostgresClientTestModel__created"',
     		'"PostgresClientTestModel"."updated" AS "PostgresClientTestModel__updated"'));
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -297,12 +297,12 @@ class PostgresTest extends CakeTestCase {
  * @return void
  */
 	public function testColumnParsing() {
-		$this->assertEqual($this->Dbo2->column('text'), 'text');
-		$this->assertEqual($this->Dbo2->column('date'), 'date');
-		$this->assertEqual($this->Dbo2->column('boolean'), 'boolean');
-		$this->assertEqual($this->Dbo2->column('character varying'), 'string');
-		$this->assertEqual($this->Dbo2->column('time without time zone'), 'time');
-		$this->assertEqual($this->Dbo2->column('timestamp without time zone'), 'datetime');
+		$this->assertEquals($this->Dbo2->column('text'), 'text');
+		$this->assertEquals($this->Dbo2->column('date'), 'date');
+		$this->assertEquals($this->Dbo2->column('boolean'), 'boolean');
+		$this->assertEquals($this->Dbo2->column('character varying'), 'string');
+		$this->assertEquals($this->Dbo2->column('time without time zone'), 'time');
+		$this->assertEquals($this->Dbo2->column('timestamp without time zone'), 'datetime');
 	}
 
 /**
@@ -311,30 +311,30 @@ class PostgresTest extends CakeTestCase {
  * @return void
  */
 	public function testValueQuoting() {
-		$this->assertEqual($this->Dbo->value(1.2, 'float'), "1.200000");
-		$this->assertEqual($this->Dbo->value('1,2', 'float'), "'1,2'");
+		$this->assertEquals($this->Dbo->value(1.2, 'float'), "1.200000");
+		$this->assertEquals($this->Dbo->value('1,2', 'float'), "'1,2'");
 
-		$this->assertEqual($this->Dbo->value('0', 'integer'), "0");
-		$this->assertEqual($this->Dbo->value('', 'integer'), 'NULL');
-		$this->assertEqual($this->Dbo->value('', 'float'), 'NULL');
-		$this->assertEqual($this->Dbo->value('', 'integer', false), "NULL");
-		$this->assertEqual($this->Dbo->value('', 'float', false), "NULL");
-		$this->assertEqual($this->Dbo->value('0.0', 'float'), "'0.0'");
+		$this->assertEquals($this->Dbo->value('0', 'integer'), "0");
+		$this->assertEquals($this->Dbo->value('', 'integer'), 'NULL');
+		$this->assertEquals($this->Dbo->value('', 'float'), 'NULL');
+		$this->assertEquals($this->Dbo->value('', 'integer', false), "NULL");
+		$this->assertEquals($this->Dbo->value('', 'float', false), "NULL");
+		$this->assertEquals($this->Dbo->value('0.0', 'float'), "'0.0'");
 
-		$this->assertEqual($this->Dbo->value('t', 'boolean'), "'TRUE'");
-		$this->assertEqual($this->Dbo->value('f', 'boolean'), "'FALSE'");
-		$this->assertEqual($this->Dbo->value(true), "'TRUE'");
-		$this->assertEqual($this->Dbo->value(false), "'FALSE'");
-		$this->assertEqual($this->Dbo->value('t'), "'t'");
-		$this->assertEqual($this->Dbo->value('f'), "'f'");
-		$this->assertEqual($this->Dbo->value('true', 'boolean'), "'TRUE'");
-		$this->assertEqual($this->Dbo->value('false', 'boolean'), "'FALSE'");
-		$this->assertEqual($this->Dbo->value('', 'boolean'), "'FALSE'");
-		$this->assertEqual($this->Dbo->value(0, 'boolean'), "'FALSE'");
-		$this->assertEqual($this->Dbo->value(1, 'boolean'), "'TRUE'");
-		$this->assertEqual($this->Dbo->value('1', 'boolean'), "'TRUE'");
-		$this->assertEqual($this->Dbo->value(null, 'boolean'), "NULL");
-		$this->assertEqual($this->Dbo->value(array()), "NULL");
+		$this->assertEquals($this->Dbo->value('t', 'boolean'), "'TRUE'");
+		$this->assertEquals($this->Dbo->value('f', 'boolean'), "'FALSE'");
+		$this->assertEquals($this->Dbo->value(true), "'TRUE'");
+		$this->assertEquals($this->Dbo->value(false), "'FALSE'");
+		$this->assertEquals($this->Dbo->value('t'), "'t'");
+		$this->assertEquals($this->Dbo->value('f'), "'f'");
+		$this->assertEquals($this->Dbo->value('true', 'boolean'), "'TRUE'");
+		$this->assertEquals($this->Dbo->value('false', 'boolean'), "'FALSE'");
+		$this->assertEquals($this->Dbo->value('', 'boolean'), "'FALSE'");
+		$this->assertEquals($this->Dbo->value(0, 'boolean'), "'FALSE'");
+		$this->assertEquals($this->Dbo->value(1, 'boolean'), "'TRUE'");
+		$this->assertEquals($this->Dbo->value('1', 'boolean'), "'TRUE'");
+		$this->assertEquals($this->Dbo->value(null, 'boolean'), "NULL");
+		$this->assertEquals($this->Dbo->value(array()), "NULL");
 	}
 
 /**
@@ -361,17 +361,17 @@ class PostgresTest extends CakeTestCase {
  * @return void
  */
 	public function testDateAndTimeAsNull() {
-		$this->assertEqual($this->Dbo->value(null, 'date'), 'NULL');
-		$this->assertEqual($this->Dbo->value('', 'date'), 'NULL');
+		$this->assertEquals($this->Dbo->value(null, 'date'), 'NULL');
+		$this->assertEquals($this->Dbo->value('', 'date'), 'NULL');
 
-		$this->assertEqual($this->Dbo->value('', 'datetime'), 'NULL');
-		$this->assertEqual($this->Dbo->value(null, 'datetime'), 'NULL');
+		$this->assertEquals($this->Dbo->value('', 'datetime'), 'NULL');
+		$this->assertEquals($this->Dbo->value(null, 'datetime'), 'NULL');
 
-		$this->assertEqual($this->Dbo->value('', 'timestamp'), 'NULL');
-		$this->assertEqual($this->Dbo->value(null, 'timestamp'), 'NULL');
+		$this->assertEquals($this->Dbo->value('', 'timestamp'), 'NULL');
+		$this->assertEquals($this->Dbo->value(null, 'timestamp'), 'NULL');
 
-		$this->assertEqual($this->Dbo->value('', 'time'), 'NULL');
-		$this->assertEqual($this->Dbo->value(null, 'time'), 'NULL');
+		$this->assertEquals($this->Dbo->value('', 'time'), 'NULL');
+		$this->assertEquals($this->Dbo->value(null, 'time'), 'NULL');
 	}
 
 /**
@@ -405,7 +405,7 @@ class PostgresTest extends CakeTestCase {
 
 		$model = new Model(array('name' => 'Datatype', 'table' => 'datatypes', 'ds' => 'test'));
 		$model->create();
-		$this->assertIdentical(false, $model->data['Datatype']['bool']);
+		$this->assertSame(false, $model->data['Datatype']['bool']);
 	}
 
 /**
@@ -423,10 +423,10 @@ class PostgresTest extends CakeTestCase {
 			"INSERT INTO {$table} (\"user\", password) VALUES ('mariano', '{$password}')"
 		);
 
-		$this->assertEqual($db1->lastInsertId($table), 5);
+		$this->assertEquals($db1->lastInsertId($table), 5);
 
 		$db1->execute("INSERT INTO {$table} (\"user\", password) VALUES ('hoge', '{$password}')");
-		$this->assertEqual($db1->lastInsertId($table), 6);
+		$this->assertEquals($db1->lastInsertId($table), 6);
 	}
 
 /**
@@ -438,11 +438,11 @@ class PostgresTest extends CakeTestCase {
 	public function testColumnUseLength() {
 		$result = array('name' => 'foo', 'type' => 'string', 'length' => 100, 'default' => 'FOO');
 		$expected = '"foo" varchar(100) DEFAULT \'FOO\'';
-		$this->assertEqual($this->Dbo->buildColumn($result), $expected);
+		$this->assertEquals($this->Dbo->buildColumn($result), $expected);
 
 		$result = array('name' => 'foo', 'type' => 'text', 'length' => 100, 'default' => 'FOO');
 		$expected = '"foo" text DEFAULT \'FOO\'';
-		$this->assertEqual($this->Dbo->buildColumn($result), $expected);
+		$this->assertEquals($this->Dbo->buildColumn($result), $expected);
 	}
 
 /**
@@ -475,7 +475,7 @@ class PostgresTest extends CakeTestCase {
 		$model->save(compact('data'));
 
 		$result = $model->find('first');
-		$this->assertEqual($result['BinaryTest']['data'], $data);
+		$this->assertEquals($result['BinaryTest']['data'], $data);
 	}
 
 /**
@@ -507,7 +507,7 @@ class PostgresTest extends CakeTestCase {
 		));
 
 		$result = $this->Dbo->createSchema($schema);
-		$this->assertNoPattern('/^CREATE INDEX(.+);,$/', $result);
+		$this->assertNotRegExp('/^CREATE INDEX(.+);,$/', $result);
 	}
 
 /**
@@ -541,9 +541,9 @@ class PostgresTest extends CakeTestCase {
 		$result = $db1->createSchema($schema, 'datatype_tests');
 
 
-		$this->assertNoPattern('/timestamp DEFAULT/', $result);
-		$this->assertPattern('/\"full_length\"\s*text\s.*,/', $result);
-		$this->assertPattern('/timestamp\s*,/', $result);
+		$this->assertNotRegExp('/timestamp DEFAULT/', $result);
+		$this->assertRegExp('/\"full_length\"\s*text\s.*,/', $result);
+		$this->assertRegExp('/timestamp\s*,/', $result);
 
 
 		$db1->query('DROP TABLE ' . $db1->fullTableName('datatype_tests'));
@@ -555,7 +555,7 @@ class PostgresTest extends CakeTestCase {
 		));
 		$schema->tables = array('datatype_tests' => $result2['tables']['missing']['datatype_tests']);
 		$result2 = $db1->createSchema($schema, 'datatype_tests');
-		$this->assertEqual($result, $result2);
+		$this->assertEquals($result, $result2);
 
 		$db1->query('DROP TABLE ' . $db1->fullTableName('datatype_tests'));
 	}
@@ -577,7 +577,7 @@ class PostgresTest extends CakeTestCase {
 		);
 		$result = $this->Dbo->index($name);
 		$this->Dbo->query('DROP TABLE ' . $name);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$name = $this->Dbo->fullTableName('index_test_2', false);
 		$this->Dbo->query('CREATE TABLE ' . $name . ' ("id" serial NOT NULL PRIMARY KEY, "bool" integer, "small_char" varchar(50), "description" varchar(40) )');
@@ -588,7 +588,7 @@ class PostgresTest extends CakeTestCase {
 		);
 		$result = $this->Dbo->index($name);
 		$this->Dbo->query('DROP TABLE ' . $name);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -631,10 +631,10 @@ class PostgresTest extends CakeTestCase {
 		$result = $model->schema();
 		$this->assertTrue(isset($result['status']));
 		$this->assertFalse(isset($result['published']));
-		$this->assertEqual($result['body']['type'], 'string');
-		$this->assertEqual($result['status']['default'], 1);
-		$this->assertEqual($result['author_id']['null'], true);
-		$this->assertEqual($result['title']['null'], false);
+		$this->assertEquals($result['body']['type'], 'string');
+		$this->assertEquals($result['status']['default'], 1);
+		$this->assertEquals($result['author_id']['null'], true);
+		$this->assertEquals($result['title']['null'], false);
 
 		$this->Dbo->query($this->Dbo->dropSchema($New));
 
@@ -652,7 +652,7 @@ class PostgresTest extends CakeTestCase {
 			)
 		));
 		$result = $this->Dbo->alterSchema($New->compare($Old), 'alter_posts');
-		$this->assertNoPattern('/varchar\(36\) NOT NULL/i', $result);
+		$this->assertNotRegExp('/varchar\(36\) NOT NULL/i', $result);
 	}
 
 /**
@@ -695,7 +695,7 @@ class PostgresTest extends CakeTestCase {
 		$this->Dbo->query($this->Dbo->alterSchema($schema2->compare($schema1)));
 
 		$indexes = $this->Dbo->index('altertest');
-		$this->assertEqual($schema2->tables['altertest']['indexes'], $indexes);
+		$this->assertEquals($schema2->tables['altertest']['indexes'], $indexes);
 
 		// Change three indexes, delete one and add another one
 		$schema3 = new CakeSchema(array(
@@ -716,16 +716,16 @@ class PostgresTest extends CakeTestCase {
 		$this->Dbo->query($this->Dbo->alterSchema($schema3->compare($schema2)));
 
 		$indexes = $this->Dbo->index('altertest');
-		$this->assertEqual($schema3->tables['altertest']['indexes'], $indexes);
+		$this->assertEquals($schema3->tables['altertest']['indexes'], $indexes);
 
 		// Compare us to ourself.
-		$this->assertEqual($schema3->compare($schema3), array());
+		$this->assertEquals($schema3->compare($schema3), array());
 
 		// Drop the indexes
 		$this->Dbo->query($this->Dbo->alterSchema($schema1->compare($schema3)));
 
 		$indexes = $this->Dbo->index('altertest');
-		$this->assertEqual(array(), $indexes);
+		$this->assertEquals(array(), $indexes);
 
 		$this->Dbo->query($this->Dbo->dropSchema($schema1));
 	}
@@ -745,10 +745,10 @@ class PostgresTest extends CakeTestCase {
 			'subquery' => 'SELECT count(*) FROM ' . $Article->Comment->table
 		);
 		$result = $Article->find('first');
-		$this->assertEqual($result['Article']['next_id'], 2);
-		$this->assertEqual($result['Article']['complex'], $result['Article']['title'] . $result['Article']['body']);
-		$this->assertEqual($result['Article']['functional'], $result['User']['user']);
-		$this->assertEqual($result['Article']['subquery'], 6);
+		$this->assertEquals($result['Article']['next_id'], 2);
+		$this->assertEquals($result['Article']['complex'], $result['Article']['title'] . $result['Article']['body']);
+		$this->assertEquals($result['Article']['functional'], $result['User']['user']);
+		$this->assertEquals($result['Article']['subquery'], 6);
 	}
 
 /**
@@ -778,7 +778,7 @@ class PostgresTest extends CakeTestCase {
 	public function testOrderAdditionalParams() {
 		$result = $this->Dbo->order(array('title' => 'DESC NULLS FIRST', 'body' => 'DESC'));
 		$expected = ' ORDER BY "title" DESC NULLS FIRST, "body" DESC';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -789,15 +789,15 @@ class PostgresTest extends CakeTestCase {
 		$Article = new Article;
 		$result = $this->Dbo->fields($Article, null, array('COUNT(DISTINCT Article.id)'));
 		$expected = array('COUNT(DISTINCT "Article"."id")');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Dbo->fields($Article, null, array('COUNT(DISTINCT id)'));
 		$expected = array('COUNT(DISTINCT "id")');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$result = $this->Dbo->fields($Article, null, array('COUNT(DISTINCT FUNC(id))'));
 		$expected = array('COUNT(DISTINCT FUNC("id"))');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -814,7 +814,7 @@ class PostgresTest extends CakeTestCase {
 		$result = $Article->find('count', array(
 			'conditions' => array('Article.title' => 'Awesome')
 		));
-		$this->assertEqual($result, 1, 'Article count is wrong or fixture has changed.');
+		$this->assertEquals($result, 1, 'Article count is wrong or fixture has changed.');
 	}
 
 /**
@@ -848,7 +848,7 @@ class PostgresTest extends CakeTestCase {
 			)
 		));
 		$result = $this->db->alterSchema($schema2->compare($schema1));
-		$this->assertEqual(2, substr_count($result, 'field_two'), 'Too many fields');
+		$this->assertEquals(2, substr_count($result, 'field_two'), 'Too many fields');
 		$this->assertFalse(strpos(';ALTER', $result), 'Too many semi colons');
 	}
 	
@@ -862,12 +862,12 @@ class PostgresTest extends CakeTestCase {
 		$this->assertTrue($result) ;
 		
 		$result = $this->Dbo->getEncoding();
-		$this->assertEqual('utf8', $result) ;
+		$this->assertEquals('utf8', $result) ;
 		
 		$result = $this->Dbo->setEncoding('EUC-JP');
 		$this->assertTrue($result) ;
 		
 		$result = $this->Dbo->getEncoding();
-		$this->assertEqual('EUC-JP', $result) ;
+		$this->assertEquals('EUC-JP', $result) ;
 	}
 }

lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php

@@ -139,7 +139,7 @@ class SqliteTest extends CakeTestCase {
 
 		);
 		$result = $this->Dbo->index($name);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 		$this->Dbo->query('DROP TABLE ' . $name);
 
 		$this->Dbo->query('CREATE TABLE ' . $name . ' ("id" int(11) PRIMARY KEY, "bool" int(1), "small_char" varchar(50), "description" varchar(40) );');
@@ -149,7 +149,7 @@ class SqliteTest extends CakeTestCase {
 			'multi_col' => array('column' => array('small_char', 'bool'), 'unique' => 1),
 		);
 		$result = $this->Dbo->index($name);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 		$this->Dbo->query('DROP TABLE ' . $name);
 	}
 
@@ -170,13 +170,13 @@ class SqliteTest extends CakeTestCase {
 		$db->execute("CREATE TABLE test_list (id VARCHAR(255));");
 
 		$db->cacheSources = true;
-		$this->assertEqual($db->listSources(), array('test_list'));
+		$this->assertEquals($db->listSources(), array('test_list'));
 		$db->cacheSources = false;
 
 		$fileName = '_' . preg_replace('/[^A-Za-z0-9_\-+]/', '_', TMP . $dbName) . '_list';
 
 		$result = Cache::read($fileName, '_cake_model_');
-		$this->assertEqual($result, array('test_list'));
+		$this->assertEquals($result, array('test_list'));
 
 		Cache::delete($fileName, '_cake_model_');
 		Configure::write('Cache.disable', true);
@@ -195,7 +195,7 @@ class SqliteTest extends CakeTestCase {
 		);
 		$result = $this->Dbo->buildColumn($data);
 		$expected = '"int_field" integer NOT NULL';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$data = array(
 			'name' => 'name',
@@ -205,7 +205,7 @@ class SqliteTest extends CakeTestCase {
 		);
 		$result = $this->Dbo->buildColumn($data);
 		$expected = '"name" varchar(20) NOT NULL';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$data = array(
 			'name' => 'testName',
@@ -217,7 +217,7 @@ class SqliteTest extends CakeTestCase {
 		);
 		$result = $this->Dbo->buildColumn($data);
 		$expected = '"testName" varchar(20) DEFAULT NULL COLLATE NOCASE';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$data = array(
 			'name' => 'testName',
@@ -228,7 +228,7 @@ class SqliteTest extends CakeTestCase {
 		);
 		$result = $this->Dbo->buildColumn($data);
 		$expected = '"testName" varchar(20) DEFAULT \'test-value\' NOT NULL';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$data = array(
 			'name' => 'testName',
@@ -239,7 +239,7 @@ class SqliteTest extends CakeTestCase {
 		);
 		$result = $this->Dbo->buildColumn($data);
 		$expected = '"testName" integer(10) DEFAULT 10 NOT NULL';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$data = array(
 			'name' => 'testName',
@@ -251,7 +251,7 @@ class SqliteTest extends CakeTestCase {
 		);
 		$result = $this->Dbo->buildColumn($data);
 		$expected = '"testName" integer(10) DEFAULT 10 NOT NULL';
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -319,7 +319,7 @@ class SqliteTest extends CakeTestCase {
 			'default' => null,
 			'key' => 'primary',
 		);
-		$this->assertEqual($result['id'], $expected);
+		$this->assertEquals($result['id'], $expected);
 		$this->Dbo->query('DROP TABLE ' . $tableName);
 
 		$tableName = 'uuid_tests';
@@ -333,7 +333,7 @@ class SqliteTest extends CakeTestCase {
 			'default' => null,
 			'key' => 'primary',
 		);
-		$this->assertEqual($result['id'], $expected);
+		$this->assertEquals($result['id'], $expected);
 		$this->Dbo->query('DROP TABLE ' . $tableName);
 	}