X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fbasic.c;h=7b4f3cd71f5c510071e5b525fb5f0c87b74682ad;hb=0d133a5ff230ad78da3208d32521d7549836187e;hp=9b09455afb8c0c6e145c5ded0dc14039271d989f;hpb=9f9925cb0726874c5d1f4fc266df54c0437a4660;p=meshlink

diff --git a/test/basic.c b/test/basic.c
index 9b09455a..7b4f3cd7 100644
--- a/test/basic.c
+++ b/test/basic.c
@@ -1,12 +1,15 @@
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
+#include <errno.h>
 
 #include "meshlink.h"
 
-int main(int argc, char *argv[]) {
+int main() {
 	// Open a new meshlink instance.
 
-	meshlink_handle_t *mesh = meshlink_open("basic_conf", "foo");
+	meshlink_handle_t *mesh = meshlink_open("basic_conf", "foo", "basic", DEV_CLASS_BACKBONE);
+
 	if(!mesh) {
 		fprintf(stderr, "Could not initialize configuration for foo\n");
 		return 1;
@@ -14,11 +17,13 @@ int main(int argc, char *argv[]) {
 
 	// Check that our own node exists.
 
-	meshlink_node_t *self = meshlink_get_node(mesh, "foo");
+	meshlink_node_t *self = meshlink_get_self(mesh);
+
 	if(!self) {
 		fprintf(stderr, "Foo does not know about itself\n");
 		return 1;
 	}
+
 	if(strcmp(self->name, "foo")) {
 		fprintf(stderr, "Foo thinks its name is %s\n", self->name);
 		return 1;
@@ -30,6 +35,7 @@ int main(int argc, char *argv[]) {
 		fprintf(stderr, "Foo could not start\n");
 		return 1;
 	}
+
 	meshlink_stop(mesh);
 
 	// Make sure we can start and stop the mesh again.
@@ -38,6 +44,7 @@ int main(int argc, char *argv[]) {
 		fprintf(stderr, "Foo could not start twice\n");
 		return 1;
 	}
+
 	meshlink_stop(mesh);
 
 	// Close the mesh and open it again, now with a different name parameter.
@@ -46,7 +53,8 @@ int main(int argc, char *argv[]) {
 
 	// Check that the name is ignored now, and that we still are "foo".
 
-	mesh = meshlink_open("basic_conf", "bar");
+	mesh = meshlink_open("basic_conf", "bar", "basic", DEV_CLASS_BACKBONE);
+
 	if(!mesh) {
 		fprintf(stderr, "Could not open configuration for foo a second time\n");
 		return 1;
@@ -57,11 +65,13 @@ int main(int argc, char *argv[]) {
 		return 1;
 	}
 
-	self = meshlink_get_node(mesh, "foo");
+	self = meshlink_get_self(mesh);
+
 	if(!self) {
 		fprintf(stderr, "Foo doesn't know about itself the second time\n");
 		return 1;
 	}
+
 	if(strcmp(self->name, "foo")) {
 		fprintf(stderr, "Foo thinks its name is %s the second time\n", self->name);
 		return 1;
@@ -73,11 +83,24 @@ int main(int argc, char *argv[]) {
 		fprintf(stderr, "Foo could not start a third time\n");
 		return 1;
 	}
+
 	meshlink_stop(mesh);
 
 	// That's it.
 
 	meshlink_close(mesh);
 
+	// Destroy the mesh.
+
+	if(!meshlink_destroy("basic_conf")) {
+		fprintf(stderr, "Could not destroy configuration\n");
+		return 1;
+	}
+
+	if(!access("basic_conf", F_OK) || errno != ENOENT) {
+		fprintf(stderr, "Configuration not fully destroyed\n");
+		return 1;
+	}
+
 	return 0;
 }