Changeset c6f00b40 in mainline for uspace/lib/ui/test

Timestamp:

2020-11-01T22:49:05Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4ac11ff

Parents:

4df6607

git-author:

Jiri Svoboda <jiri@…> (2020-11-01 22:47:03)

git-committer:

Jiri Svoboda <jiri@…> (2020-11-01 22:49:05)

Message:

Add virtual destructor for UI control

Location:

uspace/lib/ui/test

Files:

• control.c (modified) (5 diffs)
• fixed.c (modified) (5 diffs)

uspace/lib/ui/test/control.c

@@ -21 +21 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * DATA, OR PROFITS; OR BUSINESS INTvvhhzccgggrERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
@@ -39 +39 @@
 PCUT_TEST_SUITE(control);
 
+static void test_ctl_destroy(void *);
 static errno_t test_ctl_paint(void *);
 static ui_evclaim_t test_ctl_pos_event(void *, pos_event_t *);
 
 static ui_control_ops_t test_ctl_ops = {
+        .destroy = test_ctl_destroy,
         .paint = test_ctl_paint,
         .pos_event = test_ctl_pos_event
@@ -53 +55 @@
         /** Result code to return */
         errno_t rc;
+
+        /** @c true iff destroy was called */
+        bool destroy;
 
         /** @c true iff paint was called */
@@ -80 +85 @@
 {
         ui_control_delete(NULL);
+}
+
+/** Test sending destroy request to control */
+PCUT_TEST(destroy)
+{
+        ui_control_t *control = NULL;
+        test_resp_t resp;
+        errno_t rc;
+
+        rc = ui_control_new(&test_ctl_ops, &resp, &control);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(control);
+
+        resp.rc = EOK;
+        resp.destroy = false;
+
+        ui_control_destroy(control);
+        PCUT_ASSERT_TRUE(resp.destroy);
 }
 
@@ -143 +166 @@
 }
 
+static void test_ctl_destroy(void *arg)
+{
+        test_resp_t *resp = (test_resp_t *) arg;
+
+        resp->destroy = true;
+}
+
 static errno_t test_ctl_paint(void *arg)
 {

uspace/lib/ui/test/fixed.c

@@ -38 +38 @@
 PCUT_TEST_SUITE(fixed);
 
+static void test_ctl_destroy(void *);
 static errno_t test_ctl_paint(void *);
 static ui_evclaim_t test_ctl_pos_event(void *, pos_event_t *);
 
 static ui_control_ops_t test_ctl_ops = {
+        .destroy = test_ctl_destroy,
         .paint = test_ctl_paint,
         .pos_event = test_ctl_pos_event
@@ -52 +54 @@
         /** Result code to return */
         errno_t rc;
-
+        /** @c true iff destroy was called */
+        bool destroy;
         /** @c true iff paint was called */
         bool paint;
-
         /** @c true iff pos_event was called */
         bool pos;
@@ -113 +115 @@
 
         ui_fixed_destroy(fixed);
+        ui_control_delete(control);
+}
+
+/** ui_fixed_destroy() delivers destroy request to control */
+PCUT_TEST(destroy)
+{
+        ui_fixed_t *fixed = NULL;
+        ui_control_t *control;
+        test_resp_t resp;
+        errno_t rc;
+
+        rc = ui_fixed_create(&fixed);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_control_new(&test_ctl_ops, (void *) &resp, &control);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_fixed_add(fixed, control);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        resp.destroy = false;
+
+        ui_fixed_destroy(fixed);
+        PCUT_ASSERT_TRUE(resp.destroy);
 }
 
@@ -146 +172 @@
         PCUT_ASSERT_TRUE(resp.paint);
 
-        ui_fixed_remove(fixed, control);
         ui_fixed_destroy(fixed);
 }
@@ -186 +211 @@
         PCUT_ASSERT_INT_EQUALS(resp.pevent.vpos, event.vpos);
 
-        ui_fixed_remove(fixed, control);
-        ui_fixed_destroy(fixed);
+        ui_fixed_destroy(fixed);
+}
+
+static void test_ctl_destroy(void *arg)
+{
+        test_resp_t *resp = (test_resp_t *) arg;
+
+        resp->destroy = true;
 }