include: Fix pointer casting and add check_expected_ptr()

[platform/upstream/cmocka.git] / example / customer_database_test.c

diff --git a/example/customer_database_test.c b/example/customer_database_test.c
index 1d65ce4..2f78b05 100644 (file)
--- a/example/customer_database_test.c
+++ b/example/customer_database_test.c
@@ -30,8 +30,8 @@ static unsigned int mock_query_database(DatabaseConnection* const connection,
     (void) connection; /* unused */
     (void) query_string; /* unused */
 
-    *results = (void**)((size_t)mock());
-    return (unsigned int)mock();
+    *results = (void **)mock_ptr_type(int *);
+    return mock_ptr_type(int);
 }
 
 /* Mock of the connect to database function. */
@@ -68,18 +68,22 @@ static void test_get_customer_id_by_name(void **state) {
     };
     /* Return a single customer ID when mock_query_database() is called. */
     int customer_ids = 543;
+    int rc;
 
     (void) state; /* unused */
 
-    will_return(mock_query_database, &customer_ids);
+    will_return(mock_query_database,
+                cast_ptr_to_largest_integral_type(&customer_ids));
     will_return(mock_query_database, 1);
-    assert_int_equal(get_customer_id_by_name(&connection, "john doe"), 543);
+
+    rc = get_customer_id_by_name(&connection, "john doe");
+    assert_int_equal(rc, 543);
 }
 
 int main(void) {
-    const UnitTest tests[] = {
-        unit_test(test_connect_to_customer_database),
-        unit_test(test_get_customer_id_by_name),
+    const struct CMUnitTest tests[] = {
+        cmocka_unit_test(test_connect_to_customer_database),
+        cmocka_unit_test(test_get_customer_id_by_name),
     };
-    return run_tests(tests);
+    return cmocka_run_group_tests(tests, NULL, NULL);
 }