fixed naming

This commit is contained in:
2024-09-02 14:13:02 +03:00
parent b78a2e2747
commit 48981fefbe
2 changed files with 9 additions and 11 deletions

View File

@@ -7,7 +7,7 @@
using namespace omath::color; using namespace omath::color;
class ColorTest : public ::testing::Test class UnitTestColor : public ::testing::Test
{ {
protected: protected:
Color color1; Color color1;
@@ -21,7 +21,7 @@ protected:
}; };
// Test constructors // Test constructors
TEST_F(ColorTest, Constructor_Float) TEST_F(UnitTestColor, Constructor_Float)
{ {
Color color(0.5f, 0.5f, 0.5f, 1.0f); Color color(0.5f, 0.5f, 0.5f, 1.0f);
EXPECT_FLOAT_EQ(color.x, 0.5f); EXPECT_FLOAT_EQ(color.x, 0.5f);
@@ -30,7 +30,7 @@ TEST_F(ColorTest, Constructor_Float)
EXPECT_FLOAT_EQ(color.w, 1.0f); EXPECT_FLOAT_EQ(color.w, 1.0f);
} }
TEST_F(ColorTest, Constructor_Vector4) TEST_F(UnitTestColor, Constructor_Vector4)
{ {
omath::Vector4 vec(0.2f, 0.4f, 0.6f, 0.8f); omath::Vector4 vec(0.2f, 0.4f, 0.6f, 0.8f);
Color color(vec); Color color(vec);
@@ -41,7 +41,7 @@ TEST_F(ColorTest, Constructor_Vector4)
} }
// Test static methods for color creation // Test static methods for color creation
TEST_F(ColorTest, FromRGBA) TEST_F(UnitTestColor, FromRGBA)
{ {
Color color = Color::FromRGBA(128, 64, 32, 255); Color color = Color::FromRGBA(128, 64, 32, 255);
EXPECT_FLOAT_EQ(color.x, 128.0f / 255.0f); EXPECT_FLOAT_EQ(color.x, 128.0f / 255.0f);
@@ -50,7 +50,7 @@ TEST_F(ColorTest, FromRGBA)
EXPECT_FLOAT_EQ(color.w, 1.0f); EXPECT_FLOAT_EQ(color.w, 1.0f);
} }
TEST_F(ColorTest, FromHSV) TEST_F(UnitTestColor, FromHSV)
{ {
Color color = Color::FromHSV(0.0f, 1.0f, 1.0f); // Red in HSV Color color = Color::FromHSV(0.0f, 1.0f, 1.0f); // Red in HSV
EXPECT_FLOAT_EQ(color.x, 1.0f); EXPECT_FLOAT_EQ(color.x, 1.0f);
@@ -60,7 +60,7 @@ TEST_F(ColorTest, FromHSV)
} }
// Test HSV conversion // Test HSV conversion
TEST_F(ColorTest, ToHSV) TEST_F(UnitTestColor, ToHSV)
{ {
HSV hsv = color1.ToHSV(); // Red color HSV hsv = color1.ToHSV(); // Red color
EXPECT_FLOAT_EQ(hsv.m_hue, 0.0f); EXPECT_FLOAT_EQ(hsv.m_hue, 0.0f);
@@ -69,7 +69,7 @@ TEST_F(ColorTest, ToHSV)
} }
// Test color blending // Test color blending
TEST_F(ColorTest, Blend) TEST_F(UnitTestColor, Blend)
{ {
Color blended = color1.Blend(color2, 0.5f); Color blended = color1.Blend(color2, 0.5f);
EXPECT_FLOAT_EQ(blended.x, 0.5f); EXPECT_FLOAT_EQ(blended.x, 0.5f);
@@ -79,7 +79,7 @@ TEST_F(ColorTest, Blend)
} }
// Test predefined colors // Test predefined colors
TEST_F(ColorTest, PredefinedColors) TEST_F(UnitTestColor, PredefinedColors)
{ {
Color red = Color::Red(); Color red = Color::Red();
Color green = Color::Green(); Color green = Color::Green();
@@ -102,7 +102,7 @@ TEST_F(ColorTest, PredefinedColors)
} }
// Test non-member function: Blend for Vector3 // Test non-member function: Blend for Vector3
TEST_F(ColorTest, BlendVector3) TEST_F(UnitTestColor, BlendVector3)
{ {
omath::Vector3 v1(1.0f, 0.0f, 0.0f); // Red omath::Vector3 v1(1.0f, 0.0f, 0.0f); // Red
omath::Vector3 v2(0.0f, 1.0f, 0.0f); // Green omath::Vector3 v2(0.0f, 1.0f, 0.0f); // Green

View File

@@ -12,7 +12,5 @@ TEST(UnitTestProjection, IsPointOnScreen)
const omath::projection::Camera camera({0.f, 0.f, 0.f}, {0, 0.f, 0.f} , {1920.f, 1080.f}, 110.f, 0.1f, 500.f); const omath::projection::Camera camera({0.f, 0.f, 0.f}, {0, 0.f, 0.f} , {1920.f, 1080.f}, 110.f, 0.1f, 500.f);
const auto proj = camera.WorldToScreen({100, 0, 15}); const auto proj = camera.WorldToScreen({100, 0, 15});
if (proj)
std::print("{} {}", proj->x, proj->y);
EXPECT_TRUE(proj.has_value()); EXPECT_TRUE(proj.has_value());
} }