Skip to content
This repository
Browse code

Removing deprecated methods from test cases.

  • Loading branch information...
commit 4b4f3b1b821d01039e0fcb72c1f9f631fc11a1a1 1 parent 2c63391
Mark Story authored September 16, 2009
17  cake/tests/cases/libs/model/model_delete.test.php
... ...
@@ -1,6 +1,4 @@
1 1
 <?php
2  
-/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
3  
-
4 2
 /**
5 3
  * ModelDeleteTest file
6 4
  *
@@ -26,7 +24,6 @@
26 24
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
27 25
  */
28 26
 require_once dirname(__FILE__) . DS . 'model.test.php';
29  
-require_once dirname(__FILE__) . DS . 'model_delete.test.php';
30 27
 
31 28
 /**
32 29
  * ModelDeleteTest
@@ -168,7 +165,7 @@ function testDeleteDependentWithConditions() {
168 165
 		$Cd =& new Cd();
169 166
 		$OverallFavorite =& new OverallFavorite();
170 167
 
171  
-		$Cd->del(1);
  168
+		$Cd->delete(1);
172 169
 
173 170
 		$result = $OverallFavorite->find('all', array(
174 171
 			'fields' => array('model_type', 'model_id', 'priority')
@@ -191,11 +188,11 @@ function testDeleteDependentWithConditions() {
191 188
  * @access public
192 189
  * @return void
193 190
  */
194  
-	function testDel() {
  191
+	function testDelete() {
195 192
 		$this->loadFixtures('Article');
196 193
 		$TestModel =& new Article();
197 194
 
198  
-		$result = $TestModel->del(2);
  195
+		$result = $TestModel->delete(2);
199 196
 		$this->assertTrue($result);
200 197
 
201 198
 		$result = $TestModel->read(null, 2);
@@ -216,7 +213,7 @@ function testDel() {
216 213
 		)));
217 214
 		$this->assertEqual($result, $expected);
218 215
 
219  
-		$result = $TestModel->del(3);
  216
+		$result = $TestModel->delete(3);
220 217
 		$this->assertTrue($result);
221 218
 
222 219
 		$result = $TestModel->read(null, 3);
@@ -245,8 +242,8 @@ function testDel() {
245 242
 		foreach ($data as $id) {
246 243
 			$Uuid->save(array('id' => $id));
247 244
 		}
248  
-		$Uuid->del('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
249  
-		$Uuid->del('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
  245
+		$Uuid->delete('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
  246
+		$Uuid->delete('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
250 247
 		foreach ($data as $id) {
251 248
 			$Uuid->save(array('id' => $id));
252 249
 		}
@@ -416,7 +413,7 @@ function testRecursiveDel() {
416 413
 		$this->loadFixtures('Article', 'Comment', 'Attachment');
417 414
 		$TestModel =& new Article();
418 415
 
419  
-		$result = $TestModel->del(2);
  416
+		$result = $TestModel->delete(2);
420 417
 		$this->assertTrue($result);
421 418
 
422 419
 		$TestModel->recursive = 2;

0 notes on commit 4b4f3b1

Please sign in to comment.
Something went wrong with that request. Please try again.