From 482b2a44fbcb3cdc98e84ddbcdb7350a99dc26e9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 25 Oct 2020 14:52:25 -0700 Subject: [PATCH] Automated formatting of repo files (#92) Co-authored-by: Philip Top Co-authored-by: HELICS-bot --- test/test_measurement_strings.cpp | 94 ++++++++++++++++--------------- 1 file changed, 49 insertions(+), 45 deletions(-) diff --git a/test/test_measurement_strings.cpp b/test/test_measurement_strings.cpp index 4a4978bd..b0e53222 100644 --- a/test/test_measurement_strings.cpp +++ b/test/test_measurement_strings.cpp @@ -91,12 +91,15 @@ TEST(MeasurementToString, unit_withNumbers) EXPECT_EQ(str2.compare(0, 11, "10 (0.71241"), 0); } -TEST(MeasurementToString, case_sensitive) { - static const std::vector>twoc_units{ - {lb, "lb"}, {oz, "oz"}, {yd, "yd"}, {unit_cast(precise::us::quart), "qt"}}; - - for (auto &up:twoc_units) { +TEST(MeasurementToString, case_sensitive) +{ + static const std::vector> twoc_units{ + {lb, "lb"}, + {oz, "oz"}, + {yd, "yd"}, + {unit_cast(precise::us::quart), "qt"}}; + for (auto& up : twoc_units) { std::string singular = std::string("17 ") + up.second; std::string plural = singular; plural.push_back('s'); @@ -107,45 +110,46 @@ TEST(MeasurementToString, case_sensitive) { std::string plural_caps = plural; std::transform( - plural.begin(), plural.end(),plural_caps.begin(), ::toupper); - - precise_measurement case_sensitive_plural = - measurement_from_string(plural); - // true - EXPECT_TRUE(case_sensitive_plural.units().has_same_base(up.first)); - precise_measurement case_sensitive_singular = - measurement_from_string(singular); - EXPECT_TRUE(case_sensitive_singular.units().has_same_base(up.first)); - - // Case insensitive string conversion - precise_measurement case_insensitive_plural = - measurement_from_string(plural, case_insensitive); - // true - EXPECT_TRUE(case_insensitive_plural.units().has_same_base(up.first)) - << up.second; - - units::precise_measurement case_insensitive_singular = - measurement_from_string(singular, case_insensitive); - // false - EXPECT_TRUE(case_insensitive_singular.units().has_same_base(up.first)); - - - // Case insensitive string conversion caps - precise_measurement case_insensitive_plural_caps = - measurement_from_string(plural_caps, case_insensitive); - // true - EXPECT_TRUE(case_insensitive_plural_caps.units().has_same_base(up.first)); - - units::precise_measurement case_insensitive_singular_caps = - measurement_from_string(singular_caps, case_insensitive); - // false - EXPECT_TRUE(case_insensitive_singular_caps.units().has_same_base(up.first)); - - // Round trip - const std::string case_insensitive_plural_str = - units::to_string(case_insensitive_plural); - units::precise_measurement round_trip = units::measurement_from_string( - case_insensitive_plural_str, units::case_insensitive); - EXPECT_TRUE(round_trip.units().has_same_base(up.first)); + plural.begin(), plural.end(), plural_caps.begin(), ::toupper); + + precise_measurement case_sensitive_plural = + measurement_from_string(plural); + // true + EXPECT_TRUE(case_sensitive_plural.units().has_same_base(up.first)); + precise_measurement case_sensitive_singular = + measurement_from_string(singular); + EXPECT_TRUE(case_sensitive_singular.units().has_same_base(up.first)); + + // Case insensitive string conversion + precise_measurement case_insensitive_plural = + measurement_from_string(plural, case_insensitive); + // true + EXPECT_TRUE(case_insensitive_plural.units().has_same_base(up.first)) + << up.second; + + units::precise_measurement case_insensitive_singular = + measurement_from_string(singular, case_insensitive); + // false + EXPECT_TRUE(case_insensitive_singular.units().has_same_base(up.first)); + + // Case insensitive string conversion caps + precise_measurement case_insensitive_plural_caps = + measurement_from_string(plural_caps, case_insensitive); + // true + EXPECT_TRUE( + case_insensitive_plural_caps.units().has_same_base(up.first)); + + units::precise_measurement case_insensitive_singular_caps = + measurement_from_string(singular_caps, case_insensitive); + // false + EXPECT_TRUE( + case_insensitive_singular_caps.units().has_same_base(up.first)); + + // Round trip + const std::string case_insensitive_plural_str = + units::to_string(case_insensitive_plural); + units::precise_measurement round_trip = units::measurement_from_string( + case_insensitive_plural_str, units::case_insensitive); + EXPECT_TRUE(round_trip.units().has_same_base(up.first)); } } \ No newline at end of file