Allow meshlink_open() to be called with a NULL name.

[meshlink] / test / basicpp.cpp

diff --git a/test/basicpp.cpp b/test/basicpp.cpp
index 3b8b77f790e10e9ca10545f7e985cdc9c578dfab..2f4e5c84a12d727349f751540ac33a60d26c160d 100644 (file)
--- a/test/basicpp.cpp
+++ b/test/basicpp.cpp
@@ -1,85 +1,77 @@
 #include <cstring>
 #include <iostream>
+#include <unistd.h>
+#include <cerrno>
+#include <cassert>
+#include <dirent.h>
 
 #include "meshlink++.h"
 
 using namespace std;
 
-int main(int argc, char *argv[]) {
+int main() {
+       assert(meshlink::destroy("basicpp_conf"));
+
        // Open a new meshlink instance.
 
-       meshlink::mesh *mesh = meshlink::open<meshlink::mesh>("basicpp_conf", "foo");
-       if(!mesh) {
-               cerr << "Could not initialize configuration for foo\n";
-               return 1;
-       }
+       {
+               meshlink::mesh mesh("basicpp_conf", "foo", "basicpp", DEV_CLASS_BACKBONE);
+               assert(mesh.isOpen());
 
-       // Check that our own node exists.
+               // Check that our own node exists.
 
-       meshlink::node *self = mesh->get_node("foo");
-       if(!self) {
-               cerr << "Foo does not know about itself\n";
-               return 1;
-       }
-       if(strcmp(self->name, "foo")) {
-               cerr << "Foo thinks its name is " << self->name << "\n";
-               return 1;
-       }
+               meshlink::node *self = mesh.get_self();
+               assert(self);
+               assert(!strcmp(self->name, "foo"));
 
-       // Start and stop the mesh.
+               // Disable local discovery.
 
-       if(!mesh->start()) {
-               cerr << "Foo could not start\n";
-               return 1;
-       }
-       mesh->stop();
+               mesh.enable_discovery(false);
 
-       // Make sure we can start and stop the mesh again.
+               // Start and stop the mesh.
 
-       if(!mesh->start()) {
-               cerr << "Foo could not start twice\n";
-               return 1;
-       }
-       mesh->stop();
+               assert(mesh.start());
+               mesh.stop();
 
-       // Close the mesh and open it again, now with a different name parameter.
+               // Make sure we can start and stop the mesh again.
 
-       meshlink::close(mesh);
+               assert(mesh.start());
+               mesh.stop();
 
-       // Check that the name is ignored now, and that we still are "foo".
+               // Close the mesh and open it again, now with a different name parameter.
 
-       mesh = meshlink::open<meshlink::mesh>("basic_conf", "bar");
-       if(!mesh) {
-               cerr << "Could not open configuration for foo a second time\n";
-               return 1;
-       }
+               mesh.close();
+               assert(!mesh.open("basicpp_conf", "bar", "basicpp", DEV_CLASS_BACKBONE));
 
-       if(mesh->get_node("bar")) {
-               cerr << "Foo knows about bar, it shouldn't\n";
-               return 1;
-       }
+               // Open it without giving a name.
 
-       self = mesh->get_node("foo");
-       if(!self) {
-               cerr << "Foo doesn't know about itself the second time\n";
-               return 1;
-       }
-       if(strcmp(self->name, "foo")) {
-               cerr << "Foo thinks its name is " << self->name << " the second time\n";
-               return 1;
-       }
+               assert(mesh.open("basicpp_conf", nullptr, "basicpp", DEV_CLASS_BACKBONE));
+
+               // Check that the name is ignored now, and that we still are "foo".
+
+               self = mesh.get_self();
+               assert(self);
+               assert(!strcmp(self->name, "foo"));
 
-       // Start and stop the mesh.
+               // Start and stop the mesh.
 
-       if(!mesh->start()) {
-               cerr << "Foo could not start a third time\n";
-               return 1;
+               mesh.enable_discovery(false);
+
+               assert(mesh.start());
+               mesh.stop();
        }
-       mesh->stop();
 
-       // That's it.
+       // Destroy the mesh.
+
+       assert(meshlink::destroy("basicpp_conf"));
 
-       meshlink::close(mesh);
+       DIR *dir = opendir("basicpp_conf");
+       assert(dir);
+       struct dirent *ent;
+       while((ent = readdir(dir))) {
+               assert(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, ".."));
+       }
+       closedir(dir);
 
        return 0;
 }