From ae2f48bb249a9bfa7b509ae4a006faa99bdd6258 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 13 Jul 2018 15:34:43 -0700 Subject: Add additional debug diagnostics for WixToolsetTest.BuildTasks tests --- src/test/WixToolsetTest.BuildTasks/FakeBuildEngine.cs | 14 +++++++++----- src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs | 8 +++++--- 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'src/test/WixToolsetTest.BuildTasks') diff --git a/src/test/WixToolsetTest.BuildTasks/FakeBuildEngine.cs b/src/test/WixToolsetTest.BuildTasks/FakeBuildEngine.cs index 0559057f..8fd69414 100644 --- a/src/test/WixToolsetTest.BuildTasks/FakeBuildEngine.cs +++ b/src/test/WixToolsetTest.BuildTasks/FakeBuildEngine.cs @@ -3,11 +3,13 @@ namespace WixToolsetTest.BuildTasks { using System.Collections; - using System.Diagnostics; + using System.Text; using Microsoft.Build.Framework; internal class FakeBuildEngine : IBuildEngine { + private StringBuilder output = new StringBuilder(); + public int ColumnNumberOfTaskNode => 0; public bool ContinueOnError => false; @@ -16,14 +18,16 @@ namespace WixToolsetTest.BuildTasks public string ProjectFileOfTaskNode => "fake_wix.targets"; + public string Output => this.output.ToString(); + public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties, IDictionary targetOutputs) => throw new System.NotImplementedException(); - public void LogCustomEvent(CustomBuildEventArgs e) => Debug.Write(e.Message); + public void LogCustomEvent(CustomBuildEventArgs e) => this.output.AppendLine(e.Message); - public void LogErrorEvent(BuildErrorEventArgs e) => Debug.Write(e.Message); + public void LogErrorEvent(BuildErrorEventArgs e) => this.output.AppendLine(e.Message); - public void LogMessageEvent(BuildMessageEventArgs e) => Debug.Write(e.Message); + public void LogMessageEvent(BuildMessageEventArgs e) => this.output.AppendLine(e.Message); - public void LogWarningEvent(BuildWarningEventArgs e) => Debug.Write(e.Message); + public void LogWarningEvent(BuildWarningEventArgs e) => this.output.AppendLine(e.Message); } } diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs index 79975f37..a27928d5 100644 --- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs +++ b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs @@ -14,7 +14,7 @@ namespace WixToolsetTest.BuildTasks public partial class MsbuildFixture { [Fact] - public void CanBuildSingleFile() + public void CanBuildSimpleMsiPackage() { var folder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); @@ -23,9 +23,11 @@ namespace WixToolsetTest.BuildTasks var baseFolder = fs.GetFolder(); var intermediateFolder = Path.Combine(baseFolder, "obj"); + var engine = new FakeBuildEngine(); + var task = new DoIt { - BuildEngine = new FakeBuildEngine(), + BuildEngine = engine, SourceFiles = new[] { new TaskItem(Path.Combine(folder, "Package.wxs")), @@ -44,7 +46,7 @@ namespace WixToolsetTest.BuildTasks }; var result = task.Execute(); - Assert.True(result, "MSBuild task failed unexpectedly."); + Assert.True(result, $"MSBuild task failed unexpectedly. Output:\r\n{engine.Output}"); Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi"))); Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); -- cgit v1.2.3-55-g6feb