mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fixing tests now they are portable.

Browse source 
2 tests needed to lift System.Diagnostics.TraceSource since it isn't in the shared framework.

The ArgumentReflector is now a portable app, so it needs to be invoked with "dotnet".
This commit is contained in:
Eric Erhardt 2016-04-07 21:54:59 -05:00
parent 4c704997c9
commit 8a9068efbf
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
test/ArgumentForwardingTests/ArgumentForwardingTests.cs
View file

@ -4,6 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
using Xunit; using Xunit;
@ -18,7 +19,7 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding
{ {
public class ArgumentForwardingTests : TestBase public class ArgumentForwardingTests : TestBase
{ {
private static readonly string s_reflectorExeName = "ArgumentsReflector" + Constants.ExeSuffix; private static readonly string s_reflectorDllName = "ArgumentsReflector.dll";
private static readonly string s_reflectorCmdName = "reflector_cmd"; private static readonly string s_reflectorCmdName = "reflector_cmd";
private string ReflectorPath { get; set; } private string ReflectorPath { get; set; }
@ -38,7 +39,7 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding
private void FindAndEnsureReflectorPresent() private void FindAndEnsureReflectorPresent()
{ {
ReflectorPath = Path.Combine(AppContext.BaseDirectory, s_reflectorExeName); ReflectorPath = Path.Combine(AppContext.BaseDirectory, s_reflectorDllName);
ReflectorCmdPath = Path.Combine(AppContext.BaseDirectory, s_reflectorCmdName); ReflectorCmdPath = Path.Combine(AppContext.BaseDirectory, s_reflectorCmdName);
File.Exists(ReflectorPath).Should().BeTrue(); File.Exists(ReflectorPath).Should().BeTrue();
} }
@ -182,7 +183,7 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding
/// <returns></returns> /// <returns></returns>
private string[] EscapeAndEvaluateArgumentString(string[] rawEvaluatedArgument) private string[] EscapeAndEvaluateArgumentString(string[] rawEvaluatedArgument)
{ {
var commandResult = Command.Create(ReflectorPath, rawEvaluatedArgument) var commandResult = Command.Create("dotnet", new[] { ReflectorPath }.Concat(rawEvaluatedArgument))
.CaptureStdErr() .CaptureStdErr()
.CaptureStdOut() .CaptureStdOut()
.Execute(); .Execute();
@ -262,8 +263,8 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding
{ {
StartInfo = new ProcessStartInfo StartInfo = new ProcessStartInfo
{ {
FileName = ReflectorPath, FileName = Env.GetCommandPath("dotnet", ".exe", ""),
Arguments = testUserArgument, Arguments = $"{ReflectorPath} {testUserArgument}",
UseShellExecute = false, UseShellExecute = false,
RedirectStandardOutput = true, RedirectStandardOutput = true,
CreateNoWindow = true CreateNoWindow = true

1
test/Microsoft.DotNet.Cli.Utils.Tests/project.json
View file

@ -8,6 +8,7 @@
"type": "platform", "type": "platform",
"version": "1.0.0-rc2-*" "version": "1.0.0-rc2-*"
}, },
"System.Diagnostics.TraceSource": "4.0.0-rc2-24008",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24008", "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24008",
"NuGet.Versioning": "3.5.0-beta-1130", "NuGet.Versioning": "3.5.0-beta-1130",
"NuGet.Packaging": "3.5.0-beta-1130", "NuGet.Packaging": "3.5.0-beta-1130",

1
test/Microsoft.Extensions.DependencyModel.Tests/project.json
View file

@ -9,6 +9,7 @@
"type": "platform", "type": "platform",
"version": "1.0.0-rc2-*" "version": "1.0.0-rc2-*"
}, },
"System.Diagnostics.TraceSource": "4.0.0-rc2-24008",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },