aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/tests.update.cpp
diff options
context:
space:
mode:
authorxoviat <xoviat@users.noreply.github.com>2017-12-20 13:24:59 -0600
committerGitHub <noreply@github.com>2017-12-20 13:24:59 -0600
commitf1f373b189453f33a944e9db8b3451b1c785e223 (patch)
tree8713b7dc28734e4d4ad0ebba76459850955ce004 /toolsrc/src/tests.update.cpp
parent6363688b6d2f3522a4ce48cedb60da31775cd923 (diff)
parent6cb6a61aaf5ef2c143f974e9f731778bcd3f5cbe (diff)
downloadvcpkg-f1f373b189453f33a944e9db8b3451b1c785e223.tar.gz
vcpkg-f1f373b189453f33a944e9db8b3451b1c785e223.zip
Merge branch 'master' into fftw
Diffstat (limited to 'toolsrc/src/tests.update.cpp')
-rw-r--r--toolsrc/src/tests.update.cpp34
1 files changed, 22 insertions, 12 deletions
diff --git a/toolsrc/src/tests.update.cpp b/toolsrc/src/tests.update.cpp
index 06ae797f4..b6e487c17 100644
--- a/toolsrc/src/tests.update.cpp
+++ b/toolsrc/src/tests.update.cpp
@@ -9,6 +9,8 @@ using namespace vcpkg::Update;
namespace UnitTest1
{
+ using Pgh = std::vector<std::unordered_map<std::string, std::string>>;
+
class UpdateTests : public TestClass<UpdateTests>
{
TEST_METHOD(find_outdated_packages_basic)
@@ -19,10 +21,12 @@ namespace UnitTest1
StatusParagraphs status_db(std::move(status_paragraphs));
- std::map<std::string, VersionT> port_versions;
- port_versions["a"] = VersionT("0");
+ std::unordered_map<std::string, SourceControlFile> map;
+ auto scf = unwrap(SourceControlFile::parse_control_file(Pgh{{{"Source", "a"}, {"Version", "0"}}}));
+ map.emplace("a", std::move(*scf));
+ Dependencies::MapPortFileProvider provider(map);
- auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(port_versions, status_db),
+ auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(provider, status_db),
&OutdatedPackage::compare_by_name);
Assert::AreEqual(size_t(1), pkgs.size());
@@ -41,10 +45,12 @@ namespace UnitTest1
StatusParagraphs status_db(std::move(status_paragraphs));
- std::map<std::string, VersionT> port_versions;
- port_versions["a"] = VersionT("0");
+ std::unordered_map<std::string, SourceControlFile> map;
+ auto scf = unwrap(SourceControlFile::parse_control_file(Pgh{{{"Source", "a"}, {"Version", "0"}}}));
+ map.emplace("a", std::move(*scf));
+ Dependencies::MapPortFileProvider provider(map);
- auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(port_versions, status_db),
+ auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(provider, status_db),
&OutdatedPackage::compare_by_name);
Assert::AreEqual(size_t(1), pkgs.size());
@@ -65,10 +71,12 @@ namespace UnitTest1
StatusParagraphs status_db(std::move(status_paragraphs));
- std::map<std::string, VersionT> port_versions;
- port_versions["a"] = VersionT("0");
+ std::unordered_map<std::string, SourceControlFile> map;
+ auto scf = unwrap(SourceControlFile::parse_control_file(Pgh{{{"Source", "a"}, {"Version", "0"}}}));
+ map.emplace("a", std::move(*scf));
+ Dependencies::MapPortFileProvider provider(map);
- auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(port_versions, status_db),
+ auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(provider, status_db),
&OutdatedPackage::compare_by_name);
Assert::AreEqual(size_t(1), pkgs.size());
@@ -84,10 +92,12 @@ namespace UnitTest1
StatusParagraphs status_db(std::move(status_paragraphs));
- std::map<std::string, VersionT> port_versions;
- port_versions["a"] = VersionT("2");
+ std::unordered_map<std::string, SourceControlFile> map;
+ auto scf = unwrap(SourceControlFile::parse_control_file(Pgh{{{"Source", "a"}, {"Version", "2"}}}));
+ map.emplace("a", std::move(*scf));
+ Dependencies::MapPortFileProvider provider(map);
- auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(port_versions, status_db),
+ auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(provider, status_db),
&OutdatedPackage::compare_by_name);
Assert::AreEqual(size_t(0), pkgs.size());