ENH: refs #0340. Fix test so it won't break other tests

Author: zachmullen

core/tests/controllers/UserControllerTest.php

@@ -273,11 +273,18 @@ public function testDeleteUserAction()
     {
     $modelLoader = new MIDAS_ModelLoader();
     $settingModel = $modelLoader->loadModel('Setting');
+    $communityModel = $modelLoader->loadModel('Community');
+    $folderModel = $modelLoader->loadModel('Folder');
+    $itemModel = $modelLoader->loadModel('Item');
     $adminuserSetting = $settingModel->getValueByName('adminuser');
     $usersFile = $this->loadData('User', 'default');
+    $commFile = $this->loadData('Community', 'default');
+    $itemFile = $this->loadData('Item', 'default');
     $user1 = $this->User->load($usersFile[0]->getKey());
     $user2 = $this->User->load($usersFile[1]->getKey());
     $adminUser = $this->User->load($usersFile[2]->getKey());
+    $comm = $communityModel->load($commFile[0]->getKey());
+    $item = $itemModel->load($itemFile[0]->getKey());
 
     // Render the delete dialog and make sure it has correct text
     $this->resetAll();
@@ -297,6 +304,9 @@ public function testDeleteUserAction()
     $this->resetAll();
     $this->dispatchUrI('/user/delete?userId='.$user2->getKey(), $user1, true);
 
+    // Make the item exist outside of the user's tree
+    $folderModel->addItem($comm->getPublicFolder(), $item);
+
     $oldRevisions = $user1->getItemrevisions();
     $this->assertTrue(count($oldRevisions) > 0);
     $revisionKeys = array();
@@ -333,16 +343,26 @@ public function testDeleteSelfAction()
     {
     $modelLoader = new MIDAS_ModelLoader();
     $settingModel = $modelLoader->loadModel('Setting');
+    $communityModel = $modelLoader->loadModel('Community');
+    $folderModel = $modelLoader->loadModel('Folder');
+    $itemModel = $modelLoader->loadModel('Item');
     $adminuserSetting = $settingModel->getValueByName('adminuser');
     $usersFile = $this->loadData('User', 'default');
+    $commFile = $this->loadData('Community', 'default');
+    $itemFile = $this->loadData('Item', 'default');
     $user1 = $this->User->load($usersFile[0]->getKey());
+    $comm = $communityModel->load($commFile[0]->getKey());
+    $item = $itemModel->load($itemFile[0]->getKey());
 
     // Render the delete dialog and make sure it has correct text for self-deletion
     $this->resetAll();
     $this->dispatchUrI('/user/deletedialog?userId='.$user1->getKey(), $user1);
     $this->assertQuery('input[type="hidden"][name="userId"][value="'.$user1->getKey().'"]');
     $this->assertTrue(strpos($this->getBody(), 'Are you sure you want to delete your user account?') !== false);
 
+    // Make item exist outside of user's tree
+    $folderModel->addItem($comm->getPublicFolder(), $item);
+
     $oldRevisions = $user1->getItemrevisions();
     $this->assertTrue(count($oldRevisions) > 0);
     $revisionKeys = array();

core/tests/databaseDataset/default.xml

@@ -66,7 +66,6 @@
 		date="2011-01-27 12:09:02" user_id='1' changes="Description 1" />
 	<itempolicygroup item_id="1" group_id="0" policy='0'  />
 	<item2folder item_id="1" folder_id='1001' />
-  <item2folder item_id="1" folder_id="1004" />
 	<item item_id="2" name="name 2" description="Description 2" type="4" uuid='4e311fdf82007c245b07d8d6c4fcb4205f2621eb72751' />
 	<itemrevision itemrevision_id="2" item_id="2" revision="1"
 		date="2011-01-27 12:09:02" user_id='1' changes="Description 1" />