From e3940e85379b44ab8f68d01cbb6b11db8b0bad77 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 15 Jul 2020 21:31:47 +1000 Subject: Update DUtilUnitTest to reference WixBuildTools.TestSupport.Native. --- src/dutil/dutil.vcxproj | 4 +- src/dutil/packages.config | 2 +- src/test/DUtilUnitTest/DUtilUnitTest.vcxproj | 32 +++----- .../DUtilUnitTest/DUtilUnitTest.vcxproj.filters | 3 - src/test/DUtilUnitTest/NativeAssert.h | 85 ---------------------- src/test/DUtilUnitTest/packages.config | 9 +-- src/test/DUtilUnitTest/precomp.h | 2 - 7 files changed, 16 insertions(+), 121 deletions(-) delete mode 100644 src/test/DUtilUnitTest/NativeAssert.h (limited to 'src') diff --git a/src/dutil/dutil.vcxproj b/src/dutil/dutil.vcxproj index 4bae04d6..4dbd2e6b 100644 --- a/src/dutil/dutil.vcxproj +++ b/src/dutil/dutil.vcxproj @@ -51,7 +51,7 @@ - + @@ -196,6 +196,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/dutil/packages.config b/src/dutil/packages.config index 764eba29..29fbf9e4 100644 --- a/src/dutil/packages.config +++ b/src/dutil/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj index c0974780..4c660aa9 100644 --- a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj +++ b/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj @@ -3,8 +3,7 @@ - - + Debug @@ -21,10 +20,8 @@ DUtilUnitTests ManagedCProj DynamicLibrary - v142 Unicode true - v4.7.2 @@ -46,7 +43,7 @@ Create - + 4564;4691 @@ -56,7 +53,6 @@ - @@ -65,33 +61,23 @@ - - ..\..\..\packages\xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll - - - ..\..\..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - ..\..\..\packages\xunit.extensibility.core.2.4.1\lib\netstandard1.1\xunit.core.dll - - - ..\..\..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - - ..\..\..\packages\WixBuildTools.TestSupport.4.0.37\lib\net472\WixBuildTools.TestSupport.dll + ..\..\..\packages\WixBuildTools.TestSupport.4.0.40\lib\net472\WixBuildTools.TestSupport.dll + + + ..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\lib\net472\WixBuildTools.TestSupport.Native.dll - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + \ No newline at end of file diff --git a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters b/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters index 2456558f..0c83e3fa 100644 --- a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters +++ b/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters @@ -70,8 +70,5 @@ Header Files - - Header Files - \ No newline at end of file diff --git a/src/test/DUtilUnitTest/NativeAssert.h b/src/test/DUtilUnitTest/NativeAssert.h deleted file mode 100644 index 34af4f34..00000000 --- a/src/test/DUtilUnitTest/NativeAssert.h +++ /dev/null @@ -1,85 +0,0 @@ -#pragma once -// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. - - -namespace WixBuildTools { -namespace TestSupport { - - using namespace System; - using namespace System::Collections::Generic; - using namespace System::Linq; - using namespace Xunit; - - public ref class NativeAssert : WixAssert - { - public: - static void NotNull(LPCWSTR wz) - { - if (!wz) - { - Assert::NotNull(nullptr); - } - } - - // For some reason, naming these NotStringEqual methods "NotEqual" breaks Intellisense in files that call any overload of the NotEqual method. - static void NotStringEqual(LPCWSTR expected, LPCWSTR actual) - { - NativeAssert::NotStringEqual(expected, actual, FALSE); - } - - static void NotStringEqual(LPCWSTR expected, LPCWSTR actual, BOOL ignoreCase) - { - IEqualityComparer^ comparer = ignoreCase ? StringComparer::InvariantCultureIgnoreCase : StringComparer::InvariantCulture; - Assert::NotEqual(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), comparer); - } - - // For some reason, naming these StringEqual methods "Equal" breaks Intellisense in files that call any overload of the Equal method. - static void StringEqual(LPCWSTR expected, LPCWSTR actual) - { - NativeAssert::StringEqual(expected, actual, FALSE); - } - - static void StringEqual(LPCWSTR expected, LPCWSTR actual, BOOL ignoreCase) - { - IEqualityComparer^ comparer = ignoreCase ? StringComparer::InvariantCultureIgnoreCase : StringComparer::InvariantCulture; - Assert::Equal(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), comparer); - } - - static void Succeeded(HRESULT hr, LPCSTR zFormat, LPCSTR zArg, ... array^ zArgs) - { - array^ formatArgs = gcnew array(zArgs->Length + 1); - formatArgs[0] = NativeAssert::LPSTRToString(zArg); - for (int i = 0; i < zArgs->Length; ++i) - { - formatArgs[i + 1] = NativeAssert::LPSTRToString(zArgs[i]); - } - WixAssert::Succeeded(hr, gcnew String(zFormat), formatArgs); - } - - static void Succeeded(HRESULT hr, LPCSTR zFormat, ... array^ wzArgs) - { - array^ formatArgs = gcnew array(wzArgs->Length); - for (int i = 0; i < wzArgs->Length; ++i) - { - formatArgs[i] = NativeAssert::LPWSTRToString(wzArgs[i]); - } - WixAssert::Succeeded(hr, gcnew String(zFormat), formatArgs); - } - - static void ValidReturnCode(HRESULT hr, ... array^ validReturnCodes) - { - Assert::Contains(hr, (IEnumerable^)validReturnCodes); - } - - private: - static String^ LPSTRToString(LPCSTR z) - { - return z ? gcnew String(z) : nullptr; - } - static String^ LPWSTRToString(LPCWSTR wz) - { - return wz ? gcnew String(wz) : nullptr; - } - }; -} -} diff --git a/src/test/DUtilUnitTest/packages.config b/src/test/DUtilUnitTest/packages.config index 96fb423b..44e5fe06 100644 --- a/src/test/DUtilUnitTest/packages.config +++ b/src/test/DUtilUnitTest/packages.config @@ -1,7 +1,5 @@ - + - - @@ -9,5 +7,6 @@ - - + + + \ No newline at end of file diff --git a/src/test/DUtilUnitTest/precomp.h b/src/test/DUtilUnitTest/precomp.h index 284668fe..b3a1a9cb 100644 --- a/src/test/DUtilUnitTest/precomp.h +++ b/src/test/DUtilUnitTest/precomp.h @@ -23,7 +23,5 @@ #include #include -#include "NativeAssert.h" - #pragma managed #include -- cgit v1.2.3-55-g6feb