tdb2: test: convert (non-invasive) run tests to api tests.

[ccan] / ccan / tdb2 / test / run-tdb1-check.c

diff --git a/ccan/tdb2/test/run-tdb1-check.c b/ccan/tdb2/test/run-tdb1-check.c
index 017eb8328acfa1a0e92e2b12d57a630b79c16925..e939d04036fefeb1461adb3faf73024ac9347565 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-check.c
+++ b/ccan/tdb2/test/run-tdb1-check.c
@@ -8,48 +8,52 @@ int main(int argc, char *argv[])
 {
        struct tdb_context *tdb;
        TDB_DATA key, data;
+       union tdb_attribute hsize;
+
+       hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+       hsize.base.next = &tap_log_attr;
+       hsize.tdb1_hashsize.hsize = 1;
 
        plan_tests(13);
-       tdb = tdb1_open("run-check.tdb", 1, TDB_DEFAULT,
-                       O_CREAT|O_TRUNC|O_RDWR, 0600, &tap_log_attr);
+       tdb = tdb_open("run-check.tdb1", TDB_VERSION1,
+                      O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 
        ok1(tdb);
-       ok1(tdb1_check(tdb, NULL, NULL) == 0);
+       ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
 
        key.dsize = strlen("hi");
        key.dptr = (void *)"hi";
        data.dsize = strlen("world");
        data.dptr = (void *)"world";
 
-       ok1(tdb1_store(tdb, key, data, TDB_INSERT) == 0);
-       ok1(tdb1_check(tdb, NULL, NULL) == 0);
-       tdb1_close(tdb);
+       ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
+       ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
+       tdb_close(tdb);
 
-       tdb = tdb1_open("run-check.tdb", 1024, 0, O_RDWR, 0,
-                       &tap_log_attr);
+       tdb = tdb_open("run-check.tdb1", TDB_VERSION1, O_RDWR, 0, &tap_log_attr);
        ok1(tdb);
-       ok1(tdb1_check(tdb, NULL, NULL) == 0);
-       tdb1_close(tdb);
+       ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
+       tdb_close(tdb);
 
-       tdb = tdb1_open("test/tdb1.corrupt", 1024, 0, O_RDWR, 0,
+       tdb = tdb_open("test/tdb1.corrupt", TDB_VERSION1, O_RDWR, 0,
                        &tap_log_attr);
        ok1(tdb);
-       ok1(tdb1_check(tdb, NULL, NULL) == -1);
+       ok1(tdb_check(tdb, NULL, NULL) == TDB_ERR_CORRUPT);
        ok1(tdb_error(tdb) == TDB_ERR_CORRUPT);
-       tdb1_close(tdb);
+       tdb_close(tdb);
 
        /* Big and little endian should work! */
-       tdb = tdb1_open("test/old-nohash-le.tdb1", 1024, 0, O_RDWR, 0,
-                       &tap_log_attr);
+       tdb = tdb_open("test/old-nohash-le.tdb1", TDB_VERSION1, O_RDWR, 0,
+                      &tap_log_attr);
        ok1(tdb);
-       ok1(tdb1_check(tdb, NULL, NULL) == 0);
-       tdb1_close(tdb);
+       ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
+       tdb_close(tdb);
 
-       tdb = tdb1_open("test/old-nohash-be.tdb1", 1024, 0, O_RDWR, 0,
+       tdb = tdb_open("test/old-nohash-be.tdb1", TDB_VERSION1, O_RDWR, 0,
                        &tap_log_attr);
        ok1(tdb);
-       ok1(tdb1_check(tdb, NULL, NULL) == 0);
-       tdb1_close(tdb);
+       ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
+       tdb_close(tdb);
 
        return exit_status();
 }