Updated GetServiceProvider and TryGetServiceProvider to be extension …

…methods of IResourceHost
RolandKoenig · Jan 3, 2024 · fcc5cbe · fcc5cbe
1 parent d0f5cb5
commit fcc5cbe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/RolandK.AvaloniaExtensions.DependencyInjection.Tests/DependencyInjectionTests.cs b/src/RolandK.AvaloniaExtensions.DependencyInjection.Tests/DependencyInjectionTests.cs
@@ -142,6 +142,20 @@ public Task Create_Control_and_get_ServiceProvider_from_it()
         });
     }
 
+    [Fact]
+    public Task Get_ServiceProvider_from_Application()
+    {
+        return UnitTestApplication.RunInApplicationContextAsync(() =>
+        {
+            // Act
+            var serviceProvider = Application.Current?.GetServiceProvider();
+
+            // Assert
+            Assert.NotNull(serviceProvider);
+            Assert.NotNull(serviceProvider.GetService(typeof(IDummyService)));
+        });
+    }
+
     //*************************************************************************
     //*************************************************************************
     //*************************************************************************

diff --git a/....DependencyInjection/ControlExtensions.cs → ...dencyInjection/IResourceHostExtensions.cs b/....DependencyInjection/ControlExtensions.cs → ...dencyInjection/IResourceHostExtensions.cs
@@ -1,15 +1,14 @@
-using Avalonia;
 using Avalonia.Controls;
 
 namespace RolandK.AvaloniaExtensions.DependencyInjection;
 
-public static class ControlExtensions
+public static class IResourceHostExtensions
 {
     /// <summary>
     /// Gets the <see cref="IServiceProvider"/> for this application.
     /// Returns null, if the <see cref="IServiceProvider"/> could not be found.
     /// </summary>
-    public static IServiceProvider? TryGetServiceProvider(this StyledElement control)
+    public static IServiceProvider? TryGetServiceProvider(this IResourceHost control)
     {
         if(control.TryFindResource(DependencyInjectionConstants.SERVICE_PROVIDER_RESOURCE_KEY, out var resource) &&
            resource is IServiceProvider serviceProvider)
@@ -23,7 +22,7 @@ public static class ControlExtensions
     /// Gets the <see cref="IServiceProvider"/> for this application.
     /// </summary>
     /// <exception cref="InvalidOperationException"><see cref="IServiceProvider"/> could not be found</exception>
-    public static IServiceProvider GetServiceProvider(this StyledElement control)
+    public static IServiceProvider GetServiceProvider(this IResourceHost control)
     {
         var serviceProvider = TryGetServiceProvider(control);
         if (serviceProvider == null)
@@ -33,4 +32,4 @@ public static IServiceProvider GetServiceProvider(this StyledElement control)
         }
         return serviceProvider;
     }
-}
+}