Make sure error codes are translated correctly for per-machine packages.

2 files changed, 6 insertions, 5 deletions

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));
             }
         }