Allow sub-directories to be deleted when calling DeleteDirectory. Was failing when trying to tidy up my unit test with subfolders

Author: Warren Buckley

src/UmbracoFileSystemProviders.Azure.Tests/AzureBlobFileSystemTestsBase.cs

@@ -294,7 +294,7 @@ public void TestGetDirectories()
             IEnumerable<string> actual = provider.GetDirectories("/");
 
             // Assert
-            string[] expected = { "1010/", "1011/", "1012/", "forms/", "testvalid/" };
+            string[] expected = { "1010/", "1011/", "1012/" };
             Assert.IsTrue(expected.SequenceEqual(actual));
         }
 
@@ -315,7 +315,7 @@ public void TestGetDirectoriesPrefixed()
             IEnumerable<string> actual = provider.GetDirectories("/");
 
             // Assert
-            string[] expected = { "1010/", "1011/", "1012/", "testvalid/" };
+            string[] expected = { "1010/", "1011/", "1012/" };
             Assert.IsTrue(expected.SequenceEqual(actual));
         }
 
@@ -533,6 +533,9 @@ public void TestGetSubDirectories()
             // Assert
             string[] expected = { "forms/form_123/", "forms/form_456/" };
             Assert.IsTrue(expected.SequenceEqual(actual));
+
+            // Tidy up after test
+            provider.DeleteDirectory("forms");
         }
 
         /// <summary>
@@ -559,10 +562,11 @@ public void TestGetSubDirectoriesAndFiles()
             }
 
             // Assert
-            string[] expected = { "forms/form_123/kitty.jpg", "forms/form_123/dog.jpg", "forms/form_456/panda.jpg" };
+            string[] expected = { "forms/form_123/dog.jpg", "forms/form_123/kitty.jpg", "forms/form_456/panda.jpg" };
             Assert.IsTrue(expected.SequenceEqual(actual));
-        }
-        
 
+            // Tidy up after test
+            provider.DeleteDirectory("forms");
+        }
     }
 }

src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs

@@ -277,15 +277,31 @@ public void DeleteDirectory(string path, bool recursive)
 
             CloudBlobDirectory directory = this.GetDirectoryReference(path);
 
-            IEnumerable<CloudBlockBlob> blobs = directory.ListBlobs().OfType<CloudBlockBlob>();
+            // WB: This will only delete a folder if it only has files & not sub directories
+            // IEnumerable<CloudBlockBlob> blobs = directory.ListBlobs().OfType<CloudBlockBlob>();
+
+            IEnumerable<IListBlobItem> blobs = directory.ListBlobs();
+
 
             if (recursive)
             {
-                foreach (CloudBlockBlob blockBlob in blobs)
+                foreach (var blobItem in blobs)
                 {
                     try
                     {
-                        blockBlob.DeleteIfExists(DeleteSnapshotsOption.IncludeSnapshots);
+                        if (blobItem is CloudBlobDirectory)
+                        {
+                            var blobFolder = blobItem as CloudBlobDirectory;
+
+                            // Resurssively call this method
+                            this.DeleteDirectory(blobFolder.Prefix);
+                        }
+                        else
+                        {
+                            // Can assume its a file aka CloudBlob
+                            var blobFile = blobItem as CloudBlockBlob;
+                            blobFile?.DeleteIfExists(DeleteSnapshotsOption.IncludeSnapshots);
+                        }
                     }
                     catch (Exception ex)
                     {