Update the test suite for Meshlink-tiny.

[meshlink-tiny] / test / storage-policy.c

diff --git a/test/storage-policy.c b/test/storage-policy.c
index 6885406a4a5638296e719e92f4cf7ae29516000f..6db52dad931f3bc2b706ce5a2d810ddae8c3049a 100644 (file)
--- a/test/storage-policy.c
+++ b/test/storage-policy.c
@@ -7,10 +7,14 @@
 #include <sys/time.h>
 #include <assert.h>
 
+#include "full.h"
 #include "meshlink-tiny.h"
 #include "utils.h"
 
 int main(void) {
+       init_full();
+
+       full_meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
        meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
 
        meshlink_handle_t *mesh1;
@@ -18,53 +22,53 @@ int main(void) {
 
        // Open two instances
 
-       assert(meshlink_destroy("storage-policy_conf.1"));
+       assert(full_meshlink_destroy("storage-policy_conf.1"));
        assert(meshlink_destroy("storage-policy_conf.2"));
 
-       mesh1 = meshlink_open("storage-policy_conf.1", "foo", "storage-policy", DEV_CLASS_BACKBONE);
+       mesh1 = full_meshlink_open("storage-policy_conf.1", "foo", "storage-policy", DEV_CLASS_BACKBONE);
        mesh2 = meshlink_open("storage-policy_conf.2", "bar", "storage-policy", DEV_CLASS_BACKBONE);
        assert(mesh1);
        assert(mesh2);
-       meshlink_set_storage_policy(mesh1, MESHLINK_STORAGE_DISABLED);
+       full_meshlink_set_storage_policy(mesh1, MESHLINK_STORAGE_DISABLED);
        meshlink_set_storage_policy(mesh2, MESHLINK_STORAGE_DISABLED);
 
        // Exchange data
 
-       char *export1 = meshlink_export(mesh1);
+       char *export1 = full_meshlink_export(mesh1);
        char *export2 = meshlink_export(mesh2);
 
        assert(export1);
        assert(export2);
 
-       assert(meshlink_import(mesh1, export2));
+       assert(full_meshlink_import(mesh1, export2));
        assert(meshlink_import(mesh2, export1));
 
        // Check that they know each other
 
-       assert(meshlink_get_node(mesh1, "bar"));
+       assert(full_meshlink_get_node(mesh1, "bar"));
        assert(meshlink_get_node(mesh2, "foo"));
 
-       start_meshlink_pair(mesh1, mesh2);
+       start_full_tiny_pair(mesh1, mesh2);
 
        // Close the instances and reopen them.
 
-       close_meshlink_pair(mesh1, mesh2);
+       close_full_tiny_pair(mesh1, mesh2);
 
-       mesh1 = meshlink_open("storage-policy_conf.1", "foo", "storage-policy", DEV_CLASS_BACKBONE);
+       mesh1 = full_meshlink_open("storage-policy_conf.1", "foo", "storage-policy", DEV_CLASS_BACKBONE);
        mesh2 = meshlink_open("storage-policy_conf.2", "bar", "storage-policy", DEV_CLASS_BACKBONE);
        assert(mesh1);
        assert(mesh2);
-       meshlink_set_storage_policy(mesh1, MESHLINK_STORAGE_KEYS_ONLY);
+       full_meshlink_set_storage_policy(mesh1, MESHLINK_STORAGE_KEYS_ONLY);
        meshlink_set_storage_policy(mesh2, MESHLINK_STORAGE_KEYS_ONLY);
 
        // Check that the nodes no longer know each other
 
-       assert(!meshlink_get_node(mesh1, "bar"));
+       assert(!full_meshlink_get_node(mesh1, "bar"));
        assert(!meshlink_get_node(mesh2, "foo"));
 
        // Exchange data again
 
-       assert(meshlink_import(mesh1, export2));
+       assert(full_meshlink_import(mesh1, export2));
        assert(meshlink_import(mesh2, export1));
 
        free(export1);
@@ -72,89 +76,52 @@ int main(void) {
 
        // Close the instances and reopen them.
 
-       close_meshlink_pair(mesh1, mesh2);
+       close_full_tiny_pair(mesh1, mesh2);
 
-       mesh1 = meshlink_open("storage-policy_conf.1", "foo", "storage-policy", DEV_CLASS_BACKBONE);
+       mesh1 = full_meshlink_open("storage-policy_conf.1", "foo", "storage-policy", DEV_CLASS_BACKBONE);
        mesh2 = meshlink_open("storage-policy_conf.2", "bar", "storage-policy", DEV_CLASS_BACKBONE);
        assert(mesh1);
        assert(mesh2);
-       meshlink_set_storage_policy(mesh1, MESHLINK_STORAGE_KEYS_ONLY);
+       full_meshlink_set_storage_policy(mesh1, MESHLINK_STORAGE_KEYS_ONLY);
        meshlink_set_storage_policy(mesh2, MESHLINK_STORAGE_KEYS_ONLY);
 
        // Check that the nodes know each other
 
-       assert(meshlink_get_node(mesh1, "bar"));
-       assert(meshlink_get_node(mesh2, "foo"));
-
-       // Check that we update reachability
-
-       time_t last_reachable;
-       time_t last_unreachable;
-       assert(!meshlink_get_node_reachability(mesh1, meshlink_get_node(mesh1, "bar"), &last_reachable, &last_unreachable));
-       assert(!last_reachable);
-       assert(!last_unreachable);
-
-       start_meshlink_pair(mesh1, mesh2);
-       stop_meshlink_pair(mesh1, mesh2);
-
-       assert(!meshlink_get_node_reachability(mesh1, meshlink_get_node(mesh1, "bar"), &last_reachable, &last_unreachable));
-       assert(last_reachable);
-       assert(last_unreachable);
-
-       // But have not stored it
-
-       close_meshlink_pair(mesh1, mesh2);
-
-       mesh1 = meshlink_open("storage-policy_conf.1", "foo", "storage-policy", DEV_CLASS_BACKBONE);
-       mesh2 = meshlink_open("storage-policy_conf.2", "bar", "storage-policy", DEV_CLASS_BACKBONE);
-       assert(mesh1);
-       assert(mesh2);
-       meshlink_set_storage_policy(mesh1, MESHLINK_STORAGE_KEYS_ONLY);
-       meshlink_set_storage_policy(mesh2, MESHLINK_STORAGE_KEYS_ONLY);
-
-       assert(meshlink_get_node(mesh1, "bar"));
+       assert(full_meshlink_get_node(mesh1, "bar"));
        assert(meshlink_get_node(mesh2, "foo"));
 
-       assert(!meshlink_get_node_reachability(mesh1, meshlink_get_node(mesh1, "bar"), &last_reachable, &last_unreachable));
-       assert(!last_reachable);
-       assert(!last_unreachable);
-
        // Check that if we change back to STORAGE_ENABLED right before closing, pending changes are still saved
 
-       start_meshlink_pair(mesh1, mesh2);
-       stop_meshlink_pair(mesh1, mesh2);
+       start_full_tiny_pair(mesh1, mesh2);
+       stop_full_tiny_pair(mesh1, mesh2);
 
-       meshlink_set_storage_policy(mesh1, MESHLINK_STORAGE_ENABLED);
+       full_meshlink_set_storage_policy(mesh1, MESHLINK_STORAGE_ENABLED);
        meshlink_set_storage_policy(mesh2, MESHLINK_STORAGE_ENABLED);
 
-       close_meshlink_pair(mesh1, mesh2);
+       close_full_tiny_pair(mesh1, mesh2);
 
-       mesh1 = meshlink_open("storage-policy_conf.1", "foo", "storage-policy", DEV_CLASS_BACKBONE);
+       mesh1 = full_meshlink_open("storage-policy_conf.1", "foo", "storage-policy", DEV_CLASS_BACKBONE);
        mesh2 = meshlink_open("storage-policy_conf.2", "bar", "storage-policy", DEV_CLASS_BACKBONE);
        assert(mesh1);
        assert(mesh2);
 
-       assert(!meshlink_get_node_reachability(mesh1, meshlink_get_node(mesh1, "bar"), &last_reachable, &last_unreachable));
-       assert(last_reachable);
-       assert(last_unreachable);
-
        // Close the instances and reopen them.
 
-       close_meshlink_pair(mesh1, mesh2);
+       close_full_tiny_pair(mesh1, mesh2);
 
-       mesh1 = meshlink_open("storage-policy_conf.1", "foo", "storage-policy", DEV_CLASS_BACKBONE);
+       mesh1 = full_meshlink_open("storage-policy_conf.1", "foo", "storage-policy", DEV_CLASS_BACKBONE);
        mesh2 = meshlink_open("storage-policy_conf.2", "bar", "storage-policy", DEV_CLASS_BACKBONE);
        assert(mesh1);
        assert(mesh2);
-       meshlink_set_storage_policy(mesh1, MESHLINK_STORAGE_KEYS_ONLY);
+       full_meshlink_set_storage_policy(mesh1, MESHLINK_STORAGE_KEYS_ONLY);
        meshlink_set_storage_policy(mesh2, MESHLINK_STORAGE_KEYS_ONLY);
 
        // Check that the nodes know each other
 
-       assert(meshlink_get_node(mesh1, "bar"));
+       assert(full_meshlink_get_node(mesh1, "bar"));
        assert(meshlink_get_node(mesh2, "foo"));
 
        // Done.
 
-       close_meshlink_pair(mesh1, mesh2);
+       close_full_tiny_pair(mesh1, mesh2);
 }