Changes in uspace/lib/ui/test/slider.c [7470d97:5ef85c0] in mainline

File:

• uspace/lib/ui/test/slider.c (modified) (12 diffs)

uspace/lib/ui/test/slider.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -99 +99 @@
         errno_t rc;
 
-        rc = ui_slider_create(NULL, "Hello", &slider);
+        rc = ui_slider_create(NULL, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_NOT_NULL(slider);
@@ -119 +119 @@
         errno_t rc;
 
-        rc = ui_slider_create(NULL, "Hello", &slider);
+        rc = ui_slider_create(NULL, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -135 +135 @@
         errno_t rc;
 
-        rc = ui_slider_create(NULL, "Hello", &slider);
+        rc = ui_slider_create(NULL, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -152 +152 @@
 }
 
-/** Paint slider */
-PCUT_TEST(paint)
+/** Paint slider in graphics mode */
+PCUT_TEST(paint_gfx)
 {
         errno_t rc;
@@ -169 +169 @@
         PCUT_ASSERT_NOT_NULL(resource);
 
-        rc = ui_slider_create(resource, "Hello", &slider);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_slider_paint(slider);
+        rc = ui_slider_create(resource, &slider);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_slider_paint_gfx(slider);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_slider_destroy(slider);
+        ui_resource_destroy(resource);
+
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** Paint slider in text mode */
+PCUT_TEST(paint_text)
+{
+        errno_t rc;
+        gfx_context_t *gc = NULL;
+        test_gc_t tgc;
+        ui_resource_t *resource = NULL;
+        ui_slider_t *slider;
+
+        memset(&tgc, 0, sizeof(tgc));
+        rc = gfx_context_new(&ops, &tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_resource_create(gc, false, &resource);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(resource);
+
+        rc = ui_slider_create(resource, &slider);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_slider_paint_text(slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -189 +219 @@
         test_cb_resp_t resp;
 
-        rc = ui_slider_create(NULL, "Hello", &slider);
+        rc = ui_slider_create(NULL, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -195 +225 @@
         ui_slider_moved(slider, 42);
 
-        /* Moved with callback not implementing clicked */
+        /* Moved with callback not implementing moved */
         ui_slider_set_cb(slider, &dummy_slider_cb, NULL);
         ui_slider_moved(slider, 42);
@@ -230 +260 @@
         PCUT_ASSERT_NOT_NULL(resource);
 
-        rc = ui_slider_create(resource, "Hello", &slider);
+        rc = ui_slider_create(resource, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -286 +316 @@
         PCUT_ASSERT_NOT_NULL(resource);
 
-        rc = ui_slider_create(resource, "Hello", &slider);
+        rc = ui_slider_create(resource, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -350 +380 @@
         PCUT_ASSERT_NOT_NULL(resource);
 
-        rc = ui_slider_create(resource, "Hello", &slider);
+        rc = ui_slider_create(resource, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -411 +441 @@
         PCUT_ASSERT_NOT_NULL(resource);
 
-        rc = ui_slider_create(resource, "Hello", &slider);
+        rc = ui_slider_create(resource, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);