More tests

Author: kunitoki

modules/yup_graphics/primitives/yup_Rectangle.h

@@ -2091,21 +2091,21 @@ template <class ValueType>
 template <class T>
 [[nodiscard]] constexpr Rectangle<T> Size<ValueType>::toRectangle() const noexcept
 {
-    return { static_cast<T> (0), static_cast<T> (0), *this };
+    return { static_cast<T> (0), static_cast<T> (0), static_cast<T> (width), static_cast<T> (height) };
 }
 
 template <class ValueType>
 template <class T>
 [[nodiscard]] constexpr Rectangle<T> Size<ValueType>::toRectangle (T x, T y) const noexcept
 {
-    return { x, y, *this };
+    return { x, y, static_cast<T> (width), static_cast<T> (height) };
 }
 
 template <class ValueType>
 template <class T>
 [[nodiscard]] constexpr Rectangle<T> Size<ValueType>::toRectangle (Point<T> xy) const noexcept
 {
-    return { xy, *this };
+    return { xy, static_cast<T> (width), static_cast<T> (height) };
 }
 
 } // namespace yup

tests/yup_graphics/yup_Size.cpp

@@ -151,6 +151,10 @@ TEST (SizeTests, PrimitiveConversions)
     EXPECT_FLOAT_EQ (toPoint.getX(), 3.7f);
     EXPECT_FLOAT_EQ (toPoint.getY(), 4.2f);
 
+    auto toPointInt = s.toPoint<int>();
+    EXPECT_EQ (toPointInt.getX(), 3);
+    EXPECT_EQ (toPointInt.getY(), 4);
+
     auto toRectangle1 = s.toRectangle();
     EXPECT_FLOAT_EQ (toRectangle1.getX(), 0.0f);
     EXPECT_FLOAT_EQ (toRectangle1.getY(), 0.0f);
@@ -168,23 +172,47 @@ TEST (SizeTests, PrimitiveConversions)
     EXPECT_FLOAT_EQ (toRectangle3.getY(), 2.9f);
     EXPECT_FLOAT_EQ (toRectangle3.getWidth(), 3.7f);
     EXPECT_FLOAT_EQ (toRectangle3.getHeight(), 4.2f);
+
+    auto toRectangleInt = s.toRectangle<int>();
+    EXPECT_EQ (toRectangleInt.getX(), 0);
+    EXPECT_EQ (toRectangleInt.getY(), 0);
+    EXPECT_EQ (toRectangleInt.getWidth(), 3);
+    EXPECT_EQ (toRectangleInt.getHeight(), 4);
 }
 
 TEST (SizeTests, ArithmeticOperators)
 {
-    Size<float> s (2.0f, 3.0f);
-    auto mul = s * 2.0f;
-    EXPECT_FLOAT_EQ (mul.getWidth(), 4.0f);
-    EXPECT_FLOAT_EQ (mul.getHeight(), 6.0f);
-    s *= 0.5f;
-    EXPECT_FLOAT_EQ (s.getWidth(), 1.0f);
-    EXPECT_FLOAT_EQ (s.getHeight(), 1.5f);
-    auto div = mul / 2.0f;
-    EXPECT_FLOAT_EQ (div.getWidth(), 2.0f);
-    EXPECT_FLOAT_EQ (div.getHeight(), 3.0f);
-    mul /= 2.0f;
-    EXPECT_FLOAT_EQ (mul.getWidth(), 2.0f);
-    EXPECT_FLOAT_EQ (mul.getHeight(), 3.0f);
+    {
+        Size<int> s (2, 4);
+        auto mul = s * 2;
+        EXPECT_FLOAT_EQ (mul.getWidth(), 4);
+        EXPECT_FLOAT_EQ (mul.getHeight(), 8);
+        s *= 2;
+        EXPECT_FLOAT_EQ (s.getWidth(), 4);
+        EXPECT_FLOAT_EQ (s.getHeight(), 8);
+        auto div = mul / 2;
+        EXPECT_FLOAT_EQ (div.getWidth(), 2);
+        EXPECT_FLOAT_EQ (div.getHeight(), 4);
+        mul /= 2;
+        EXPECT_FLOAT_EQ (mul.getWidth(), 2);
+        EXPECT_FLOAT_EQ (mul.getHeight(), 4);
+    }
+
+    {
+        Size<float> s (2.0f, 3.0f);
+        auto mul = s * 2.0f;
+        EXPECT_FLOAT_EQ (mul.getWidth(), 4.0f);
+        EXPECT_FLOAT_EQ (mul.getHeight(), 6.0f);
+        s *= 0.5f;
+        EXPECT_FLOAT_EQ (s.getWidth(), 1.0f);
+        EXPECT_FLOAT_EQ (s.getHeight(), 1.5f);
+        auto div = mul / 2.0f;
+        EXPECT_FLOAT_EQ (div.getWidth(), 2.0f);
+        EXPECT_FLOAT_EQ (div.getHeight(), 3.0f);
+        mul /= 2.0f;
+        EXPECT_FLOAT_EQ (mul.getWidth(), 2.0f);
+        EXPECT_FLOAT_EQ (mul.getHeight(), 3.0f);
+    }
 }
 
 TEST (SizeTests, EqualityAndApproxEqual)