From 924de7c5fee3a1289e8fe044f5e22ba5ffca2704 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Wed, 26 Apr 2017 19:21:40 -0700 Subject: Formatting + add test to the vcxproj --- toolsrc/src/VcpkgCmdArguments.cpp | 6 +- toolsrc/src/tests_arguments.cpp | 86 ++++++++++++++--------------- toolsrc/vcpkgtest/vcpkgtest.vcxproj | 1 + toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters | 3 + 4 files changed, 50 insertions(+), 46 deletions(-) diff --git a/toolsrc/src/VcpkgCmdArguments.cpp b/toolsrc/src/VcpkgCmdArguments.cpp index 2d4205240..5abe69e66 100644 --- a/toolsrc/src/VcpkgCmdArguments.cpp +++ b/toolsrc/src/VcpkgCmdArguments.cpp @@ -78,9 +78,9 @@ namespace vcpkg if (arg[0] == '-' && arg[1] == '-') { - // make argument case insensitive - auto &f = std::use_facet>(std::locale()); - f.tolower(&arg[0], &arg[0] + arg.size()); + // make argument case insensitive + auto& f = std::use_facet>(std::locale()); + f.tolower(&arg[0], &arg[0] + arg.size()); // command switch if (arg == "--vcpkg-root") { diff --git a/toolsrc/src/tests_arguments.cpp b/toolsrc/src/tests_arguments.cpp index 7cdf68048..33121b93a 100644 --- a/toolsrc/src/tests_arguments.cpp +++ b/toolsrc/src/tests_arguments.cpp @@ -1,46 +1,46 @@ #include "CppUnitTest.h" #include "VcpkgCmdArguments.h" -#pragma comment(lib,"version") -#pragma comment(lib,"winhttp") - -using namespace Microsoft::VisualStudio::CppUnitTestFramework; - -using namespace vcpkg; - -namespace UnitTest1 -{ - TEST_CLASS(ArgumentTests) - { - public: - TEST_METHOD(create_from_arg_sequence_options_lower) - { - 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); - } - - TEST_METHOD(create_from_arg_sequence_options_upper) - { - 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); - } - }; -} \ No newline at end of file +#pragma comment(lib,"version") +#pragma comment(lib,"winhttp") + +using namespace Microsoft::VisualStudio::CppUnitTestFramework; + +using namespace vcpkg; + +namespace UnitTest1 +{ + TEST_CLASS(ArgumentTests) + { + public: + TEST_METHOD(create_from_arg_sequence_options_lower) + { + 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); + } + + TEST_METHOD(create_from_arg_sequence_options_upper) + { + 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); + } + }; +} diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj b/toolsrc/vcpkgtest/vcpkgtest.vcxproj index 5245a9d05..26d5c98eb 100644 --- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj +++ b/toolsrc/vcpkgtest/vcpkgtest.vcxproj @@ -19,6 +19,7 @@ + diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters b/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters index bbbc6bd40..f1230cfce 100644 --- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters +++ b/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters @@ -21,5 +21,8 @@ Source Files + + Source Files + \ No newline at end of file -- cgit v1.2.3