From cbc52bc6a4f92ac4c5379912b09adb37a6ea1918 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 28 Apr 2017 17:27:07 -0700 Subject: [vcpkg] Remove OptBool in favor of Optional --- toolsrc/src/tests_arguments.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'toolsrc/src/tests_arguments.cpp') diff --git a/toolsrc/src/tests_arguments.cpp b/toolsrc/src/tests_arguments.cpp index 9145dcdb9..624fbb910 100644 --- a/toolsrc/src/tests_arguments.cpp +++ b/toolsrc/src/tests_arguments.cpp @@ -17,9 +17,9 @@ namespace UnitTest1 std::vector t = {"--vcpkg-root", "C:\\vcpkg", "--debug", "--sendmetrics", "--printmetrics"}; auto v = VcpkgCmdArguments::create_from_arg_sequence(t.data(), t.data() + t.size()); Assert::AreEqual("C:\\vcpkg", v.vcpkg_root_dir.get()->c_str()); - Assert::IsTrue(vcpkg::OptBoolC::ENABLED == v.debug); - Assert::IsTrue(vcpkg::OptBoolC::ENABLED == v.sendmetrics); - Assert::IsTrue(vcpkg::OptBoolC::ENABLED == v.printmetrics); + Assert::IsTrue(v.debug && *v.debug.get()); + Assert::IsTrue(v.sendmetrics && v.sendmetrics.get()); + Assert::IsTrue(v.printmetrics && *v.printmetrics.get()); } TEST_METHOD(create_from_arg_sequence_options_upper) @@ -27,9 +27,9 @@ namespace UnitTest1 std::vector t = {"--VCPKG-ROOT", "C:\\vcpkg", "--DEBUG", "--SENDMETRICS", "--PRINTMETRICS"}; auto v = VcpkgCmdArguments::create_from_arg_sequence(t.data(), t.data() + t.size()); Assert::AreEqual("C:\\vcpkg", v.vcpkg_root_dir.get()->c_str()); - Assert::IsTrue(vcpkg::OptBoolC::ENABLED == v.debug); - Assert::IsTrue(vcpkg::OptBoolC::ENABLED == v.sendmetrics); - Assert::IsTrue(vcpkg::OptBoolC::ENABLED == v.printmetrics); + Assert::IsTrue(v.debug && *v.debug.get()); + Assert::IsTrue(v.sendmetrics && v.sendmetrics.get()); + Assert::IsTrue(v.printmetrics && *v.printmetrics.get()); } }; } \ No newline at end of file -- cgit v1.2.3