From 95b1be66d4c16b1b05b761c1771df229ac0e539c Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 31 Dec 2021 18:20:50 -0600
Subject: Try to get more helpful test failure messages.

---
 .../BaseBootstrapperApplicationFactoryFixture.cs                     | 3 ++-
 .../burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj | 5 +++++
 src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs             | 3 ++-
 src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj      | 5 +++++
 4 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'src/api')

diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs b/src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs
index 8705ed13..39a92024 100644
--- a/src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs
+++ b/src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs
@@ -5,6 +5,7 @@ namespace WixToolsetTest.Mba.Core
     using System;
     using System.Collections.Generic;
     using System.Runtime.InteropServices;
+    using WixBuildTools.TestSupport;
     using WixToolset.Mba.Core;
     using Xunit;
 
@@ -45,7 +46,7 @@ namespace WixToolsetTest.Mba.Core
                         Assert.Equal(baFactory.BA.Command.Display, command.display);
 
                         var mbaCommand = baFactory.BA.Command.ParseCommandLine();
-                        Assert.Equal(mbaCommand.UnknownCommandLineArgs, new string[] { "this", "is a", "test" });
+                        WixAssert.CompareLineByLine(mbaCommand.UnknownCommandLineArgs, new string[] { "this", "is a", "test" });
                         Assert.Equal(mbaCommand.Variables, new KeyValuePair<string, string>[]
                         {
                             new KeyValuePair<string, string>("VariableA", "AVariable"),
diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
index af3a09b0..39d4def3 100644
--- a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+++ b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
@@ -14,6 +14,11 @@
     <ProjectReference Include="..\..\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- <PackageReference Include="WixBuildTools.TestSupport" /> -->
+    <ProjectReference Include="..\..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
diff --git a/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs b/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs
index 8a65c2d4..cd485fd2 100644
--- a/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs
+++ b/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs
@@ -5,6 +5,7 @@ namespace WixToolsetTest.Data
     using System;
     using System.IO;
     using System.Linq;
+    using WixBuildTools.TestSupport;
     using WixToolset.Data;
     using WixToolset.Data.Bind;
     using WixToolset.Data.Symbols;
@@ -375,7 +376,7 @@ namespace WixToolsetTest.Data
                 var loc = loaded.Localizations.Single();
                 Assert.Equal(65001, loc.Codepage);
                 Assert.Empty(loc.Culture);
-                Assert.Equal(new[]
+                WixAssert.CompareLineByLine(new[]
                 {
                     "TestVar1/TestValue1/False",
                     "TestVar2/TestValue2/True",
diff --git a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
index f6e10488..36220fb7 100644
--- a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
+++ b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
@@ -12,6 +12,11 @@
     <ProjectReference Include="..\..\WixToolset.Data\WixToolset.Data.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- <PackageReference Include="WixBuildTools.TestSupport" /> -->
+    <ProjectReference Include="..\..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
-- 
cgit v1.2.3-55-g6feb