From ef1f36f2836bcdc82a8b2ca1526924b99a54f70c Mon Sep 17 00:00:00 2001
From: shriram <saravananshriram80@gmail.com>
Date: Tue, 8 Nov 2022 16:07:27 -0400
Subject: [PATCH] Updated test cases to include file deletion

---
 islandora.module                                    |  9 ++++++---
 ...WithMedia.php => DeleteNodeWithMediaAndFile.php} | 13 +++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)
 rename tests/src/Functional/{DeleteNodeWithMedia.php => DeleteNodeWithMediaAndFile.php} (87%)

diff --git a/islandora.module b/islandora.module
index 9130caeb..44dc35a7 100644
--- a/islandora.module
+++ b/islandora.module
@@ -347,9 +347,12 @@ function islandora_form_alter(&$form, FormStateInterface $form_state, $form_id)
           '#title' => t('Delete all associated medias and nodes'),
         ];
 
-        foreach ($medias as  $media) {
+        $media_list = [];
+
+        foreach ($medias as $media) {
           $media_list[] = $media->getName();
         }
+
         $form['media_items'] = [
           '#theme' => 'item_list',
           '#type' => 'ul',
@@ -451,9 +454,9 @@ function islandora_object_delete_form_submit($form, &$form_state) {
 
     if ($delete_files) {
       $file_storage->delete($delete_files);
-      foreach ($delete_files as $media) {
+      foreach ($delete_files as $file) {
         $logger->notice('The file %label has been deleted.', [
-          '%label' => $media->label(),
+          '%label' => $file->label(),
         ]);
       }
     }
diff --git a/tests/src/Functional/DeleteNodeWithMedia.php b/tests/src/Functional/DeleteNodeWithMediaAndFile.php
similarity index 87%
rename from tests/src/Functional/DeleteNodeWithMedia.php
rename to tests/src/Functional/DeleteNodeWithMediaAndFile.php
index b9cc8f99..ff793f0d 100644
--- a/tests/src/Functional/DeleteNodeWithMedia.php
+++ b/tests/src/Functional/DeleteNodeWithMediaAndFile.php
@@ -7,17 +7,18 @@ namespace Drupal\Tests\islandora\Functional;
  *
  * @group islandora
  */
-class DeleteNodeWithMedia extends IslandoraFunctionalTestBase {
+class DeleteNodeWithMediaAndFile extends IslandoraFunctionalTestBase {
 
   /**
    * Tests delete Node and its assoicated media.
    */
-  public function testDeleteNodeWithMedia() {
+  public function testDeleteNodeWithMediaAndFile() {
     $account = $this->drupalCreateUser([
       'delete any media',
       'create media',
       'view media',
       'bypass node access',
+      'access files overview',
     ]);
     $this->drupalLogin($account);
 
@@ -81,14 +82,18 @@ class DeleteNodeWithMedia extends IslandoraFunctionalTestBase {
     $assert_session->pageTextContains('Media2');
     $this->submitForm($delete, 'Delete');
 
-    $assert_session->pageTextContains('Media1');
-    $assert_session->pageTextContains('Media2');
+    $assert_session->pageTextContains($media1->id());
+    $assert_session->pageTextContains($media2->id());
 
     $this->drupalGet("media/1/delete");
     $assert_session->pageTextContains('Page not found');
 
     $this->drupalGet("media/2/delete");
     $assert_session->pageTextContains('Page not found');
+
+    $this->drupalGet("/admin/content/files");
+    $assert_session->pageTextNotContains('test.jpeg');
+
   }
 
 }