chore: fix more xLoad tests

unoplatform · Mar 9, 2024 · 2fde6bd · 2fde6bd
1 parent 4f045f0
commit 2fde6bd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/Uno.UI.Tests/Windows_UI_Xaml/Given_xLoad.cs b/src/Uno.UI.Tests/Windows_UI_Xaml/Given_xLoad.cs
@@ -76,11 +76,12 @@ public void When_xLoad_Deferred_VisibilityBinding()
 
 			Assert.IsNull(SUT.border7);
 
+			// Changing the visibility DOES NOT materialize the lazily-loaded element.
 			SUT.DataContext = true;
-
-			Assert.IsNotNull(SUT.border7);
+			Assert.IsNull(SUT.border7);
 
 			var border = SUT.FindName("border7");
+			Assert.IsNotNull(SUT.border7);
 			Assert.AreEqual(SUT.border7, border);
 		}
 
@@ -96,12 +97,14 @@ public void When_xLoad_Deferred_VisibilityxBind()
 
 			Assert.IsNull(SUT.border8);
 
+			// Changing the visibility DOES NOT materialize the lazily-loaded element.
 			SUT.MyVisibility = true;
 			SUT.Measure(new Size(42, 42));
 
-			Assert.IsNotNull(SUT.border8);
+			Assert.IsNull(SUT.border8);
 
 			var border1 = SUT.FindName("border8");
+			Assert.IsNotNull(SUT.border8);
 			Assert.AreEqual(SUT.border8, border1);
 		}
 

diff --git a/src/Uno.UI.Tests/Windows_UI_Xaml_Data/xBindTests/Given_xBind_Binding.cs b/src/Uno.UI.Tests/Windows_UI_Xaml_Data/xBindTests/Given_xBind_Binding.cs
@@ -951,14 +951,18 @@ public void When_xLoad_DataTemplate()
 			// Changing the visibility DOES NOT materialize the lazily-loaded element.
 			Assert.AreEqual(1, innerRoot.EnumerateAllChildren().OfType<ElementStub>().Count());
 
+			// Calling FindName on an element inside a lazy-loaded element won't materialize the lazy-loaded element
 			var innerTextBlock = SUT.FindName("innerTextBlock") as TextBlock;
-			Assert.AreEqual(0, innerRoot.EnumerateAllChildren().OfType<ElementStub>().Count());
-			Assert.IsNotNull(innerTextBlock);
-			Assert.AreEqual(data.InnerText, innerTextBlock.Text);
+			Assert.AreEqual(1, innerRoot.EnumerateAllChildren().OfType<ElementStub>().Count());
+			Assert.IsNull(innerTextBlock);
 
 			data.TopLevelVisiblity = false;
 
 			var topLevelContent = SUT.FindName("topLevelContent") as FrameworkElement;
+			Assert.AreEqual(0, innerRoot.EnumerateAllChildren().OfType<ElementStub>().Count());
+			innerTextBlock = SUT.FindName("innerTextBlock") as TextBlock;
+			Assert.IsNotNull(innerTextBlock);
+			Assert.AreEqual(data.InnerText, innerTextBlock.Text);
 			Assert.AreEqual(Visibility.Collapsed, topLevelContent.Visibility);
 		}