Changes in uspace/lib/ui/test/pbutton.c [3c54869:7470d97] in mainline

File:

• uspace/lib/ui/test/pbutton.c (modified) (10 diffs)

uspace/lib/ui/test/pbutton.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -63 +63 @@
 
 static void test_pbutton_clicked(ui_pbutton_t *, void *);
-static void test_pbutton_down(ui_pbutton_t *, void *);
-static void test_pbutton_up(ui_pbutton_t *, void *);
 
 static ui_pbutton_cb_t test_pbutton_cb = {
-        .clicked = test_pbutton_clicked,
-        .down = test_pbutton_down,
-        .up = test_pbutton_up
+        .clicked = test_pbutton_clicked
 };
 
@@ -94 +90 @@
 typedef struct {
         bool clicked;
-        bool down;
-        bool up;
 } test_cb_resp_t;
 
@@ -131 +125 @@
 
         ui_control_destroy(control);
-}
-
-/** Set flags sets internal field */
-PCUT_TEST(set_flags)
-{
-        ui_pbutton_t *pbutton;
-        errno_t rc;
-
-        rc = ui_pbutton_create(NULL, "Hello", &pbutton);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_pbutton_set_flags(pbutton, ui_pbf_no_text_depress);
-        PCUT_ASSERT_INT_EQUALS(ui_pbf_no_text_depress, pbutton->flags);
-
-        ui_pbutton_destroy(pbutton);
 }
 
@@ -190 +169 @@
 }
 
-/** Get light gets internal field */
-PCUT_TEST(get_light)
-{
-        ui_pbutton_t *pbutton;
-        errno_t rc;
-
-        rc = ui_pbutton_create(NULL, "Hello", &pbutton);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        pbutton->light = true;
-        PCUT_ASSERT_TRUE(ui_pbutton_get_light(pbutton));
-
-        pbutton->light = false;
-        PCUT_ASSERT_FALSE(ui_pbutton_get_light(pbutton));
-
-        ui_pbutton_destroy(pbutton);
-}
-
-/** Set light sets internal field */
-PCUT_TEST(set_light)
-{
-        ui_pbutton_t *pbutton;
-        errno_t rc;
-
-        rc = ui_pbutton_create(NULL, "Hello", &pbutton);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_pbutton_set_light(pbutton, true);
-        PCUT_ASSERT_TRUE(pbutton->light);
-
-        ui_pbutton_set_light(pbutton, false);
-        PCUT_ASSERT_FALSE(pbutton->light);
-
-        ui_pbutton_destroy(pbutton);
-}
-
-/** Set caption sets internal field */
-PCUT_TEST(set_caption)
-{
-        ui_pbutton_t *pbutton;
-        errno_t rc;
-
-        rc = ui_pbutton_create(NULL, "Hello", &pbutton);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        PCUT_ASSERT_STR_EQUALS("Hello", pbutton->caption);
-
-        rc = ui_pbutton_set_caption(pbutton, "World");
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        PCUT_ASSERT_STR_EQUALS("World", pbutton->caption);
-
-        ui_pbutton_destroy(pbutton);
-}
-
 /** Paint button */
 PCUT_TEST(paint)
@@ -301 +225 @@
 }
 
-/** Test ui_pbutton_down() */
-PCUT_TEST(down)
-{
-        errno_t rc;
-        ui_pbutton_t *pbutton;
-        test_cb_resp_t resp;
-
-        rc = ui_pbutton_create(NULL, "Hello", &pbutton);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Down with no callbacks set */
-        ui_pbutton_clicked(pbutton);
-
-        /* Down with callback not implementing down */
-        ui_pbutton_set_cb(pbutton, &dummy_pbutton_cb, NULL);
-        ui_pbutton_down(pbutton);
-
-        /* Down with real callback set */
-        resp.down = false;
-        ui_pbutton_set_cb(pbutton, &test_pbutton_cb, &resp);
-        ui_pbutton_down(pbutton);
-        PCUT_ASSERT_TRUE(resp.down);
-
-        ui_pbutton_destroy(pbutton);
-}
-
-/** Test ui_pbutton_up() */
-PCUT_TEST(up)
-{
-        errno_t rc;
-        ui_pbutton_t *pbutton;
-        test_cb_resp_t resp;
-
-        rc = ui_pbutton_create(NULL, "Hello", &pbutton);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Up with no callbacks set */
-        ui_pbutton_clicked(pbutton);
-
-        /* Up with callback not implementing up */
-        ui_pbutton_set_cb(pbutton, &dummy_pbutton_cb, NULL);
-        ui_pbutton_up(pbutton);
-
-        /* Up with real callback set */
-        resp.up = false;
-        ui_pbutton_set_cb(pbutton, &test_pbutton_cb, &resp);
-        ui_pbutton_up(pbutton);
-        PCUT_ASSERT_TRUE(resp.up);
-
-        ui_pbutton_destroy(pbutton);
-}
-
 /** Press and release button */
 PCUT_TEST(press_release)
@@ -375 +247 @@
 
         resp.clicked = false;
-        resp.down = false;
-        resp.up = false;
         ui_pbutton_set_cb(pbutton, &test_pbutton_cb, &resp);
 
@@ -385 +255 @@
         PCUT_ASSERT_TRUE(pbutton->held);
         PCUT_ASSERT_TRUE(pbutton->inside);
-        PCUT_ASSERT_TRUE(resp.down);
-        PCUT_ASSERT_FALSE(resp.up);
         PCUT_ASSERT_FALSE(resp.clicked);
 
@@ -392 +260 @@
         PCUT_ASSERT_FALSE(pbutton->held);
         PCUT_ASSERT_TRUE(pbutton->inside);
-        PCUT_ASSERT_TRUE(resp.up);
         PCUT_ASSERT_TRUE(resp.clicked);
 
@@ -721 +588 @@
 }
 
-static void test_pbutton_down(ui_pbutton_t *pbutton, void *arg)
-{
-        test_cb_resp_t *resp = (test_cb_resp_t *) arg;
-
-        resp->down = true;
-}
-
-static void test_pbutton_up(ui_pbutton_t *pbutton, void *arg)
-{
-        test_cb_resp_t *resp = (test_cb_resp_t *) arg;
-
-        resp->up = true;
-}
-
 PCUT_EXPORT(pbutton);