Changes in uspace/srv/hid/display/test/window.c [dd7df1c:6828a56] in mainline

File:

• uspace/srv/hid/display/test/window.c (modified) (4 diffs)

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

@@ -1109 +1109 @@
         PCUT_ASSERT_EQUALS(wnd->display->cursor[dcurs_arrow], wnd->cursor);
 
-        // Check that invalid cursors cannot be set: ignore enum conversions
-        // as we are out-of-bounds
-#pragma GCC diagnostic push
-#if defined(__GNUC__) && (__GNUC__ >= 10)
-#pragma GCC diagnostic ignored "-Wenum-conversion"
-#endif
         rc = ds_window_set_cursor(wnd, dcurs_limit);
         PCUT_ASSERT_ERRNO_VAL(EINVAL, rc);
@@ -1122 +1116 @@
         PCUT_ASSERT_ERRNO_VAL(EINVAL, rc);
         PCUT_ASSERT_EQUALS(wnd->display->cursor[dcurs_arrow], wnd->cursor);
-#pragma GCC diagnostic pop
 
         rc = ds_window_set_cursor(wnd, dcurs_size_lr);
@@ -1176 +1169 @@
 }
 
-/** ds_window_find_next() finds next window by flags */
-PCUT_TEST(window_find_next)
+/** ds_window_find_alt() finds alternate window by flags */
+PCUT_TEST(window_find_alt)
 {
         gfx_context_t *gc;
@@ -1217 +1210 @@
         w2->flags |= wndf_system;
 
-        wnd = ds_window_find_next(w0, wndf_minimized);
+        wnd = ds_window_find_alt(w0, wndf_minimized);
         PCUT_ASSERT_EQUALS(w1, wnd);
 
-        wnd = ds_window_find_next(w0, wndf_system);
+        wnd = ds_window_find_alt(w0, wndf_system);
         PCUT_ASSERT_EQUALS(w2, wnd);
 
-        wnd = ds_window_find_next(w0, wndf_maximized);
-        PCUT_ASSERT_NULL(wnd);
-
-        ds_window_destroy(w0);
-        ds_window_destroy(w1);
-        ds_window_destroy(w2);
-        ds_seat_destroy(seat);
-        ds_client_destroy(client);
-        ds_display_destroy(disp);
-}
-
-/** ds_window_find_prev() finds previous window by flags */
-PCUT_TEST(window_find_prev)
-{
-        gfx_context_t *gc;
-        ds_display_t *disp;
-        ds_client_t *client;
-        ds_seat_t *seat;
-        ds_window_t *w0;
-        ds_window_t *w1;
-        ds_window_t *w2;
-        ds_window_t *wnd;
-        display_wnd_params_t params;
-        errno_t rc;
-
-        rc = gfx_context_new(&dummy_ops, NULL, &gc);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ds_display_create(gc, df_none, &disp);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ds_client_create(disp, NULL, NULL, &client);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ds_seat_create(disp, "Alice", &seat);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        display_wnd_params_init(&params);
-        params.rect.p0.x = params.rect.p0.y = 0;
-        params.rect.p1.x = params.rect.p1.y = 1;
-
-        rc = ds_window_create(client, &params, &w2);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        w2->flags |= wndf_system;
-
-        rc = ds_window_create(client, &params, &w1);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        w1->flags |= wndf_minimized;
-
-        rc = ds_window_create(client, &params, &w0);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        wnd = ds_window_find_prev(w0, wndf_minimized);
-        PCUT_ASSERT_EQUALS(w1, wnd);
-
-        wnd = ds_window_find_prev(w0, wndf_system);
-        PCUT_ASSERT_EQUALS(w2, wnd);
-
-        wnd = ds_window_find_prev(w0, wndf_maximized);
+        wnd = ds_window_find_alt(w0, wndf_maximized);
         PCUT_ASSERT_NULL(wnd);