ENH: refs #0355. Add a test to make sure item delete doesn't break again

Author: zachmullen

core/controllers/ItemController.php

@@ -292,21 +292,21 @@ function editAction()
     $this->view->form = $formArray;
     }
 
-  /** Delete an item*/
+  /** Delete an item */
   function deleteAction()
     {
-    $this->_helper->layout->disableLayout();
+    $this->disableLayout();
     $this->_helper->viewRenderer->setNoRender();
 
-    $itemId = $this->_getParam("itemId");
+    $itemId = $this->_getParam('itemId');
     if(!isset($itemId) || (!is_numeric($itemId) && strlen($itemId) != 32)) // This is tricky! and for Cassandra for now
       {
       throw new Zend_Exception("itemId should be a number");
       }
     $itemDao = $this->Item->load($itemId);
     if($itemDao === false || !$this->Item->policyCheck($itemDao, $this->userSession->Dao, MIDAS_POLICY_ADMIN))
       {
-      throw new Zend_Exception("This community doesn't exist or you don't have the permissions.");
+      throw new Zend_Exception("This item doesn't exist or you don't have the permissions.");
       }
 
     $this->Item->delete($itemDao);

core/tests/controllers/CMakeLists.txt

@@ -1,7 +1,8 @@
-add_midas_test( IndexController IndexControllerTest.php )
 add_midas_test( FeedController FeedControllerTest.php )
-add_midas_test( UserController UserControllerTest.php )
+add_midas_test( ItemController ItemControllerTest.php )
+add_midas_test( IndexController IndexControllerTest.php )
 add_midas_test( UploadDownloadController UploadDownloadControllerTest.php )
+add_midas_test( UserController UserControllerTest.php )
 
 add_subdirectory( components )
 

core/tests/controllers/ItemControllerTest.php

@@ -0,0 +1,58 @@
+<?php
+/*=========================================================================
+MIDAS Server
+Copyright (c) Kitware SAS. 20 rue de la Villette. All rights reserved.
+69328 Lyon, FRANCE.
+
+See Copyright.txt for details.
+This software is distributed WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the above copyright notices for more information.
+=========================================================================*/
+/** test item controller*/
+class ItemControllerTest extends ControllerTestCase
+  {
+
+  /** init test*/
+  public function setUp()
+    {
+    $this->setupDatabase(array('default'));
+    $this->_models = array('Item', 'ItemRevision', 'User');
+    parent::setUp();
+    }
+
+  /** Test explicit deletion of an item */
+  public function testDeleteAction()
+    {
+    $itemsFile = $this->loadData('Item', 'default');
+    $usersFile = $this->loadData('User', 'default');
+    $userWithPermission = $this->User->load($usersFile[0]->getKey());
+    $userWithoutPermission = $this->User->load($usersFile[1]->getKey());
+
+    $itemDao = $this->Item->load($itemsFile[1]->getKey());
+    $this->assertEquals(count($itemDao->getRevisions()), 1);
+    $revisions = $itemDao->getRevisions();
+    $revisionId = $revisions[0]->getItemrevisionId();
+
+    $url = '/item/delete?itemId='.$itemDao->getItemId();
+
+    // Should throw an exception for anonymous user
+    $this->dispatchUrI($url, null, true);
+    $this->assertController('error');
+
+    // Should throw an exception for normal user
+    $this->resetAll();
+    $this->dispatchUrI($url, $userWithoutPermission, true);
+    $this->assertController('error');
+
+    // User with proper privileges should be able to delete the item
+    $this->resetAll();
+    $this->dispatchUrI($url, $userWithPermission);
+    $this->assertController('item');
+    $this->assertAction('delete');
+
+    $this->assertFalse($this->Item->load($itemsFile[1]->getKey()));
+    $this->assertFalse($this->ItemRevision->load($revisionId));
+    }
+
+  }