clean up

Author: smdn

tests/Smdn.Net.MuninNode.Hosting/Smdn.Net.MuninNode.Hosting/MuninNodeBackgroundService.cs

@@ -230,7 +230,7 @@ private class NullMuninNode : IMuninNode {
     public EndPoint EndPoint { get; } = new IPEndPoint(IPAddress.Any, 0);
 
     public Task RunAsync(CancellationToken cancellationToken)
-      => Task.Run(() => cancellationToken.WaitHandle.WaitOne());
+      => Task.Run(cancellationToken.WaitHandle.WaitOne);
   }
 
   [Test]

tests/Smdn.Net.MuninNode/Smdn.Net.MuninNode.AccessRules/AddressListAccessRule.cs

@@ -1,6 +1,5 @@
 // SPDX-FileCopyrightText: 2025 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using System;
 using System.Net;
 
 using NUnit.Framework;

tests/Smdn.Net.MuninNode/Smdn.Net.MuninNode.AccessRules/LoopbackOnlyAccessRule.cs

@@ -1,8 +1,5 @@
 // SPDX-FileCopyrightText: 2025 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using System;
-using System.Net;
-
 using NUnit.Framework;
 
 namespace Smdn.Net.MuninNode.AccessRules;

tests/Smdn.Net.MuninNode/Smdn.Net.MuninNode.DependencyInjection/IMuninServiceBuilderExtensions.cs

@@ -167,8 +167,7 @@ public void AddNode_Multiple_GetKeyedService(string hostName)
   }
 
   private class CustomMuninNodeBuilder<TMuninNodeOptions> : MuninNodeBuilder
-    where TMuninNodeOptions : MuninNodeOptions
-  {
+    where TMuninNodeOptions : MuninNodeOptions {
     private readonly Func<TMuninNodeOptions, IPluginProvider, IMuninNodeListenerFactory?, IServiceProvider, IMuninNode> nodeFactory;
 
     public CustomMuninNodeBuilder(

tests/Smdn.Net.MuninNode/Smdn.Net.MuninNode.Protocol/MuninProtocolHandler.Command.Cap.cs

@@ -1,7 +1,5 @@
 // SPDX-FileCopyrightText: 2025 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using System;
-
 using NUnit.Framework;
 
 namespace Smdn.Net.MuninNode.Protocol;

tests/Smdn.Net.MuninNode/Smdn.Net.MuninNode.Protocol/MuninProtocolHandler.cs

@@ -125,17 +125,15 @@ public void HandleTransactionStartAsync_CancellationRequested()
       profile: new MuninNodeProfile()
     );
     var client = new PseudoMuninNodeClient();
-    using var cts = new CancellationTokenSource();
-
-    cts.Cancel();
+    var cancellationToken = new CancellationToken(canceled: true);
 
     Assert.That(
-      async () => await handler.HandleTransactionStartAsync(client, cts.Token),
+      async () => await handler.HandleTransactionStartAsync(client, cancellationToken),
       Throws
         .InstanceOf<OperationCanceledException>()
         .With
         .Property(nameof(OperationCanceledException.CancellationToken))
-        .EqualTo(cts.Token)
+        .EqualTo(cancellationToken)
     );
 
     Assert.That(client.Responses.Count, Is.Zero);
@@ -184,17 +182,15 @@ public void HandleTransactionEndAsync_CancellationRequested()
       profile: new MuninNodeProfile()
     );
     var client = new PseudoMuninNodeClient();
-    using var cts = new CancellationTokenSource();
-
-    cts.Cancel();
+    var cancellationToken = new CancellationToken(canceled: true);
 
     Assert.That(
-      async () => await handler.HandleTransactionEndAsync(client, cts.Token),
+      async () => await handler.HandleTransactionEndAsync(client, cancellationToken),
       Throws
         .InstanceOf<OperationCanceledException>()
         .With
         .Property(nameof(OperationCanceledException.CancellationToken))
-        .EqualTo(cts.Token)
+        .EqualTo(cancellationToken)
     );
 
     Assert.That(client.Responses.Count, Is.Zero);
@@ -227,17 +223,15 @@ public void HandleCommandAsync_CancellationRequested()
       profile: new MuninNodeProfile()
     );
     var client = new PseudoMuninNodeClient();
-    using var cts = new CancellationTokenSource();
-
-    cts.Cancel();
+    var cancellationToken = new CancellationToken(canceled: true);
 
     Assert.That(
-      async () => await handler.HandleCommandAsync(client, CreateCommandLineSequence("."), cts.Token),
+      async () => await handler.HandleCommandAsync(client, CreateCommandLineSequence("."), cancellationToken),
       Throws
         .InstanceOf<OperationCanceledException>()
         .With
         .Property(nameof(OperationCanceledException.CancellationToken))
-        .EqualTo(cts.Token)
+        .EqualTo(cancellationToken)
     );
 
     Assert.That(client.Responses.Count, Is.Zero);

tests/Smdn.Net.MuninNode/Smdn.Net.MuninNode/NodeBase.Commands.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -81,18 +80,6 @@ private static Task RunSessionAsync(
       cancellationToken: cancellationToken
     );
 
-  private static Task RunSessionAsync(
-    IReadOnlyList<IPlugin>? plugins,
-    Func<PseudoMuninNode, PseudoMuninNodeClient, TextWriter, TextReader, CancellationToken, Task> action,
-    CancellationToken cancellationToken = default
-  )
-    => RunSessionAsync(
-      accessRule: null,
-      plugins: plugins,
-      action: action,
-      cancellationToken: cancellationToken
-    );
-
   private static async Task RunSessionAsync(
     IAccessRule? accessRule,
     IReadOnlyList<IPlugin>? plugins,

tests/Smdn.Net.MuninNode/Smdn.Net.MuninNode/NodeBase.cs

@@ -130,9 +130,6 @@ protected override ValueTask StoppedAsync(CancellationToken cancellationToken)
   private static NodeBase CreateNode()
     => CreateNode(accessRule: null, plugins: Array.Empty<IPlugin>());
 
-  private static NodeBase CreateNode(IReadOnlyList<IPlugin> plugins)
-    => CreateNode(accessRule: null, plugins: plugins);
-
   private static NodeBase CreateNode(IAccessRule? accessRule, IReadOnlyList<IPlugin> plugins)
     => new TestLocalNode(accessRule, plugins);
 
@@ -358,7 +355,7 @@ public async Task StopAsync_StartedByStart()
     await using var node = CreateNode();
 
 #pragma warning disable CS0618
-    Assert.That(() => node.Start(), Throws.Nothing);
+    Assert.That(node.Start, Throws.Nothing);
 #pragma warning restore CS0618
 
     Assert.That(async () => await node.StopAsync(default), Throws.Nothing);

tests/Smdn.Net.MuninNode/Smdn.Net.MuninPlugin/AggregatePluginProvider.cs

@@ -195,10 +195,8 @@ public void INodeSessionCallback_ReportSessionStartedAsync_CancellationRequested
 
     INodeSessionCallback sessionCallback = pluginProviderCollections;
 
-    using var cts = new CancellationTokenSource(0);
-
     Assert.That(
-      async () => await sessionCallback.ReportSessionStartedAsync(string.Empty, cts.Token),
+      async () => await sessionCallback.ReportSessionStartedAsync(string.Empty, cancellationToken: new(canceled: true)),
       Throws.InstanceOf<OperationCanceledException>()
     );
 
@@ -221,10 +219,8 @@ public void INodeSessionCallback_ReportSessionClosedAsync_CancellationRequested(
 
     INodeSessionCallback sessionCallback = pluginProviderCollections;
 
-    using var cts = new CancellationTokenSource(0);
-
     Assert.That(
-      async () => await sessionCallback.ReportSessionClosedAsync(string.Empty, cts.Token),
+      async () => await sessionCallback.ReportSessionClosedAsync(string.Empty, cancellationToken: new(canceled: true)),
       Throws.InstanceOf<OperationCanceledException>()
     );
 

tests/Smdn.Net.MuninNode/Smdn.Net.MuninPlugin/PluginGraphAttributesBuilder.GraphArgs.cs

@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2025 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
 using System;
-using System.Collections.Generic;
 
 using NUnit.Framework;