Adjusted the unit tests

erri120 · Feb 14, 2020 · 2f6531a · 2f6531a
1 parent 4acbf25
commit 2f6531a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/OMODFramework.Test/CSharpTest.cs b/OMODFramework.Test/CSharpTest.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OMODFramework.Scripting;
 
 namespace OMODFramework.Test
 {
@@ -28,7 +29,7 @@ public void TestCSharpScript()
 
                 var scriptFunctions = new ScriptFunctions();
 
-                omod.RunScript(scriptFunctions);
+                ScriptRunner.RunScript(omod, scriptFunctions);
             });
         }
     }

diff --git a/OMODFramework.Test/EndToEndTest.cs b/OMODFramework.Test/EndToEndTest.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Reflection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OMODFramework.Scripting;
 using Directory = Alphaleonis.Win32.Filesystem.Directory;
 using File = Alphaleonis.Win32.Filesystem.File;
 using Path = Alphaleonis.Win32.Filesystem.Path;
@@ -113,7 +114,7 @@ public void EndToEnd()
 
             var scriptFunctions = new ScriptFunctions();
 
-            var srd = omod.RunScript(scriptFunctions, data);
+            var srd = ScriptRunner.RunScript(omod, scriptFunctions, data);
 
             Assert.IsNotNull(srd);
             Assert.IsTrue(!srd.CancelInstall);

diff --git a/OMODFramework.Test/OMODFramework.Test.csproj b/OMODFramework.Test/OMODFramework.Test.csproj
@@ -88,6 +88,10 @@
       <Project>{715a10c0-cac4-49b2-8a1d-0d6dd2e31f45}</Project>
       <Name>OMODFramework</Name>
     </ProjectReference>
+    <ProjectReference Include="..\OMODFramework.Scripting\OMODFramework.Scripting.csproj">
+      <Project>{f53b7974-2131-4907-b503-80562ea3dd39}</Project>
+      <Name>OMODFramework.Scripting</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/OMODFramework.Test/ScriptTest.cs b/OMODFramework.Test/ScriptTest.cs
@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
 
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OMODFramework.Scripting;
 
 namespace OMODFramework.Test
 {
@@ -84,7 +85,7 @@ public void TestOBMMScript()
 
                 var scriptFunctions = new ScriptFunctions();
 
-                var srd = omod.RunScript(scriptFunctions, data, plugins);
+                var srd = ScriptRunner.RunScript(omod, scriptFunctions, data, plugins);
 
                 Assert.IsNotNull(srd);
                 Assert.IsTrue(!srd.CancelInstall);