From ec76d6aac3583cbf4288746a550b89421477603b Mon Sep 17 00:00:00 2001 From: "mariano.iglesias" Date: Wed, 24 Oct 2007 16:10:20 +0000 Subject: [PATCH] Changing names for instance vars in test added for #3455 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5890 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/tests/cases/libs/model/model.test.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php index ab3b3cb84..64ee8d327 100644 --- a/cake/tests/cases/libs/model/model.test.php +++ b/cake/tests/cases/libs/model/model.test.php @@ -642,24 +642,24 @@ class ModelTest extends CakeTestCase { } function testCreationWithMultipleDataSameModel() { - $this->PrimaryModel =& new Article(); - $this->SecondaryModel =& new Article(); + $this->Article =& new Article(); + $this->SecondaryArticle =& new Article(); - $result = $this->PrimaryModel->field('title', array('id' => 1)); + $result = $this->Article->field('title', array('id' => 1)); $this->assertEqual($result, 'First Article'); $data = array('Article' => array('user_id' => 2, 'title' => 'Brand New Article', 'body' => 'Brand New Article Body', 'published' => 'Y')); - $this->PrimaryModel->create(); - $result = $this->PrimaryModel->save($data); + $this->Article->create(); + $result = $this->Article->save($data); $this->assertTrue($result); - $result = $this->PrimaryModel->getInsertID(); + $result = $this->Article->getInsertID(); $this->assertTrue(!empty($result)); - $result = $this->PrimaryModel->field('title', array('id' => 1)); + $result = $this->Article->field('title', array('id' => 1)); $this->assertEqual($result, 'First Article'); - $articles = $this->PrimaryModel->find('all', array('fields' => array('id','title'), 'recursive' => -1)); + $articles = $this->Article->find('all', array('fields' => array('id','title'), 'recursive' => -1)); $this->assertEqual($articles, array( array('Article' => array('id' => 1, 'title' => 'First Article')), array('Article' => array('id' => 2, 'title' => 'Second Article')),