Fixed tests (#100)

Aragas · May 8, 2021 · f3101ae · f3101ae
1 parent e72e95b
commit f3101ae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/tests/MCM.Tests/BaseTests.cs b/tests/MCM.Tests/BaseTests.cs
@@ -19,6 +19,8 @@
 using v4::MCM;
 using v4::MCM.Implementation;
 
+using ModuleInfoHelper = Bannerlord.BUTR.Shared.Helpers.ModuleInfoHelper;
+using AccessTools2 = v4::HarmonyLib.BUTR.Extensions.AccessTools2;
 using SymbolExtensions2 = v4::HarmonyLib.BUTR.Extensions.SymbolExtensions2;
 
 namespace MCM.Tests
@@ -51,6 +53,8 @@ private static bool MockedGetModulesNames(ref string[] __result)
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
+            _harmony.Patch(AccessTools2.Method(typeof(ButterLibSubModule).Assembly.GetType("Bannerlord.BUTR.Shared.Helpers.FSIOHelper"), "GetConfigPath"),
+                prefix: new HarmonyMethod(DelegateHelper.GetMethodInfo(MockedGetConfigsPath)));
             _harmony.Patch(SymbolExtensions2.GetMethodInfo(() => FSIOHelper.GetConfigPath()),
                 prefix: new HarmonyMethod(DelegateHelper.GetMethodInfo(MockedGetConfigsPath)));
             _harmony.Patch(SymbolExtensions2.GetMethodInfo(() => ModuleInfoHelper.GetLoadedModules()),

diff --git a/tests/MCM.Tests/SettingsFormat/BaseSettingsFormatTests.cs b/tests/MCM.Tests/SettingsFormat/BaseSettingsFormatTests.cs
@@ -1,14 +1,24 @@
 extern alias v4;
 
+using NUnit.Framework;
+
+using System;
+using System.Runtime.CompilerServices;
+
 using v4::MCM.Abstractions.Settings.Base.Global;
 using v4::MCM.Abstractions.Settings.Formats;
 
-using NUnit.Framework;
-
 namespace MCM.Tests.SettingsFormat
 {
     public class BaseSettingsFormatTests : BaseTests
     {
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        protected static bool MockedGetConfigPath(ref string __result)
+        {
+            __result = AppDomain.CurrentDomain.BaseDirectory;
+            return false;
+        }
+
         protected bool _boolValue;
         protected int _intValue;
         protected float _floatValue;