Replace PathIsAbsolute with PathIsRooted and add PathIsFullyQualified.

1 files changed, 21 insertions, 0 deletions

diff --git a/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h b/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h
index 62ace4a9..b0206b14 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h
+++ b/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h
@@ -64,6 +64,27 @@ namespace TestSupport {
             WixAssert::Succeeded(hr, gcnew String(zFormat), formatArgs);
         }
 
+        static void SpecificReturnCode(HRESULT hrExpected, HRESULT hr, LPCSTR zFormat, LPCSTR zArg, ... array<LPCSTR>^ zArgs)
+        {
+            array<Object^>^ formatArgs = gcnew array<Object^, 1>(zArgs->Length + 1);
+            formatArgs[0] = NativeAssert::LPSTRToString(zArg);
+            for (int i = 0; i < zArgs->Length; ++i)
+            {
+                formatArgs[i + 1] = NativeAssert::LPSTRToString(zArgs[i]);
+            }
+            WixAssert::SpecificReturnCode(hrExpected, hr, gcnew String(zFormat), formatArgs);
+        }
+
+        static void SpecificReturnCode(HRESULT hrExpected, HRESULT hr, LPCSTR zFormat, ... array<LPCWSTR>^ wzArgs)
+        {
+            array<Object^>^ formatArgs = gcnew array<Object^, 1>(wzArgs->Length);
+            for (int i = 0; i < wzArgs->Length; ++i)
+            {
+                formatArgs[i] = NativeAssert::LPWSTRToString(wzArgs[i]);
+            }
+            WixAssert::SpecificReturnCode(hrExpected, hr, gcnew String(zFormat), formatArgs);
+        }
+
         static void ValidReturnCode(HRESULT hr, ... array<HRESULT>^ validReturnCodes)
         {
             Assert::Contains(hr, (IEnumerable<HRESULT>^)validReturnCodes);