From e758b272bd48dbea9b35325e990ad9e1300ee847 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Mon, 20 Jun 2011 01:34:25 -0430
Subject: [PATCH] Fixing problems when running the AllTests testsuite

---
 lib/Cake/Model/Model.php                      |  8 +++++--
 .../Console/Command/Task/ExtractTaskTest.php  |  6 ++---
 lib/Cake/Test/test_app/Model/PersisterOne.php | 22 +++++++++++++++++++
 lib/Cake/Test/test_app/Model/Post.php         | 22 -------------------
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
index 7028729cc..d3e6b442b 100644
--- a/lib/Cake/Model/Model.php
+++ b/lib/Cake/Model/Model.php
@@ -2584,6 +2584,10 @@ class Model extends Object {
 				}
 				$validator = array_merge($default, $validator);
 
+				$validationDomain = $this->validationDomain;
+				if (empty($validationDomain)) {
+					$validationDomain = 'default';
+				}
 				if (isset($validator['message'])) {
 					$message = $validator['message'];
 				} else {
@@ -2603,7 +2607,7 @@ class Model extends Object {
 					);
 
 					if ($required) {
-						$this->invalidate($fieldName, $message);
+						$this->invalidate($fieldName, __d($validationDomain, $message));
 						if ($validator['last']) {
 							break;
 						}
@@ -2647,7 +2651,7 @@ class Model extends Object {
 								} elseif (is_numeric($index) && count($ruleSet) > 1) {
 									$validator['message'] = $index + 1;
 								} else {
-									$validator['message'] = $message;
+									$validator['message'] = __d($validationDomain, $message);
 								}
 							}
 							$this->invalidate($fieldName, $validator['message']);
diff --git a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
index 2a7636777..ac09ece83 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
@@ -239,7 +239,7 @@ class ExtractTaskTest extends CakeTestCase {
 		App::build(array(
 			'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
 			'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
-		));
+		), App::RESET);
 		$this->out = $this->getMock('ConsoleOutput', array(), array(), '', false);
 		$this->in = $this->getMock('ConsoleInput', array(), array(), '', false);
 		$this->Task = $this->getMock('ExtractTask',
@@ -256,10 +256,10 @@ class ExtractTaskTest extends CakeTestCase {
 		$this->Task->execute();
 		$result = file_get_contents($this->path . DS . 'default.pot');
 
-		$pattern = '#Model/Post.php:validation for field title#';
+		$pattern = '#Model/PersisterOne.php:validation for field title#';
 		$this->assertPattern($pattern, $result);
 
-		$pattern = '#Model/Post.php:validation for field body#';
+		$pattern = '#Model/PersisterOne.php:validation for field body#';
 		$this->assertPattern($pattern, $result);
 
 		$pattern = '#msgid "Post title is required"#';
diff --git a/lib/Cake/Test/test_app/Model/PersisterOne.php b/lib/Cake/Test/test_app/Model/PersisterOne.php
index 26e1b1dd6..763fc5a0f 100644
--- a/lib/Cake/Test/test_app/Model/PersisterOne.php
+++ b/lib/Cake/Test/test_app/Model/PersisterOne.php
@@ -25,4 +25,26 @@ class PersisterOne extends AppModel {
 	public $actsAs = array('PersisterOneBehavior', 'TestPlugin.TestPluginPersisterOne');
 
 	public $hasMany = array('Comment', 'TestPlugin.TestPluginComment');
+	public $validate = array(
+		'title' => array(
+			'rule' => array('custom', '.*'),
+			'allowEmpty' => true,
+			'required' => false,
+			'message' => 'Post title is required'
+		),
+		'body' => array(
+			'first_rule' => array(
+				'rule' => array('custom', '.*'),
+				'allowEmpty' => true,
+				'required' => false,
+				'message' => 'Post body is required'
+			),
+			'second_rule' => array(
+				'rule' => array('custom', '.*'),
+				'allowEmpty' => true,
+				'required' => false,
+				'message' => 'Post body is super required'
+			)
+		),
+	);
 }
diff --git a/lib/Cake/Test/test_app/Model/Post.php b/lib/Cake/Test/test_app/Model/Post.php
index 1c59673de..5a1c15370 100644
--- a/lib/Cake/Test/test_app/Model/Post.php
+++ b/lib/Cake/Test/test_app/Model/Post.php
@@ -21,26 +21,4 @@
 class Post extends AppModel {
 	public $useTable = 'posts';
 	public $name = 'Post';
-	public $validate = array(
-		'title' => array(
-			'rule' => array('custom', '.*'),
-			'allowEmpty' => true,
-			'required' => false,
-			'message' => 'Post title is required'
-		),
-		'body' => array(
-			'first_rule' => array(
-				'rule' => array('custom', '.*'),
-				'allowEmpty' => true,
-				'required' => false,
-				'message' => 'Post body is required'
-			),
-			'second_rule' => array(
-				'rule' => array('custom', '.*'),
-				'allowEmpty' => true,
-				'required' => false,
-				'message' => 'Post body is super required'
-			)
-		),
-	);
 }