whitespace normalization

cake/tests/cases/console/cake.test.php

@@ -116,7 +116,7 @@ class TestShellDispatcher extends ShellDispatcher {
  * @return void
  */
 	function clear() {
-		
+
 	}
 
 /**
@@ -192,7 +192,6 @@ class ShellDispatcherTest extends UnitTestCase {
 		$Dispatcher->parseParams($params);
 		$this->assertEqual($expected, $Dispatcher->params);
 
-
 		$params = array('cake.php');
 		$expected = array(
 			'app' => 'app',
@@ -204,7 +203,6 @@ class ShellDispatcherTest extends UnitTestCase {
 		$Dispatcher->parseParams($params);
 		$this->assertEqual($expected, $Dispatcher->params);
 
-
 		$params = array(
 			'cake.php',
 			'-app',
@@ -220,7 +218,6 @@ class ShellDispatcherTest extends UnitTestCase {
 		$Dispatcher->parseParams($params);
 		$this->assertEqual($expected, $Dispatcher->params);
 
-
 		$params = array(
 			'./cake.php',
 			'bake',
@@ -241,7 +238,6 @@ class ShellDispatcherTest extends UnitTestCase {
 		$Dispatcher->parseParams($params);
 		$this->assertEqual($expected, $Dispatcher->params);
 
-
 		$params = array(
 			'./console/cake.php',
 			'bake',
@@ -260,7 +256,6 @@ class ShellDispatcherTest extends UnitTestCase {
 		$Dispatcher->parseParams($params);
 		$this->assertEqual($expected, $Dispatcher->params);
 
-
 		$params = array(
 			'./console/cake.php',
 			'bake',
@@ -281,7 +276,6 @@ class ShellDispatcherTest extends UnitTestCase {
 		$Dispatcher->parseParams($params);
 		$this->assertEqual($expected, $Dispatcher->params);
 
-
 		$params = array(
 			'./console/cake.php',
 			'-working',
@@ -307,11 +301,9 @@ class ShellDispatcherTest extends UnitTestCase {
 		$Dispatcher->parseParams($params);
 		$this->assertEqual($expected, $Dispatcher->params);
 
-
 		$expected = array('./console/cake.php', 'schema', 'run', 'create');
 		$this->assertEqual($expected, $Dispatcher->args);
 
-
 		$params = array(
 			'/cake/1.2.x.x/cake/console/cake.php',
 			'-working',
@@ -335,7 +327,6 @@ class ShellDispatcherTest extends UnitTestCase {
 		$Dispatcher->parseParams($params);
 		$this->assertEqual($expected, $Dispatcher->params);
 
-
 		$expected = array('/cake/1.2.x.x/cake/console/cake.php', 'schema', 'run', 'create');
 		$this->assertEqual($expected, $Dispatcher->args);
 		$params = array(
@@ -353,12 +344,10 @@ class ShellDispatcherTest extends UnitTestCase {
 			'root' => 'C:\wamp\www\apps\cake'
 		);
 
-
 		$Dispatcher->params = $Dispatcher->args = array();
 		$Dispatcher->parseParams($params);
 		$this->assertEqual($expected, $Dispatcher->params);
 
-
 		$params = array(
 			'cake.php',
 			'-working',
@@ -377,7 +366,6 @@ class ShellDispatcherTest extends UnitTestCase {
 		$Dispatcher->parseParams($params);
 		$this->assertEqual($expected, $Dispatcher->params);
 
-
 		$params = array(
 			'cake.php',
 			'-working',
@@ -399,7 +387,6 @@ class ShellDispatcherTest extends UnitTestCase {
 		$Dispatcher->parseParams($params);
 		$this->assertEqual($expected, $Dispatcher->params);
 
-
 		$params = array(
 			'/home/amelo/dev/cake-common/cake/console/cake.php',
 			'-root',

cake/tests/cases/console/libs/tasks/db_config.test.php

@@ -33,7 +33,6 @@ if (!class_exists('ShellDispatcher')) {
 require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'db_config.php';
 //require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
 
-
 Mock::generatePartial(
 	'ShellDispatcher', 'TestDbConfigTaskMockShellDispatcher',
 	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
@@ -54,7 +53,7 @@ class TEST_DATABASE_CONFIG {
 		'database' => 'database_name',
 		'prefix' => '',
 	);
-	
+
 	var $otherOne = array(
 		'driver' => 'mysql',
 		'persistent' => false,
@@ -73,6 +72,7 @@ class TEST_DATABASE_CONFIG {
  * @subpackage    cake.tests.cases.console.libs.tasks
  */
 class DbConfigTaskTest extends CakeTestCase {
+
 /**
  * startTest method
  *
@@ -88,6 +88,7 @@ class DbConfigTaskTest extends CakeTestCase {
 		$this->Task->params['working'] = rtrim(APP, '/');
 		$this->Task->databaseClassName = 'TEST_DATABASE_CONFIG';
 	}
+
 /**
  * endTest method
  *
@@ -98,6 +99,7 @@ class DbConfigTaskTest extends CakeTestCase {
 		unset($this->Task, $this->Dispatcher);
 		ClassRegistry::flush();
 	}
+
 /**
  * Test the getConfig method.
  *
@@ -108,6 +110,7 @@ class DbConfigTaskTest extends CakeTestCase {
 		$result = $this->Task->getConfig();
 		$this->assertEqual($result, 'otherOne');
 	}
+
 /**
  * test that initialize sets the path up.
  *
@@ -118,8 +121,9 @@ class DbConfigTaskTest extends CakeTestCase {
 		$this->Task->initialize();
 		$this->assertFalse(empty($this->Task->path));
 		$this->assertEqual($this->Task->path, APP . 'config' . DS);
-		
+
 	}
+
 /**
  * test execute and by extension __interactive
  *

cake/tests/cases/console/libs/tasks/fixture.test.php

@@ -47,6 +47,7 @@ Mock::generatePartial(
 	'Shell', 'MockFixtureModelTask',
 	array('in', 'out', 'err', 'createFile', '_stop', 'getName', 'getTable', 'listAll')
 );
+
 /**
  * FixtureTaskTest class
  *
@@ -54,12 +55,14 @@ Mock::generatePartial(
  * @subpackage    cake.tests.cases.console.libs.tasks
  */
 class FixtureTaskTest extends CakeTestCase {
+
 /**
  * fixtures
  *
  * @var array
  **/
 	var $fixtures = array('core.article', 'core.comment');
+
 /**
  * startTest method
  *
@@ -75,6 +78,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->Dispatch->shellPaths = App::path('shells');
 		$this->Task->Template->initialize();
 	}
+
 /**
  * endTest method
  *
@@ -85,6 +89,7 @@ class FixtureTaskTest extends CakeTestCase {
 		unset($this->Task, $this->Dispatcher);
 		ClassRegistry::flush();
 	}
+
 /**
  * test that initialize sets the path
  *
@@ -97,6 +102,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$expected = '/my/path/tests/fixtures/';
 		$this->assertEqual($Task->path, $expected);
 	}
+
 /**
  * test import option array generation
  *
@@ -117,7 +123,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$result = $this->Task->importOptions('Article');
 		$expected = array();
 		$this->assertEqual($result, $expected);
-		
+
 		$this->Task->setReturnValueAt(5, 'in', 'n');
 		$this->Task->setReturnValueAt(6, 'in', 'n');
 		$this->Task->setReturnValueAt(7, 'in', 'y');
@@ -125,6 +131,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$expected = array('fromTable' => true);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test generating a fixture with database conditions.
  *
@@ -143,6 +150,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->assertPattern('/Second Article/', $result, 'Missing import data %s');
 		$this->assertPattern('/Third Article/', $result, 'Missing import data %s');
 	}
+
 /**
  * test that execute passes runs bake depending with named model.
  *
@@ -156,6 +164,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
 		$this->Task->execute();
 	}
+
 /**
  * test that execute runs all() when args[0] = all
  *
@@ -175,6 +184,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/class CommentFixture/')));
 		$this->Task->execute();
 	}
+
 /**
  * test interactive mode of execute
  *
@@ -183,7 +193,7 @@ class FixtureTaskTest extends CakeTestCase {
 	function testExecuteInteractive() {
 		$this->Task->connection = 'test_suite';
 		$this->Task->path = '/my/path/';
-		
+
 		$this->Task->setReturnValue('in', 'y');
 		$this->Task->Model->setReturnValue('getName', 'Article');
 		$this->Task->Model->setReturnValue('getTable', 'articles', array('Article'));
@@ -192,6 +202,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
 		$this->Task->execute();
 	}
+
 /**
  * Test that bake works
  *
@@ -225,6 +236,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->assertNoPattern('/var \$fields/', $result);
 		$this->assertNoPattern('/var \$records/', $result);
 	}
+
 /**
  * Test that file generation includes headers and correct path for plugins.
  *
@@ -241,6 +253,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/\<\?php(.*)\?\>/ms')));
 		$result = $this->Task->generateFixtureFile('Article', array());
 	}
+
 /**
  * test generating files into plugins.
  *

cake/tests/cases/console/libs/tasks/test.test.php

@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id$ */
+
 /**
  * TestTaskTest file
  *
@@ -92,11 +93,12 @@ class TestTaskTag extends Model {
 		)
 	);
 }
+
 /**
  * Simulated Plugin
  **/
 class TestTaskAppModel extends Model {
-	
+
 }
 class TestTaskComment extends TestTaskAppModel {
 	var $name = 'TestTaskComment';
@@ -123,6 +125,7 @@ class TestTaskCommentsController extends Controller {
 class TestTaskTest extends CakeTestCase {
 
 	var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag');
+
 /**
  * startTest method
  *
@@ -136,6 +139,7 @@ class TestTaskTest extends CakeTestCase {
 		$this->Task->Dispatch =& $this->Dispatcher;
 		$this->Task->Template =& new TemplateTask($this->Dispatcher);
 	}
+
 /**
  * endTest method
  *
@@ -145,13 +149,14 @@ class TestTaskTest extends CakeTestCase {
 	function endTest() {
 		ClassRegistry::flush();
 	}
+
 /**
  * Test that file path generation doesn't continuously append paths.
  *
  * @access public
  * @return void
  */
-	function testFilePathGeneration () {
+	function testFilePathGeneration() {
 		$file = TESTS . 'cases' . DS . 'models' . DS . 'my_class.test.php';
 
 		$this->Task->Dispatch->expectNever('stderr');
@@ -168,8 +173,9 @@ class TestTaskTest extends CakeTestCase {
 		$this->Task->expectAt(2, 'createFile', array($file, '*'));
 		$this->Task->bake('Controller', 'Comments');
 	}
+
 /**
- * Test that method introspection pulls all relevant non parent class 
+ * Test that method introspection pulls all relevant non parent class
  * methods into the test case.
  *
  * @return void
@@ -179,6 +185,7 @@ class TestTaskTest extends CakeTestCase {
 		$expected = array('doSomething', 'doSomethingElse');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test that the generation of fixtures works correctly.
  *
@@ -187,11 +194,12 @@ class TestTaskTest extends CakeTestCase {
 	function testFixtureArrayGenerationFromModel() {
 		$subject = ClassRegistry::init('TestTaskArticle');
 		$result = $this->Task->generateFixtureList($subject);
-		$expected = array('plugin.test_task.test_task_comment', 'app.articles_tags', 
+		$expected = array('plugin.test_task.test_task_comment', 'app.articles_tags',
 			'app.test_task_article', 'app.test_task_tag');
 
 		$this->assertEqual(sort($result), sort($expected));
 	}
+
 /**
  * test that the generation of fixtures works correctly.
  *
@@ -200,11 +208,12 @@ class TestTaskTest extends CakeTestCase {
 	function testFixtureArrayGenerationFromController() {
 		$subject = new TestTaskCommentsController();
 		$result = $this->Task->generateFixtureList($subject);
-		$expected = array('plugin.test_task.test_task_comment', 'app.articles_tags', 
+		$expected = array('plugin.test_task.test_task_comment', 'app.articles_tags',
 			'app.test_task_article', 'app.test_task_tag');
 
 		$this->assertEqual(sort($result), sort($expected));
 	}
+
 /**
  * test user interaction to get object type
  *
@@ -219,6 +228,7 @@ class TestTaskTest extends CakeTestCase {
 		$result = $this->Task->getObjectType();
 		$this->assertEqual($result, $this->Task->classTypes[1]);
 	}
+
 /**
  * creating test subjects should clear the registry so the registry is always fresh
  *
@@ -242,6 +252,7 @@ class TestTaskTest extends CakeTestCase {
 		$keys = ClassRegistry::keys();
 		$this->assertFalse(in_array('random', $keys));
 	}
+
 /**
  * test that getClassName returns the user choice as a classname.
  *
@@ -262,6 +273,7 @@ class TestTaskTest extends CakeTestCase {
 		$options = Configure::listObjects('model');
 		$this->assertEqual($result, $options[0]);
 	}
+
 /**
  * Test the user interaction for defining additional fixtures.
  *
@@ -274,6 +286,7 @@ class TestTaskTest extends CakeTestCase {
 		$expected = array('app.pizza', 'app.topping', 'app.side_dish');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test that resolving classnames works
  *
@@ -295,6 +308,7 @@ class TestTaskTest extends CakeTestCase {
 		$result = $this->Task->getRealClassname('Component', 'Auth');
 		$this->assertEqual($result, 'AuthComponent');
 	}
+
 /**
  * test baking files.
  *
@@ -323,6 +337,7 @@ class TestTaskTest extends CakeTestCase {
 		$this->assertPattern("/'app\.test_task_tag'/", $result);
 		$this->assertPattern("/'app\.articles_tag'/", $result);
 	}
+
 /**
  * test baking controller test files, ensure that the stub class is generated.
  *
@@ -352,6 +367,7 @@ class TestTaskTest extends CakeTestCase {
 		$this->assertPattern("/'app\.test_task_tag'/", $result);
 		$this->assertPattern("/'app\.articles_tag'/", $result);
 	}
+
 /**
  * test Constructor generation ensure that constructClasses is called for controllers
  *
@@ -370,6 +386,7 @@ class TestTaskTest extends CakeTestCase {
 		$expected = "new FormHelper()\n";
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * Test that mock class generation works for the appropriate classes
  *
@@ -379,6 +396,7 @@ class TestTaskTest extends CakeTestCase {
 		$result = $this->Task->hasMockClass('controller');
 		$this->assertTrue($result);
 	}
+
 /**
  * test bake() with a -plugin param
  *
@@ -391,6 +409,7 @@ class TestTaskTest extends CakeTestCase {
 		$this->Task->expectAt(0, 'createFile', array($path, '*'));
 		$this->Task->bake('Helper', 'Form');
 	}
+
 /**
  * Test filename generation for each type + plugins
  *
@@ -424,6 +443,7 @@ class TestTaskTest extends CakeTestCase {
 		$expected = APP . 'plugins' . DS . 'test_test' . DS . 'tests' . DS . 'cases' . DS . 'models' . DS . 'post.test.php';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test execute with a type defined
  *
@@ -436,6 +456,7 @@ class TestTaskTest extends CakeTestCase {
 		$this->Task->expectAt(0, 'createFile', array('*', new PatternExpectation('/class TestTaskTagTestCase extends CakeTestCase/')));
 		$this->Task->execute();
 	}
+
 /**
  * test execute with type and class name defined
  *

cake/tests/cases/libs/controller/components/cookie.test.php

@@ -27,6 +27,7 @@
  */
 App::import('Controller', array('Component', 'Controller'), false);
 App::import('Component', 'Cookie');
+
 /**
  * CookieComponentTestController class
  *

cake/tests/cases/libs/model/model_delete.test.php

@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
+
 /**
  * ModelDeleteTest file
  *
@@ -26,6 +27,7 @@
  */
 require_once dirname(__FILE__) . DS . 'model.test.php';
 require_once dirname(__FILE__) . DS . 'model_delete.test.php';
+
 /**
  * ModelDeleteTest
  *
@@ -33,6 +35,7 @@ require_once dirname(__FILE__) . DS . 'model_delete.test.php';
  * @subpackage    cake.tests.cases.libs.model.operations
  */
 class ModelDeleteTest extends BaseModelTest {
+
 /**
  * testDeleteHabtmReferenceWithConditions method
  *
@@ -123,6 +126,7 @@ class ModelDeleteTest extends BaseModelTest {
 		));
 		$this->assertFalse($result);
 	}
+
 /**
  * testDeleteArticleBLinks method
  *
@@ -151,6 +155,7 @@ class ModelDeleteTest extends BaseModelTest {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testDeleteDependentWithConditions method
  *
@@ -179,6 +184,7 @@ class ModelDeleteTest extends BaseModelTest {
 		$this->assertTrue(is_array($result));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testDel method
  *
@@ -228,7 +234,6 @@ class ModelDeleteTest extends BaseModelTest {
 
 		$this->assertEqual($result, $expected);
 
-
 		// make sure deleting a non-existent record doesn't break save()
 		// ticket #6293
 		$this->loadFixtures('Uuid');
@@ -258,6 +263,7 @@ class ModelDeleteTest extends BaseModelTest {
 				'id' => 'B607DAB9-88A2-46CF-B57C-842CA9E3B3B3')));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testDeleteAll method
  *
@@ -399,6 +405,7 @@ class ModelDeleteTest extends BaseModelTest {
 		$result = $TestModel->deleteAll(array('Article.user_id' => 999));
 		$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
 	}
+
 /**
  * testRecursiveDel method
  *
@@ -434,6 +441,7 @@ class ModelDeleteTest extends BaseModelTest {
 		$result = $TestModel->Comment->Attachment->find('count');
 		$this->assertEqual($result, 0);
 	}
+
 /**
  * testDependentExclusiveDelete method
  *
@@ -452,6 +460,7 @@ class ModelDeleteTest extends BaseModelTest {
 		$TestModel->delete(1);
 		$this->assertEqual($TestModel->Comment->find('count'), 2);
 	}
+
 /**
  * testDeleteLinks method
  *
@@ -499,6 +508,7 @@ class ModelDeleteTest extends BaseModelTest {
 		$result = $TestModel->deleteAll(array('Article.user_id' => 999));
 		$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
 	}
+
 /**
  * testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable method
  *

cake/tests/cases/libs/model/model_integration.test.php

@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
+
 /**
  * ModelDeleteTest file
  *
@@ -34,6 +35,7 @@ require_once dirname(__FILE__) . DS . 'model_integration.test.php';
  * @subpackage    cake.tests.cases.libs.model.operations
  */
 class ModelIntegrationTest extends BaseModelTest {
+
 /**
  * testPkInHAbtmLinkModelArticleB
  *
@@ -45,6 +47,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$TestModel2 =& new ArticleB();
 		$this->assertEqual($TestModel2->ArticlesTag->primaryKey, 'article_id');
 	}
+
 /**
  * Tests that $cacheSources can only be disabled in the db using model settings, not enabled
  *
@@ -64,6 +67,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$TestModel->setSource('join_as');
 		$this->assertFalse($this->db->cacheSources);
 	}
+
 /**
  * testPkInHabtmLinkModel method
  *
@@ -92,6 +96,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$this->assertEqual($TestModel4->JoinAsJoinB->primaryKey, 'id');
 
 	}
+
 /**
  * testDynamicBehaviorAttachment method
  *
@@ -128,6 +133,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$this->assertEqual($TestModel->Behaviors->attached(), array());
 		$this->assertFalse(isset($TestModel->Behaviors->Tree));
 	}
+
 /**
  * Tests cross database joins.  Requires $test and $test2 to both be set in DATABASE_CONFIG
  * NOTE: When testing on MySQL, you must set 'persistent' => false on *both* database connections,
@@ -490,6 +496,7 @@ class ModelIntegrationTest extends BaseModelTest {
 			$this->_fixtures[$this->_fixtureClassMap[$class]]->drop($db2);
 		}
 	}
+
 /**
  * testDisplayField method
  *
@@ -506,6 +513,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$this->assertEqual($Person->displayField, 'name');
 		$this->assertEqual($Comment->displayField, 'id');
 	}
+
 /**
  * testSchema method
  *
@@ -528,6 +536,7 @@ class ModelIntegrationTest extends BaseModelTest {
 
 		$this->assertEqual($Post->getColumnTypes(), array_combine($columns, $types));
 	}
+
 /**
  * test deconstruct() with time fields.
  *
@@ -613,6 +622,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$TestModel->set($data);
 		$this->assertEqual($TestModel->data, $data);
 	}
+
 /**
  * testDeconstructFields with datetime, timestamp, and date fields
  *
@@ -789,6 +799,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$TestModel->set($data);
 		$this->assertEqual($TestModel->data, $data);
 	}
+
 /**
  * testTablePrefixSwitching method
  *
@@ -842,6 +853,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$this->assertEqual($db2->fullTableName($TestModel, false), 'apples');
 		$this->assertEqual($db1->fullTableName($TestModel, false), 'apples');
 	}
+
 /**
  * Tests validation parameter order in custom validation methods
  *
@@ -852,6 +864,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$TestModel =& new ValidationTest1();
 		$this->assertNull($TestModel->getAssociated('Foo'));
 	}
+
 /**
  * testLoadModelSecondIteration method
  *
@@ -868,6 +881,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$this->assertIsA($model->ModelC, 'ModelC');
 		$this->assertIsA($model->ModelC->ModelD, 'ModelD');
 	}
+
 /**
  * ensure that __exists is reset on create
  *
@@ -889,6 +903,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$result = $Article->read(null, 2);
 		$this->assertEqual($result['Article']['title'], 'Staying alive');
 	}
+
 /**
  * testPluginAssociations method
  *
@@ -1013,6 +1028,7 @@ class ModelIntegrationTest extends BaseModelTest {
 
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * Tests getAssociated method
  *
@@ -1161,6 +1177,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$this->assertEqual($TestModel->Tag->name, 'Tag');
 		$this->assertEqual($TestFakeModel->Tag->name, 'Tag');
 	}
+
 /**
  * test Model::__construct
  *
@@ -1181,6 +1198,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$this->assertEqual($TestModel->actsAs, $expected);
 		$this->assertTrue(isset($TestModel->Behaviors->Containable));
 	}
+
 /**
  * test Model::__construct
  *
@@ -1198,6 +1216,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$NewVoid =& new TheVoid(null, false, 'other');
 		$this->assertEqual('other', $NewVoid->useDbConfig);
 	}
+
 /**
  * testColumnTypeFetching method
  *
@@ -1216,6 +1235,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$this->assertEqual($model->getColumnType('Tag.id'), 'integer');
 		$this->assertEqual($model->getColumnType('Article.id'), 'integer');
 	}
+
 /**
  * testHabtmUniqueKey method
  *
@@ -1226,6 +1246,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$model =& new Item();
 		$this->assertFalse($model->hasAndBelongsToMany['Portfolio']['unique']);
 	}
+
 /**
  * testIdentity method
  *
@@ -1248,6 +1269,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$expected = 'AnotherTest';
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testWithAssociation method
  *
@@ -1499,6 +1521,7 @@ class ModelIntegrationTest extends BaseModelTest {
 
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindSelfAssociations method
  *
@@ -1608,6 +1631,7 @@ class ModelIntegrationTest extends BaseModelTest {
 
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testDynamicAssociations method
  *
@@ -1715,6 +1739,7 @@ class ModelIntegrationTest extends BaseModelTest {
 
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testCreation method
  *

cake/tests/cases/libs/model/model_read.test.php

@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
+
 /**
  * ModelReadTest file
  *
@@ -26,6 +27,7 @@
  */
 require_once dirname(__FILE__) . DS . 'model.test.php';
 require_once dirname(__FILE__) . DS . 'model_read.test.php';
+
 /**
  * ModelReadTest
  *
@@ -33,6 +35,7 @@ require_once dirname(__FILE__) . DS . 'model_read.test.php';
  * @subpackage    cake.tests.cases.libs.model.operations
  */
 class ModelReadTest extends BaseModelTest {
+
 /**
  * testFetchingNonUniqueFKJoinTableRecords()
  *
@@ -70,6 +73,7 @@ class ModelReadTest extends BaseModelTest {
 		$this->assertEqual($result['SomethingElse'][0]['JoinThing']['doomed'], 1);
 		$this->assertEqual($result['SomethingElse'][1]['JoinThing']['doomed'], 0);
 	}
+
 /**
  * testGroupBy method
  *
@@ -196,28 +200,24 @@ class ModelReadTest extends BaseModelTest {
 		));
 		$this->assertEqual($result, $expected);
 
-
 		$result = $Thread->find('all', array(
 			'conditions' => array('Thread.project_id' => 1),
 			'group' => array('project_id')
 		));
 		$this->assertEqual($result, $expected);
 
-
 		$result = $Thread->find('all', array(
 			'conditions' => array('Thread.project_id' => 1),
 			'group' => array('project_id', 'Project.id')
 		));
 		$this->assertEqual($result, $expected);
 
-
 		$result = $Thread->find('all', array(
 			'conditions' => array('Thread.project_id' => 1),
 			'group' => array('Thread.project_id', 'Project.id')
 		));
 		$this->assertEqual($result, $expected);
 
-
 		$expected = array(
 			array('Product' => array('type' => 'Clothing'), array('price' => 32)),
 			array('Product' => array('type' => 'Food'), array('price' => 9)),
@@ -237,6 +237,7 @@ class ModelReadTest extends BaseModelTest {
 			'order' => 'Product.type ASC'));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testOldQuery method
  *
@@ -272,6 +273,7 @@ class ModelReadTest extends BaseModelTest {
 		$this->assertTrue(isset($this->db->_queryCache[$query]));
 		$this->assertTrue(is_array($results));
 	}
+
 /**
  * testPreparedQuery method
  *
@@ -353,6 +355,7 @@ class ModelReadTest extends BaseModelTest {
 		$this->assertTrue(isset($this->db->_queryCache[$expected]));
 
 	}
+
 /**
  * testParameterMismatch method
  *
@@ -374,6 +377,7 @@ class ModelReadTest extends BaseModelTest {
 		ob_end_clean();
 		$this->assertEqual($result, null);
 	}
+
 /**
  * testVeryStrangeUseCase method
  *
@@ -403,6 +407,7 @@ class ModelReadTest extends BaseModelTest {
 		$result = $Article->query($query, $param);
 		ob_end_clean();
 	}
+
 /**
  * testRecursiveUnbind method
  *
@@ -2997,6 +3002,7 @@ class ModelReadTest extends BaseModelTest {
 		)));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSelfAssociationAfterFind method
  *
@@ -3024,6 +3030,7 @@ class ModelReadTest extends BaseModelTest {
 		}
 		$this->assertEqual($afterFindData, $noAfterFindData);
 	}
+
 /**
  * testFindAllThreaded method
  *
@@ -3500,6 +3507,7 @@ class ModelReadTest extends BaseModelTest {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * test find('neighbors')
  *
@@ -3933,6 +3941,7 @@ class ModelReadTest extends BaseModelTest {
 		));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSaveEmpty method
  *
@@ -4045,7 +4054,6 @@ class ModelReadTest extends BaseModelTest {
 		$result = $TestModel->find('all', compact('conditions', 'recursive', 'order'));
 		$this->assertEqual($result, $expected);
 
-
 		$conditions = array('id' => array('1', 2, '3.0'));
 		$order = 'Article.id ASC';
 		$result = $TestModel->find('all', compact('recursive', 'conditions', 'order'));
@@ -4086,6 +4094,7 @@ class ModelReadTest extends BaseModelTest {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testBindUnbind method
  *
@@ -4545,6 +4554,7 @@ class ModelReadTest extends BaseModelTest {
 		$this->assertEqual($TestModel2->hasMany['NewFeatureSet'], $expected);
 		$this->assertTrue(is_object($TestModel2->NewFeatureSet));
 	}
+
 /**
  * testBindMultipleTimes method
  *
@@ -4825,6 +4835,7 @@ class ModelReadTest extends BaseModelTest {
 		);
 		$this->assertEqual($result[0]['Post'][0]['Comment'][0], $expected);
 	}
+
 /**
  * Tests that callbacks can be properly disabled
  *
@@ -4851,6 +4862,7 @@ class ModelReadTest extends BaseModelTest {
 		$expected = array('mariano', 'nate', 'larry', 'garrett');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testMultipleBelongsToWithSameClass method
  *
@@ -4949,6 +4961,7 @@ class ModelReadTest extends BaseModelTest {
 
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testHabtmRecursiveBelongsTo method
  *
@@ -5007,6 +5020,7 @@ class ModelReadTest extends BaseModelTest {
 
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testHabtmFinderQuery method
  *
@@ -5055,6 +5069,7 @@ class ModelReadTest extends BaseModelTest {
 
 		$this->assertEqual($result['Tag'], $expected);
 	}
+
 /**
  * testHabtmLimitOptimization method
  *
@@ -5125,6 +5140,7 @@ class ModelReadTest extends BaseModelTest {
 
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testHasManyLimitOptimization method
  *
@@ -5239,6 +5255,7 @@ class ModelReadTest extends BaseModelTest {
 
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindAllRecursiveSelfJoin method
  *
@@ -5344,10 +5361,8 @@ class ModelReadTest extends BaseModelTest {
 		)))));
 
 		$this->assertEqual($result, $expected);
-
-
-
 	}
+
 /**
  * testFindAllRecursiveWithHabtm method
  *
@@ -5416,6 +5431,7 @@ class ModelReadTest extends BaseModelTest {
 
 		$this->assertIdentical($result, $expected);
 	}
+
 /**
  * testReadFakeThread method
  *
@@ -5480,6 +5496,7 @@ class ModelReadTest extends BaseModelTest {
 		$this->db->fullDebug = $fullDebug;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindFakeThread method
  *
@@ -5544,6 +5561,7 @@ class ModelReadTest extends BaseModelTest {
 		$this->db->fullDebug = $fullDebug;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindAllFakeThread method
  *
@@ -5764,6 +5782,7 @@ class ModelReadTest extends BaseModelTest {
 		$this->db->fullDebug = $fullDebug;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testConditionalNumerics method
  *
@@ -6011,6 +6030,7 @@ class ModelReadTest extends BaseModelTest {
 			$this->assertEqual($result, $expected);
 		}
 	}
+
 /**
  * test find('list') method
  *
@@ -6274,6 +6294,7 @@ class ModelReadTest extends BaseModelTest {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testFindField method
  *
@@ -6303,6 +6324,7 @@ class ModelReadTest extends BaseModelTest {
 		$result = $TestModel->field('COUNT(*)', true);
 		$this->assertEqual($result, 4);
 	}
+
 /**
  * testFindUnique method
  *
@@ -6325,6 +6347,7 @@ class ModelReadTest extends BaseModelTest {
 			'password' => '5f4dcc3b5aa765d61d8327deb882cf99'
 		)));
 	}
+
 /**
  * test find('count') method
  *
@@ -6371,6 +6394,7 @@ class ModelReadTest extends BaseModelTest {
 		$result = $TestModel->find('count', array('fields' => 'DISTINCT name'));
 		$this->assertEqual($result, 4);
 	}
+
 /**
  * Test find(count) with Db::expression
  *
@@ -6395,6 +6419,7 @@ class ModelReadTest extends BaseModelTest {
 		)));
 		$this->assertEqual($result, 1);
 	}
+
 /**
  * testFindMagic method
  *
@@ -6426,6 +6451,7 @@ class ModelReadTest extends BaseModelTest {
 		));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testRead method
  *
@@ -6506,6 +6532,7 @@ class ModelReadTest extends BaseModelTest {
 		)));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testRecursiveRead method
  *
@@ -6932,6 +6959,7 @@ class ModelReadTest extends BaseModelTest {
 		)));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testRecursiveFindAllWithLimit method
  *

cake/tests/cases/libs/model/model_validation.test.php

@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
+
 /**
  * ModelValidationTest file
  *
@@ -26,6 +27,7 @@
  */
 require_once dirname(__FILE__) . DS . 'model.test.php';
 require_once dirname(__FILE__) . DS . 'model_validation.test.php';
+
 /**
  * ModelValidationTest
  *
@@ -33,6 +35,7 @@ require_once dirname(__FILE__) . DS . 'model_validation.test.php';
  * @subpackage    cake.tests.cases.libs.model.operations
  */
 class ModelValidationTest extends BaseModelTest {
+
 /**
  * Tests validation parameter order in custom validation methods
  *
@@ -74,6 +77,7 @@ class ModelValidationTest extends BaseModelTest {
 
 		$this->assertEqual($TestModel->invalidFields(), $expected);
 	}
+
 /**
  * Tests validation parameter fieldList in invalidFields
  *

cake/tests/cases/libs/model/model_write.test.php

@@ -1,5 +1,6 @@
 <?php
 /* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
+
 /**
  * ModelWriteTest file
  *
@@ -26,6 +27,7 @@
  */
 require_once dirname(__FILE__) . DS . 'model.test.php';
 require_once dirname(__FILE__) . DS . 'model_write.test.php';
+
 /**
  * ModelWriteTest
  *
@@ -33,6 +35,7 @@ require_once dirname(__FILE__) . DS . 'model_write.test.php';
  * @subpackage    cake.tests.cases.libs.model.operations
  */
 class ModelWriteTest extends BaseModelTest {
+
 /**
  * testInsertAnotherHabtmRecordWithSameForeignKey method
  *
@@ -87,6 +90,7 @@ class ModelWriteTest extends BaseModelTest {
 		$result = $TestModel->JoinAsJoinB->findById(1);
 		$this->assertEqual($result['JoinAsJoinB']['other'], $updatedValue);
 	}
+
 /**
  * testSaveDateAsFirstEntry method
  *
@@ -117,6 +121,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertEqual($testResult['Article']['created'], '2008-01-01 00:00:00');
 
 	}
+
 /**
  * testUnderscoreFieldSave method
  *
@@ -142,6 +147,7 @@ class ModelWriteTest extends BaseModelTest {
 		$currentCount = $UnderscoreField->find('count');
 		$this->assertEqual($currentCount, 4);
 	}
+
 /**
  * testAutoSaveUuid method
  *
@@ -167,6 +173,7 @@ class ModelWriteTest extends BaseModelTest {
 		);
 		$this->assertEqual(strlen($result['Uuid']['id']), 36);
 	}
+
 /**
  * testZeroDefaultFieldValue method
  *
@@ -187,6 +194,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertIdentical($result['DataTest']['count'], '0');
 		$this->assertIdentical($result['DataTest']['float'], '0');
 	}
+
 /**
  * testNonNumericHabtmJoinKey method
  *
@@ -285,6 +293,7 @@ class ModelWriteTest extends BaseModelTest {
 		));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * Tests validation parameter order in custom validation methods
  *
@@ -305,6 +314,7 @@ class ModelWriteTest extends BaseModelTest {
 		));
 		$this->assertEqual($TestModel->data, $expected);
 	}
+
 /**
  * test that Caches are getting cleared on save().
  * ensure that both inflections of controller names are getting cleared
@@ -342,6 +352,7 @@ class ModelWriteTest extends BaseModelTest {
 		Configure::write('Cache.check', $_back['check']);
 		Configure::write('Cache.disable', $_back['disable']);
 	}
+
 /**
  * testSaveWithCounterCache method
  *
@@ -378,6 +389,7 @@ class ModelWriteTest extends BaseModelTest {
 		$result = $TestModel->findById(2);
 		$this->assertIdentical($result['Syfile']['item_count'], '0');
 	}
+
 /**
  * Tests that counter caches are updated when records are added
  *
@@ -403,6 +415,7 @@ class ModelWriteTest extends BaseModelTest {
 		$expected = 3;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * Tests that counter caches are updated when records are deleted
  *
@@ -424,6 +437,7 @@ class ModelWriteTest extends BaseModelTest {
 		$expected = 1;
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * Tests that counter caches are updated when foreign keys of counted records change
  *
@@ -446,6 +460,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertEqual($users[0]['User']['post_count'], 1);
 		$this->assertEqual($users[1]['User']['post_count'], 2);
 	}
+
 /**
  * Test counter cache with models that use a non-standard (i.e. not using 'id')
  * as their primary key.
@@ -453,14 +468,14 @@ class ModelWriteTest extends BaseModelTest {
  * @access public
  * @return void
  */
-    function testCounterCacheWithNonstandardPrimaryKey() {
+	function testCounterCacheWithNonstandardPrimaryKey() {
-        $this->loadFixtures(
+		$this->loadFixtures(
 			'CounterCacheUserNonstandardPrimaryKey',
 			'CounterCachePostNonstandardPrimaryKey'
 		);
 
-        $User = new CounterCacheUserNonstandardPrimaryKey();
+		$User = new CounterCacheUserNonstandardPrimaryKey();
-        $Post = new CounterCachePostNonstandardPrimaryKey();
+		$Post = new CounterCachePostNonstandardPrimaryKey();
 
 		$data = $Post->find('first', array(
 			'conditions' => array('pid' => 1),
@@ -472,7 +487,7 @@ class ModelWriteTest extends BaseModelTest {
 		$users = $User->find('all',array('order' => 'User.uid'));
 		$this->assertEqual($users[0]['User']['post_count'], 1);
 		$this->assertEqual($users[1]['User']['post_count'], 2);
-    }
+	}
 
 /**
  * test Counter Cache With Self Joining table
@@ -502,6 +517,7 @@ class ModelWriteTest extends BaseModelTest {
 		$expected = array_fill(0, 1, 1);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSaveWithCounterCacheScope method
  *
@@ -541,6 +557,7 @@ class ModelWriteTest extends BaseModelTest {
 		$result = $TestModel->findById(1);
 		$this->assertIdentical($result['Syfile']['item_count'], '1');
 	}
+
 /**
  * testValidatesBackwards method
  *
@@ -606,6 +623,7 @@ class ModelWriteTest extends BaseModelTest {
 		$result = $TestModel->validates();
 		$this->assertTrue($result);
 	}
+
 /**
  * testValidates method
  *
@@ -958,6 +976,7 @@ class ModelWriteTest extends BaseModelTest {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSaveField method
  *
@@ -1026,6 +1045,7 @@ class ModelWriteTest extends BaseModelTest {
 		$result = $Node->read();
 		$this->assertEqual(Set::extract('/ParentNode/name', $result), array('Second'));
 	}
+
 /**
  * testSaveWithCreate method
  *
@@ -1247,6 +1267,7 @@ class ModelWriteTest extends BaseModelTest {
 
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSaveWithSet method
  *
@@ -1374,6 +1395,7 @@ class ModelWriteTest extends BaseModelTest {
 		);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSaveWithNonExistentFields method
  *
@@ -1425,6 +1447,7 @@ class ModelWriteTest extends BaseModelTest {
 		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSaveFromXml method
  *
@@ -1442,6 +1465,7 @@ class ModelWriteTest extends BaseModelTest {
 		$results = $Article->find(array('Article.title' => 'test xml'));
 		$this->assertTrue($results);
 	}
+
 /**
  * testSaveHabtm method
  *
@@ -1913,6 +1937,7 @@ class ModelWriteTest extends BaseModelTest {
 		$expected = array('new record', 'new record');
 		$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/other', $result), $expected);
 	}
+
 /**
  * testSaveHabtmCustomKeys method
  *
@@ -1963,6 +1988,7 @@ class ModelWriteTest extends BaseModelTest {
 		));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testHabtmSaveKeyResolution method
  *
@@ -2052,6 +2078,7 @@ class ModelWriteTest extends BaseModelTest {
 		));
 		$this->assertEqual($result['Monkey'], $expected);
 	}
+
 /**
  * testCreationOfEmptyRecord method
  *
@@ -2071,6 +2098,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertTrue(isset($result['Author']['updated']));
 		$this->assertEqual($TestModel->find('count'), 1);
 	}
+
 /**
  * testCreateWithPKFiltering method
  *
@@ -2167,6 +2195,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertEqual($result, $expected);
 		$this->assertFalse($TestModel->id);
 	}
+
 /**
  * testCreationWithMultipleData method
  *
@@ -2338,6 +2367,7 @@ class ModelWriteTest extends BaseModelTest {
 	))));
 
 	}
+
 /**
  * testCreationWithMultipleDataSameModel method
  *
@@ -2396,6 +2426,7 @@ class ModelWriteTest extends BaseModelTest {
 				'title' => 'Brand New Article'
 		))));
 	}
+
 /**
  * testCreationWithMultipleDataSameModelManualInstances method
  *
@@ -2434,6 +2465,7 @@ class ModelWriteTest extends BaseModelTest {
 		$result = $Primary->find('count');
 		$this->assertEqual($result, 2);
 	}
+
 /**
  * testRecordExists method
  *
@@ -2457,6 +2489,7 @@ class ModelWriteTest extends BaseModelTest {
 		$TestModel->id = 5;
 		$this->assertFalse($TestModel->exists());
 	}
+
 /**
  * testUpdateExisting method
  *
@@ -2504,6 +2537,7 @@ class ModelWriteTest extends BaseModelTest {
 		$result = $Comment->save($data);
 		$this->assertTrue($result);
 	}
+
 /**
  * testUpdateMultiple method
  *
@@ -2537,6 +2571,7 @@ class ModelWriteTest extends BaseModelTest {
 		$expected = array_fill(0, 2, 'Updated today');
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testHabtmUuidWithUuidId method
  *
@@ -2556,6 +2591,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertEqual(1, count($result['Uuiditem']));
 		$this->assertEqual(strlen($result['Uuiditem'][0]['UuiditemsUuidportfolio']['id']), 36);
 	}
+
 /**
  * test HABTM saving when join table has no primary key and only 2 columns.
  *
@@ -2579,6 +2615,7 @@ class ModelWriteTest extends BaseModelTest {
 		);
 		$this->assertTrue($Fruit->save($data));
 	}
+
 /**
  * test HABTM saving when join table has no primary key and only 2 columns, no with model is used.
  *
@@ -2621,6 +2658,7 @@ class ModelWriteTest extends BaseModelTest {
 		$result = $TestModel->read(null, $id);
 		$this->assertEqual(1, count($result['Uuidportfolio']));
 	}
+
 /**
  * testSaveMultipleHabtm method
  *
@@ -2739,6 +2777,7 @@ class ModelWriteTest extends BaseModelTest {
 
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSaveAll method
  *
@@ -2878,6 +2917,7 @@ class ModelWriteTest extends BaseModelTest {
 		);
 		$this->assertEqual($result[6]['Attachment'], $expected);
 	}
+
 /**
  * Test SaveAll with Habtm relations
  *
@@ -2909,6 +2949,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertEqual(count($result['Comment']), 1);
 		$this->assertEqual(count($result['Comment'][0]['comment']['Article comment']), 1);
 	}
+
 /**
  * Test SaveAll with Habtm relations and extra join table fields
  *
@@ -2952,6 +2993,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[something_else_id=3]', $result));
 		$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[doomed=1]', $result));
 	}
+
 /**
  * testSaveAllHasOne method
  *
@@ -2991,6 +3033,7 @@ class ModelWriteTest extends BaseModelTest {
 		)));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSaveAllBelongsTo method
  *
@@ -3030,6 +3073,7 @@ class ModelWriteTest extends BaseModelTest {
 		)));
 		$this->assertEqual($result, $expected);
 	}
+
 /**
  * testSaveAllHasOneValidation method
  *
@@ -3076,6 +3120,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertEqual($model->validationErrors, $expected['Comment']);
 		$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
 	}
+
 /**
  * testSaveAllAtomic method
  *
@@ -3149,6 +3194,7 @@ class ModelWriteTest extends BaseModelTest {
 		), array('atomic' => false));
 		$this->assertIdentical($result, array('Article' => true, 'Comment' => array(true, true)));
 	}
+
 /**
  * testSaveAllHasMany method
  *
@@ -3225,6 +3271,7 @@ class ModelWriteTest extends BaseModelTest {
 		);
 		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
 	}
+
 /**
  * testSaveAllHasManyValidation method
  *
@@ -3265,6 +3312,7 @@ class ModelWriteTest extends BaseModelTest {
 			))
 		), array('validate' => 'only'));
 	}
+
 /**
  * testSaveAllTransaction method
  *
@@ -3654,6 +3702,7 @@ class ModelWriteTest extends BaseModelTest {
 
 		$TestModel->validate['body'] = 'notEmpty';
 	}
+
 /**
  * testSaveAllValidationOnly method
  *
@@ -3706,6 +3755,7 @@ class ModelWriteTest extends BaseModelTest {
 		);
 		$this->assertEqual($TestModel->validationErrors, $expected);
 	}
+
 /**
  * testSaveAllValidateFirst method
  *
@@ -3784,6 +3834,7 @@ class ModelWriteTest extends BaseModelTest {
 		);
 		$this->assertEqual($result[0]['Comment'][0]['comment'], 'Only new comment');
 	}
+
 /**
  * testUpdateWithCalculation method
  *
@@ -3812,6 +3863,7 @@ class ModelWriteTest extends BaseModelTest {
 		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
 		$this->assertEqual($result, array(6, 4, 5, 2));
 	}
+
 /**
  * testSaveAllHasManyValidationOnly method
  *

cake/tests/lib/cake_test_fixture.php

@@ -40,6 +40,7 @@ class CakeTestFixture extends Object {
  * @var string
  **/
 	var $name = null;
+
 /**
  * Cake's DBO driver (e.g: DboMysql).
  *
@@ -53,6 +54,7 @@ class CakeTestFixture extends Object {
  * @access public
  */
 	var $table = null;
+
 /**
  * Instantiate the fixture.
  *

cake/tests/test_app/views/layouts/cache_layout.ctp

@@ -35,5 +35,4 @@
 <cake:nocache>
 	<?php echo $variable; ?>
 </cake:nocache>
-<p>Additional regular text.</p>
+<p>Additional regular text.</p>
-

cake/tests/test_app/views/layouts/email/text/default.ctp

@@ -26,4 +26,4 @@
 
 <?php echo $content_for_layout;?>
 
-This email was sent using the CakePHP Framework, http://cakephp.org.
+This email was sent using the CakePHP Framework, http://cakephp.org.