From 5f3e7559016997afed60d5003fd11548c3b24e3a Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 16 Jul 2020 16:39:27 +1000 Subject: Add WixAssert.AssertEqualLineByLine. --- appveyor.yml | 2 +- src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj | 2 +- src/WixBuildTools.TestSupport/WixAssert.cs | 10 ++++++++++ src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj | 2 +- src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8d80c6af..522e5af3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ branches: - master - develop -image: Visual Studio 2017 +image: Visual Studio 2019 version: 0.0.0.{build} configuration: Release diff --git a/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj b/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj index ccbb92c2..1c728c00 100644 --- a/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj +++ b/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/WixBuildTools.TestSupport/WixAssert.cs b/src/WixBuildTools.TestSupport/WixAssert.cs index 4a5c6a97..71dc6b67 100644 --- a/src/WixBuildTools.TestSupport/WixAssert.cs +++ b/src/WixBuildTools.TestSupport/WixAssert.cs @@ -7,6 +7,16 @@ namespace WixBuildTools.TestSupport public class WixAssert : Assert { + public static void AssertEqualLineByLine(string[] expectedLines, string[] actualLines) + { + for (var i = 0; i < expectedLines.Length; ++i) + { + Assert.True(actualLines.Length > i, $"{i}: expectedLines longer than actualLines"); + Assert.Equal($"{i}: {expectedLines[i]}", $"{i}: {actualLines[i]}"); + } + Assert.True(expectedLines.Length == actualLines.Length, "actualLines longer than expectedLines"); + } + public static void Succeeded(int hr, string format, params object[] formatArgs) { if (0 > hr) diff --git a/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj b/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj index e6cdddef..9aa5de47 100644 --- a/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj +++ b/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj b/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj index bf9d957f..b8536e74 100644 --- a/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj +++ b/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj @@ -20,7 +20,7 @@ - + -- cgit v1.2.3-55-g6feb