Add StopServer for AdbServer

SharpAdb · Oct 20, 2023 · 5428875 · 5428875
1 parent 79344a1
commit 5428875
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 2 deletions.
diff --git a/AdvancedSharpAdbClient.Tests/AdbServerTests.Async.cs b/AdvancedSharpAdbClient.Tests/AdbServerTests.Async.cs
@@ -220,5 +220,17 @@ public async void RestartServerAsyncTest()
             Assert.Equal("host:version", socket.Requests[0]);
             Assert.Equal("host:kill", socket.Requests[1]);
         }
+
+        /// <summary>
+        /// Tests the <see cref="AdbServer.StopServerAsync(CancellationToken)"/> method.
+        /// </summary>
+        [Fact]
+        public async void StopServerAsyncTest()
+        {
+            await adbServer.StopServerAsync();
+
+            Assert.Single(socket.Requests);
+            Assert.Equal("host:kill", socket.Requests[0]);
+        }
     }
 }
diff --git a/AdvancedSharpAdbClient.Tests/AdbServerTests.cs b/AdvancedSharpAdbClient.Tests/AdbServerTests.cs
@@ -244,6 +244,18 @@ public void RestartServerTest()
             Assert.Equal("host:kill", socket.Requests[1]);
         }
 
+        /// <summary>
+        /// Tests the <see cref="AdbServer.StopServer"/> method.
+        /// </summary>
+        [Fact]
+        public void StopServerTest()
+        {
+            adbServer.StopServer();
+
+            Assert.Single(socket.Requests);
+            Assert.Equal("host:kill", socket.Requests[0]);
+        }
+
         /// <summary>
         /// Tests the <see cref="AdbServer(IAdbClient, Func{string, IAdbCommandLineClient})"/> method.
         /// </summary>

diff --git a/AdvancedSharpAdbClient.Tests/Dummys/DummyAdbServer.cs b/AdvancedSharpAdbClient.Tests/Dummys/DummyAdbServer.cs
@@ -77,5 +77,15 @@ public Task<StartServerResult> StartServerAsync(string adbPath, bool restartServ
             tcs.SetResult(result);
             return tcs.Task;
         }
+
+        /// <inheritdoc/>
+        public void StopServer() => Status = Status with { IsRunning = false };
+
+        /// <inheritdoc/>
+        public Task StopServerAsync(CancellationToken cancellationToken)
+        {
+            StopServer();
+            return Task.CompletedTask;
+        }
     }
 }
diff --git a/AdvancedSharpAdbClient/AdbServer.Async.cs b/AdvancedSharpAdbClient/AdbServer.Async.cs
@@ -78,6 +78,9 @@ public Task<StartServerResult> RestartServerAsync(CancellationToken cancellation
         public virtual Task<StartServerResult> RestartServerAsync(string adbPath, CancellationToken cancellationToken = default) =>
             StringExtensions.IsNullOrWhiteSpace(adbPath) ? RestartServerAsync(cancellationToken) : StartServerAsync(adbPath, true, cancellationToken);
 
+        /// <inheritdoc/>
+        public virtual Task StopServerAsync(CancellationToken cancellationToken = default) => adbClient.KillAdbAsync(cancellationToken);
+
         /// <inheritdoc/>
         public virtual async Task<AdbServerStatus> GetStatusAsync(CancellationToken cancellationToken = default)
         {

diff --git a/AdvancedSharpAdbClient/AdbServer.cs b/AdvancedSharpAdbClient/AdbServer.cs
@@ -164,6 +164,9 @@ public virtual StartServerResult StartServer(string adbPath, bool restartServerI
         public virtual StartServerResult RestartServer(string adbPath) =>
             StringExtensions.IsNullOrWhiteSpace(adbPath) ? RestartServer() : StartServer(adbPath, true);
 
+        /// <inheritdoc/>
+        public virtual void StopServer() => adbClient.KillAdb();
+
         /// <inheritdoc/>
         public virtual AdbServerStatus GetStatus()
         {

diff --git a/AdvancedSharpAdbClient/Interfaces/IAdbServer.Async.cs b/AdvancedSharpAdbClient/Interfaces/IAdbServer.Async.cs
@@ -73,7 +73,12 @@ public partial interface IAdbServer
         Task<StartServerResult> RestartServerAsync(string adbPath, CancellationToken cancellationToken);
 
         /// <summary>
-        /// Gets the status of the adb server.
+        /// Stop the adb server asynchronously.
+        /// </summary>
+        Task StopServerAsync(CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the status of the adb server asynchronously.
         /// </summary>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> which can be used to cancel the asynchronous operation.</param>
         /// <returns>A <see cref="Task"/> which return a <see cref="AdbServerStatus"/> object that describes the status of the adb server.</returns>

diff --git a/AdvancedSharpAdbClient/Interfaces/IAdbServer.cs b/AdvancedSharpAdbClient/Interfaces/IAdbServer.cs
@@ -55,7 +55,8 @@ public partial interface IAdbServer
         /// <see cref="AdbServer.StartServer(string, bool)"/> and passed the full path to the adb server.</remarks>
         StartServerResult RestartServer();
 
-        /// <summary>Restarts the adb server with new adb path if it suddenly became unavailable. Call this class if, for example,
+        /// <summary>
+        /// Restarts the adb server with new adb path if it suddenly became unavailable. Call this class if, for example,
         /// you receive an <see cref="AdbException"/> with the <see cref="AdbException.ConnectionReset"/> flag
         /// set to <see langword="true"/> - a clear indicating the ADB server died.
         /// </summary>
@@ -66,6 +67,11 @@ public partial interface IAdbServer
         /// <see cref="AdbServer.StartServer(string, bool)"/> and passed the full path to the adb server.</remarks>
         StartServerResult RestartServer(string adbPath);
 
+        /// <summary>
+        /// Stop the adb server.
+        /// </summary>
+        void StopServer();
+
         /// <summary>
         /// Gets the status of the adb server.
         /// </summary>