From cfad44fe9821b335ebdd85f238333a8831fd5d71 Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Sat, 16 Nov 2019 16:02:36 -0600 Subject: [PATCH] TestUtils.GameName -> Game enum --- Wabbajack.Test/ACompilerTest.cs | 2 +- Wabbajack.Test/AVortexCompilerTest.cs | 4 ++-- Wabbajack.Test/EndToEndTests.cs | 2 +- Wabbajack.Test/TestUtils.cs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Wabbajack.Test/ACompilerTest.cs b/Wabbajack.Test/ACompilerTest.cs index 22e6e4c6..f7b7ac52 100644 --- a/Wabbajack.Test/ACompilerTest.cs +++ b/Wabbajack.Test/ACompilerTest.cs @@ -20,7 +20,7 @@ namespace Wabbajack.Test Consts.TestMode = true; utils = new TestUtils(); - utils.GameName = "Skyrim Special Edition"; + utils.Game = Game.SkyrimSpecialEdition; Utils.LogMessages.Subscribe(f => TestContext.WriteLine(f)); diff --git a/Wabbajack.Test/AVortexCompilerTest.cs b/Wabbajack.Test/AVortexCompilerTest.cs index bffde171..49fe5bd0 100644 --- a/Wabbajack.Test/AVortexCompilerTest.cs +++ b/Wabbajack.Test/AVortexCompilerTest.cs @@ -19,7 +19,7 @@ namespace Wabbajack.Test utils = new TestUtils { - GameName = "darkestdungeon" + Game = Game.DarkestDungeon }; Utils.LogMessages.Subscribe(f => TestContext.WriteLine(f)); @@ -43,7 +43,7 @@ namespace Wabbajack.Test protected VortexCompiler MakeCompiler() { - var vortexCompiler = new VortexCompiler(utils.GameName, utils.GameFolder); + var vortexCompiler = new VortexCompiler(GameRegistry.Games[utils.Game].NexusName, utils.GameFolder); return vortexCompiler; } diff --git a/Wabbajack.Test/EndToEndTests.cs b/Wabbajack.Test/EndToEndTests.cs index c7ebeb40..55b6b761 100644 --- a/Wabbajack.Test/EndToEndTests.cs +++ b/Wabbajack.Test/EndToEndTests.cs @@ -27,7 +27,7 @@ namespace Wabbajack.Test Consts.TestMode = true; utils = new TestUtils(); - utils.GameName = "Skyrim Special Edition"; + utils.Game = Game.SkyrimSpecialEdition; Utils.LogMessages.Subscribe(f => TestContext.WriteLine(f)); diff --git a/Wabbajack.Test/TestUtils.cs b/Wabbajack.Test/TestUtils.cs index 4c35d79f..abb10136 100644 --- a/Wabbajack.Test/TestUtils.cs +++ b/Wabbajack.Test/TestUtils.cs @@ -30,7 +30,7 @@ namespace Wabbajack.Test public string ID { get; } public Random RNG { get; } - public string GameName { get; set; } + public Game Game { get; set; } public string TestFolder => Path.Combine(WorkingDirectory, ID); public string GameFolder => Path.Combine(WorkingDirectory, ID, "game_folder"); @@ -50,7 +50,7 @@ namespace Wabbajack.Test File.WriteAllLines(Path.Combine(MO2Folder, "ModOrganizer.ini"), new [] { "[General]", - $"gameName={GameName}", + $"gameName={GameRegistry.Games[this.Game].MO2Name}", $"gamePath={GameFolder.Replace("\\", "\\\\")}", $"download_directory={DownloadsFolder}" });