From 705e9065a3b677359a9db1fadd7665dec96bb050 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 3 Aug 2022 02:28:05 -0400
Subject: [PATCH] Add more tests for lazy resources

---
 .../Xaml/ResourceDictionaryTests.cs           | 84 +++++++++++++++++--
 1 file changed, 79 insertions(+), 5 deletions(-)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
index 939c5319e4..74b6a1e15d 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
@@ -74,13 +74,33 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 var xaml = @"
 <ResourceDictionary xmlns='https://github.com/avaloniaui'
                     xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-  <Color x:Key='Red'>Red</Color>
+    <SolidColorBrush x:Key='Red' Color='Red' />
 </ResourceDictionary>";
                 var resources = (ResourceDictionary)AvaloniaRuntimeXamlLoader.Load(xaml);
 
                 Assert.True(resources.ContainsDeferredKey("Red"));
             }
         }
+        
+        [Fact]
+        public void Item_Added_To_ResourceDictionary_Is_UnDeferred_On_Read()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<ResourceDictionary xmlns='https://github.com/avaloniaui'
+                    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <SolidColorBrush x:Key='Red' Color='Red' />
+</ResourceDictionary>";
+                var resources = (ResourceDictionary)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+                Assert.True(resources.ContainsDeferredKey("Red"));
+
+                Assert.IsType<SolidColorBrush>(resources["Red"]);
+                
+                Assert.False(resources.ContainsDeferredKey("Red"));
+            }
+        }
 
         [Fact]
         public void Item_Is_Added_To_Window_Resources_As_Deferred()
@@ -91,7 +111,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 <Window xmlns='https://github.com/avaloniaui'
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <Window.Resources>
-        <Color x:Key='Red'>Red</Color>
+        <SolidColorBrush x:Key='Red' Color='Red' />
     </Window.Resources>
 </Window>";
                 var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
@@ -113,7 +133,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary>
-                    <Color x:Key='Red'>Red</Color>
+                    <SolidColorBrush x:Key='Red' Color='Red' />
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
@@ -135,7 +155,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 <Style xmlns='https://github.com/avaloniaui'
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <Style.Resources>
-        <Color x:Key='Red'>Red</Color>
+        <SolidColorBrush x:Key='Red' Color='Red' />
     </Style.Resources>
 </Style>";
                 var style = (Style)AvaloniaRuntimeXamlLoader.Load(xaml);
@@ -154,7 +174,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 <Styles xmlns='https://github.com/avaloniaui'
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <Styles.Resources>
-        <Color x:Key='Red'>Red</Color>
+        <SolidColorBrush x:Key='Red' Color='Red' />
     </Styles.Resources>
 </Styles>";
                 var style = (Styles)AvaloniaRuntimeXamlLoader.Load(xaml);
@@ -164,6 +184,60 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void Item_Can_Be_StaticReferenced_As_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <SolidColorBrush x:Key='Red' Color='Red' />
+    </Window.Resources>
+    <Button>
+        <Button.Resources>
+            <StaticResource x:Key='Red2' ResourceKey='Red' />
+        </Button.Resources>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var windowResources = (ResourceDictionary)window.Resources;
+                var buttonResources = (ResourceDictionary)((Button)window.Content!).Resources;
+                
+                Assert.True(windowResources.ContainsDeferredKey("Red"));
+                Assert.True(buttonResources.ContainsDeferredKey("Red2"));
+            }
+        }
+        
+        [Fact]
+        public void Item_StaticReferenced_Is_UnDeferred_On_Read()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <SolidColorBrush x:Key='Red' Color='Red' />
+    </Window.Resources>
+    <Button>
+        <Button.Resources>
+            <StaticResource x:Key='Red2' ResourceKey='Red' />
+        </Button.Resources>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var windowResources = (ResourceDictionary)window.Resources;
+                var buttonResources = (ResourceDictionary)((Button)window.Content!).Resources;
+                
+                Assert.IsType<SolidColorBrush>(buttonResources["Red2"]);
+                
+                Assert.False(windowResources.ContainsDeferredKey("Red"));
+                Assert.False(buttonResources.ContainsDeferredKey("Red2"));
+            }
+        }
+
         private IDisposable StyledWindow(params (string, string)[] assets)
         {
             var services = TestServices.StyledWindow.With(