From 6602fd4b2cf498896674f9ee0daa636a7d41b7b0 Mon Sep 17 00:00:00 2001 From: Adam Kewley Date: Thu, 13 Jun 2024 20:46:57 +0200 Subject: [PATCH] Refactor west-const tests/testoscar --- tests/testoscar/Maths/TestCoordinateAxis.cpp | 2 +- .../Maths/TestCoordinateDirection.cpp | 6 +- tests/testoscar/Maths/TestPlaneFunctions.cpp | 8 +- .../Platform/TestAppSettingValueType.cpp | 6 +- .../testoscar/Platform/TestResourceLoader.cpp | 4 +- .../testoscar/Platform/TestResourceStream.cpp | 6 +- tests/testoscar/TestingHelpers.cpp | 3 +- tests/testoscar/TestingHelpers.h | 11 +- tests/testoscar/Utils/TestAlgorithms.cpp | 14 +- tests/testoscar/Utils/TestCStringView.cpp | 11 +- .../testoscar/Utils/TestFileChangePoller.cpp | 4 +- tests/testoscar/Utils/TestStringHelpers.cpp | 67 ++--- tests/testoscar/Utils/TestStringName.cpp | 24 +- tests/testoscar/Variant/TestVariant.cpp | 283 +++++++----------- tests/testoscar/Variant/TestVariantType.cpp | 8 +- 15 files changed, 186 insertions(+), 271 deletions(-) diff --git a/tests/testoscar/Maths/TestCoordinateAxis.cpp b/tests/testoscar/Maths/TestCoordinateAxis.cpp index ec28ed9ba..e741c1453 100644 --- a/tests/testoscar/Maths/TestCoordinateAxis.cpp +++ b/tests/testoscar/Maths/TestCoordinateAxis.cpp @@ -136,6 +136,6 @@ INSTANTIATE_TEST_SUITE_P( TEST_P(CoordinateAxisParsingTestFixture, Check) { - ParsingTestCase const tc = GetParam(); + const ParsingTestCase tc = GetParam(); ASSERT_EQ(CoordinateAxis::try_parse(tc.input), tc.expected) << "input = " << tc.input; } diff --git a/tests/testoscar/Maths/TestCoordinateDirection.cpp b/tests/testoscar/Maths/TestCoordinateDirection.cpp index 4026f729b..db9d5e80f 100644 --- a/tests/testoscar/Maths/TestCoordinateDirection.cpp +++ b/tests/testoscar/Maths/TestCoordinateDirection.cpp @@ -78,7 +78,7 @@ TEST(CoordinateDirection, DirectionReturnsExpectedResults) TEST(CoordinateDirection, AreOrderedAsExpected) { - auto const expectedOrder = std::to_array({ + const auto expectedOrder = std::to_array({ CoordinateDirection::minus_x(), CoordinateDirection::x(), CoordinateDirection::minus_y(), @@ -216,7 +216,7 @@ INSTANTIATE_TEST_SUITE_P( TEST_P(ParsingTestFixture, Check) { - ParsingTestCase const tc = GetParam(); + const ParsingTestCase tc = GetParam(); ASSERT_EQ(CoordinateDirection::try_parse(tc.input), tc.expected) << "input = " << tc.input; } @@ -248,7 +248,7 @@ INSTANTIATE_TEST_SUITE_P( TEST_P(PrintingTestFixture, Check) { - PrintingTestCase const tc = GetParam(); + const PrintingTestCase tc = GetParam(); std::stringstream ss; ss << tc.input; ASSERT_EQ(ss.str(), tc.expected); diff --git a/tests/testoscar/Maths/TestPlaneFunctions.cpp b/tests/testoscar/Maths/TestPlaneFunctions.cpp index fa179f720..2327b4fac 100644 --- a/tests/testoscar/Maths/TestPlaneFunctions.cpp +++ b/tests/testoscar/Maths/TestPlaneFunctions.cpp @@ -15,7 +15,7 @@ TEST(signed_distance_between, ProducesExpectedAnswersInExampleCases) float expected; }; - auto const cases = std::to_array({ + const auto cases = std::to_array({ // origin // normal // point // expected signed distance {{Vec3{}, Vec3{0.0f, 1.0f, 0.0f}}, Vec3{0.0f, 0.5f, 0.0f}, 0.5f }, {{Vec3{}, Vec3{0.0f, 1.0f, 0.0f}}, Vec3{0.0f, -0.5f, 0.0f}, -0.5f }, @@ -23,7 +23,7 @@ TEST(signed_distance_between, ProducesExpectedAnswersInExampleCases) {{Vec3{1.0f}, Vec3{1.0f, 0.0f, 0.0f}}, Vec3{0.0f, 0.25f, 0.0f}, -1.0f }, }); - for (auto const& [plane, point, expected] : cases) { + for (const auto& [plane, point, expected] : cases) { ASSERT_NEAR(signed_distance_between(plane, point), expected, epsilon_v); } } @@ -36,7 +36,7 @@ TEST(is_in_front_of, ProducesExpectedAnswersInExampleCases) bool expected; }; - auto const cases = std::to_array({ + const auto cases = std::to_array({ // origin // normal // min // max // is in front of plane? {{Vec3{}, Vec3{ 0.0f, 1.0f, 0.0f}}, {{ 1.0f, 1.0f, 1.0f}, { 2.0f, 2.0f, 2.0f}}, true}, {{Vec3{}, Vec3{ 0.0f, 1.0f, 0.0f}}, {{-2.0f, -2.0f, -2.0f}, {-1.0f, -1.0f, -1.0f}}, false}, @@ -55,7 +55,7 @@ TEST(is_in_front_of, ProducesExpectedAnswersInExampleCases) - for (auto const& [plane, aabb, expected] : cases) { + for (const auto& [plane, aabb, expected] : cases) { ASSERT_EQ(is_in_front_of(plane, aabb), expected) << "plane = " << plane << ", aabb = " << aabb << " (dimensions_of = " << dimensions_of(aabb) << ", half_widths . normal = " << dot(half_widths_of(aabb), abs(plane.normal)) << ", signed distance = " << signed_distance_between(plane, centroid_of(aabb)) << ')'; } } diff --git a/tests/testoscar/Platform/TestAppSettingValueType.cpp b/tests/testoscar/Platform/TestAppSettingValueType.cpp index a5cfcf4c8..b844cbb6d 100644 --- a/tests/testoscar/Platform/TestAppSettingValueType.cpp +++ b/tests/testoscar/Platform/TestAppSettingValueType.cpp @@ -68,14 +68,12 @@ TEST(AppSettingValue, StringValueToBoolReturnsExpectedBoolValues) TEST(AppSettingValue, ColorValueToStringReturnsSameAsToHtmlStringRGBA) { - auto const colors = std::to_array( - { + const auto colors = std::to_array({ Color::red(), Color::magenta(), }); - for (auto const& color : colors) - { + for (const auto& color : colors) { ASSERT_EQ(AppSettingValue{color}.to_string(), to_html_string_rgba(color)); } } diff --git a/tests/testoscar/Platform/TestResourceLoader.cpp b/tests/testoscar/Platform/TestResourceLoader.cpp index 63d3a3ece..577236d64 100644 --- a/tests/testoscar/Platform/TestResourceLoader.cpp +++ b/tests/testoscar/Platform/TestResourceLoader.cpp @@ -25,13 +25,13 @@ namespace m_State{std::move(state_)} {} private: - ResourceStream impl_open(ResourcePath const& p) override + ResourceStream impl_open(const ResourcePath& p) override { m_State->lastOpenCallArg = p; return ResourceStream{}; } - std::function()> impl_iterate_directory(ResourcePath const&) override + std::function()> impl_iterate_directory(const ResourcePath&) override { return []() { return std::nullopt; }; } diff --git a/tests/testoscar/Platform/TestResourceStream.cpp b/tests/testoscar/Platform/TestResourceStream.cpp index 9feb9127a..d8dda75a6 100644 --- a/tests/testoscar/Platform/TestResourceStream.cpp +++ b/tests/testoscar/Platform/TestResourceStream.cpp @@ -21,7 +21,7 @@ namespace return std::string{beg, end}; } - std::string slurp(std::filesystem::path const& p) + std::string slurp(const std::filesystem::path& p) { std::ifstream fs{p, std::ios::binary}; return slurp(fs); @@ -40,7 +40,7 @@ TEST(ResourceStream, WhenDefaultConstructedHasNameNullstream) TEST(ResourceStream, WhenConstructedFromFilepathCreatesStreamThatReadsFile) { - auto const path = std::filesystem::path{OSC_TESTING_RESOURCES_DIR} / "awesomeface.png"; + const auto path = std::filesystem::path{OSC_TESTING_RESOURCES_DIR} / "awesomeface.png"; ResourceStream rs{path}; ASSERT_TRUE(slurp(rs) == slurp(path)); @@ -48,6 +48,6 @@ TEST(ResourceStream, WhenConstructedFromFilepathCreatesStreamThatReadsFile) TEST(ResourceStream, WhenConstructedFromFilepathHasNameEqualtoFilename) { - auto const path = std::filesystem::path{OSC_TESTING_RESOURCES_DIR} / "awesomeface.png"; + const auto path = std::filesystem::path{OSC_TESTING_RESOURCES_DIR} / "awesomeface.png"; ASSERT_EQ(ResourceStream{path}.name(), path.filename().string()); } diff --git a/tests/testoscar/TestingHelpers.cpp b/tests/testoscar/TestingHelpers.cpp index 21e02cd4c..0d33caa15 100644 --- a/tests/testoscar/TestingHelpers.cpp +++ b/tests/testoscar/TestingHelpers.cpp @@ -14,8 +14,7 @@ namespace { std::vector rv; rv.reserve(n); - for (size_t i = 0; i < n; ++i) - { + for (size_t i = 0; i < n; ++i) { rv.push_back(f()); } return rv; diff --git a/tests/testoscar/TestingHelpers.h b/tests/testoscar/TestingHelpers.h index 07bfceeca..584c6880c 100644 --- a/tests/testoscar/TestingHelpers.h +++ b/tests/testoscar/TestingHelpers.h @@ -43,7 +43,7 @@ namespace osc::testing std::vector GenerateIndices(size_t start, size_t end); template - bool ContainersEqual(T const& a, U const& b) + bool ContainersEqual(const T& a, const U& b) { using std::begin; using std::end; @@ -52,23 +52,22 @@ namespace osc::testing } template - requires std::invocable - auto MapToVector(Range const& src, UnaryOperation op) + requires std::invocable + auto MapToVector(const Range& src, UnaryOperation op) { using std::begin; using std::end; std::vector()))>>> rv; rv.reserve(std::distance(begin(src), end(src))); - for (auto const& el : src) - { + for (const auto& el : src) { rv.push_back(op(el)); } return rv; } template - std::vector ResizedVectorCopy(std::vector const& v, size_t newSize, T const& filler = {}) + std::vector ResizedVectorCopy(const std::vector& v, size_t newSize, const T& filler = {}) { std::vector rv; rv.reserve(newSize); diff --git a/tests/testoscar/Utils/TestAlgorithms.cpp b/tests/testoscar/Utils/TestAlgorithms.cpp index 09343777c..446f9c941 100644 --- a/tests/testoscar/Utils/TestAlgorithms.cpp +++ b/tests/testoscar/Utils/TestAlgorithms.cpp @@ -109,7 +109,7 @@ TEST(lookup_or_nullptr, WorksWithStdMap) TEST(lookup_or_nullptr, WorksWithConstQualifiedStdUnorderedMap) { - std::unordered_map const um{ + const std::unordered_map um{ {20, 30}, {-1, 98}, {5, 10}, @@ -138,28 +138,28 @@ TEST(lookup_or_nullptr, CanMutateViaReturnedPointer) TEST(min_element, WorksAsExpected) { - auto const els = std::to_array({1, 5, 8, -4, 13}); + const auto els = std::to_array({1, 5, 8, -4, 13}); ASSERT_EQ(rgs::min_element(els), els.begin() + 3); } TEST(min, WorksAsExpected) { - auto const els = std::to_array({1, 5, 8, -4, 13}); + const auto els = std::to_array({1, 5, 8, -4, 13}); ASSERT_EQ(rgs::min(els), -4); } TEST(minmax_element, WorksAsExpected) { - auto const els = std::to_array({1, 5, 8, -4, -4, 13, 13, 13}); - auto const [minit, maxit] = rgs::minmax_element(els); + const auto els = std::to_array({1, 5, 8, -4, -4, 13, 13, 13}); + const auto [minit, maxit] = rgs::minmax_element(els); ASSERT_EQ(minit, els.begin() + 3); ASSERT_EQ(maxit, els.end() - 1); } TEST(minmax, WorksAsExpected) { - auto const els = std::to_array({1, 5, 8, -4, -4, 13, 13, 13}); - auto const [min, max] = rgs::minmax(els); + const auto els = std::to_array({1, 5, 8, -4, -4, 13, 13, 13}); + const auto [min, max] = rgs::minmax(els); ASSERT_EQ(min, -4); ASSERT_EQ(max, 13); } diff --git a/tests/testoscar/Utils/TestCStringView.cpp b/tests/testoscar/Utils/TestCStringView.cpp index 6da7d380d..df30ae6ce 100644 --- a/tests/testoscar/Utils/TestCStringView.cpp +++ b/tests/testoscar/Utils/TestCStringView.cpp @@ -11,13 +11,13 @@ using namespace osc::literals; TEST(CStringView, WhenPassedNullCstringYieldsEmptyCStringView) { - char const* p = nullptr; + const char* p = nullptr; ASSERT_TRUE(CStringView{p}.empty()); } TEST(CStringView, WhenPassedNullCStringYieldsNonNullCStr) { - char const* p = nullptr; + const char* p = nullptr; ASSERT_NE(CStringView{p}.c_str(), nullptr); } @@ -43,13 +43,12 @@ TEST(CStringView, WhenConstructedFromNullptrYieldsNonNullCStr) TEST(CStringView, ThreeWayComparisonBehavesIdenticallyToStringViewComparision) { - auto const svs = std::to_array({ "x", "somestring", "somethingelse", "", "_i hope it works ;)" }); - auto sameThreeWayResultWithAllOtherElements = [&svs](char const* elCStr) + const auto svs = std::to_array({ "x", "somestring", "somethingelse", "", "_i hope it works ;)" }); + auto sameThreeWayResultWithAllOtherElements = [&svs](const char* elCStr) { std::string_view sv{elCStr}; CStringView csv{elCStr}; - for (char const* otherCStr : svs) - { + for (const char* otherCStr : svs) { ASSERT_EQ(sv <=> std::string_view{otherCStr}, csv <=> CStringView{otherCStr}); } }; diff --git a/tests/testoscar/Utils/TestFileChangePoller.cpp b/tests/testoscar/Utils/TestFileChangePoller.cpp index 6c1dd1fff..937a7296b 100644 --- a/tests/testoscar/Utils/TestFileChangePoller.cpp +++ b/tests/testoscar/Utils/TestFileChangePoller.cpp @@ -12,7 +12,7 @@ using namespace osc; // that something not-quite-right has happened TEST(FileChangePoller, CtorDoesNotThrowExceptionIfGivenInvalidPath) { - std::string const path = "doesnt-exist"; + const std::string path = "doesnt-exist"; // constructing with an invalid path shouldn't throw ASSERT_NO_THROW({ FileChangePoller(std::chrono::milliseconds{0}, path); }); @@ -26,7 +26,7 @@ TEST(FileChangePoller, CtorDoesNotThrowExceptionIfGivenInvalidPath) // that something not-quite-right has happened TEST(FileChangePoller, ChangeWasDetectedDoesNotThrowExceptionIfGivenInvalidPath) { - std::string const path = "doesnt-exist"; + const std::string path = "doesnt-exist"; // construct it with an invalid path FileChangePoller p{std::chrono::milliseconds{0}, path}; diff --git a/tests/testoscar/Utils/TestStringHelpers.cpp b/tests/testoscar/Utils/TestStringHelpers.cpp index 85efc3955..571287cc2 100644 --- a/tests/testoscar/Utils/TestStringHelpers.cpp +++ b/tests/testoscar/Utils/TestStringHelpers.cpp @@ -24,8 +24,7 @@ TEST(Algorithms, TrimLeadingAndTrailingWhitespaceWorksAsExpected) std::string_view expectedOutput; }; - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ // trivial case {"", ""}, @@ -62,9 +61,8 @@ TEST(Algorithms, TrimLeadingAndTrailingWhitespaceWorksAsExpected) {"\r\na ", "a"}, }); - for (TestCase const& tc : testCases) - { - std::string_view const rv = strip_whitespace(tc.input); + for (const TestCase& tc : testCases) { + const std::string_view rv = strip_whitespace(tc.input); ASSERT_EQ(rv, tc.expectedOutput); } } @@ -73,14 +71,12 @@ TEST(Algorithms, TrimLeadingAndTrailingWhitespaceWorksAsExpected) // one test per test case namespace { - std::ostream& operator<<(std::ostream& o, std::optional const& v) + std::ostream& operator<<(std::ostream& o, const std::optional& v) { - if (v) - { + if (v) { o << "Some(" << *v << ')'; } - else - { + else { o << "None"; } return o; @@ -111,16 +107,16 @@ namespace return rv; } - std::ostream& operator<<(std::ostream& o, TestCase const& tc) + std::ostream& operator<<(std::ostream& o, const TestCase& tc) { // care: test UIs (e.g. Visual Studio test explorer) don't like it // when they have to print test names containing control // characters - std::string const sanitizedInput = WithoutControlCharacters(tc.input); + const std::string sanitizedInput = WithoutControlCharacters(tc.input); return o << "TestCase(input = " << sanitizedInput << ", expectedOutput = " << tc.expectedOutput << ')'; } - void PrintTo(TestCase const& tc, std::ostream* o) + void PrintTo(const TestCase& tc, std::ostream* o) { // this teaches googletest to pretty-print a std::optional // @@ -128,8 +124,7 @@ namespace *o << tc; } - auto constexpr c_TestCases = std::to_array( - { + constexpr auto c_TestCases = std::to_array({ // it strips purely-whitespace strings {"", std::nullopt}, {" ", std::nullopt}, @@ -187,14 +182,13 @@ TEST_P(FromCharsStripWhitespace, Check) TEST(to_hex_chars, ReturnsExpectedResultsWhenComparedToAlternateImplementation) { // test by comparing with - for (size_t i = 0; i <= static_cast(std::numeric_limits::max()); ++i) - { - auto const v = static_cast(i); + for (size_t i = 0; i <= static_cast(std::numeric_limits::max()); ++i) { + const auto v = static_cast(i); - uint8_t const msn = (v>>4) & 0xf; - uint8_t const lsn = v & 0xf; - char const msc = static_cast(msn <= 9 ? '0' + msn : 'a' + (msn-10)); - char const lsc = static_cast(lsn <= 9 ? '0' + lsn : 'a' + (lsn-10)); + const uint8_t msn = (v>>4) & 0xf; + const uint8_t lsn = v & 0xf; + const char msc = static_cast(msn <= 9 ? '0' + msn : 'a' + (msn-10)); + const char lsc = static_cast(lsn <= 9 ? '0' + lsn : 'a' + (lsn-10)); auto [a, b] = to_hex_chars(v); @@ -210,8 +204,7 @@ TEST(to_hex_chars, ReturnsExpectedResults) std::pair expectedOutput; }; - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ {0x00, {'0', '0'}}, {0x0f, {'0', 'f'}}, {0xf0, {'f', '0'}}, @@ -222,8 +215,7 @@ TEST(to_hex_chars, ReturnsExpectedResults) {0xef, {'e', 'f'}}, }); - for (TestCase const& tc : testCases) - { + for (const TestCase& tc : testCases) { ASSERT_EQ(to_hex_chars(tc.input), tc.expectedOutput); } } @@ -259,8 +251,7 @@ TEST(try_parse_hex_chars_as_byte, ReturnsExpectedResults) TEST(StringHelpers, IsValidIdentifierReturnsTrueForTypicalIdentifiers) { - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ "f", "g", "a_snake_case_string", @@ -274,16 +265,14 @@ TEST(StringHelpers, IsValidIdentifierReturnsTrueForTypicalIdentifiers) "__orIfYouLikeCPPThenItsMaybeReserved", }); - for (auto const& testCase : testCases) - { + for (const auto& testCase : testCases) { ASSERT_TRUE(is_valid_identifier(testCase)) << testCase; } } TEST(StringHelpers, IsValidIdentifierReturnsFalseWhenGivenAnIdentifierWithLeadingNumbers) { - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ "1f", "2g", "3a_snake_case_string", @@ -294,8 +283,7 @@ TEST(StringHelpers, IsValidIdentifierReturnsFalseWhenGivenAnIdentifierWithLeadin "8Inner56Numbers", }); - for (auto const& testCase : testCases) - { + for (const auto& testCase : testCases) { ASSERT_FALSE(is_valid_identifier(testCase)) << testCase; } } @@ -307,24 +295,23 @@ TEST(StringHelpers, IsValidIdentifierReturnsFalseIfGivenAnEmptyString) TEST(StringHelpers, IsValidIdentifierReturnsFalseWhenGivenIdentifiersWithInvalidASCIICharacters) { - auto const assertCharCannotBeUsedInIdentifier = [](char c) + const auto assertCharCannotBeUsedInIdentifier = [](char c) { { - std::string const leading = c + std::string{"leading"}; + const std::string leading = c + std::string{"leading"}; ASSERT_FALSE(is_valid_identifier(leading)) << leading; } { - std::string const trailing = std::string{"trailing"} + c; + const std::string trailing = std::string{"trailing"} + c; ASSERT_FALSE(is_valid_identifier(trailing)) << trailing; } { - std::string const inner = std::string{"inner"} + c + std::string{"usage"}; + const std::string inner = std::string{"inner"} + c + std::string{"usage"}; ASSERT_FALSE(is_valid_identifier(inner)) << inner; } }; - auto const invalidRanges = std::to_array>( - { + const auto invalidRanges = std::to_array>({ {0, 0x1F}, // control chars {0x20, 0x2F}, // SPC ! " # $ % & ' ( ) * + ' - / {0x3A, 0x40}, // : ; < = > ? @ diff --git a/tests/testoscar/Utils/TestStringName.cpp b/tests/testoscar/Utils/TestStringName.cpp index 0c0e6a58c..329467d1a 100644 --- a/tests/testoscar/Utils/TestStringName.cpp +++ b/tests/testoscar/Utils/TestStringName.cpp @@ -18,9 +18,9 @@ using namespace osc; namespace { constexpr auto c_LongStringToAvoidSSOData = std::to_array("somequitelongstringthatprobablyneedstobeheapallocatedsothatmemoryanalyzershaveabetterchance"); - constexpr char const* const c_LongStringToAvoidSSO = c_LongStringToAvoidSSOData.data(); + constexpr const char* const c_LongStringToAvoidSSO = c_LongStringToAvoidSSOData.data(); constexpr auto c_AnotherStringToAvoidSSOData = std::to_array("somedifferencequitelongstringthatprobablyneedstobeheapallocatedbutwhoknows"); - constexpr char const* const c_AnotherStringToAvoidSSO = c_AnotherStringToAvoidSSOData.data(); + constexpr const char* const c_AnotherStringToAvoidSSO = c_AnotherStringToAvoidSSOData.data(); } TEST(StringName, CanBeDefaultConstructed) @@ -83,7 +83,7 @@ TEST(StringName, DefaultConstructedExplicitlyConvertsIntoCStringView) TEST(StringName, CanBeUsedToCallCStringViewFunctions) { StringName sn; - auto const f = [](CStringView) {}; + const auto f = [](CStringView) {}; f(sn); // should compile } @@ -210,9 +210,9 @@ TEST(StringName, DefaultConstructedCanBeStreamedWhichWritesNothingToTheStream) TEST(StringName, DefaultConstructedSwappingWorksAsExpectedWithNonEmpty) { StringName a; - StringName const aCopy{a}; + const StringName aCopy{a}; StringName b{c_LongStringToAvoidSSO}; - StringName const bCopy{b}; + const StringName bCopy{b}; swap(a, b); @@ -247,7 +247,7 @@ TEST(StringName, CanConstructFromCString) TEST(StringName, CanImplicitlyConstructFromCStringView) { - auto const f = [](CStringView const&) {}; + const auto f = [](const CStringView&) {}; f(CStringView{"cstring"}); // should compile } @@ -308,8 +308,8 @@ TEST(StringName, DataReturnsNulTerminatedPointerToFirstElement) constexpr auto c_Input = std::to_array("string"); StringName s{c_Input.data()}; - std::span inputSpan(c_Input); - std::span outputSpan{s.data(), std::size(c_Input)}; // plus nul terminator + std::span inputSpan(c_Input); + std::span outputSpan{s.data(), std::size(c_Input)}; // plus nul terminator ASSERT_TRUE(std::equal(outputSpan.begin(), outputSpan.end(), inputSpan.begin(), inputSpan.end())); } @@ -319,21 +319,21 @@ TEST(StringName, CStringReturnsNulTerminatedPointerToFirstElement) constexpr auto c_Input = std::to_array("string"); StringName s{c_Input.data()}; - std::span inputSpan(c_Input); - std::span outputSpan{s.c_str(), std::size(c_Input)}; // plus nul terminator + std::span inputSpan(c_Input); + std::span outputSpan{s.c_str(), std::size(c_Input)}; // plus nul terminator ASSERT_TRUE(std::equal(outputSpan.begin(), outputSpan.end(), inputSpan.begin(), inputSpan.end())); } TEST(StringName, ImplicitlyConvertingToStringViewWorksAsExpected) { - StringName const s{c_LongStringToAvoidSSO}; + const StringName s{c_LongStringToAvoidSSO}; ASSERT_EQ(static_cast(s), std::string_view{c_LongStringToAvoidSSO}); } TEST(StringName, ImplicitlyConvertingToCStringViewWorksAsExpected) { - StringName const s{c_LongStringToAvoidSSO}; + const StringName s{c_LongStringToAvoidSSO}; ASSERT_EQ(static_cast(s), CStringView{c_LongStringToAvoidSSO}); } diff --git a/tests/testoscar/Variant/TestVariant.cpp b/tests/testoscar/Variant/TestVariant.cpp index 75ef12091..5f363d2e1 100644 --- a/tests/testoscar/Variant/TestVariant.cpp +++ b/tests/testoscar/Variant/TestVariant.cpp @@ -27,12 +27,10 @@ namespace std::string s{v}; size_t pos = 0; - try - { + try { return std::stof(s, &pos); } - catch (std::exception const&) - { + catch (const std::exception&) { return 0.0f; } } @@ -289,14 +287,12 @@ TEST(Variant, ColorToIntReturnsExpectedValues) TEST(Variant, ColorValueToStringReturnsSameAsToHtmlStringRGBA) { - auto const colors = std::to_array( - { + const auto colors = std::to_array({ Color::red(), Color::magenta(), }); - for (auto const& color : colors) - { + for (const auto& color : colors) { ASSERT_EQ(Variant(color).to(), to_html_string_rgba(color)); } } @@ -330,9 +326,8 @@ TEST(Variant, FloatValueToBoolReturnsExpectedValues) TEST(Variant, FloatValueToColorReturnsExpectedColor) { - for (float v : std::to_array({0.0f, 0.5f, 0.75, 1.0f})) - { - Color const expected = {v, v, v}; + for (float v : std::to_array({0.0f, 0.5f, 0.75, 1.0f})) { + const Color expected = {v, v, v}; ASSERT_EQ(Variant(v).to(), expected); } } @@ -346,18 +341,16 @@ TEST(Variant, FloatValueToFloatReturnsInput) TEST(Variant, FloatValueToIntReturnsCastedResult) { - for (float v : std::to_array({-0.5f, -0.123f, 0.0f, 1.0f, 1337.0f})) - { - int const expected = static_cast(v); + for (float v : std::to_array({-0.5f, -0.123f, 0.0f, 1.0f, 1337.0f})) { + const int expected = static_cast(v); ASSERT_EQ(Variant(v).to(), expected); } } TEST(Variant, FloatValueToStringReturnsToStringedResult) { - for (float v : std::to_array({-5.35f, -2.0f, -1.0f, 0.0f, 0.123f, 18000.0f})) - { - std::string const expected = std::to_string(v); + for (float v : std::to_array({-5.35f, -2.0f, -1.0f, 0.0f, 0.123f, 18000.0f})) { + const std::string expected = std::to_string(v); ASSERT_EQ(Variant(v).to(), expected); } } @@ -370,18 +363,16 @@ TEST(Variant, FloatValueToStringNameReturnsEmptyStringName) TEST(Variant, FloatValueToVec2ReturnsVec2FilledWithFloat) { - for (float v : std::to_array({-20000.0f, -5.328f, -1.2f, 0.0f, 0.123f, 50.0f, 18000.0f})) - { - Vec2 const expected = {v, v}; + for (float v : std::to_array({-20000.0f, -5.328f, -1.2f, 0.0f, 0.123f, 50.0f, 18000.0f})) { + const Vec2 expected = {v, v}; ASSERT_EQ(Variant(v).to(), expected); } } TEST(Variant, FloatValueToVec3ReturnsVec3FilledWithFloat) { - for (float v : std::to_array({-20000.0f, -5.328f, -1.2f, 0.0f, 0.123f, 50.0f, 18000.0f})) - { - Vec3 const expected = {v, v, v}; + for (float v : std::to_array({-20000.0f, -5.328f, -1.2f, 0.0f, 0.123f, 50.0f, 18000.0f})) { + const Vec3 expected = {v, v, v}; ASSERT_EQ(Variant(v).to(), expected); } } @@ -406,9 +397,8 @@ TEST(Variant, IntValueToColorReturnsBlackOrWhite) TEST(Variant, IntValueToFloatReturnsIntCastedToFloat) { - for (int v : std::to_array({-10000, -1000, -1, 0, 1, 17, 23000})) - { - auto const expected = static_cast(v); + for (int v : std::to_array({-10000, -1000, -1, 0, 1, 17, 23000})) { + const auto expected = static_cast(v); ASSERT_EQ(Variant(v).to(), expected); } } @@ -423,9 +413,8 @@ TEST(Variant, IntValueToIntReturnsTheSuppliedInt) TEST(Variant, IntValueToStringReturnsStringifiedInt) { - for (int v : std::to_array({ -121010, -13482, -1923, -123, -92, -7, 0, 1, 1294, 1209849})) - { - std::string const expected = std::to_string(v); + for (int v : std::to_array({ -121010, -13482, -1923, -123, -92, -7, 0, 1, 1294, 1209849})) { + const std::string expected = std::to_string(v); ASSERT_EQ(Variant(v).to(), expected); } } @@ -439,20 +428,18 @@ TEST(Variant, IntValueToStringNameReturnsEmptyString) TEST(Variant, IntValueToVec2CastsValueToFloatThenPlacesItInAllSlots) { - for (int v : std::to_array({ -12193, -1212, -738, -12, -1, 0, 1, 18, 1294, 1209849})) - { - auto const vf = static_cast(v); - Vec2 const expected = {vf, vf}; + for (int v : std::to_array({ -12193, -1212, -738, -12, -1, 0, 1, 18, 1294, 1209849})) { + const auto vf = static_cast(v); + const Vec2 expected = {vf, vf}; ASSERT_EQ(Variant(v).to(), expected); } } TEST(Variant, IntValueToVec3CastsValueToFloatThenPlacesInAllSlots) { - for (int v : std::to_array({ -12193, -1212, -738, -12, -1, 0, 1, 18, 1294, 1209849})) - { - auto const vf = static_cast(v); - Vec3 const expected = {vf, vf, vf}; + for (int v : std::to_array({ -12193, -1212, -738, -12, -1, 0, 1, 18, 1294, 1209849})) { + const auto vf = static_cast(v); + const Vec3 expected = {vf, vf, vf}; ASSERT_EQ(Variant(v).to(), expected); } } @@ -490,8 +477,7 @@ TEST(Variant, StringValueColorReturnsBlackIfStringIsInvalidHTMLColorString) TEST(Variant, StringValueToFloatTriesToParseStringAsFloatAndReturnsZeroOnFailure) { - auto const inputs = std::to_array( - { + const auto inputs = std::to_array({ "-1.0", "20e-10", "", @@ -502,17 +488,15 @@ TEST(Variant, StringValueToFloatTriesToParseStringAsFloatAndReturnsZeroOnFailure " ", }); - for (auto const& input : inputs) - { - float const expectedOutput = ToFloatOrZero(input); + for (const auto& input : inputs) { + const float expectedOutput = ToFloatOrZero(input); ASSERT_EQ(Variant{input}.to(), expectedOutput); } } TEST(Variant, StringValueToIntTriesToParseStringAsBase10Int) { - auto const inputs = std::to_array( - { + const auto inputs = std::to_array({ "-1.0", "20e-10", "", @@ -523,17 +507,15 @@ TEST(Variant, StringValueToIntTriesToParseStringAsBase10Int) " ", }); - for (auto const& input : inputs) - { - int const expectedOutput = ToIntOrZero(input); + for (const auto& input : inputs) { + const int expectedOutput = ToIntOrZero(input); ASSERT_EQ(Variant{input}.to(), expectedOutput); } } TEST(Variant, StringValueToStringReturnsSuppliedString) { - auto const inputs = std::to_array( - { + const auto inputs = std::to_array({ "some\tstring", "-1.0", "20e-10", @@ -546,16 +528,14 @@ TEST(Variant, StringValueToStringReturnsSuppliedString) "a slightly longer string in case sso is in some way important" }); - for (auto const& input : inputs) - { + for (const auto& input : inputs) { ASSERT_EQ(Variant{input}.to(), input); } } TEST(Variant, StringValueToStringNameReturnsSuppliedStringAsAStringName) { - auto const inputs = std::to_array( - { + const auto inputs = std::to_array({ "some\tstring", "-1.0", "20e-10", @@ -568,38 +548,34 @@ TEST(Variant, StringValueToStringNameReturnsSuppliedStringAsAStringName) "a slightly longer string in case sso is in some way important" }); - for (auto const& input : inputs) - { + for (const auto& input : inputs) { ASSERT_EQ(Variant{input}.to(), StringName{input}); } } TEST(Variant, StringValueToVec2AlwaysReturnsZeroedVec) { - auto const inputs = std::to_array( - { - "some\tstring", - "-1.0", - "20e-10", - "", - "not a number", - " ", - "1, 2, 3", - "(1, 2, 3)", - "[1, 2, 3]", - "Vec3(1, 2, 3)", - }); - - for (auto const& input : inputs) - { + const auto inputs = std::to_array({ + "some\tstring", + "-1.0", + "20e-10", + "", + "not a number", + " ", + "1, 2, 3", + "(1, 2, 3)", + "[1, 2, 3]", + "Vec3(1, 2, 3)", + }); + + for (const auto& input : inputs) { ASSERT_EQ(Variant{input}.to(), Vec2{}); } } TEST(Variant, StringValueToVec3AlwaysReturnsZeroedVec) { - auto const inputs = std::to_array( - { + const auto inputs = std::to_array({ "some\tstring", "-1.0", "20e-10", @@ -612,8 +588,7 @@ TEST(Variant, StringValueToVec3AlwaysReturnsZeroedVec) "Vec3(1, 2, 3)", }); - for (auto const& input : inputs) - { + for (const auto& input : inputs) { ASSERT_EQ(Variant{input}.to(), Vec3{}); } } @@ -648,7 +623,7 @@ TEST(Variant, Vec2ValueToBoolReturnsTrueIfXIsNonZeroRegardlessOfOtherComponents) TEST(Variant, Vec2ValueToColorExtractsTheElementsIntoRGB) { - auto const testCases = std::to_array({ + const auto testCases = std::to_array({ { 0.0f, 0.0f}, { 1.0f, 1.0f}, {-1.0f, 7.5f}, @@ -656,15 +631,14 @@ TEST(Variant, Vec2ValueToColorExtractsTheElementsIntoRGB) { 0.0f, -0.0f}, }); - for (auto const& testCase : testCases) - { + for (const auto& testCase : testCases) { ASSERT_EQ(Variant{testCase}.to(), Color(testCase.x, testCase.y, 0.0f)); } } TEST(Variant, Vec2ValueToFloatExtractsXToTheFloat) { - auto const testCases = std::to_array({ + const auto testCases = std::to_array({ { 0.0f, 0.0f}, { 1.0f, 1.0f}, {-1.0f, 7.5f}, @@ -672,14 +646,14 @@ TEST(Variant, Vec2ValueToFloatExtractsXToTheFloat) { 0.0f, -0.0f}, }); - for (auto const& testCase : testCases) { + for (const auto& testCase : testCases) { ASSERT_EQ(Variant{testCase}.to(), testCase.x); } } TEST(Variant, Vec2ValueToIntExtractsXToTheInt) { - auto const testCases = std::to_array({ + const auto testCases = std::to_array({ { 0.0f, 0.0f}, { 1.0f, 1.0f}, {-1.0f, 7.5f}, @@ -687,14 +661,14 @@ TEST(Variant, Vec2ValueToIntExtractsXToTheInt) { 0.0f, -0.0f}, }); - for (auto const& testCase : testCases) { + for (const auto& testCase : testCases) { ASSERT_EQ(Variant{testCase}.to(), static_cast(testCase.x)); } } TEST(Variant, Vec2ValueToStringReturnsSameAsDirectlyConvertingVectorToString) { - auto const testCases = std::to_array({ + const auto testCases = std::to_array({ { 0.0f, 0.0f}, { 1.0f, 1.0f}, {-1.0f, 7.5f}, @@ -702,7 +676,7 @@ TEST(Variant, Vec2ValueToStringReturnsSameAsDirectlyConvertingVectorToString) { 0.0f, -0.0f}, }); - for (auto const& testCase : testCases) { + for (const auto& testCase : testCases) { ASSERT_EQ(Variant{testCase}.to(), to_string(testCase)); } } @@ -715,7 +689,7 @@ TEST(Variant, Vec2ValueToStringNameReturnsAnEmptyString) TEST(Variant, Vec2ValueToVec3ReturnsOriginalValue) { - auto const testCases = std::to_array({ + const auto testCases = std::to_array({ { 0.0f, 0.0f}, { 1.0f, 1.0f}, {-1.0f, 7.5f}, @@ -723,7 +697,7 @@ TEST(Variant, Vec2ValueToVec3ReturnsOriginalValue) { 0.0f, -0.0f}, }); - for (auto const& testCase : testCases) { + for (const auto& testCase : testCases) { ASSERT_EQ(Variant{testCase}.to(), testCase); } } @@ -758,8 +732,7 @@ TEST(Variant, Vec3ValueToBoolReturnsTrueIfXIsNonZeroRegardlessOfOtherComponents) TEST(Variant, Vec3ValueToColorExtractsTheElementsIntoRGB) { - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ {0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 1.0f}, {-1.0f, 0.0f, 1.0f}, @@ -767,16 +740,14 @@ TEST(Variant, Vec3ValueToColorExtractsTheElementsIntoRGB) {0.0f, -20.0f, 0.5f}, }); - for (auto const& testCase : testCases) - { + for (const auto& testCase : testCases) { ASSERT_EQ(Variant{testCase}.to(), Color{testCase}); } } TEST(Variant, Vec3ValueToFloatExtractsXToTheFloat) { - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ {0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 1.0f}, {-1.0f, 0.0f, 1.0f}, @@ -784,16 +755,14 @@ TEST(Variant, Vec3ValueToFloatExtractsXToTheFloat) {0.0f, -20.0f, 0.5f}, }); - for (auto const& testCase : testCases) - { + for (const auto& testCase : testCases) { ASSERT_EQ(Variant{testCase}.to(), testCase.x); } } TEST(Variant, Vec3ValueToIntExtractsXToTheInt) { - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ {0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 1.0f}, {-1.0f, 0.0f, 1.0f}, @@ -801,16 +770,14 @@ TEST(Variant, Vec3ValueToIntExtractsXToTheInt) {0.0f, -20.0f, 0.5f}, }); - for (auto const& testCase : testCases) - { + for (const auto& testCase : testCases) { ASSERT_EQ(Variant{testCase}.to(), static_cast(testCase.x)); } } TEST(Variant, Vec3ValueToStringReturnsSameAsDirectlyConvertingVectorToString) { - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ {0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 1.0f}, {-1.0f, 0.0f, 1.0f}, @@ -818,8 +785,7 @@ TEST(Variant, Vec3ValueToStringReturnsSameAsDirectlyConvertingVectorToString) {0.0f, -20.0f, 0.5f}, }); - for (auto const& testCase : testCases) - { + for (const auto& testCase : testCases) { ASSERT_EQ(Variant{testCase}.to(), to_string(testCase)); } } @@ -832,8 +798,7 @@ TEST(Variant, Vec3ValueToStringNameReturnsAnEmptyString) TEST(Variant, Vec3ValueToVec3ReturnsOriginalValue) { - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ {0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 1.0f}, {-1.0f, 0.0f, 1.0f}, @@ -841,16 +806,14 @@ TEST(Variant, Vec3ValueToVec3ReturnsOriginalValue) {0.0f, -20.0f, 0.5f}, }); - for (auto const& testCase : testCases) - { + for (const auto& testCase : testCases) { ASSERT_EQ(Variant{testCase}.to(), testCase); } } TEST(Variant, IsAlwaysEqualToACopyOfItself) { - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ Variant{false}, Variant{true}, Variant{Color::white()}, @@ -885,26 +848,22 @@ TEST(Variant, IsAlwaysEqualToACopyOfItself) Variant{Vec3{-0.5f}}, }); - for (auto const& tc : testCases) - { + for (const auto& tc : testCases) { ASSERT_EQ(tc, tc) << "input: " << tc.to(); } - auto const exceptions = std::to_array( - { + const auto exceptions = std::to_array({ Variant{std::numeric_limits::quiet_NaN()}, Variant{std::numeric_limits::signaling_NaN()}, }); - for (auto const& tc : exceptions) - { + for (const auto& tc : exceptions) { ASSERT_NE(tc, tc) << "input: " << tc.to(); } } TEST(Variant, IsNotEqualToOtherValuesEvenIfConversionIsPossible) { - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ Variant{false}, Variant{true}, Variant{Color::white()}, @@ -957,8 +916,7 @@ TEST(Variant, IsNotEqualToOtherValuesEvenIfConversionIsPossible) TEST(Variant, CanHashAVarietyOfTypes) { - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ Variant{false}, Variant{true}, Variant{Color::white()}, @@ -996,16 +954,14 @@ TEST(Variant, CanHashAVarietyOfTypes) Variant{Vec3{-0.5f}}, }); - for (auto const& testCase : testCases) - { + for (const auto& testCase : testCases) { ASSERT_NO_THROW({ std::hash{}(testCase); }); } } TEST(Variant, FreeFunctionToStringOnVarietyOfTypesReturnsSameAsCallingToStringMemberFunction) { - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ Variant{false}, Variant{true}, Variant{Color::white()}, @@ -1043,16 +999,14 @@ TEST(Variant, FreeFunctionToStringOnVarietyOfTypesReturnsSameAsCallingToStringMe Variant{Vec3{-0.5f}}, }); - for (auto const& testCase : testCases) - { + for (const auto& testCase : testCases) { ASSERT_EQ(to_string(testCase), testCase.to()); } } TEST(Variant, StreamingToOutputStreamProducesSameOutputAsToString) { - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ Variant{false}, Variant{true}, Variant{Color::white()}, @@ -1090,8 +1044,7 @@ TEST(Variant, StreamingToOutputStreamProducesSameOutputAsToString) Variant{Vec3{-0.5f}}, }); - for (auto const& testCase : testCases) - { + for (const auto& testCase : testCases) { std::stringstream ss; ss << testCase; ASSERT_EQ(ss.str(), testCase.to()); @@ -1100,8 +1053,7 @@ TEST(Variant, StreamingToOutputStreamProducesSameOutputAsToString) TEST(Variant, HashesForStringValuesMatchStdStringEtc) { - auto const strings = std::to_array( - { + const auto strings = std::to_array({ "false", "true", "0", @@ -1109,10 +1061,9 @@ TEST(Variant, HashesForStringValuesMatchStdStringEtc) "a string", }); - for (auto const& s : strings) - { - Variant const variant{s}; - auto const hash = std::hash{}(variant); + for (const auto& s : strings) { + const Variant variant{s}; + const auto hash = std::hash{}(variant); ASSERT_EQ(hash, std::hash{}(std::string{s})); ASSERT_EQ(hash, std::hash{}(s)); @@ -1168,8 +1119,7 @@ TEST(Variant, StringNameValueToColorReturnsBlackIfStringIsInvalidHTMLColorString TEST(Variant, StringNameValueToFloatTriesToParseStringAsFloatAndReturnsZeroOnFailure) { - auto const inputs = std::to_array( - { + const auto inputs = std::to_array({ "-1.0", "20e-10", "", @@ -1180,17 +1130,15 @@ TEST(Variant, StringNameValueToFloatTriesToParseStringAsFloatAndReturnsZeroOnFai " ", }); - for (auto const& input : inputs) - { - float const expectedOutput = ToFloatOrZero(input); + for (const auto& input : inputs) { + const float expectedOutput = ToFloatOrZero(input); ASSERT_EQ(Variant{StringName{input}}.to(), expectedOutput); } } TEST(Variant, StringNameValueToIntTriesToParseStringAsBase10Int) { - auto const inputs = std::to_array( - { + const auto inputs = std::to_array({ "-1.0", "20e-10", "", @@ -1201,17 +1149,15 @@ TEST(Variant, StringNameValueToIntTriesToParseStringAsBase10Int) " ", }); - for (auto const& input : inputs) - { - int const expectedOutput = ToIntOrZero(input); + for (const auto& input : inputs) { + const int expectedOutput = ToIntOrZero(input); ASSERT_EQ(Variant{StringName{input}}.to(), expectedOutput); } } TEST(Variant, StringNameValueToStringReturnsSuppliedString) { - auto const inputs = std::to_array( - { + const auto inputs = std::to_array({ "some\tstring", "-1.0", "20e-10", @@ -1224,16 +1170,14 @@ TEST(Variant, StringNameValueToStringReturnsSuppliedString) "a slightly longer string in case sso is in some way important" }); - for (auto const& input : inputs) - { + for (const auto& input : inputs) { ASSERT_EQ(Variant{StringName{input}}.to(), input); } } TEST(Variant, StringNameValueToStringNameReturnsSuppliedStringName) { - auto const inputs = std::to_array( - { + const auto inputs = std::to_array({ "some\tstring", "-1.0", "20e-10", @@ -1246,16 +1190,14 @@ TEST(Variant, StringNameValueToStringNameReturnsSuppliedStringName) "a slightly longer string in case sso is in some way important" }); - for (auto const& input : inputs) - { + for (const auto& input : inputs) { ASSERT_EQ(Variant{StringName{input}}.to(), StringName{input}); } } TEST(Variant, StringNameToVec3AlwaysReturnsZeroedVec) { - auto const inputs = std::to_array( - { + const auto inputs = std::to_array({ "some\tstring", "-1.0", "20e-10", @@ -1268,16 +1210,14 @@ TEST(Variant, StringNameToVec3AlwaysReturnsZeroedVec) "Vec3(1, 2, 3)", }); - for (auto const& input : inputs) - { + for (const auto& input : inputs) { ASSERT_EQ(Variant{StringName{input}}.to(), Vec3{}); } } TEST(Variant, HashOfStringNameVariantIsSameAsHashOfStringVariant) { - auto const inputs = std::to_array( - { + const auto inputs = std::to_array({ "some\tstring", "-1.0", "20e-10", @@ -1290,10 +1230,9 @@ TEST(Variant, HashOfStringNameVariantIsSameAsHashOfStringVariant) "Vec3(1, 2, 3)", }); - for (auto const& input : inputs) - { - auto snv = Variant{StringName{input}}; - auto sv = Variant{std::string{input}}; + for (const auto& input : inputs) { + const auto snv = Variant{StringName{input}}; + const auto sv = Variant{std::string{input}}; ASSERT_EQ(std::hash{}(snv), std::hash{}(sv)); } @@ -1301,8 +1240,7 @@ TEST(Variant, HashOfStringNameVariantIsSameAsHashOfStringVariant) TEST(Variant, StringNameVariantComparesEqualToEquivalentStringVariant) { - auto const inputs = std::to_array( - { + const auto inputs = std::to_array({ "some\tstring", "-1.0", "20e-10", @@ -1315,18 +1253,16 @@ TEST(Variant, StringNameVariantComparesEqualToEquivalentStringVariant) "Vec3(1, 2, 3)", }); - for (auto const& input : inputs) - { - auto snv = Variant{StringName{input}}; - auto sv = Variant{std::string{input}}; + for (const auto& input : inputs) { + const auto snv = Variant{StringName{input}}; + const auto sv = Variant{std::string{input}}; ASSERT_EQ(snv, sv); } } TEST(Variant, StringNameVariantComparesEqualToEquivalentStringVariantReversed) { - auto const inputs = std::to_array( - { + const auto inputs = std::to_array({ "some\tstring", "-1.0", "20e-10", @@ -1339,10 +1275,9 @@ TEST(Variant, StringNameVariantComparesEqualToEquivalentStringVariantReversed) "Vec3(1, 2, 3)", }); - for (auto const& input : inputs) - { - auto snv = Variant{StringName{input}}; - auto sv = Variant{std::string{input}}; + for (const auto& input : inputs) { + const auto snv = Variant{StringName{input}}; + const auto sv = Variant{std::string{input}}; ASSERT_EQ(sv, snv); // reversed, compared to other test } } diff --git a/tests/testoscar/Variant/TestVariantType.cpp b/tests/testoscar/Variant/TestVariantType.cpp index 4735064f0..02e212078 100644 --- a/tests/testoscar/Variant/TestVariantType.cpp +++ b/tests/testoscar/Variant/TestVariantType.cpp @@ -15,8 +15,7 @@ TEST(VariantType, ToStringReturnsExpectedResults) VariantType input; std::string_view expectedOutput; }; - auto const testCases = std::to_array( - { + const auto testCases = std::to_array({ {VariantType::None, "NoneType"}, {VariantType::Bool, "bool"}, {VariantType::Color, "Color"}, @@ -29,14 +28,13 @@ TEST(VariantType, ToStringReturnsExpectedResults) }); static_assert(num_options() == std::tuple_size()); - for (auto const& tc : testCases) - { + for (const auto& tc : testCases) { ASSERT_EQ(to_string(tc.input), tc.expectedOutput); } } TEST(VariantType, PassingBsValueIntoToStringThrows) { - auto const bs = static_cast(std::numeric_limits>::max()-1); + const auto bs = static_cast(std::numeric_limits>::max()-1); ASSERT_ANY_THROW({ to_string(bs); }); }