Skip to content
Permalink
Browse files

Removing deprecated methods from test cases.

  • Loading branch information...
markstory committed Sep 16, 2009
1 parent 2c63391 commit 4b4f3b1b821d01039e0fcb72c1f9f631fc11a1a1
Showing with 7 additions and 10 deletions.
  1. +7 −10 cake/tests/cases/libs/model/model_delete.test.php
@@ -1,6 +1,4 @@
<?php
/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
/**
* ModelDeleteTest file
*
@@ -26,7 +24,6 @@
* @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
*/
require_once dirname(__FILE__) . DS . 'model.test.php';
require_once dirname(__FILE__) . DS . 'model_delete.test.php';
/**
* ModelDeleteTest
@@ -168,7 +165,7 @@ function testDeleteDependentWithConditions() {
$Cd =& new Cd();
$OverallFavorite =& new OverallFavorite();
$Cd->del(1);
$Cd->delete(1);
$result = $OverallFavorite->find('all', array(
'fields' => array('model_type', 'model_id', 'priority')
@@ -191,11 +188,11 @@ function testDeleteDependentWithConditions() {
* @access public
* @return void
*/
function testDel() {
function testDelete() {
$this->loadFixtures('Article');
$TestModel =& new Article();
$result = $TestModel->del(2);
$result = $TestModel->delete(2);
$this->assertTrue($result);
$result = $TestModel->read(null, 2);
@@ -216,7 +213,7 @@ function testDel() {
)));
$this->assertEqual($result, $expected);
$result = $TestModel->del(3);
$result = $TestModel->delete(3);
$this->assertTrue($result);
$result = $TestModel->read(null, 3);
@@ -245,8 +242,8 @@ function testDel() {
foreach ($data as $id) {
$Uuid->save(array('id' => $id));
}
$Uuid->del('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
$Uuid->del('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
$Uuid->delete('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
$Uuid->delete('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
foreach ($data as $id) {
$Uuid->save(array('id' => $id));
}
@@ -416,7 +413,7 @@ function testRecursiveDel() {
$this->loadFixtures('Article', 'Comment', 'Attachment');
$TestModel =& new Article();
$result = $TestModel->del(2);
$result = $TestModel->delete(2);
$this->assertTrue($result);
$TestModel->recursive = 2;

0 comments on commit 4b4f3b1

Please sign in to comment.
You can’t perform that action at this time.