Changeset f5191b4 in mainline

Timestamp:

2020-01-28T09:17:35Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4645b2c

Parents:

cc90846

git-author:

Jiri Svoboda <jiri@…> (2020-01-27 19:17:32)

git-committer:

Jiri Svoboda <jiri@…> (2020-01-28 09:17:35)

Message:

Fix unit test failures

Location:

uspace/srv/hid/display

Files:

• display.c (modified) (1 diff)
• test/display.c (modified) (1 diff)
• test/window.c (modified) (1 diff)
• window.c (modified) (2 diffs)

uspace/srv/hid/display/display.c

@@ -463 +463 @@
 
         gc = ds_display_get_gc(disp); // XXX
+        if (gc == NULL)
+                return EOK;
 
         rc = gfx_set_color(gc, disp->bg_color);

uspace/srv/hid/display/test/display.c

@@ -396 +396 @@
         PCUT_ASSERT_EQUALS(w1, seat->focus);
 
+        event.type = PTD_RELEASE;
+        event.btn_num = 1;
+        rc = ds_display_post_ptd_event(disp, &event);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_FALSE(called_cb);
+
         event.type = PTD_MOVE;
         event.dmove.x = -400 + 10;

uspace/srv/hid/display/test/window.c

@@ -125 +125 @@
 
         PCUT_ASSERT_INT_EQUALS(dsw_moving, wnd->state);
-        PCUT_ASSERT_INT_EQUALS(wnd->dpos.x, 0);
-        PCUT_ASSERT_INT_EQUALS(wnd->dpos.y, 0);
+        PCUT_ASSERT_INT_EQUALS(wnd->dpos.x, 1);
+        PCUT_ASSERT_INT_EQUALS(wnd->dpos.y, 2);
 
         event.type = POS_RELEASE;

uspace/srv/hid/display/window.c

@@ -301 +301 @@
                 wnd->pixelmap.height = dims.y;
                 wnd->pixelmap.data = alloc.pixels;
-        }
-
-        if (wnd->pixelmap.data == NULL) {
-                rc = ENOMEM;
-                goto error;
+
+                if (wnd->pixelmap.data == NULL) {
+                        rc = ENOMEM;
+                        goto error;
+                }
         }
 
@@ -382 +382 @@
         }
 
+        /* This can happen in unit tests */
+        if (wnd->bitmap == NULL)
+                return EOK;
+
         return gfx_bitmap_render(wnd->bitmap, brect, &wnd->dpos);
 }