adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 10:36:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding test cases for HABTM limit fix (#4204), and disproving HABTM save issue (#4194)

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6571 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2008-03-15 05:08:06 +00:00
parent a9378fb681
commit a282e1152f
4 changed files with 93 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
cake/tests/cases/libs/model/model.test.php
View file

@ -48,7 +48,7 @@ class ModelTest extends CakeTestCase {
'core.syfile', 'core.image', 'core.device_type', 'core.device_type_category', 'core.feature_set', 'core.exterior_type_category',
'core.document', 'core.device', 'core.document_directory', 'core.primary_model', 'core.secondary_model', 'core.something',
'core.something_else', 'core.join_thing', 'core.join_a', 'core.join_b', 'core.join_c', 'core.join_a_b', 'core.join_a_c',
'core.uuid', 'core.data_test', 'core.posts_tag'
'core.uuid', 'core.data_test', 'core.posts_tag', 'core.the_paper_monkies'
);
function start() {
@ -168,24 +168,29 @@ class ModelTest extends CakeTestCase {
}
function testHabtmLimitOptimization() {
$this->loadFixtures('Article', 'User', 'Comment', 'Tag', 'ArticlesTag');
$this->model =& new Article();
$this->loadFixtures('Article', 'User', 'Comment', 'Tag', 'ArticlesTag');
$this->model =& new Article();
$this->model->hasAndBelongsToMany['Tag']['limit'] = 1;
$result = $this->model->read(null, 2);
$expected = array(
'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
'User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
'Comment' => array(
array('id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'),
array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31')
),
'Tag' => array(
array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
)
);
//$this->assertEqual($result, $expected);
$this->model->hasAndBelongsToMany['Tag']['limit'] = 2;
$result = $this->model->read(null, 2);
$expected = array(
'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
'User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
'Comment' => array(
array('id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'),
array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31')
),
'Tag' => array(
array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
)
);
$this->assertEqual($result, $expected);
$this->model->hasAndBelongsToMany['Tag']['limit'] = 1;
$result = $this->model->read(null, 2);
unset($expected['Tag'][1]);
$this->assertEqual($result, $expected);
}
function testHasManyLimitOptimization() {
@ -1815,9 +1820,7 @@ class ModelTest extends CakeTestCase {
));
$result = $this->model->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
$expected = array(
'Article' => array(
'id' => '2', 'user_id' => '3', 'title' => 'New Second Article', 'body' => 'Second Article Body'
),
'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'New Second Article', 'body' => 'Second Article Body'),
'Tag' => array()
);
$this->assertEqual($result, $expected);
@ -1957,6 +1960,25 @@ class ModelTest extends CakeTestCase {
$this->assertEqual($result, $expected);
}
/**
* @todo This is technically incorrect (ThePaperMonkies.apple_id should be ThePaperMonkies.the_paper_id),
* the foreign key name should come from the association name, not the table name... but that's the existing
* functionality at this point.
*/
function testHabtmSaveKeyResolution() {
$this->loadFixtures('Apple', 'Device', 'ThePaperMonkies');
$this->ThePaper =& new ThePaper();
$this->ThePaper->id = 1;
$this->ThePaper->save(array('Monkey' => array(2, 3)));
$result = $this->ThePaper->findById(1);
$expected = array(
array('id' => '2', 'device_type_id' => '1', 'name' => 'Device 2', 'typ' => '1'),
array('id' => '3', 'device_type_id' => '1', 'name' => 'Device 3', 'typ' => '2')
);
$this->assertEqual($result['Monkey'], $expected);
}
function testSaveAll() {
$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
$this->model =& new Post();

5
cake/tests/cases/libs/model/models.php
View file

@ -456,6 +456,11 @@ class ThePaper extends CakeTestModel {
var $name = 'ThePaper';
var $useTable = 'apples';
var $hasOne = array('Itself' => array('className' => 'ThePaper', 'foreignKey' => 'apple_id'));
var $hasAndBelongsToMany = array('Monkey' => array('joinTable' => 'the_paper_monkies'));
}
class Monkey extends CakeTestModel {
var $name = 'Monkey';
var $useTable = 'devices';
}
/**
* Short description for class.

3
cake/tests/fixtures/aco_action_fixture.php vendored
View file

@ -43,8 +43,7 @@ class AcoActionFixture extends CakeTestFixture {
'lft' => array('type' => 'integer', 'length' => 10, 'null' => true),
'rght' => array('type' => 'integer', 'length' => 10, 'null' => true)
);
var $records = array(
);
var $records = array();
}
?>

44
cake/tests/fixtures/the_paper_monkies_fixture.php vendored Normal file
View file

@ -0,0 +1,44 @@
<?php
/* SVN FILE: $Id: the_paper_monkies_fixture.php 6296 2008-01-01 22:18:17Z nate $ */
/**
* Short description for file.
*
* Long description for file
*
* PHP versions 4 and 5
*
* CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
* Copyright 2005-2008, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The Open Group Test Suite License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
* @copyright Copyright 2005-2008, Cake Software Foundation, Inc.
* @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
* @package cake.tests
* @subpackage cake.tests.fixtures
* @since CakePHP(tm) v 1.2.0.4667
* @version $Revision: 6296 $
* @modifiedby $LastChangedBy: phpnut $
* @lastmodified $Date: 2008-01-01 17:18:17 -0500 (Tue, 01 Jan 2008) $
* @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
*/
/**
* Short description for class.
*
* @package cake.tests
* @subpackage cake.tests.fixtures
*/
class ThePaperMonkiesFixture extends CakeTestFixture {
var $name = 'ThePaperMonkies';
var $fields = array(
'apple_id' => array('type' => 'integer', 'length' => 10, 'null' => true),
'device_id' => array('type' => 'integer', 'length' => 10, 'null' => true)
);
var $records = array();
}
?>