From db11f9ef915afcacf38bf043ce89a6b48a8e068d Mon Sep 17 00:00:00 2001
From: "mariano.iglesias"
 <mariano.iglesias@3807eeeb-6ff5-0310-8944-8be069107fe0>
Date: Mon, 12 May 2008 15:47:20 +0000
Subject: [PATCH] Improving test readability

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6817 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/tests/cases/libs/model/model.test.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php
index 93eac35cc..f694295d6 100644
--- a/cake/tests/cases/libs/model/model.test.php
+++ b/cake/tests/cases/libs/model/model.test.php
@@ -2241,7 +2241,8 @@ class ModelTest extends CakeTestCase {
 			array('id' => '1', 'title' => 'Un-Baleeted First Post', 'body' => 'Not Baleeted!', 'published' => 'Y'),
 			array('id' => '2', 'title' => '', 'body' => 'Trying to get away with an empty title'),
 		);
-		$this->assertFalse($this->model->saveAll($data));
+		$result = $this->model->saveAll($data);
+		$this->assertEqual($result, false);
 		$result = $this->model->find('all', array('recursive' => -1));
 		$errors = array(2 => array('title' => 'This field cannot be left blank'));
 		$expected = array(
@@ -2260,16 +2261,15 @@ class ModelTest extends CakeTestCase {
 		);
 		$result = $this->model->saveAll($data, array('atomic' => false));
 		$this->assertEqual($result, array(true, false));
+		$result = $this->model->find('all', array('recursive' => -1));
+		$errors = array(2 => array('title' => 'This field cannot be left blank'));
 		$newTs = date('Y-m-d H:i:s');
 		$expected = array(
-			array('Post' => array('id' => '1', 'author_id' => '1', 'title' => 'Baleeted First Post', 'body' => 'Baleeted!', 'published' => 'N', 'created' => '2007-03-18 10:39:23', 'updated' => $ts)),
+			array('Post' => array('id' => '1', 'author_id' => '1', 'title' => 'Un-Baleeted First Post', 'body' => 'Not Baleeted!', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => $newTs)),
 			array('Post' => array('id' => '2', 'author_id' => '3', 'title' => 'Just update the title', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => $ts)),
 			array('Post' => array('id' => '3', 'author_id' => '1', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')),
 			array('Post' => array('id' => '4', 'author_id' => '2', 'title' => 'Creating a fourth post', 'body' => 'Fourth post body', 'published' => 'N', 'created' => $ts, 'updated' => $ts))
 		);
-		$expected[0]['Post'] = array_merge($expected[0]['Post'], $data[0], array('updated' => $newTs));
-		$result = $this->model->find('all', array('recursive' => -1));
-		$errors = array(2 => array('title' => 'This field cannot be left blank'));
 		$this->assertEqual($result, $expected);
 		$this->assertEqual($this->model->validationErrors, $errors);