From a37208d9a26ec7886870cc17f0726676a285bf7f Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 25 Aug 2022 15:06:04 -0500 Subject: Make sure error codes are translated correctly for per-machine packages. --- .../XunitExtensions/SpecificReturnCodeException.cs | 9 +++++---- .../WixBuildTools.TestSupport/XunitExtensions/WixAssert.cs | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/internal/WixBuildTools.TestSupport') diff --git a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SpecificReturnCodeException.cs b/src/internal/WixBuildTools.TestSupport/XunitExtensions/SpecificReturnCodeException.cs index c66890f8..c703e90a 100644 --- a/src/internal/WixBuildTools.TestSupport/XunitExtensions/SpecificReturnCodeException.cs +++ b/src/internal/WixBuildTools.TestSupport/XunitExtensions/SpecificReturnCodeException.cs @@ -7,11 +7,12 @@ namespace WixBuildTools.TestSupport public class SpecificReturnCodeException : XunitException { - public SpecificReturnCodeException(int hr, string userMessage) + public SpecificReturnCodeException(int hrExpected, int hr, string userMessage) : base(String.Format("WixAssert.SpecificReturnCode() Failure\r\n" + - "HRESULT: 0x{0:X8}\r\n" + - "Message: {1}", - hr, userMessage)) + "Expected HRESULT: 0x{0:X8}\r\n" + + "Actual HRESULT: 0x{1:X8}\r\n" + + "Message: {2}", + hrExpected, hr, userMessage)) { this.HResult = hr; } diff --git a/src/internal/WixBuildTools.TestSupport/XunitExtensions/WixAssert.cs b/src/internal/WixBuildTools.TestSupport/XunitExtensions/WixAssert.cs index d8d02746..a8513bfb 100644 --- a/src/internal/WixBuildTools.TestSupport/XunitExtensions/WixAssert.cs +++ b/src/internal/WixBuildTools.TestSupport/XunitExtensions/WixAssert.cs @@ -58,7 +58,7 @@ namespace WixBuildTools.TestSupport { if (hrExpected != hr) { - throw new SpecificReturnCodeException(hr, String.Format(format, formatArgs)); + throw new SpecificReturnCodeException(hrExpected, hr, String.Format(format, formatArgs)); } } -- cgit v1.2.3-55-g6feb