Tmp

Author: javiercn

src/Components/Components/src/ComponentSubscriptionKey.cs

@@ -1,11 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using Microsoft.AspNetCore.Components.Rendering;
 
 namespace Microsoft.AspNetCore.Components.Infrastructure;
 
-// TODO: Add debugger display to show the component state component type and property name.
+[DebuggerDisplay("{GetDebuggerDisplay(),nq}")]
 internal readonly struct ComponentSubscriptionKey(ComponentState subscriber, string propertyName) : IEquatable<ComponentSubscriptionKey>
 {
     public ComponentState Subscriber { get; } = subscriber;
@@ -20,4 +21,7 @@ public override bool Equals(object? obj)
 
     public override int GetHashCode()
         => HashCode.Combine(Subscriber, PropertyName);
+
+    private string GetDebuggerDisplay()
+        => $"{Subscriber.Component.GetType().Name}.{PropertyName}";
 }

src/Components/Components/test/PersistentState/ComponentStatePersistenceManagerTest.cs

@@ -353,6 +353,51 @@ public async Task PersistStateAsync_InvokesAllCallbacksEvenIfACallbackIsRemovedA
         Assert.Equal(4, executionSequence.Count);
     }
 
+    [Fact]
+    public async Task RestoreStateAsync_ValidatesOnlySupportUpdatesWhenRestoreContextValueUpdate()
+    {
+        var store = new TestStore([]);
+
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            CreateServiceProvider());
+
+        // First restore should work (initialize state)
+        await persistenceManager.RestoreStateAsync(store, RestoreContext.InitialValue);
+
+        // Second restore with non-ValueUpdate context should throw
+        var exception = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            persistenceManager.RestoreStateAsync(store, RestoreContext.InitialValue));
+
+        Assert.Equal("State already initialized.", exception.Message);
+    }
+
+    [Fact]
+    public async Task RestoreStateAsync_ValidatesRegisteredUpdateCallbacksAreInvokedOnValueUpdates()
+    {
+        var store = new TestStore([]);
+
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            CreateServiceProvider());
+
+        var callbackInvoked = false;
+
+        // First restore to initialize state
+        await persistenceManager.RestoreStateAsync(store, RestoreContext.InitialValue);
+
+        // Register a callback for value updates through the state object
+        var options = new RestoreOptions { RestoreBehavior = RestoreBehavior.Default, AllowUpdates = true };
+        persistenceManager.State.RegisterOnRestoring(() => { callbackInvoked = true; }, options);
+        // RegisterOnRestoring will invoke the callback immediately, so we reset it
+        callbackInvoked = false;
+
+        // Second restore with ValueUpdate context should invoke callbacks
+        await persistenceManager.RestoreStateAsync(store, RestoreContext.ValueUpdate);
+
+        Assert.True(callbackInvoked);
+    }
+
     private class TestRenderer : Renderer
     {
         public TestRenderer() : base(new ServiceCollection().BuildServiceProvider(), NullLoggerFactory.Instance)

src/Components/Components/test/PersistentState/PersistentComponentStateTest.cs

@@ -284,83 +284,4 @@ public void RegisterOnRestoring_SubscriptionCanBeDisposed()
         // Assert
         Assert.Empty(callbacks);
     }
-
-    [Fact]
-    public async Task ComponentStatePersistenceManagerRestoreStateAsync_ValidatesOnlySupportUpdatesWhenRestoreContextValueUpdate()
-    {
-        // Arrange
-        var store = Mock.Of<IPersistentComponentStateStore>();
-        Mock.Get(store)
-            .Setup(s => s.GetPersistedStateAsync())
-            .ReturnsAsync(new Dictionary<string, byte[]>());
-        
-        var persistenceManager = new ComponentStatePersistenceManager(
-            NullLogger<ComponentStatePersistenceManager>.Instance,
-            CreateServiceProvider());
-
-        // Act & Assert
-        // First restore should work (initialize state)
-        await persistenceManager.RestoreStateAsync(store, RestoreContext.InitialValue);
-
-        // Second restore with non-ValueUpdate context should throw
-        var exception = await Assert.ThrowsAsync<InvalidOperationException>(() =>
-            persistenceManager.RestoreStateAsync(store, RestoreContext.InitialValue));
-
-        Assert.Equal("State already initialized.", exception.Message);
-    }
-
-    [Fact]
-    public async Task ComponentStatePersistenceManagerRestoreStateAsync_ValidatesRegisteredUpdateCallbacksAreInvokedOnValueUpdates()
-    {
-        // Arrange
-        var store = Mock.Of<IPersistentComponentStateStore>();
-        Mock.Get(store)
-            .Setup(s => s.GetPersistedStateAsync())
-            .ReturnsAsync(new Dictionary<string, byte[]>());
-        
-        var persistenceManager = new ComponentStatePersistenceManager(
-            NullLogger<ComponentStatePersistenceManager>.Instance,
-            CreateServiceProvider());
-
-        var callbackInvoked = false;
-        
-        // Act
-        // First restore to initialize state
-        await persistenceManager.RestoreStateAsync(store, RestoreContext.InitialValue);
-        
-        // Register a callback for value updates through the state object
-        var options = new RestoreOptions { RestoreBehavior = RestoreBehavior.Default, AllowUpdates = true };
-        persistenceManager.State.RegisterOnRestoring(() => { callbackInvoked = true; }, options);
-        
-        // Second restore with ValueUpdate context should invoke callbacks
-        await persistenceManager.RestoreStateAsync(store, RestoreContext.ValueUpdate);
-
-        // Assert
-        Assert.True(callbackInvoked);
-    }
-
-    private static IServiceProvider CreateServiceProvider()
-    {
-        return new ServiceCollection()
-            .AddScoped(sp => new TestStore(new Dictionary<string, byte[]>()))
-            .BuildServiceProvider();
-    }
-
-    private sealed class TestStore(IDictionary<string, byte[]> data) : IPersistentComponentStateStore
-    {
-        private readonly IDictionary<string, byte[]> _data = data;
-
-        public Task<IDictionary<string, byte[]>> GetPersistedStateAsync()
-            => Task.FromResult(_data);
-
-        public Task PersistStateAsync(IReadOnlyDictionary<string, byte[]> state)
-        {
-            foreach (var (key, value) in state)
-            {
-                _data[key] = value;
-            }
-
-            return Task.CompletedTask;
-        }
-    }
 }