Changeset 7e38970d in mainline for uspace/lib/gfx/test/coord.c

Timestamp:

2020-12-07T00:08:37Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jxsvoboda-gfx' into master

File:

• uspace/lib/gfx/test/coord.c (modified) (2 diffs)

uspace/lib/gfx/test/coord.c

@@ -34 +34 @@
 PCUT_TEST_SUITE(coord);
 
+/** gfx_coord_div_rneg rounds towards negative numbers */
+PCUT_TEST(coord_div_rneg)
+{
+        PCUT_ASSERT_INT_EQUALS(-3, gfx_coord_div_rneg(-7, 3));
+        PCUT_ASSERT_INT_EQUALS(-2, gfx_coord_div_rneg(-6, 3));
+        PCUT_ASSERT_INT_EQUALS(-2, gfx_coord_div_rneg(-5, 3));
+        PCUT_ASSERT_INT_EQUALS(-2, gfx_coord_div_rneg(-4, 3));
+        PCUT_ASSERT_INT_EQUALS(-1, gfx_coord_div_rneg(-3, 3));
+        PCUT_ASSERT_INT_EQUALS(-1, gfx_coord_div_rneg(-2, 3));
+        PCUT_ASSERT_INT_EQUALS(-1, gfx_coord_div_rneg(-1, 3));
+        PCUT_ASSERT_INT_EQUALS(0, gfx_coord_div_rneg(0, 3));
+        PCUT_ASSERT_INT_EQUALS(0, gfx_coord_div_rneg(1, 3));
+        PCUT_ASSERT_INT_EQUALS(0, gfx_coord_div_rneg(2, 3));
+        PCUT_ASSERT_INT_EQUALS(1, gfx_coord_div_rneg(3, 3));
+        PCUT_ASSERT_INT_EQUALS(1, gfx_coord_div_rneg(4, 3));
+        PCUT_ASSERT_INT_EQUALS(1, gfx_coord_div_rneg(5, 3));
+        PCUT_ASSERT_INT_EQUALS(2, gfx_coord_div_rneg(6, 3));
+}
+
 /** gfx_coord2_add should add two coordinate vectors */
 PCUT_TEST(coord2_add)
@@ -578 +597 @@
 }
 
+/** Center rectangle on rectangle */
+PCUT_TEST(rect_ctr_on_rect)
+{
+        gfx_rect_t a;
+        gfx_rect_t b;
+        gfx_rect_t dest;
+
+        /* Dimensions: 20 x 20 */
+        b.p0.x = 10;
+        b.p0.y = 20;
+        b.p1.x = 30;
+        b.p1.y = 40;
+
+        /* Dimensions: 20 x 20 */
+        a.p0.x = 100;
+        a.p0.y = 200;
+        a.p1.x = 120;
+        a.p1.y = 220;
+
+        /* Centering rectangle of same size should give us the same rectangle */
+        gfx_rect_ctr_on_rect(&a, &b, &dest);
+        PCUT_ASSERT_INT_EQUALS(b.p0.x, dest.p0.x);
+        PCUT_ASSERT_INT_EQUALS(b.p0.y, dest.p0.y);
+        PCUT_ASSERT_INT_EQUALS(b.p1.x, dest.p1.x);
+        PCUT_ASSERT_INT_EQUALS(b.p1.y, dest.p1.y);
+
+        /* Dimensions: 10 x 10 */
+        a.p0.x = 100;
+        a.p0.y = 200;
+        a.p1.x = 110;
+        a.p1.y = 210;
+
+        gfx_rect_ctr_on_rect(&a, &b, &dest);
+        PCUT_ASSERT_INT_EQUALS(15, dest.p0.x);
+        PCUT_ASSERT_INT_EQUALS(25, dest.p0.y);
+        PCUT_ASSERT_INT_EQUALS(25, dest.p1.x);
+        PCUT_ASSERT_INT_EQUALS(35, dest.p1.y);
+}
+
 /** Sort span points that are already sorted should produde indentical points */
 PCUT_TEST(rect_points_sort_sorted)