object: Let create_simple() accept an optional destructor.

[sysdb.git] / t / core / object_test.c

diff --git a/t/core/object_test.c b/t/core/object_test.c
index e00d300177b4694a5fd2b6d90a1ee9d9a3e72c84..85e95c3a8b121cf590f6eee1e0de55a70ed703da 100644 (file)
--- a/t/core/object_test.c
+++ b/t/core/object_test.c
@@ -90,6 +90,12 @@ START_TEST(test_obj_create)
        fail_unless(obj->type.size == test_type.size,
                        "after sdb_object_create(): type size mismatch; got: %zu; "
                        "expected: %zu", obj->type.size, test_type.size);
+       fail_unless(obj->type.init == obj_init_noop,
+                       "after sdb_object_create(): type init = %p; exptected: %p",
+                       obj->type.init, obj_init_noop);
+       fail_unless(obj->type.destroy == obj_destroy_noop,
+                       "after sdb_object_create(): type destroy = %p; exptected: %p",
+                       obj->type.destroy, obj_destroy_noop);
        fail_unless(obj->ref_cnt == 1,
                        "after sdb_object_create(): obj->ref_cnt = %d; expected: 1",
                        obj->ref_cnt);
@@ -107,11 +113,6 @@ START_TEST(test_obj_create)
                        "sdb_object_create() did not initialize data to zero");
 
        sdb_object_deref(obj);
-       /* the memory address at 'obj' is no longer valid but usually this check
-        * should still work */
-       fail_unless(obj->ref_cnt == 0,
-                       "after sdb_object_deref(): obj->ref_cnt = %d; expected: 0",
-                       obj->ref_cnt);
        fail_unless(destroy_noop_called == 1,
                        "sdb_object_deref() did not call object's destroy function");
 
@@ -156,6 +157,35 @@ START_TEST(test_obj_create)
        fail_unless(obj != NULL,
                        "sdb_object_create() fails without destroy callback");
        sdb_object_deref(obj);
+
+       init_noop_called = 0;
+       obj = sdb_object_create_simple(name, sizeof(struct noop), NULL);
+       fail_unless(obj != NULL,
+                       "sdb_object_create_simple() = NULL; expected: <obj>");
+       fail_unless(obj->type.size == sizeof(struct noop),
+                       "sdb_object_create_simple() created object of size %zu; "
+                       "expected: %zu", obj->type.size, sizeof(struct noop));
+       fail_unless(obj->type.init == NULL,
+                       "sdb_object_create_simple() did not set init=NULL");
+       fail_unless(obj->type.destroy == NULL,
+                       "sdb_object_create_simple() did not set destroy=NULL");
+       fail_unless(init_noop_called == 0,
+                       "sdb_object_create_simple() unexpectedly called noop's init");
+       sdb_object_deref(obj);
+
+       obj = sdb_object_create_T(NULL, struct noop);
+       fail_unless(obj != NULL,
+                       "sdb_object_create_simple() = NULL; expected: <obj>");
+       fail_unless(obj->type.size == sizeof(struct noop),
+                       "sdb_object_create_simple() created object of size %zu; "
+                       "expected: %zu", obj->type.size, sizeof(struct noop));
+       fail_unless(obj->type.init == NULL,
+                       "sdb_object_create_simple() did not set init=NULL");
+       fail_unless(obj->type.destroy == NULL,
+                       "sdb_object_create_simple() did not set destroy=NULL");
+       fail_unless(init_noop_called == 0,
+                       "sdb_object_create_simple() unexpectedly called noop's init");
+       sdb_object_deref(obj);
 }
 END_TEST
 
@@ -248,10 +278,6 @@ START_TEST(test_obj_ref)
        /* test_obj_create already checks the ref_cnt == 1 case */
        obj->ref_cnt = 0;
        sdb_object_deref(obj);
-       fail_unless(obj->ref_cnt <= 0,
-                       "after db_object_deref(): obj->ref_cnt = %d; expected: <= 0",
-                       obj->ref_cnt);
-
        fail_unless(init_noop_called == 1,
                        "after some sdb_object_{de,}ref(); object's init called %d times; "
                        "expected: 1", init_noop_called);