Remove the old PUB/SUB tests.

The new tests are more exhaustive, and cover everything.  We also
added a case for testing that posting messages that we didn't
subscribe too doesn't raise the pollable flag.

1 files changed, 0 insertions, 198 deletions

diff --git a/tests/pubsub.c b/tests/pubsub.c
deleted file mode 100644
index 14bd20fc..00000000
--- a/tests/pubsub.c
+++ /dev/null
@@ -1,198 +0,0 @@
-//
-// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech>
-// Copyright 2018 Capitar IT Group BV <info@capitar.com>
-//
-// This software is supplied under the terms of the MIT License, a
-// copy of which should be located in the distribution where this
-// file was obtained (LICENSE.txt).  A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-#include <string.h>
-
-#include <nng/nng.h>
-#include <nng/protocol/pubsub0/pub.h>
-#include <nng/protocol/pubsub0/sub.h>
-#include <nng/supplemental/util/platform.h>
-
-#include "convey.h"
-#include "stubs.h"
-
-#define APPENDSTR(m, s) nng_msg_append(m, s, strlen(s))
-#define CHECKSTR(m, s)                   \
-	So(nng_msg_len(m) == strlen(s)); \
-	So(memcmp(nng_msg_body(m), s, strlen(s)) == 0)
-
-TestMain("PUB/SUB pattern", {
-	const char *addr = "inproc://test";
-
-	Reset({ nng_fini(); });
-
-	Convey("We can create a PUB socket", {
-		nng_socket pub;
-
-		So(nng_pub_open(&pub) == 0);
-
-		Reset({ nng_close(pub); });
-
-		Convey("Recv fails", {
-			nng_msg *msg;
-			So(nng_recvmsg(pub, &msg, 0) == NNG_ENOTSUP);
-		});
-
-		Convey("It cannot subscribe", {
-			So(nng_setopt(pub, NNG_OPT_SUB_SUBSCRIBE, "", 0) ==
-			    NNG_ENOTSUP);
-		});
-
-		Convey("It cannot unsubscribe", {
-			So(nng_setopt(pub, NNG_OPT_SUB_UNSUBSCRIBE, "", 0) ==
-			    NNG_ENOTSUP);
-		});
-	});
-
-	Convey("We can create a SUB socket", {
-		nng_socket sub;
-		So(nng_sub_open(&sub) == 0);
-
-		Reset({ nng_close(sub); });
-
-		Convey("It can subscribe", {
-			So(nng_setopt(sub, NNG_OPT_SUB_SUBSCRIBE, "ABC", 3) ==
-			    0);
-			So(nng_setopt(sub, NNG_OPT_SUB_SUBSCRIBE, "", 0) == 0);
-			Convey("And it can unsubscribe", {
-				So(nng_setopt(sub, NNG_OPT_SUB_UNSUBSCRIBE,
-				       "ABC", 3) == 0);
-				So(nng_setopt(sub, NNG_OPT_SUB_UNSUBSCRIBE, "",
-				       0) == 0);
-
-				So(nng_setopt(sub, NNG_OPT_SUB_UNSUBSCRIBE, "",
-				       0) == NNG_ENOENT);
-				So(nng_setopt(sub, NNG_OPT_SUB_UNSUBSCRIBE,
-				       "HELLO", 0) == NNG_ENOENT);
-			});
-		});
-	});
-
-	Convey("We can create a linked PUB/SUB pair", {
-		nng_socket pub;
-		nng_socket sub;
-
-		So(nng_pub_open(&pub) == 0);
-
-		So(nng_sub_open(&sub) == 0);
-
-		Reset({
-			nng_close(pub);
-			nng_close(sub);
-		});
-
-		// Most applications will usually have the pub listen,
-		// and the sub dial.  However, this creates a problem
-		// for our tests, since we can wind up trying to push
-		// data before the pipe is fully registered (the accept
-		// runs asynchronously.)
-		So(nng_listen(sub, addr, NULL, 0) == 0);
-		So(nng_dial(pub, addr, NULL, 0) == 0);
-
-		nng_msleep(200); // give time for connecting threads
-
-		Convey("Subs can receive from pubs", {
-			nng_msg *msg;
-
-			So(nng_setopt(sub, NNG_OPT_SUB_SUBSCRIBE, "/some/",
-			       strlen("/some/")) == 0);
-			So(nng_setopt_ms(sub, NNG_OPT_RECVTIMEO, 90) == 0);
-
-			So(nng_msg_alloc(&msg, 0) == 0);
-			APPENDSTR(msg, "/some/like/it/hot");
-			So(nng_sendmsg(pub, msg, 0) == 0);
-			So(nng_recvmsg(sub, &msg, 0) == 0);
-			CHECKSTR(msg, "/some/like/it/hot");
-			nng_msg_free(msg);
-
-			So(nng_msg_alloc(&msg, 0) == 0);
-			APPENDSTR(msg, "/somewhere/over/the/rainbow");
-			CHECKSTR(msg, "/somewhere/over/the/rainbow");
-
-			So(nng_sendmsg(pub, msg, 0) == 0);
-			So(nng_recvmsg(sub, &msg, 0) == NNG_ETIMEDOUT);
-
-			So(nng_msg_alloc(&msg, 0) == 0);
-			APPENDSTR(msg, "/some/day/some/how");
-			CHECKSTR(msg, "/some/day/some/how");
-
-			So(nng_sendmsg(pub, msg, 0) == 0);
-			So(nng_recvmsg(sub, &msg, 0) == 0);
-			CHECKSTR(msg, "/some/day/some/how");
-			nng_msg_free(msg);
-		});
-
-		Convey("Subs using NNG_FLAG_NONBLOCK and no sub", {
-			nng_msg *msg;
-
-			So(nng_msg_alloc(&msg, 0) == 0);
-			APPENDSTR(msg, "/some/don't/like/it");
-			So(nng_sendmsg(pub, msg, 0) == 0);
-			So(nng_recvmsg(sub, &msg, NNG_FLAG_NONBLOCK) == NNG_EAGAIN);
-		});
-            Convey("Subs using NNG_FLAG_NONBLOCK and empty sub", {
-                    nng_msg *msg;
-                    char *buf;
-                    size_t size;
-
-                    So(nng_setopt(sub, NNG_OPT_SUB_SUBSCRIBE, "", 0)  == 0);
-                    So(nng_recvmsg(sub, &msg, NNG_FLAG_NONBLOCK) == NNG_EAGAIN);
-                    So(nng_recv(sub, &buf, &size, NNG_FLAG_NONBLOCK | NNG_FLAG_ALLOC) == NNG_EAGAIN);
-            });
-
-            Convey("Subs without subscriptions don't receive", {
-                    nng_msg *msg;
-                    So(nng_setopt_ms(sub, NNG_OPT_RECVTIMEO, 90) == 0);
-
-                    So(nng_msg_alloc(&msg, 0) == 0);
-                    APPENDSTR(msg, "/some/don't/like/it");
-                    So(nng_sendmsg(pub, msg, 0) == 0);
-                    So(nng_recvmsg(sub, &msg, 0) == NNG_ETIMEDOUT);
-            });
-
-        });
-
-	Convey("Subs in raw receive", {
-		nng_msg *  msg;
-		nng_socket pub;
-		nng_socket sub;
-		bool       raw;
-
-		So(nng_pub_open(&pub) == 0);
-
-		So(nng_sub_open_raw(&sub) == 0);
-
-		Reset({
-			nng_close(pub);
-			nng_close(sub);
-		});
-
-		// Most applications will usually have the pub listen,
-		// and the sub dial.  However, this creates a problem
-		// for our tests, since we can wind up trying to push
-		// data before the pipe is fully registered (the accept
-		// runs asynchronously.)
-		So(nng_listen(sub, addr, NULL, 0) == 0);
-		So(nng_dial(pub, addr, NULL, 0) == 0);
-
-		nng_msleep(200); // give time for connecting threads
-
-		So(nng_setopt_ms(sub, NNG_OPT_RECVTIMEO, 90) == 0);
-		So(nng_getopt_bool(sub, NNG_OPT_RAW, &raw) == 0);
-		So(raw == true);
-
-		So(nng_msg_alloc(&msg, 0) == 0);
-		APPENDSTR(msg, "/some/like/it/raw");
-		So(nng_sendmsg(pub, msg, 0) == 0);
-		So(nng_recvmsg(sub, &msg, 0) == 0);
-		CHECKSTR(msg, "/some/like/it/raw");
-		nng_msg_free(msg);
-	});
-})