diff options
Diffstat (limited to 'test/utils/rectangle.cpp')
| -rw-r--r-- | test/utils/rectangle.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/utils/rectangle.cpp b/test/utils/rectangle.cpp index 343d442f..faee50f9 100644 --- a/test/utils/rectangle.cpp +++ b/test/utils/rectangle.cpp @@ -54,10 +54,10 @@ namespace usdx int coords[] = { 100, 150, 200, 250 }; Rectangle<int> rect(coords); - CPPUNIT_ASSERT(rect.get_left() == 100); - CPPUNIT_ASSERT(rect.get_top() == 150); - CPPUNIT_ASSERT(rect.get_width() == 200); - CPPUNIT_ASSERT(rect.get_height() == 250); + CPPUNIT_ASSERT_EQUAL(rect.get_left(), 100); + CPPUNIT_ASSERT_EQUAL(rect.get_top(), 150); + CPPUNIT_ASSERT_EQUAL(rect.get_width(), 200); + CPPUNIT_ASSERT_EQUAL(rect.get_height(), 250); } void testIntersectInner() @@ -66,10 +66,10 @@ namespace usdx Rectangle<int> inner(120, 170, 180, 200); Rectangle<int> intersect = outer.intersect(inner); - CPPUNIT_ASSERT(intersect.get_point1().get_x() == 120); - CPPUNIT_ASSERT(intersect.get_point1().get_y() == 170); - CPPUNIT_ASSERT(intersect.get_point2().get_x() == 180); - CPPUNIT_ASSERT(intersect.get_point2().get_y() == 200); + CPPUNIT_ASSERT_EQUAL(intersect.get_point1().get_x(), 120); + CPPUNIT_ASSERT_EQUAL(intersect.get_point1().get_y(), 170); + CPPUNIT_ASSERT_EQUAL(intersect.get_point2().get_x(), 180); + CPPUNIT_ASSERT_EQUAL(intersect.get_point2().get_y(), 200); } void testIntersectOuter() @@ -78,10 +78,10 @@ namespace usdx Rectangle<int> inner(100, 150, 200, 250); Rectangle<int> intersect = outer.intersect(inner); - CPPUNIT_ASSERT(intersect.get_point1().get_x() == 120); - CPPUNIT_ASSERT(intersect.get_point1().get_y() == 170); - CPPUNIT_ASSERT(intersect.get_point2().get_x() == 180); - CPPUNIT_ASSERT(intersect.get_point2().get_y() == 200); + CPPUNIT_ASSERT_EQUAL(intersect.get_point1().get_x(), 120); + CPPUNIT_ASSERT_EQUAL(intersect.get_point1().get_y(), 170); + CPPUNIT_ASSERT_EQUAL(intersect.get_point2().get_x(), 180); + CPPUNIT_ASSERT_EQUAL(intersect.get_point2().get_y(), 200); } }; |