Test GetProviderRoot/GetCacheRoot exceptions

Author: ronaldbarendse

tests/ImageSharp.Web.Tests/Caching/PhysicialFileSystemCacheTests.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
 using SixLabors.ImageSharp.Web.Caching;
 using Xunit;
 
@@ -31,21 +32,36 @@ public void FilePathMatchesReference(string key, int cacheFolderDepth, string ex
         [InlineData("cacheFolder", null, "/Users/WebRoot", null, "/Users/WebRoot/cacheFolder/")]
         [InlineData("cacheFolder", "../Temp", null, "/Users/this/a/root", "/Users/this/a/Temp/cacheFolder/")]
 #elif OS_WINDOWS
-        [InlineData("cacheFolder", "C:/Temp", null, null, "C:/Temp\\cacheFolder\\")]
-        [InlineData("cacheFolder", null, "C:/WebRoot", null, "C:/WebRoot\\cacheFolder\\")]
-        [InlineData("cacheFolder", "../Temp", null, "C:/this/a/root", "C:\\this\\a\\Temp\\cacheFolder\\")]
+        [InlineData("cacheFolder", "C:\\Temp", null, null, "C:\\Temp\\cacheFolder\\")]
+        [InlineData("cacheFolder", null, "C:\\WebRoot", null, "C:\\WebRoot\\cacheFolder\\")]
+        [InlineData("cacheFolder", "..\\Temp", null, "C:\\this\\a\\root", "C:\\this\\a\\Temp\\cacheFolder\\")]
 #endif
-        public void CacheRootFromOptions(string cacheFolder, string cacheRoot, string webRootPath, string contentRootPath, string expected)
+        public void GetCacheRoot(string cacheFolder, string cacheRootPath, string webRootPath, string contentRootPath, string expected)
         {
             var cacheOptions = new PhysicalFileSystemCacheOptions
             {
                 CacheFolder = cacheFolder,
-                CacheRootPath = cacheRoot
+                CacheRootPath = cacheRootPath
             };
 
-            string cacheRootResult = PhysicalFileSystemCache.GetCacheRoot(cacheOptions, webRootPath, contentRootPath);
+            string actual = PhysicalFileSystemCache.GetCacheRoot(cacheOptions, webRootPath, contentRootPath);
 
-            Assert.Equal(expected, cacheRootResult);
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData("cacheFolder", null, null, "C:\\root\\")]
+        [InlineData("cacheFolder", "", null, "C:\\root\\")]
+        [InlineData("cacheFolder", null, "", "C:\\root\\")]
+        public void GetCacheRootThrows(string cacheFolder, string cacheRootPath, string webRootPath, string contentRootPath)
+        {
+            var cacheOptions = new PhysicalFileSystemCacheOptions
+            {
+                CacheFolder = cacheFolder,
+                CacheRootPath = cacheRootPath
+            };
+
+            Assert.Throws<InvalidOperationException>(() => PhysicalFileSystemCache.GetCacheRoot(cacheOptions, webRootPath, contentRootPath));
         }
     }
 }

tests/ImageSharp.Web.Tests/Providers/PhysicalFileSystemProviderTests.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
 using SixLabors.ImageSharp.Web.Providers;
 using Xunit;
 
@@ -22,22 +23,36 @@ public class PhysicalFileSystemProviderTests
         [InlineData("../Temp", null, "/Users/this/a/root", "/Users/this/a/Temp/")]
         [InlineData("/Users/WebRoot", null, "/Users/this/a/root", "/Users/WebRoot/")]
 #elif OS_WINDOWS
-        [InlineData(null, "wwwroot", "C:/root\\", "C:\\root\\wwwroot\\")]
-        [InlineData(null, "C:/WebRoot", "C:/root\\", "C:/WebRoot\\")]
-        [InlineData("providerFolder", "../Temp", "C:/this/a/root", "C:\\this\\a\\root\\providerFolder\\")]
-        [InlineData("../Temp", null, "C:/this/a/root", "C:\\this\\a\\Temp\\")]
-        [InlineData("C:/WebRoot", null, "C:/this/a/root", "C:/WebRoot\\")]
+        [InlineData(null, "wwwroot", "C:\\root\\", "C:\\root\\wwwroot\\")]
+        [InlineData(null, "C:\\WebRoot", "C:\\root\\", "C:\\WebRoot\\")]
+        [InlineData("providerFolder", "..\\Temp", "C:\\this\\a\\root", "C:\\this\\a\\root\\providerFolder\\")]
+        [InlineData("..\\Temp", null, "C:\\this\\a\\root", "C:\\this\\a\\Temp\\")]
+        [InlineData("C:\\WebRoot", null, "C:\\this\\a\\root", "C:\\WebRoot\\")]
 #endif
-        public void ProvidersRootFromOptions(string providerRoot, string webRootPath, string contentRootPath, string expected)
+        public void GetProviderRoot(string providerRootPath, string webRootPath, string contentRootPath, string expected)
         {
             var providerOptions = new PhysicalFileSystemProviderOptions
             {
-                ProviderRootPath = providerRoot,
+                ProviderRootPath = providerRootPath
             };
 
-            string providerRootResult = PhysicalFileSystemProvider.GetProviderRoot(providerOptions, webRootPath, contentRootPath);
+            string actual = PhysicalFileSystemProvider.GetProviderRoot(providerOptions, webRootPath, contentRootPath);
 
-            Assert.Equal(expected, providerRootResult);
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(null, null, "C:\\root\\")]
+        [InlineData("", null, "C:\\root\\")]
+        [InlineData(null, "", "C:\\root\\")]
+        public void GetProviderRootThrows(string providerRootPath, string webRootPath, string contentRootPath)
+        {
+            var providerOptions = new PhysicalFileSystemProviderOptions
+            {
+                ProviderRootPath = providerRootPath
+            };
+
+            Assert.Throws<InvalidOperationException>(() => PhysicalFileSystemProvider.GetProviderRoot(providerOptions, webRootPath, contentRootPath));
         }
     }
 }