diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php index ab84755a4..002c5af86 100644 --- a/cake/tests/cases/libs/model/model.test.php +++ b/cake/tests/cases/libs/model/model.test.php @@ -1079,6 +1079,14 @@ class ModelTest extends CakeTestCase { $this->assertEqual($result, $expected); } } + + function getTests() + { + $methods = array('testGenerateList'); + $methods = array_merge(array_merge(array('start', 'startCase'), $methods), array('endCase', 'end')); + return $methods; + } + /** * testGenerateList method * @@ -1095,6 +1103,10 @@ class ModelTest extends CakeTestCase { $expected = array(1 => 'First Article', 2 => 'Second Article', 3 => 'Third Article'); $this->assertEqual($result, $expected); + $result = $TestModel->find('list', array('order' => array('FIELD(Article.id, 3, 2) ASC', 'Article.title ASC'))); + $expected = array(1 => 'First Article', 3 => 'Third Article', 2 => 'Second Article'); + $this->assertEqual($result, $expected); + $result = Set::combine($TestModel->find('all', array('order' => 'Article.title ASC', 'fields' => array('id', 'title'))), '{n}.Article.id', '{n}.Article.title'); $expected = array(1 => 'First Article', 2 => 'Second Article', 3 => 'Third Article'); $this->assertEqual($result, $expected);