From ed0ef472c76ac0d2a3d7a138e4f3b7ad950a56bc Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 30 Mar 2021 17:15:25 -0500 Subject: Add test for apuputil and fix descending sorting. --- src/test/DUtilUnitTest/ApupUtilTests.cpp | 46 +++++++++++++++ src/test/DUtilUnitTest/DUtilUnitTest.vcxproj | 4 ++ .../DUtilUnitTest/DUtilUnitTest.vcxproj.filters | 3 + .../TestData/ApupUtilTests/FeedBv2.0.xml | 68 ++++++++++++++++++++++ src/test/DUtilUnitTest/precomp.h | 6 +- 5 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 src/test/DUtilUnitTest/ApupUtilTests.cpp create mode 100644 src/test/DUtilUnitTest/TestData/ApupUtilTests/FeedBv2.0.xml (limited to 'src/test') diff --git a/src/test/DUtilUnitTest/ApupUtilTests.cpp b/src/test/DUtilUnitTest/ApupUtilTests.cpp new file mode 100644 index 00000000..30a45f5a --- /dev/null +++ b/src/test/DUtilUnitTest/ApupUtilTests.cpp @@ -0,0 +1,46 @@ +// 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. + +#include "precomp.h" + +using namespace System; +using namespace Xunit; +using namespace WixBuildTools::TestSupport; + +namespace DutilTests +{ + public ref class ApupUtil + { + public: + [Fact] + void AllocChainFromAtomSortsDescending() + { + HRESULT hr = S_OK; + ATOM_FEED* pFeed = NULL; + APPLICATION_UPDATE_CHAIN* pChain = NULL; + + DutilInitialize(&DutilTestTraceError); + + try + { + XmlInitialize(); + NativeAssert::Succeeded(hr, "Failed to initialize Xml."); + + pin_ptr feedFilePath = PtrToStringChars(TestData::Get("TestData", "ApupUtilTests", "FeedBv2.0.xml")); + hr = AtomParseFromFile(feedFilePath, &pFeed); + NativeAssert::Succeeded(hr, "Failed to parse feed: {0}", feedFilePath); + + hr = ApupAllocChainFromAtom(pFeed, &pChain); + NativeAssert::Succeeded(hr, "Failed to get chain from feed."); + + Assert::Equal(3ul, pChain->cEntries); + NativeAssert::StringEqual(L"Bundle v2.0", pChain->rgEntries[0].wzTitle); + NativeAssert::StringEqual(L"Bundle v1.0", pChain->rgEntries[1].wzTitle); + NativeAssert::StringEqual(L"Bundle v1.0-preview", pChain->rgEntries[2].wzTitle); + } + finally + { + DutilUninitialize(); + } + } + }; +} diff --git a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj index 942c39f0..32463262 100644 --- a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj +++ b/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj @@ -30,6 +30,7 @@ rpcrt4.lib;Mpr.lib;Ws2_32.lib;urlmon.lib;wininet.lib + @@ -59,6 +60,9 @@ + + + diff --git a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters b/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters index fdc6d278..4df7af89 100644 --- a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters +++ b/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters @@ -15,6 +15,9 @@ + + Source Files + Source Files diff --git a/src/test/DUtilUnitTest/TestData/ApupUtilTests/FeedBv2.0.xml b/src/test/DUtilUnitTest/TestData/ApupUtilTests/FeedBv2.0.xml new file mode 100644 index 00000000..d9f961fe --- /dev/null +++ b/src/test/DUtilUnitTest/TestData/ApupUtilTests/FeedBv2.0.xml @@ -0,0 +1,68 @@ + + + + + + BundleB v2.0 + Bundle Subtitle. + 1116353B-7C6E-4C29-BFA1-D4A972CD421D + 2014-07-14T12:39:00.000Z + http://localhost:9999/wix4/BundleB/feed + + manual build + + Bundle v2.0 + v2.0 + + Bundle_Author + http://mycompany.com/software + Bundle_Author@mycompany.com + + + + + <p>Change list:</p><ul> + <li>Updated release.</li> + </ul> + + 2.0.0.0 + 2014-11-10T12:39:00.000Z + + + Bundle v1.0 + v1.0 + + Bundle_Author + http://mycompany.com/software + Bundle_Author@mycompany.com + + + + + <p>Change list:</p><ul> + <li>Initial release.</li> + </ul> + + + 1.0.0.0 + 2014-11-09T12:39:00.000Z + + + Bundle v1.0-preview + v1.0-preview + + Bundle_Author + http://mycompany.com/software + Bundle_Author@mycompany.com + + + + + <p>Change list:</p><ul> + <li>Initial release.</li> + </ul> + + 1.0.0.0 + 2014-11-09T12:39:00.000Z + + diff --git a/src/test/DUtilUnitTest/precomp.h b/src/test/DUtilUnitTest/precomp.h index f665fed1..e9f8770b 100644 --- a/src/test/DUtilUnitTest/precomp.h +++ b/src/test/DUtilUnitTest/precomp.h @@ -11,6 +11,8 @@ #include "error.h" #include +#include +#include #include #include #include @@ -21,8 +23,10 @@ #include #include #include +#include +#include // NOTE: this must come after atomutil.h and rssutil.h since it uses them. #include -#include +#include #pragma managed #include -- cgit v1.2.3-55-g6feb