diff options
| author | Bob Arnson <bob@firegiant.com> | 2026-02-04 20:47:04 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2026-02-04 20:47:04 -0500 |
| commit | edccb203c421d2bd820062024088c6698424d9ee (patch) | |
| tree | 6b47c3eb5ca53bd9f79f3d032dc1a596d411bf38 /src/internal/WixInternal.TestSupport.Native/NativeAssert.h | |
| parent | a3d3963f806117ce123d95e8b77e73e1c1545b25 (diff) | |
| download | wix-bob/ConfigurableScopeBundles.tar.gz wix-bob/ConfigurableScopeBundles.tar.bz2 wix-bob/ConfigurableScopeBundles.zip | |
Support dual-purpose packages in Burn.bob/ConfigurableScopeBundles
Fixes https://github.com/wixtoolset/issues/issues/8958
Diffstat (limited to '')
| -rw-r--r-- | src/internal/WixInternal.TestSupport.Native/NativeAssert.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/internal/WixInternal.TestSupport.Native/NativeAssert.h b/src/internal/WixInternal.TestSupport.Native/NativeAssert.h index 9ca04fea..8663c511 100644 --- a/src/internal/WixInternal.TestSupport.Native/NativeAssert.h +++ b/src/internal/WixInternal.TestSupport.Native/NativeAssert.h | |||
| @@ -43,6 +43,16 @@ namespace TestSupport { | |||
| 43 | WixAssert::StringEqual(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), ignoreCase); | 43 | WixAssert::StringEqual(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), ignoreCase); |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | static void StringEqual(LPCSTR expected, LPCSTR actual) | ||
| 47 | { | ||
| 48 | NativeAssert::StringEqual(expected, actual, FALSE); | ||
| 49 | } | ||
| 50 | |||
| 51 | static void StringEqual(LPCSTR expected, LPCSTR actual, BOOL ignoreCase) | ||
| 52 | { | ||
| 53 | WixAssert::StringEqual(NativeAssert::LPSTRToString(expected), NativeAssert::LPSTRToString(actual), ignoreCase); | ||
| 54 | } | ||
| 55 | |||
| 46 | static void Succeeded(HRESULT hr, LPCSTR zFormat, LPCSTR zArg, ... array<LPCSTR>^ zArgs) | 56 | static void Succeeded(HRESULT hr, LPCSTR zFormat, LPCSTR zArg, ... array<LPCSTR>^ zArgs) |
| 47 | { | 57 | { |
| 48 | array<Object^>^ formatArgs = gcnew array<Object^, 1>(zArgs->Length + 1); | 58 | array<Object^>^ formatArgs = gcnew array<Object^, 1>(zArgs->Length + 1); |
| @@ -91,10 +101,11 @@ namespace TestSupport { | |||
| 91 | } | 101 | } |
| 92 | 102 | ||
| 93 | private: | 103 | private: |
| 94 | static String^ LPSTRToString(LPCSTR z) | 104 | static String^ LPSTRToString(LPCSTR sz) |
| 95 | { | 105 | { |
| 96 | return z ? gcnew String(z) : nullptr; | 106 | return sz ? gcnew String(sz) : nullptr; |
| 97 | } | 107 | } |
| 108 | |||
| 98 | static String^ LPWSTRToString(LPCWSTR wz) | 109 | static String^ LPWSTRToString(LPCWSTR wz) |
| 99 | { | 110 | { |
| 100 | return wz ? gcnew String(wz) : nullptr; | 111 | return wz ? gcnew String(wz) : nullptr; |
