From 68e54edc630099137b30ab946a80a8231a0d3d44 Mon Sep 17 00:00:00 2001
From: Ron Martin <cpuwzd@comcast.net>
Date: Fri, 8 Apr 2022 20:05:40 -0400
Subject: Fix "flaky" DUtil test.

---
 .../WixBuildTools.TestSupport/WixAssert.cs         | 47 ++++++++++++++++++++++
 src/libs/dutil/test/DUtilUnitTest/DUtilTests.cpp   |  5 ++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/internal/WixBuildTools.TestSupport/WixAssert.cs b/src/internal/WixBuildTools.TestSupport/WixAssert.cs
index 6d14bc89..1db842c3 100644
--- a/src/internal/WixBuildTools.TestSupport/WixAssert.cs
+++ b/src/internal/WixBuildTools.TestSupport/WixAssert.cs
@@ -91,5 +91,52 @@ namespace WixBuildTools.TestSupport
                 return this.stringComparer.GetHashCode((string)obj);
             }
         }
+
+        // There appears to have been a bug in VC++, which might or might not have been partially
+        // or completely corrected. It was unable to disambiguate a call to:
+        //     Xunit::Assert::Throws(System::Type^, System::Action^)
+        // from a call to:
+        //     Xunit::Assert::Throws(System::Type^, System::Func<System::Object^>^)
+        // that implicitly ignores its return value.
+        //
+        // The ambiguity may have been reported by some versions of the compiler and not by others.
+        // Some versions of the compiler may not have emitted any code in this situation, making it
+        // appear that the test has passed when, in fact, it hasn't been run.
+        //
+        // This situation is not an issue for C#.
+        //
+        // The following method is used to isolate DUtilTests in order to overcome the above problem.
+
+        /// <summary>
+        /// This shim allows C++/CLR code to call the Xunit method with the same signature
+        /// without getting an ambiguous overload error.  If the specified test code
+        /// fails to generate an exception of the exact specified type, an assertion
+        /// exception is thrown. Otherwise, execution flow proceeds as normal.
+        /// </summary>
+        /// <typeparam name="T">The type name of the expected exception.</typeparam>
+        /// <param name="testCode">An Action delegate to run the test code.</param>
+        public static new void Throws<T>(System.Action testCode)
+            where T : System.Exception
+        {
+            Xunit.Assert.Throws<T>(testCode);
+        }
+
+        // This shim has been tested, but is not currently used anywhere. It was provided
+        // at the same time as the preceding shim because it involved the same overload
+        // resolution conflict.
+
+        /// <summary>
+        /// This shim allows C++/CLR code to call the Xunit method with the same signature
+        /// without getting an ambiguous overload error.  If the specified test code
+        /// fails to generate an exception of the exact specified type, an assertion
+        /// exception is thrown. Otherwise, execution flow proceeds as normal.
+        /// </summary>
+        /// <param name="exceptionType">The type object associated with exceptions of the expected type.</param>
+        /// <param name="testCode">An Action delegate to run the test code.</param>
+        /// <returns>An exception of a type other than the type specified, is such an exception is thrown.</returns>
+        public static new System.Exception Throws(System.Type exceptionType, System.Action testCode)
+        {
+            return Xunit.Assert.Throws(exceptionType, testCode);
+        }
     }
 }
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/DUtilTests.cpp
index c3ac6a79..d92a9272 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilTests.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilTests.cpp
@@ -11,7 +11,7 @@ namespace DutilTests
     public ref class DUtil
     {
     public:
-        [Fact(Skip = "Flaky")]
+        [Fact]
         void DUtilTraceErrorSourceFiltersOnTraceLevel()
         {
             DutilInitialize(&DutilTestTraceError);
@@ -21,7 +21,8 @@ namespace DutilTests
             Dutil_TraceSetLevel(REPORT_DEBUG, FALSE);
 
             Action^ action = gcnew Action(this, &DUtil::CallDutilTraceErrorSource);
-            Assert::Throws<Exception^>(action);
+            // See the comments in WixBuildTools.WixAssert for details.
+            WixAssert::Throws<Exception^>(action);
 
             DutilUninitialize();
         }
-- 
cgit v1.2.3-55-g6feb