From 4d5b4735fb02e35d6e46bd17447ed1200c87f315 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Fri, 8 Dec 2017 13:12:18 -0500 Subject: [PATCH] Update Installer.UI and tests to use the new IServerInterface --- TGS.Installer.UI/Main.cs | 12 ++++++------ .../TestRepoSetPushTestmergeCommitsCommand.cs | 4 ++-- TGS.Tests/ControlPanel/TestInstanceSelector.cs | 3 +-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/TGS.Installer.UI/Main.cs b/TGS.Installer.UI/Main.cs index 57e33887d4..caea2cf03c 100644 --- a/TGS.Installer.UI/Main.cs +++ b/TGS.Installer.UI/Main.cs @@ -79,7 +79,7 @@ namespace TGS.Installer.UI var verifiedConnection = Interface.ConnectionStatus().HasFlag(ConnectivityLevel.Administrator); try { - var realVersion = Interface.ServerVersion; + var realVersion = Interface.Server.Version; var isV0 = realVersion < new Version(3, 1, 0, 0); if (isV0) //OH GOD!!!! MessageBox.Show("Upgrading from version 3.0 may trigger a bug that can delete /config and /data. IT IS STRONGLY RECCOMMENDED THAT YOU BACKUP THESE FOLDERS BEFORE UPDATING!", "Warning"); @@ -106,7 +106,7 @@ namespace TGS.Installer.UI var connectionVerified = Interface.ConnectionStatus().HasFlag(ConnectivityLevel.Administrator); try { - Interface.GetServiceComponent().PrepareForUpdate(); + Interface.Server.Management.PrepareForUpdate(); Thread.Sleep(3000); //chat messages return true; } @@ -194,18 +194,18 @@ namespace TGS.Installer.UI var sc = new ServerConfig(); try { - sc.PythonPath = Interface.GetServiceComponent().PythonPath(); + sc.PythonPath = Interface.Server.Management.PythonPath(); } catch { } try { - sc.RemoteAccessPort = Interface.GetServiceComponent().RemoteAccessPort(); + sc.RemoteAccessPort = Interface.Server.Management.RemoteAccessPort(); } catch { } try { - foreach (var I in Interface.GetServiceComponent().ListInstances()) - sc.InstancePaths.Add(I.Path); + foreach (var I in Interface.Server.Instances) + sc.InstancePaths.Add(I.Metadata.Path); } catch { } diff --git a/TGS.Tests/CommandLine/Commands/Repository/TestRepoSetPushTestmergeCommitsCommand.cs b/TGS.Tests/CommandLine/Commands/Repository/TestRepoSetPushTestmergeCommitsCommand.cs index 19301b5172..a5f2b72ede 100644 --- a/TGS.Tests/CommandLine/Commands/Repository/TestRepoSetPushTestmergeCommitsCommand.cs +++ b/TGS.Tests/CommandLine/Commands/Repository/TestRepoSetPushTestmergeCommitsCommand.cs @@ -21,7 +21,7 @@ namespace TGS.CommandLine.Commands.Repository.Tests var ran = false; var repo = new Mock(); repo.Setup(foo => foo.SetPushTestmergeCommits(true)).Callback(() => { ran = true; }); - ConsoleCommand.Server = MockInterfaceToRepo(repo.Object); + ConsoleCommand.Instance = MockInterfaceToRepo(repo.Object); Assert.AreEqual(new RepoSetPushTestmergeCommitsCommand().DoRun(new List { "on" }), Command.ExitCode.Normal); Assert.IsTrue(ran); } @@ -36,7 +36,7 @@ namespace TGS.CommandLine.Commands.Repository.Tests var ran = false; var repo = new Mock(); repo.Setup(foo => foo.SetPushTestmergeCommits(false)).Callback(() => { ran = true; }); - ConsoleCommand.Server = MockInterfaceToRepo(repo.Object); + ConsoleCommand.Instance = MockInterfaceToRepo(repo.Object); Assert.AreEqual(new RepoSetPushTestmergeCommitsCommand().DoRun(new List { "off" }), Command.ExitCode.Normal); Assert.IsTrue(ran); } diff --git a/TGS.Tests/ControlPanel/TestInstanceSelector.cs b/TGS.Tests/ControlPanel/TestInstanceSelector.cs index 913d89017d..2d65a3b1db 100644 --- a/TGS.Tests/ControlPanel/TestInstanceSelector.cs +++ b/TGS.Tests/ControlPanel/TestInstanceSelector.cs @@ -20,8 +20,7 @@ namespace TGS.ControlPanel.Tests { var mockLanding = new Mock(); mockLanding.Setup(x => x.ListInstances()).Returns(new List()); - var mockInter = new Mock(); - mockInter.Setup(x => x.GetComponent()).Returns(mockLanding.Object); + var mockInter = new Mock(); new InstanceSelector(mockInter.Object).Dispose(); }