diff --git a/Tests/UnitTests/HelpersTests/Tests.h b/Tests/UnitTests/HelpersTests/Tests.h deleted file mode 100644 index 2a79e5d1ca8..00000000000 --- a/Tests/UnitTests/HelpersTests/Tests.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "BitsTests.h" diff --git a/Tests/UnitTests/UnitTests.cpp b/Tests/UnitTests/UnitTests.cpp index f2825b5ea97..4ca3ce7981a 100644 --- a/Tests/UnitTests/UnitTests.cpp +++ b/Tests/UnitTests/UnitTests.cpp @@ -1,5 +1,4 @@ #include "FeatureTests/HudFeaturesTests/Tests.h" -#include "HelpersTests/Tests.h" #include "MemorySearchTests/Tests.h" #include "PlatformTests/Tests.h" #include "UtilsTests/Tests.h" diff --git a/Tests/UnitTests/HelpersTests/BitsTests.h b/Tests/UnitTests/UtilsTests/BitsTests.h similarity index 55% rename from Tests/UnitTests/HelpersTests/BitsTests.h rename to Tests/UnitTests/UtilsTests/BitsTests.h index 09156ec03cf..b790d6cab69 100644 --- a/Tests/UnitTests/HelpersTests/BitsTests.h +++ b/Tests/UnitTests/UtilsTests/BitsTests.h @@ -4,12 +4,12 @@ #include -#include +#include namespace { -TEST(Helpers_CountrZero, PassingZeroRaisesDebugAssertion) { +TEST(CountrZero, PassingZeroRaisesDebugAssertion) { EXPECT_DEBUG_DEATH(std::ignore = bits::countrZero(0), ""); } @@ -18,13 +18,13 @@ struct CountrZeroParam { int firstSetBitIndex; }; -class Helpers_CountrZeroWithParam : public testing::TestWithParam {}; +class CountrZeroWithParam : public testing::TestWithParam {}; -TEST_P(Helpers_CountrZeroWithParam, IndexOfFirstSetBitFromRightIsReturned) { +TEST_P(CountrZeroWithParam, IndexOfFirstSetBitFromRightIsReturned) { EXPECT_EQ(bits::countrZero(GetParam().x), GetParam().firstSetBitIndex); } -INSTANTIATE_TEST_SUITE_P(, Helpers_CountrZeroWithParam, testing::Values( +INSTANTIATE_TEST_SUITE_P(, CountrZeroWithParam, testing::Values( CountrZeroParam{ 1, 0 }, CountrZeroParam{ 0b100001000, 3 }, CountrZeroParam{ 1u << 31, 31 } diff --git a/Tests/UnitTests/UtilsTests/Tests.h b/Tests/UnitTests/UtilsTests/Tests.h index abaca050e1c..8edf76c0b16 100644 --- a/Tests/UnitTests/UtilsTests/Tests.h +++ b/Tests/UnitTests/UtilsTests/Tests.h @@ -1,5 +1,6 @@ #pragma once +#include "BitsTests.h" #include "FlagsBuilderTests.h" #include "OptionalTests.h" #include "PatternFinderTests.h"