refactor: minor changes

servicetitan · Dec 3, 2023 · f31c964 · f31c964
1 parent 9797c0a
commit f31c964
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/samples/TodoApp/UI/Shared/BarConnectionStatus.razor b/samples/TodoApp/UI/Shared/BarConnectionStatus.razor
@@ -3,7 +3,7 @@
 
 @{
     var m = State.Value;
-    var isOk = m.LikelyConnected;
+    var isOk = m.Kind is not RpcPeerStateKind.Disconnected;
     var iconName = isOk
         ? FontAwesomeIcons.Cloud
         : FontAwesomeIcons.ExclamationTriangle;

diff --git a/samples/TodoApp/UI/Shared/TextConnectionStatus.razor b/samples/TodoApp/UI/Shared/TextConnectionStatus.razor
@@ -3,7 +3,7 @@
 
 @{
     var m = State.Value;
-    var isOk = m.LikelyConnected;
+    var isOk = m.Kind is not RpcPeerStateKind.Disconnected;
 }
 
 <Div Margin="Margin.Is1.OnY" TextColor="@(isOk ? TextColor.Default : TextColor.Warning)">

diff --git a/tests/Stl.Fusion.Tests/FusionRpcBasicTest.cs b/tests/Stl.Fusion.Tests/FusionRpcBasicTest.cs
@@ -47,14 +47,15 @@ public async Task PeerMonitorTest()
         var clientPeer = testClient.Connections.First().Value.ClientPeer;
         var monitor = new RpcPeerStateMonitor(services, clientPeer);
         var state = monitor.State;
-        await state.When(x => x.IsConnected).WaitAsync(TimeSpan.FromSeconds(1));
+        await state.When(x => x.Kind == RpcPeerStateKind.JustConnected).WaitAsync(TimeSpan.FromSeconds(1));
+        await state.When(x => x.Kind == RpcPeerStateKind.Connected).WaitAsync(TimeSpan.FromSeconds(2));
 
         _ = clientPeer.Disconnect(false, new InvalidOperationException("Disconnected!"));
-        await state.When(x => x.Kind == RpcPeerStateKind.JustDisconnected)
-            .WaitAsync(TimeSpan.FromSeconds(2));
-        await state.When(x => !x.LikelyConnected).WaitAsync(TimeSpan.FromSeconds(5));
+        await state.When(x => x.Kind == RpcPeerStateKind.JustDisconnected).WaitAsync(TimeSpan.FromSeconds(1));
+        await state.When(x => x.Kind == RpcPeerStateKind.Disconnected).WaitAsync(TimeSpan.FromSeconds(5));
 
         await testClient[clientPeer].Connect();
-        await state.When(x => x.IsConnected).WaitAsync(TimeSpan.FromSeconds(1));
+        await state.When(x => x.Kind == RpcPeerStateKind.JustConnected).WaitAsync(TimeSpan.FromSeconds(1));
+        await state.When(x => x.Kind == RpcPeerStateKind.Connected).WaitAsync(TimeSpan.FromSeconds(2));
     }
 }