Change Server Menu

k3ldar · Dec 19, 2023 · c3fd002 · c3fd002
1 parent 5b71cd7
commit c3fd002
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/src/GCATests/GSendCS/ServerAddressProcessorTests.cs b/src/GCATests/GSendCS/ServerAddressProcessorTests.cs
@@ -233,7 +233,7 @@ public void Delete_ExclusiveAccessNotAvailable_ReturnsErrorCodeExclusiveAccessDe
         public void Delete_ExistingServerAddress_StillReadableWhilstFileStreamOpen_WhenFileDoesNotExist()
         {
             string serverSettingsFile = Path.GetTempFileName();
-            File.WriteAllText(serverSettingsFile, "[\"http://127.0.0.1:7150\"]");
+            File.WriteAllText(serverSettingsFile, "[\"http://127.0.0.1:7150/\"]");
             MockCommandLineArgs mockArgs = new();
             MockDisplay mockDisplay = new();
 

diff --git a/src/GCATests/Mocks/MockRunProgram.cs b/src/GCATests/Mocks/MockRunProgram.cs
@@ -17,12 +17,13 @@ public int Run(string programName, string parameters, bool useShellExecute, bool
 
         public string Run(string programName, string parameters)
         {
-            throw new NotImplementedException();
+            return Run(programName, parameters, out int _);
         }
 
         public string Run(string programName, string parameters, out int exitCode)
         {
-            throw new NotImplementedException();
+            exitCode = ExitCode;
+            return Result;
         }
 
         public int ReturnValue { get; set; } = Int32.MinValue;
@@ -36,5 +37,9 @@ public string Run(string programName, string parameters, out int exitCode)
         public bool WaitForFinish { get; set; }
 
         public int TimeoutMilliseconds { get; set; }
+
+        public int ExitCode { get; set; }
+
+        public string Result { get; set; }
     }
 }
diff --git a/src/GCATests/Shared/Plugins/ServerMenuPluginTests.cs b/src/GCATests/Shared/Plugins/ServerMenuPluginTests.cs
@@ -21,9 +21,11 @@ public class ServerMenuPluginTests
         [TestMethod]
         public void ServerMenuPlugin_ConstructValidInstance_Success()
         {
+            MockRunProgram mockRunProgram = new MockRunProgram();
+            mockRunProgram.Result = string.Empty;
             IPluginMenu parentMenu = new MockPluginMenu("test", MenuType.MenuItem, null);
             MockSenderPluginHost pluginHost = new(parentMenu);
-            ServerMenuPlugin sut = new(new ServerConfigurationUpdated(), new CommonUtils(), new MockRunProgram());
+            ServerMenuPlugin sut = new(new MockGSendApiWrapper(), new ServerConfigurationUpdated(), new CommonUtils(), mockRunProgram);
             sut.Initialize(pluginHost);
 
             Assert.IsNotNull(sut);

diff --git a/src/GSendControls/Plugins/InternalPlugins/ServerMenu/ServerMenuPlugin.cs b/src/GSendControls/Plugins/InternalPlugins/ServerMenu/ServerMenuPlugin.cs
@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Windows.Forms;
 
+using GSendApi;
+
 using GSendControls.Abstractions;
 using GSendControls.Threads;
 
@@ -18,14 +21,16 @@ namespace GSendControls.Plugins.InternalPlugins.ServerMenu
     /// </summary>
     public sealed class ServerMenuPlugin : IGSendPluginModule
     {
+        private readonly IGSendApiWrapper _gSendApiWrapper;
         private readonly ICommonUtils _commonUtils;
         private const int MaximumServerNameMenuItems = 10;
         private List<IPluginMenu> _pluginMenus;
         private IPluginHost _pluginHost;
         private readonly IRunProgram _runProgram;
 
-        public ServerMenuPlugin(IServerConfigurationUpdated serverConfigurationUpdated, ICommonUtils commonUtils, IRunProgram runProgram)
+        public ServerMenuPlugin(IGSendApiWrapper gSendApiWrapper, IServerConfigurationUpdated serverConfigurationUpdated, ICommonUtils commonUtils, IRunProgram runProgram)
         {
+            _gSendApiWrapper = gSendApiWrapper ?? throw new ArgumentNullException(nameof(gSendApiWrapper));
             _commonUtils = commonUtils ?? throw new ArgumentNullException(nameof(commonUtils));
             _runProgram = runProgram ?? throw new ArgumentNullException(nameof(runProgram));
 
@@ -60,7 +65,7 @@ public IReadOnlyList<IPluginMenu> MenuItems
 
                     for (int i = 0; i < MaximumServerNameMenuItems; i++)
                     {
-                        _pluginMenus.Add(new ServerSelectMenuItem(parentServerMenu, i + 2));
+                        _pluginMenus.Add(new ServerSelectMenuItem(parentServerMenu, i + 2, _gSendApiWrapper));
                     }
 
                     UpdateServerMenuItems();

diff --git a/src/GSendControls/Plugins/InternalPlugins/ServerMenu/ServerSelectMenuItem.cs b/src/GSendControls/Plugins/InternalPlugins/ServerMenu/ServerSelectMenuItem.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Drawing;
 
+using GSendApi;
+
 using GSendControls.Abstractions;
 
 using GSendShared;
@@ -10,14 +12,16 @@ namespace GSendControls.Plugins.InternalPlugins.ServerMenu
 {
     public sealed class ServerSelectMenuItem : IPluginMenu
     {
+        private readonly IGSendApiWrapper _gSendApiWrapper;
         private Uri _uri = null;
 
-        public ServerSelectMenuItem(IPluginMenu parentMenu, int index)
+        public ServerSelectMenuItem(IPluginMenu parentMenu, int index, IGSendApiWrapper gSendApiWrapper)
         {
+            _gSendApiWrapper = gSendApiWrapper ?? throw new ArgumentNullException(nameof(gSendApiWrapper));
             ParentMenu = parentMenu ?? throw new ArgumentNullException(nameof(parentMenu));
             Index = index;
         }
-
+         
         public Image MenuImage => null;
 
         public MenuType MenuType => MenuType.MenuItem;
@@ -32,7 +36,7 @@ public ServerSelectMenuItem(IPluginMenu parentMenu, int index)
 
         public void Clicked()
         {
-
+            _gSendApiWrapper.ServerAddress = _uri ?? throw new InvalidOperationException("Invalid Server Address");
         }
 
         public void ClientMessageReceived(IClientBaseMessage clientMessage)
@@ -49,7 +53,10 @@ public bool GetShortcut(out string groupName, out string shortcutName)
 
         public bool IsChecked()
         {
-            return false;
+            if (_uri == null)
+                return false;
+
+            return _uri.Equals(_gSendApiWrapper.ServerAddress);
         }
 
         public bool IsEnabled()