From 9373fb5d3dc94ab289f4d4b245af9428535a34ce Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Tue, 11 Aug 2026 13:37:51 +0200
Subject: [PATCH 1/2] Remove UI tests that only restate the code they cover

These fixtures were written while porting to Avalonia, as an author's own
verification step rather than as coverage: reflection asserting that a type
derives from its base and that a property has the type it is declared with;
literals (MinHeight 29, Padding 3, MaxWidth 900) copied out of the .axaml
beside them; a property override asserted only so pane descendants stay
reachable from tests. None of them can fail except when someone deliberately
edits the line they mirror, and then they fail as a chore.

StartupPerfTests keeps its two [Explicit] benchmarks, which print per-phase
timings worth reading. The third was a wall-clock assertion (8 CoreLib copies
must settle in under 15s) that ran in CI, where a shared runner decides the
verdict; as [Explicit] it would be strictly dominated by the 200-assembly
benchmark it was derived from, so it goes.

Two fixtures are trimmed rather than deleted, because their kernel is real:
XmlDocLoader's ref-pack fallback has no other test in the repo, and the
MenuIcon metadata rasterisation was dropped once during the port already.
Both now assert that without booting MainWindow to reach it.

This is worth about two seconds - it buys reviewers less to read, not CI
less to do.

Assisted-by: Claude:claude-opus-5:Claude Code
---
 .../Bookmarks/BookmarksPaneStructureTests.cs  | 17 -----
 ILSpy.Tests/Diagnostics/StartupPerfTests.cs   | 51 ---------------
 .../Docking/ContentPageHierarchyTests.cs      | 62 ------------------
 .../DocumentationRendererTooltipWidthTests.cs | 29 ++-------
 ILSpy.Tests/Editor/XmlDocumentationTests.cs   | 65 +++++++------------
 ...conWiringProbe.cs => MainMenuIconTests.cs} | 32 +--------
 .../ToolPaneDeferredContentTests.cs           | 47 --------------
 7 files changed, 30 insertions(+), 273 deletions(-)
 delete mode 100644 ILSpy.Tests/Docking/ContentPageHierarchyTests.cs
 rename ILSpy.Tests/MainWindow/{MenuIconWiringProbe.cs => MainMenuIconTests.cs} (62%)
 delete mode 100644 ILSpy.Tests/MainWindow/ToolPaneDeferredContentTests.cs

diff --git a/ILSpy.Tests/Bookmarks/BookmarksPaneStructureTests.cs b/ILSpy.Tests/Bookmarks/BookmarksPaneStructureTests.cs
index 39dae06f5b..f67523b242 100644
--- a/ILSpy.Tests/Bookmarks/BookmarksPaneStructureTests.cs
+++ b/ILSpy.Tests/Bookmarks/BookmarksPaneStructureTests.cs
@@ -26,7 +26,6 @@
 
 using ICSharpCode.ILSpy.Bookmarks;
 using ICSharpCode.ILSpy.Properties;
-using ICSharpCode.ILSpy.Views.Controls;
 
 using NUnit.Framework;
 
@@ -35,22 +34,6 @@ namespace ICSharpCode.ILSpy.Tests.Bookmarks;
 [TestFixture]
 public class BookmarksPaneStructureTests
 {
-	[AvaloniaTest]
-	public void Toolbar_uses_main_toolbar_chrome_and_button_content()
-	{
-		var pane = new BookmarksPane();
-		var toolbarBorder = pane.FindControl<Border>("ToolbarBorder")!;
-		var toolbarRoot = pane.FindControl<StackPanel>("ToolbarRoot")!;
-
-		toolbarBorder.BorderThickness.Should().Be(new Avalonia.Thickness(0, 0, 0, 1));
-		toolbarBorder.MinHeight.Should().Be(29);
-		toolbarBorder.Padding.Should().Be(new Avalonia.Thickness(3));
-		toolbarRoot.Children.OfType<Separator>().Should().HaveCount(2);
-		toolbarRoot.Children.OfType<Button>().Should().AllSatisfy(button => {
-			button.Content.Should().BeOfType<GrayscaleAwareImage>();
-		});
-	}
-
 	[AvaloniaTest]
 	public void Module_column_shows_module_name_with_full_path_tooltip()
 	{
diff --git a/ILSpy.Tests/Diagnostics/StartupPerfTests.cs b/ILSpy.Tests/Diagnostics/StartupPerfTests.cs
index de7999b692..04ba70e3fc 100644
--- a/ILSpy.Tests/Diagnostics/StartupPerfTests.cs
+++ b/ILSpy.Tests/Diagnostics/StartupPerfTests.cs
@@ -148,57 +148,6 @@ await Waiters.WaitForAsync(
 		}
 	}
 
-	/// <summary>
-	/// CI-runnable variant of <see cref="BindTree_With_Large_AssemblyList_Reports_Phase_Timings"/>.
-	/// Same shape but with a much smaller assembly count (8 vs 200) so it can run inside the
-	/// regular suite — catches order-of-magnitude regressions in the open + load pipeline
-	/// without the 30+ second cost of the full benchmark. NOT [Explicit] on purpose.
-	/// </summary>
-	[AvaloniaTest]
-	public async Task BindTree_With_Small_AssemblyList_Settles_In_Reasonable_Time()
-	{
-		const int Copies = 8;
-		var tempDir = Path.Combine(Path.GetTempPath(), "ILSpy.PerfTest.CI", Guid.NewGuid().ToString("N"));
-		Directory.CreateDirectory(tempDir);
-		try
-		{
-			var sourcePath = typeof(object).Assembly.Location;
-			var clones = new string[Copies];
-			for (int i = 0; i < Copies; i++)
-			{
-				clones[i] = Path.Combine(tempDir, $"copy{i:D2}.dll");
-				File.Copy(sourcePath, clones[i]);
-			}
-
-			var window = AppComposition.Current.GetExport<MainWindow>();
-			window.Show();
-			var vm = (MainWindowViewModel)window.DataContext!;
-			await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 3);
-			var baselineCount = vm.AssemblyTreeModel.AssemblyList!.GetAssemblies().Length;
-
-			var swTotal = Stopwatch.StartNew();
-			foreach (var path in clones)
-				vm.AssemblyTreeModel.AssemblyList!.OpenAssembly(path);
-			await Waiters.WaitForAsync(
-				() => vm.AssemblyTreeModel.AssemblyList!.GetAssemblies().Length >= baselineCount + Copies,
-				timeout: TimeSpan.FromSeconds(60));
-			swTotal.Stop();
-
-			// Relaxed CI threshold — 8 assemblies should never take more than 15s, even on a
-			// shared CI runner. A 10× regression of the open-and-settle pipeline trips this.
-			swTotal.Elapsed.Should().BeLessThan(TimeSpan.FromSeconds(15),
-				"opening + settling 8 LoadedAssembly entries should complete in well under 15s");
-			vm.AssemblyTreeModel.AssemblyList!.GetAssemblies().Length
-				.Should().BeGreaterThanOrEqualTo(baselineCount + Copies);
-		}
-		finally
-		{
-			try
-			{ Directory.Delete(tempDir, recursive: true); }
-			catch { /* cleanup must never fail */ }
-		}
-	}
-
 	const int ResponsivenessAssemblyCount = 200;
 
 	[Explicit("Perf benchmark — emits dispatcher-latency stats for manual inspection")]
diff --git a/ILSpy.Tests/Docking/ContentPageHierarchyTests.cs b/ILSpy.Tests/Docking/ContentPageHierarchyTests.cs
deleted file mode 100644
index 0683f4e62c..0000000000
--- a/ILSpy.Tests/Docking/ContentPageHierarchyTests.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) 2026 AlphaSierraPapa for the SharpDevelop Team
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using AwesomeAssertions;
-
-using ICSharpCode.ILSpy.ViewModels;
-
-using NUnit.Framework;
-
-namespace ICSharpCode.ILSpy.Tests;
-
-/// <summary>
-/// Locks the single inner-content hierarchy: every viewmodel that may occupy a
-/// <see cref="ContentTabPage"/>'s Content slot derives from the one <see cref="ContentPageModel"/>
-/// base, and <c>ContentTabPage.Content</c> is typed to it (not <c>object</c>). Guards against a
-/// future content type sneaking back in as a bare ObservableObject or the slot weakening to object.
-/// </summary>
-[TestFixture]
-public class ContentPageHierarchyTests
-{
-	[Test]
-	public void All_Four_Content_Types_Derive_From_ContentPageModel()
-	{
-		typeof(ICSharpCode.ILSpy.TextView.DecompilerTabPageModel).Should().BeAssignableTo<ContentPageModel>();
-		typeof(MetadataTablePageModel).Should().BeAssignableTo<ContentPageModel>();
-		typeof(ICSharpCode.ILSpy.Compare.CompareTabPageModel).Should().BeAssignableTo<ContentPageModel>();
-		typeof(ICSharpCode.ILSpy.Options.OptionsPageModel).Should().BeAssignableTo<ContentPageModel>(
-			"OptionsPageModel must join the content hierarchy, not stay a bare ObservableObject");
-	}
-
-	[Test]
-	public void ContentTabPage_Content_Is_Typed_To_ContentPageModel()
-	{
-		typeof(ContentTabPage).GetProperty(nameof(ContentTabPage.Content))!.PropertyType
-			.Should().Be(typeof(ContentPageModel), "the Content slot must be strongly typed, not object");
-	}
-
-	[Test]
-	public void IsStaticContent_Is_A_Single_Inherited_Member()
-	{
-		// One IsStaticContent, declared on the base -- not duck-typed across unrelated classes.
-		typeof(ContentPageModel).GetProperty(nameof(ContentPageModel.IsStaticContent))
-			.Should().NotBeNull("IsStaticContent lives on ContentPageModel");
-		typeof(ICSharpCode.ILSpy.Options.OptionsPageModel).GetProperty("IsStaticContent")!.DeclaringType
-			.Should().Be(typeof(ContentPageModel), "OptionsPageModel must inherit IsStaticContent, not redeclare it");
-	}
-}
diff --git a/ILSpy.Tests/Editor/DocumentationRendererTooltipWidthTests.cs b/ILSpy.Tests/Editor/DocumentationRendererTooltipWidthTests.cs
index 62b531ef70..0a7ae83c8e 100644
--- a/ILSpy.Tests/Editor/DocumentationRendererTooltipWidthTests.cs
+++ b/ILSpy.Tests/Editor/DocumentationRendererTooltipWidthTests.cs
@@ -37,14 +37,11 @@
 namespace ICSharpCode.ILSpy.Tests.TextView;
 
 /// <summary>
-/// Pins the rendering shape of method-signature tooltips so a long signature isn't
-/// clipped horizontally. Two failure modes the original implementation suffered from:
-/// (1) the signature <see cref="SelectableTextBlock"/> was created with
-/// <see cref="TextWrapping.NoWrap"/>, so text past the popup's MaxWidth was simply cut
-/// off (no horizontal scrolling because the outer ScrollViewer disables it);
-/// (2) the popup MaxWidth defaulted to a snug 600px, narrower than most real C#
-/// generic-method signatures. WPF parity is wrap-friendly, so we mirror that — these
-/// tests fail if either property regresses.
+/// Pins the rendering shape of method-signature tooltips so a long signature isn't clipped
+/// horizontally: the signature <see cref="SelectableTextBlock"/> must wrap. Created with
+/// <see cref="TextWrapping.NoWrap"/>, text past the popup's MaxWidth is simply cut off,
+/// because the outer ScrollViewer disables horizontal scrolling. WPF parity is
+/// wrap-friendly, so we mirror that.
 /// </summary>
 [TestFixture]
 public class DocumentationRendererTooltipWidthTests
@@ -78,20 +75,4 @@ public void Signature_Block_Wraps_So_Long_Method_Signatures_Are_Not_Clipped()
 			"the signature must wrap inside the popup — without wrapping a long signature is "
 			+ "clipped at the outer MaxWidth because the ScrollViewer disables horizontal scrolling");
 	}
-
-	[AvaloniaTest]
-	public void CreateView_Default_MaxWidth_Is_Generous_Enough_For_Typical_Signatures()
-	{
-		// 600 was too narrow — generic methods + ref-struct parameters routinely exceed it.
-		// Pin the bumped default so a future tweak doesn't silently shrink it back.
-		var renderer = new DocumentationRenderer(
-			new CSharpAmbience(),
-			new FontFamily("Consolas, Menlo, Monospace"),
-			12);
-
-		var view = (Border)renderer.CreateView();
-		view.MaxWidth.Should().BeGreaterThanOrEqualTo(900,
-			"the popup's outer MaxWidth must be wide enough that most realistic method "
-			+ "signatures fit without aggressive wrapping");
-	}
 }
diff --git a/ILSpy.Tests/Editor/XmlDocumentationTests.cs b/ILSpy.Tests/Editor/XmlDocumentationTests.cs
index d062675bc4..58e1ac2895 100644
--- a/ILSpy.Tests/Editor/XmlDocumentationTests.cs
+++ b/ILSpy.Tests/Editor/XmlDocumentationTests.cs
@@ -16,68 +16,47 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-using System.Linq;
-using System.Threading.Tasks;
-
-using Avalonia.Headless.NUnit;
-
 using AwesomeAssertions;
 
 using ICSharpCode.Decompiler.Documentation;
-using ICSharpCode.Decompiler.TypeSystem;
 
-using ICSharpCode.ILSpy.AppEnv;
-using ICSharpCode.ILSpy.TreeNodes;
-using ICSharpCode.ILSpy.ViewModels;
-using ICSharpCode.ILSpy.Views;
+using ICSharpCode.ILSpyX;
 
 using NUnit.Framework;
 
 namespace ICSharpCode.ILSpy.Tests.TextView;
 
 /// <summary>
-/// Diagnoses whether the XML-documentation lookup that backs the decompiler-view hover
-/// tooltip actually surfaces non-empty docs for a well-documented system method. The
-/// renderer + wiring (<c>DocumentationRenderer</c>,
-/// <c>DecompilerTextView.BuildHoverContent</c>, <c>AppendXmlDocumentation</c>) are
-/// already in place; this test verifies the underlying
-/// <see cref="ICSharpCode.Decompiler.Documentation.XmlDocLoader.LoadDocumentation"/>
-/// path produces a real doc string for at least one ubiquitous CoreLib method.
+/// The XML-documentation lookup behind the decompiler view's hover tooltip. On modern .NET
+/// the entity's metadata-token-bearing assembly (System.Private.CoreLib.dll) is not the one
+/// whose XML carries its docs (System.Runtime.xml), so <see cref="XmlDocLoader"/> falls back
+/// to the parallel ref pack - <c>&lt;dotnet&gt;/packs/Microsoft.NETCore.App.Ref/&lt;version&gt;/ref/&lt;tfm&gt;/*.xml</c>
+/// - and aggregates every XML there into one provider. Without that fallback every tooltip
+/// over a BCL member renders empty.
 /// </summary>
 [TestFixture]
 public class XmlDocumentationTests
 {
-	[AvaloniaTest]
-	public async Task XmlDocLoader_Surfaces_Documentation_For_CoreLib_String_Concat()
-	{
-		var window = AppComposition.Current.GetExport<MainWindow>();
-		window.Show();
-		var vm = (MainWindowViewModel)window.DataContext!;
-		await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 1);
+	// The ID string the decompiler produces for the two-argument overload; using the literal
+	// keeps the test off the type system, which is not what is under test here.
+	const string StringConcatId = "M:System.String.Concat(System.String,System.String)";
 
-		var coreLibName = typeof(object).Assembly.GetName().Name!;
-		var stringNode = vm.AssemblyTreeModel.FindNode<TypeTreeNode>(coreLibName, "System", "System.String");
-		stringNode.IsExpanded = true;
-		var concatNode = stringNode.Children.OfType<MethodTreeNode>()
-			.First(m => m.MethodDefinition.Name == "Concat");
-
-		var concat = concatNode.MethodDefinition;
-		Assert.That(concat, Is.Not.Null);
-		Assert.That(concat!.ParentModule, Is.Not.Null);
-		Assert.That(concat.ParentModule!.MetadataFile, Is.Not.Null);
+	[Test]
+	public void XmlDocLoader_Surfaces_Documentation_For_CoreLib_String_Concat()
+	{
+		var coreLib = new AssemblyList().OpenAssembly(typeof(object).Assembly.Location)
+			.GetMetadataFileOrNull();
+		coreLib.Should().NotBeNull();
 
-		// XmlDocLoader's modern-.NET fallback (added in the shared decompiler library) walks
-		// the parallel ref pack — <dotnet>/packs/Microsoft.NETCore.App.Ref/<version>/ref/<tfm>/*.xml
-		// — and aggregates every XML there into a single provider, since each entity's
-		// metadata-token-bearing assembly (System.Private.CoreLib.dll) differs from the one
-		// whose XML carries its docs (System.Runtime.xml).
-		var provider = XmlDocLoader.LoadDocumentation(concat.ParentModule.MetadataFile!);
+		var provider = XmlDocLoader.LoadDocumentation(coreLib!);
 		((object?)provider).Should().NotBeNull(
-			"XmlDocLoader's modern-.NET ref-pack fallback must locate XMLs for the test-host runtime layout");
+			"the ref-pack fallback must locate the XMLs for the test-host runtime layout");
+
+		var documentation = provider!.GetDocumentation(StringConcatId);
 
-		var documentation = provider!.GetDocumentation(concat.GetIdString());
 		documentation.Should().NotBeNullOrEmpty(
-			"System.String.Concat is one of the most-documented methods in CoreLib — the hover tooltip would be empty without this");
+			"System.String.Concat is one of the most-documented methods in CoreLib - the hover "
+			+ "tooltip would be empty without this");
 		documentation.Should().Contain("<summary",
 			"the raw documentation string must include the <summary> tag the renderer parses");
 	}
diff --git a/ILSpy.Tests/MainWindow/MenuIconWiringProbe.cs b/ILSpy.Tests/MainWindow/MainMenuIconTests.cs
similarity index 62%
rename from ILSpy.Tests/MainWindow/MenuIconWiringProbe.cs
rename to ILSpy.Tests/MainWindow/MainMenuIconTests.cs
index b883ef64e1..7d6f20df39 100644
--- a/ILSpy.Tests/MainWindow/MenuIconWiringProbe.cs
+++ b/ILSpy.Tests/MainWindow/MainMenuIconTests.cs
@@ -17,7 +17,6 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 
 using Avalonia.Controls;
@@ -35,48 +34,23 @@
 namespace ICSharpCode.ILSpy.Tests;
 
 [TestFixture]
-public class MenuIconWiringProbe
+public class MainMenuIconTests
 {
 	[AvaloniaTest]
-	public void Known_Menu_Items_With_MenuIcon_Metadata_Get_Icon_Populated()
+	public void A_Menu_Item_Declaring_MenuIcon_Metadata_Gets_Its_Icon_Rasterised()
 	{
 		var window = AppComposition.Current.GetExport<MainWindow>();
 		window.Show();
 		var nativeMenu = NativeMenu.GetMenu(window)
 			?? throw new InvalidOperationException("MainMenu.Attach should have set NativeMenu on the window");
 
-		var leaves = new List<(string Path, bool HasIcon)>();
-		Collect(nativeMenu, "", leaves);
-		var withIcon = leaves.Where(l => l.HasIcon).Select(l => l.Path).ToList();
-
-		// Spot-check: File -> Open (which has MenuIcon="Images/Open" in MEF metadata).
 		var fileMenu = nativeMenu.Items.OfType<NativeMenuItem>()
 			.Single(m => string.Equals(m.Header, Resources._File, StringComparison.Ordinal));
 		var openItem = fileMenu.Menu!.Items.OfType<NativeMenuItem>()
 			.Single(m => string.Equals(m.Header, Resources._Open, StringComparison.Ordinal));
+
 		openItem.Icon.Should().NotBeNull(
 			"File > Open declares MenuIcon=\"Images/Open\" in its [ExportMainMenuCommand]; the menu builder "
 			+ "must rasterise that into NativeMenuItem.Icon.");
-
-		// Sanity: at least 5 leaves with icons (we have ~12+ MEF declarations with MenuIcon).
-		// On failure, name the items that DID get an icon so the regression is diagnosable without
-		// dumping the whole menu on every (passing) run.
-		withIcon.Count.Should().BeGreaterThanOrEqualTo(5,
-			$"at least 5 main-menu items have MenuIcon metadata; found {withIcon.Count} of {leaves.Count} "
-			+ $"leaves with an icon [{string.Join(", ", withIcon)}]");
-	}
-
-	static void Collect(NativeMenu menu, string parentPath, List<(string Path, bool HasIcon)> leaves)
-	{
-		foreach (var element in menu.Items)
-		{
-			if (element is not NativeMenuItem item)
-				continue;
-			var path = string.IsNullOrEmpty(parentPath) ? (item.Header ?? "<unnamed>") : $"{parentPath} > {item.Header}";
-			if (item.Menu is { Items.Count: > 0 } sub)
-				Collect(sub, path, leaves);
-			else
-				leaves.Add((path, item.Icon != null));
-		}
 	}
 }
diff --git a/ILSpy.Tests/MainWindow/ToolPaneDeferredContentTests.cs b/ILSpy.Tests/MainWindow/ToolPaneDeferredContentTests.cs
deleted file mode 100644
index 8ccebdd3e3..0000000000
--- a/ILSpy.Tests/MainWindow/ToolPaneDeferredContentTests.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2026 AlphaSierraPapa for the SharpDevelop Team
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using AwesomeAssertions;
-
-using Dock.Controls.DeferredContentControl;
-
-using ICSharpCode.ILSpy.ViewModels;
-
-using NUnit.Framework;
-
-namespace ICSharpCode.ILSpy.Tests;
-
-/// <summary>
-/// Regression guard: <see cref="ToolPaneModel"/> opts out of Dock's deferred content
-/// presentation so panes (search, analyzers, debug steps, etc.) materialise their views
-/// eagerly. Without this, tests can't reach descendants of a pane until it's
-/// focus-activated by the user — and the search-pane's startup tasks (assembly index
-/// scan, etc.) wouldn't kick off until first activation.
-/// </summary>
-[TestFixture]
-public class ToolPaneDeferredContentTests
-{
-	[Test]
-	public void ToolPaneModel_Opts_Out_Of_Dock_Deferred_Content_Presentation()
-	{
-		var sentinel = new TestToolPane();
-		((IDeferredContentPresentation)sentinel).DeferContentPresentation.Should().BeFalse();
-	}
-
-	sealed class TestToolPane : ToolPaneModel { }
-}

From a42b96962c73d18b86ded62038e28384deea6b6c Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Wed, 12 Aug 2026 08:08:03 +0200
Subject: [PATCH 2/2] Collapse UI tests that repeat setup already paid for

Five fixtures covered the "Use nested namespace structure" setting, four of
them running the same toggle at a different layer: the model shape, the same
toggle awaited live, and the same toggle again asserting it reached the
SharpTreeView's rows. Each paid its own boot for a scenario that is one story
end to end, and together they were the second-largest block of time in the
suite after the process-list scroll loops. One test now walks the whole path
once, carrying every assertion the four had, including the nesting depth only
the first checked.

The comparison view's model-is-bound test is dropped: the test after it
renders rows out of that model, which cannot happen unless it is bound, and
it opened two fixture assemblies to prove it.

The expander hitbox test asserted the toggle measures 13x16 and its glyph 9x9,
then clicked 14px down to prove the area below the glyph is live. The click
proves the geometry; the measurements only restate it, and would fail on a
font-metric change that broke nothing. Its layout-settling loop slept 200ms
unconditionally, which is a race that usually wins - it now waits for the
condition it needs.

Assisted-by: Claude:claude-opus-5:Claude Code
---
 .../AssemblyTreeExpanderHitboxTests.cs        |  53 +++------
 ...UseNestedNamespaceNodesGridVerification.cs |  95 ---------------
 .../UseNestedNamespaceNodesLiveTests.cs       |  78 -------------
 .../UseNestedNamespaceNodesTests.cs           | 108 ++++++++++--------
 ILSpy.Tests/Compare/CompareViewRenderTests.cs |  28 -----
 5 files changed, 75 insertions(+), 287 deletions(-)
 delete mode 100644 ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesGridVerification.cs
 delete mode 100644 ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesLiveTests.cs

diff --git a/ILSpy.Tests/AssemblyList/AssemblyTreeExpanderHitboxTests.cs b/ILSpy.Tests/AssemblyList/AssemblyTreeExpanderHitboxTests.cs
index 85094c0b24..90df93d699 100644
--- a/ILSpy.Tests/AssemblyList/AssemblyTreeExpanderHitboxTests.cs
+++ b/ILSpy.Tests/AssemblyList/AssemblyTreeExpanderHitboxTests.cs
@@ -46,11 +46,10 @@ public class AssemblyTreeExpanderHitboxTests
 	[AvaloniaTest]
 	public async Task Expander_Toggle_Offers_At_Least_16x16_Clickable_Target()
 	{
-		// The +/- expander in the assembly tree must give a click target that fills the full 13px
-		// expander column and the 16px row-tall toggle, while its visible glyph stays the classic
-		// 9x9 box. The column is kept at 13px so the +/- box centres on the tree connector lines;
-		// the target must be genuinely hittable across that whole area — not merely occupy it in
-		// layout while only the 9x9 glyph receives input.
+		// The +/- expander's click target fills the 13px expander column and the 16px row height,
+		// while the drawn glyph stays the classic 9x9 box centred on the tree connector lines. The
+		// grown area has to be genuinely hittable rather than merely occupied in layout, so the
+		// test clicks below the glyph instead of measuring the boxes.
 
 		// Arrange — boot, wait for assemblies, expand a node so an expandable row is realised.
 		var (window, vm) = await TestHarness.BootAsync(3);
@@ -63,39 +62,21 @@ public async Task Expander_Toggle_Offers_At_Least_16x16_Clickable_Target()
 		var pane = await window.WaitForComponent<AssemblyListPane>();
 		var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
 
-		// Let rows realise and layout settle.
-		for (int i = 0; i < 8; i++)
-		{
-			Dispatcher.UIThread.RunJobs();
-			grid.UpdateLayout();
-			await Task.Delay(25);
-		}
-
-		// Act — locate the expander toggle of the (expandable) assembly row.
-		var row = grid.GetVisualDescendants().OfType<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem>()
-			.FirstOrDefault(r => RowMatches(r, assemblyNode));
-		row.Should().NotBeNull("the expanded assembly row must be realised");
-		var expander = row!.GetVisualDescendants().OfType<ToggleButton>()
-			.FirstOrDefault(b => b.Name == "PART_Expander");
-		expander.Should().NotBeNull("an expandable row must realise a PART_Expander toggle");
+		// Act — locate the expander toggle of the (expandable) assembly row, once the row and its
+		// template have been realised.
+		ToggleButton? expander = null;
+		await Waiters.WaitForAsync(
+			() => {
+				grid.UpdateLayout();
+				expander = grid.GetVisualDescendants().OfType<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeViewItem>()
+					.FirstOrDefault(r => RowMatches(r, assemblyNode))
+					?.GetVisualDescendants().OfType<ToggleButton>()
+					.FirstOrDefault(b => b.Name == "PART_Expander");
+				return expander is { Bounds.Height: >= 16 };
+			},
+			description: "the expanded assembly row must realise a PART_Expander toggle filling the row height");
 		expander!.IsEnabled.Should().BeTrue("the assembly row is expandable");
 
-		// Assert — the click target fills the 13px expander column and is 16px tall.
-		expander.Bounds.Width.Should().BeGreaterThanOrEqualTo(13,
-			"the expander click target must fill the 13px expander column for reliable tapping");
-		expander.Bounds.Height.Should().BeGreaterThanOrEqualTo(16,
-			"the expander click target must be at least 16px tall for reliable tapping");
-
-		// Assert — the visible glyph box is unchanged at 9x9 (the nearest Border around ExpandPath,
-		// i.e. the drawn box, not the transparent hit-target wrapper).
-		var glyphPath = expander.GetVisualDescendants().OfType<Path>()
-			.FirstOrDefault(p => p.Name == "ExpandPath");
-		glyphPath.Should().NotBeNull("the expander must render its ExpandPath glyph");
-		var glyph = glyphPath!.GetVisualAncestors().OfType<Border>().FirstOrDefault();
-		glyph.Should().NotBeNull("the expander must still render its glyph box");
-		glyph!.Bounds.Width.Should().BeApproximately(9, 0.5, "the visible glyph box must stay 9px wide");
-		glyph.Bounds.Height.Should().BeApproximately(9, 0.5, "the visible glyph box must stay 9px tall");
-
 		// Assert — a real click well below the 9x9 glyph (y=14, inside the 16-tall target but
 		// outside the centred glyph at ~y=3.5..12.5) collapses the node. This proves the grown
 		// area is genuinely hittable, not just larger in layout.
diff --git a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesGridVerification.cs b/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesGridVerification.cs
deleted file mode 100644
index 9ae23e9cb4..0000000000
--- a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesGridVerification.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) 2026 AlphaSierraPapa for the SharpDevelop Team
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Collections;
-using System.Linq;
-using System.Threading.Tasks;
-
-using Avalonia.Headless.NUnit;
-
-using AwesomeAssertions;
-
-using ICSharpCode.ILSpyX.TreeView;
-
-using ICSharpCode.ILSpy;
-using ICSharpCode.ILSpy.AppEnv;
-using ICSharpCode.ILSpy.AssemblyTree;
-using ICSharpCode.ILSpy.TreeNodes;
-
-using NUnit.Framework;
-
-namespace ICSharpCode.ILSpy.Tests;
-
-[TestFixture]
-public class UseNestedNamespaceNodesGridVerification
-{
-	[AvaloniaTest]
-	public async Task Toggling_UseNestedNamespaceNodes_Reshapes_The_Visible_Tree_In_Place()
-	{
-		// Toggling UseNestedNamespaceNodes rebuilds each loaded assembly's namespace subtree.
-		// SharpTreeView's flattener observes node.Children mutations live, so the rebuilt shape
-		// surfaces in the visible row list without any model re-bind (the ProDataGrid snapshot
-		// problem that used to need a HierarchicalModel rebind is gone). This pins that the
-		// flat-mode -> nested-mode switch is reflected in the SharpTreeView's ItemsSource.
-
-		var settings = AppComposition.Current.GetExport<SettingsService>().DisplaySettings;
-		settings.UseNestedNamespaceNodes = false;
-
-		var (window, vm) = await TestHarness.BootAsync(3);
-		var pane = await window.WaitForComponent<AssemblyListPane>();
-		var grid = await pane.WaitForComponent<ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView>();
-
-		// Expand an assembly so its namespace children become visible rows.
-		var assemblyNode = vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>("System.Linq");
-		assemblyNode.IsExpanded = true;
-		await Waiters.WaitForAsync(() => assemblyNode.Children.OfType<NamespaceTreeNode>().Any());
-		TestCapture.Step("system-linq-expanded-flat");
-
-		var flat = (IList)grid.ItemsSource!;
-		bool VisibleNamespace(string name) => flat.Cast<SharpTreeNode>()
-			.OfType<NamespaceTreeNode>()
-			.Any(n => string.Equals(n.Text?.ToString(), name, System.StringComparison.Ordinal));
-
-		// In flat mode the full dotted namespace is a single visible row.
-		await Waiters.WaitForAsync(() => VisibleNamespace("System.Collections.Generic"),
-			description: "flat mode shows the dotted namespace as one row");
-
-		try
-		{
-			settings.UseNestedNamespaceNodes = true;
-			assemblyNode.IsExpanded = true;
-			TestCapture.Step("nested-namespaces-rebuilt");
-
-			// In nested mode the leaf segment ("Generic") becomes its own row nested under
-			// "System" -> "Collections"; the live flattener must surface that without a re-bind.
-			await Waiters.WaitForAsync(
-				() => assemblyNode.Children.OfType<NamespaceTreeNode>()
-						.Any(n => string.Equals(n.Text?.ToString(), "System", System.StringComparison.Ordinal)),
-				System.TimeSpan.FromSeconds(5),
-				"toggling UseNestedNamespaceNodes must rebuild the namespace subtree into nested nodes");
-
-			VisibleNamespace("System").Should().BeTrue(
-				"the rebuilt nested 'System' namespace node must appear in the SharpTreeView's visible rows "
-				+ "without any model re-bind (the live flattener observes the child mutations directly)");
-		}
-		finally
-		{
-			settings.UseNestedNamespaceNodes = false;
-		}
-	}
-}
diff --git a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesLiveTests.cs b/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesLiveTests.cs
deleted file mode 100644
index c34d0be77c..0000000000
--- a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesLiveTests.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) 2026 AlphaSierraPapa for the SharpDevelop Team
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Linq;
-using System.Threading.Tasks;
-
-using Avalonia.Headless.NUnit;
-
-using AwesomeAssertions;
-
-using ICSharpCode.ILSpy;
-using ICSharpCode.ILSpy.AppEnv;
-using ICSharpCode.ILSpy.TreeNodes;
-
-using NUnit.Framework;
-
-namespace ICSharpCode.ILSpy.Tests;
-
-[TestFixture]
-public class UseNestedNamespaceNodesLiveTests
-{
-	[AvaloniaTest]
-	public async Task Toggling_UseNestedNamespaceNodes_Live_Refreshes_The_Tree_Shape()
-	{
-		// Drives the live-reactivity path: toggle the Display-Settings flag and observe
-		// that the AssemblyTreeNode's namespace children switch between flat and nested
-		// layouts without a manual rebuild.
-		var settings = AppComposition.Current.GetExport<SettingsService>().DisplaySettings;
-		settings.UseNestedNamespaceNodes = false;
-
-		var (_, vm) = await TestHarness.BootAsync(3);
-
-		try
-		{
-			var assemblyNode = vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>("System.Linq");
-			assemblyNode.EnsureLazyChildren();
-
-			var flatNamespaces = assemblyNode.Children.OfType<NamespaceTreeNode>()
-				.Select(n => n.Name).ToList();
-			flatNamespaces.Should().Contain("System.Linq",
-				"baseline: flat mode lists 'System.Linq' as a top-level sibling");
-
-			// Toggle the live setting — should fan out through MessageBus<SettingsChangedEventArgs>
-			// to AssemblyTreeModel.OnSettingsChanged and rebuild the namespace subtrees.
-			settings.UseNestedNamespaceNodes = true;
-
-			await Waiters.WaitForAsync(() =>
-				assemblyNode.Children.OfType<NamespaceTreeNode>().Any(n => n.Name == "System"),
-				System.TimeSpan.FromSeconds(5));
-
-			var nestedNames = assemblyNode.Children.OfType<NamespaceTreeNode>()
-				.Select(n => n.Name).ToList();
-			nestedNames.Should().Contain("System",
-				"after live toggle: nested mode must surface 'System' as top-level");
-			nestedNames.Should().NotContain("System.Linq",
-				"after live toggle: the flat 'System.Linq' sibling must disappear");
-		}
-		finally
-		{
-			settings.UseNestedNamespaceNodes = false;
-		}
-	}
-}
diff --git a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesTests.cs b/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesTests.cs
index b9bbdc3133..149681faf8 100644
--- a/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesTests.cs
+++ b/ILSpy.Tests/AssemblyList/UseNestedNamespaceNodesTests.cs
@@ -16,6 +16,8 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+using System;
+using System.Collections;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -23,77 +25,83 @@
 
 using AwesomeAssertions;
 
-using ICSharpCode.ILSpy;
 using ICSharpCode.ILSpy.AppEnv;
+using ICSharpCode.ILSpy.AssemblyTree;
 using ICSharpCode.ILSpy.TreeNodes;
 
+using ICSharpCode.ILSpyX.TreeView;
+
 using NUnit.Framework;
 
+using SharpTreeView = ICSharpCode.ILSpy.Controls.TreeView.SharpTreeView;
+
 namespace ICSharpCode.ILSpy.Tests;
 
+/// <summary>
+/// The "Use nested namespace structure" display setting, from the setting through to the
+/// rows on screen. Flat mode keeps every dotted namespace as its own sibling of the assembly
+/// node; nested mode splits them, so "System.Linq" becomes "Linq" under "System". The switch
+/// happens live: toggling rebuilds each loaded assembly's namespace subtree, and because
+/// SharpTreeView's flattener observes node.Children directly, the rebuilt shape reaches the
+/// visible rows with no model re-bind.
+/// </summary>
 [TestFixture]
 public class UseNestedNamespaceNodesTests
 {
 	[AvaloniaTest]
-	public async Task When_UseNestedNamespaceNodes_True_Namespaces_Are_Hierarchical()
+	public async Task Toggling_The_Setting_Reshapes_The_Tree_Live_Down_To_The_Visible_Rows()
 	{
-		// With the setting on, "System" becomes a single root node holding "Collections",
-		// "IO", "Linq", … as descendants — not the flat "System", "System.Collections",
-		// "System.IO" siblings the default flat mode produces.
-
 		var settings = AppComposition.Current.GetExport<SettingsService>().DisplaySettings;
-		var (_, vm) = await TestHarness.BootAsync(3);
+		settings.UseNestedNamespaceNodes = false;
+
+		var (window, vm) = await TestHarness.BootAsync(3);
+		var pane = await window.WaitForComponent<AssemblyListPane>();
+		var grid = await pane.WaitForComponent<SharpTreeView>();
 
 		try
 		{
-			settings.UseNestedNamespaceNodes = true;
-
-			// Use System.Linq's assembly — it has System and System.Linq as namespaces.
+			// System.Linq's assembly carries both "System" and "System.Linq", so one assembly
+			// shows the difference between the two layouts.
 			var assemblyNode = vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>("System.Linq");
-			assemblyNode.Children.Clear();
-			assemblyNode.LazyLoading = true;
-			assemblyNode.EnsureLazyChildren();
-
-			var systemNode = assemblyNode.Children.OfType<NamespaceTreeNode>()
-				.SingleOrDefault(ns => ns.Name == "System");
-			((object?)systemNode).Should().NotBeNull(
-				"in nested mode the top-level node for the System namespace must exist as 'System' (last segment), not 'System.Linq'");
-
-			var nestedLinq = systemNode!.Children.OfType<NamespaceTreeNode>()
-				.SingleOrDefault(ns => ns.Name == "Linq");
-			((object?)nestedLinq).Should().NotBeNull(
-				"the System.Linq namespace must nest under the System node in nested mode");
-
-			// Sanity: there is NO sibling "System.Linq" at the assembly-node level.
-			assemblyNode.Children.OfType<NamespaceTreeNode>()
-				.Select(n => n.Name).Should().NotContain("System.Linq",
-				"flat-style 'System.Linq' sibling must not appear when nesting is on");
+			assemblyNode.IsExpanded = true;
+			await Waiters.WaitForAsync(() => assemblyNode.Children.OfType<NamespaceTreeNode>().Any());
+
+			var visibleRows = (IList)grid.ItemsSource!;
+			bool VisibleNamespace(string name) => visibleRows.Cast<SharpTreeNode>()
+				.OfType<NamespaceTreeNode>()
+				.Any(n => string.Equals(n.Text?.ToString(), name, StringComparison.Ordinal));
+
+			NamespaceNames().Should().Contain("System.Linq",
+				"flat mode lists the whole dotted namespace as one sibling of the assembly node");
+			await Waiters.WaitForAsync(() => VisibleNamespace("System.Collections.Generic"),
+				description: "flat mode shows the dotted namespace as a single visible row");
+			TestCapture.Step("flat-mode");
+
+			// The setting fans out through MessageBus<SettingsChangedEventArgs> to
+			// AssemblyTreeModel.OnSettingsChanged, which rebuilds the namespace subtrees.
+			settings.UseNestedNamespaceNodes = true;
+			assemblyNode.IsExpanded = true;
+
+			await Waiters.WaitForAsync(() => NamespaceNames().Contains("System"),
+				TimeSpan.FromSeconds(5),
+				"toggling the setting must rebuild the namespace subtree into nested nodes");
+			TestCapture.Step("nested-mode");
+
+			NamespaceNames().Should().NotContain("System.Linq",
+				"the flat dotted sibling must be gone once its segments are nested");
+			assemblyNode.Children.OfType<NamespaceTreeNode>().Single(n => n.Name == "System")
+				.Children.OfType<NamespaceTreeNode>().Select(n => n.Name).Should().Contain("Linq",
+				"the trailing segment must hang under the node for the leading one");
+			VisibleNamespace("System").Should().BeTrue(
+				"the rebuilt node must reach the visible rows without a model re-bind - the live "
+				+ "flattener observes the child mutations directly");
+
+			string[] NamespaceNames() => assemblyNode.Children.OfType<NamespaceTreeNode>()
+				.Select(n => n.Name).ToArray();
 		}
 		finally
 		{
 			settings.UseNestedNamespaceNodes = false;
 		}
 	}
-
-	[AvaloniaTest]
-	public async Task When_UseNestedNamespaceNodes_False_Namespaces_Are_Flat()
-	{
-		// Baseline: the default flat layout keeps every distinct namespace string as a
-		// sibling under the AssemblyTreeNode.
-		var settings = AppComposition.Current.GetExport<SettingsService>().DisplaySettings;
-		settings.UseNestedNamespaceNodes = false;
-
-		var (_, vm) = await TestHarness.BootAsync(3);
-
-		var assemblyNode = vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>("System.Linq");
-		assemblyNode.Children.Clear();
-		assemblyNode.LazyLoading = true;
-		assemblyNode.EnsureLazyChildren();
-
-		var namespaceNames = assemblyNode.Children.OfType<NamespaceTreeNode>()
-			.Select(n => n.Name).ToList();
-
-		namespaceNames.Should().Contain("System.Linq",
-			"in flat mode 'System.Linq' must appear as a top-level sibling");
-	}
 }
diff --git a/ILSpy.Tests/Compare/CompareViewRenderTests.cs b/ILSpy.Tests/Compare/CompareViewRenderTests.cs
index 4a3c28770b..83dc5a19eb 100644
--- a/ILSpy.Tests/Compare/CompareViewRenderTests.cs
+++ b/ILSpy.Tests/Compare/CompareViewRenderTests.cs
@@ -48,34 +48,6 @@ namespace ICSharpCode.ILSpy.Tests.Compare;
 [TestFixture]
 public class CompareViewRenderTests
 {
-	[AvaloniaTest]
-	public async Task CompareView_Binds_A_HierarchicalModel_When_Opened()
-	{
-		var window = AppComposition.Current.GetExport<MainWindow>();
-		window.Show();
-		var vm = (MainWindowViewModel)window.DataContext!;
-		await vm.AssemblyTreeModel.WaitForAssembliesAsync(minimumCount: 2);
-
-		var entry = AppComposition.Current.GetExport<ICSharpCode.ILSpy.ContextMenuEntryRegistry>()
-			.Entries.Single(e => e.Metadata.Header == "Compare...").Value;
-		var assemblies = new[] {
-			await vm.OpenFixtureAsync("FixtureA"),
-			await vm.OpenFixtureAsync("FixtureB"),
-		};
-		var nodes = assemblies.Select(a =>
-			(SharpTreeNode)vm.AssemblyTreeModel.FindNode<AssemblyTreeNode>(a.ShortName)).ToArray();
-
-		entry.Execute(new TextViewContext { SelectedTreeNodes = nodes });
-
-		var view = await window.WaitForComponent<CompareView>();
-		var grid = await view.WaitForComponent<DataGrid>();
-
-		await Waiters.WaitForAsync(() => grid.HierarchicalModel != null,
-			description: "CompareView must populate the DataGrid's HierarchicalModel — without it "
-				+ "the hierarchical column is rendered over an empty source and the tab shows nothing");
-		grid.HierarchicalModel.Should().NotBeNull();
-	}
-
 	[AvaloniaTest]
 	public async Task CompareView_Renders_Rows_For_The_Merged_Tree()
 	{