Code standards formatting

This commit is contained in:
Kyle Robinson Young 2011-12-15 22:52:07 -08:00
parent f1b566b88e
commit 51f9837db4
58 changed files with 220 additions and 213 deletions

View file

@ -355,7 +355,7 @@ class AclNodeTest extends CakeTestCase {
$result = $Aco->find('all'); $result = $Aco->find('all');
$expected = array( $expected = array(
array('DbAcoTest' => array('id' => '1', 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'Application', 'lft' => '1', 'rght' => '4'), 'DbAroTest' => array()), array('DbAcoTest' => array('id' => '1', 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'Application', 'lft' => '1', 'rght' => '4'), 'DbAroTest' => array()),
array('DbAcoTest' => array('id' => '2', 'parent_id' => '1', 'model' => null, 'foreign_key' => null, 'alias' => 'Pages', 'lft' => '2', 'rght' => '3', ), 'DbAroTest' => array()) array('DbAcoTest' => array('id' => '2', 'parent_id' => '1', 'model' => null, 'foreign_key' => null, 'alias' => 'Pages', 'lft' => '2', 'rght' => '3'), 'DbAroTest' => array())
); );
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }

View file

@ -5412,7 +5412,7 @@ class ModelWriteTest extends BaseModelTest {
* *
* @return void * @return void
*/ */
function testUpdateAllWithoutForeignKey() { public function testUpdateAllWithoutForeignKey() {
$this->skipIf(!$this->db instanceof Mysql, 'Currently, there is no way of doing joins in an update statement in postgresql'); $this->skipIf(!$this->db instanceof Mysql, 'Currently, there is no way of doing joins in an update statement in postgresql');
$this->loadFixtures('ProductUpdateAll', 'GroupUpdateAll'); $this->loadFixtures('ProductUpdateAll', 'GroupUpdateAll');

View file

@ -36,18 +36,22 @@ class GroupUpdateAllFixture extends CakeTestFixture {
array( array(
'id' => 1, 'id' => 1,
'name' => 'group one', 'name' => 'group one',
'code' => 120), 'code' => 120
),
array( array(
'id' => 2, 'id' => 2,
'name' => 'group two', 'name' => 'group two',
'code' => 125), 'code' => 125
),
array( array(
'id' => 3, 'id' => 3,
'name' => 'group three', 'name' => 'group three',
'code' => 130), 'code' => 130
),
array( array(
'id' => 4, 'id' => 4,
'name' => 'group four', 'name' => 'group four',
'code' => 135) 'code' => 135
),
); );
} }

View file

@ -44,16 +44,19 @@ class ProductUpdateAllFixture extends CakeTestFixture {
'id' => 2, 'id' => 2,
'name' => 'product two', 'name' => 'product two',
'groupcode' => 120, 'groupcode' => 120,
'group_id' => 1), 'group_id' => 1
),
array( array(
'id' => 3, 'id' => 3,
'name' => 'product three', 'name' => 'product three',
'groupcode' => 125, 'groupcode' => 125,
'group_id' => 2), 'group_id' => 2
),
array( array(
'id' => 4, 'id' => 4,
'name' => 'product four', 'name' => 'product four',
'groupcode' => 135, 'groupcode' => 135,
'group_id' => 4) 'group_id' => 4
),
); );
} }