trying to make tests cross-platform

Sharpiro · Sharpiro · commit e858c154d26a · 2018-06-13T16:37:46.000-04:00
testing that generated exectuables execute correctly
diff --git a/src/Dotnet.Script.Tests/ScriptPublisherTests.cs b/src/Dotnet.Script.Tests/ScriptPublisherTests.cs
@@ -1,4 +1,7 @@
-﻿using Dotnet.Script.DependencyModel.Environment;
+﻿using Dotnet.Script.Core;
+using Dotnet.Script.DependencyModel.Environment;
+using Dotnet.Script.DependencyModel.Logging;
+using Dotnet.Script.DependencyModel.Process;
 using System.IO;
 using Xunit;
 
@@ -7,10 +10,12 @@ namespace Dotnet.Script.Tests
     public class ScriptPublisherTests
     {
         private readonly ScriptEnvironment _scriptEnvironment;
+        private readonly CommandRunner _commandRunner;
 
         public ScriptPublisherTests()
         {
             _scriptEnvironment = ScriptEnvironment.Default;
+            _commandRunner = new CommandRunner(GetLogFactory());
         }
 
         [Fact]
@@ -22,9 +27,13 @@ public void SimplePublishTest()
                 var mainPath = Path.Combine(scriptFolder.Path, "main.csx");
                 File.WriteAllText(mainPath, code);
                 var args = new string[] { "publish", mainPath };
-                var result = Execute(string.Join(" ", args), scriptFolder.Path);
-                Assert.Equal(0, result.exitCode);
-                Assert.True(File.Exists(Path.Combine(scriptFolder.Path, "publish", "script.exe")));
+                var publishResult = Execute(string.Join(" ", args), scriptFolder.Path);
+                Assert.Equal(0, publishResult.exitCode);
+
+                var exePath = Path.Combine(scriptFolder.Path, "publish", "script");
+                var executableRunResult = _commandRunner.Execute(exePath);
+
+                Assert.Equal(0, executableRunResult);
             }
         }
 
@@ -38,9 +47,13 @@ public void SimplePublishToOtherFolderTest()
                 var mainPath = Path.Combine(workspaceFolder.Path, "main.csx");
                 File.WriteAllText(mainPath, code);
                 var args = new string[] { "publish", mainPath, "-o", publishRootFolder.Path };
-                var result = Execute(string.Join(" ", args), workspaceFolder.Path);
-                Assert.Equal(0, result.exitCode);
-                Assert.True(File.Exists(Path.Combine(publishRootFolder.Path, "script.exe")));
+                var publishResult = Execute(string.Join(" ", args), workspaceFolder.Path);
+                Assert.Equal(0, publishResult.exitCode);
+
+                var exePath = Path.Combine(publishRootFolder.Path, "script");
+                var executableRunResult = _commandRunner.Execute(exePath);
+
+                Assert.Equal(0, executableRunResult);
             }
         }
 
@@ -53,9 +66,13 @@ public void SimplePublishFromCurrentDirectoryTest()
                 var mainPath = Path.Combine(workspaceFolder.Path, "main.csx");
                 File.WriteAllText(mainPath, code);
                 var args = new string[] { "publish", "main.csx" };
-                var result = Execute(string.Join(" ", args), workspaceFolder.Path);
-                Assert.Equal(0, result.exitCode);
-                Assert.True(File.Exists(Path.Combine(workspaceFolder.Path, "publish", "script.exe")));
+                var publishResult = Execute(string.Join(" ", args), workspaceFolder.Path);
+                Assert.Equal(0, publishResult.exitCode);
+
+                var exePath = Path.Combine(workspaceFolder.Path, "publish", "script");
+                var executableRunResult = _commandRunner.Execute(exePath);
+
+                Assert.Equal(0, executableRunResult);
             }
         }
 
@@ -68,9 +85,13 @@ public void SimplePublishFromCurrentDirectoryToOtherFolderTest()
                 var mainPath = Path.Combine(workspaceFolder.Path, "main.csx");
                 File.WriteAllText(mainPath, code);
                 var args = new string[] { "publish", "main.csx", "-o", "publish" };
-                var result = Execute(string.Join(" ", args), workspaceFolder.Path);
-                Assert.Equal(0, result.exitCode);
-                Assert.True(File.Exists(Path.Combine(workspaceFolder.Path, "publish", "script.exe")));
+                var publishResult = Execute(string.Join(" ", args), workspaceFolder.Path);
+                Assert.Equal(0, publishResult.exitCode);
+
+                var exePath = Path.Combine(workspaceFolder.Path, "publish", "script");
+                var executableRunResult = _commandRunner.Execute(exePath);
+
+                Assert.Equal(0, executableRunResult);
             }
         }
 
@@ -98,5 +119,21 @@ private string[] GetDotnetScriptArguments(string args)
 #endif
             return new[] { "exec", Path.Combine(Directory.GetCurrentDirectory(), "..", "..", "..", "..", "Dotnet.Script", "bin", configuration, _scriptEnvironment.TargetFramework, "dotnet-script.dll"), args };
         }
+
+        private LogFactory GetLogFactory()
+        {
+            var logger = new ScriptLogger(ScriptConsole.Default.Error, true);
+            return type => ((level, message) =>
+            {
+                if (level == LogLevel.Debug)
+                {
+                    logger.Verbose(message);
+                }
+                if (level == LogLevel.Info)
+                {
+                    logger.Log(message);
+                }
+            });
+        }
     }
 }
