Repository: qpid-proton Updated Branches: refs/heads/master 8410e2e6e -> 3ae6efdf6
NO-JIRA: Use CHECK_COND_DESC instead of CHECK_IN for conditions. Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/cb0737ae Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/cb0737ae Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/cb0737ae Branch: refs/heads/master Commit: cb0737aeb47969f9ceefd49d6d67a78cec5e354b Parents: fcee877 Author: Alan Conway <[email protected]> Authored: Fri Jun 16 16:49:29 2017 -0400 Committer: Alan Conway <[email protected]> Committed: Mon Jun 19 13:14:08 2017 -0400 ---------------------------------------------------------------------- proton-c/src/tests/proactor.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cb0737ae/proton-c/src/tests/proactor.c ---------------------------------------------------------------------- diff --git a/proton-c/src/tests/proactor.c b/proton-c/src/tests/proactor.c index c41110b..3e1598c 100644 --- a/proton-c/src/tests/proactor.c +++ b/proton-c/src/tests/proactor.c @@ -497,35 +497,35 @@ static void test_errors(test_t *t) { pn_connection_t *c = pn_connection(); pn_proactor_connect(client, c, "127.0.0.1:xxx"); TEST_ETYPE_EQUAL(t, PN_TRANSPORT_CLOSED, PROACTOR_TEST_RUN(pts)); - TEST_STR_IN(t, "xxx", pn_condition_get_description(last_condition)); + TEST_COND_DESC(t, "xxx", last_condition); TEST_ETYPE_EQUAL(t, PN_PROACTOR_INACTIVE, PROACTOR_TEST_RUN(pts)); pn_listener_t *l = pn_listener(); pn_proactor_listen(server, l, "127.0.0.1:xxx", 1); TEST_ETYPE_EQUAL(t, PN_LISTENER_OPEN, PROACTOR_TEST_RUN(pts)); TEST_ETYPE_EQUAL(t, PN_LISTENER_CLOSE, PROACTOR_TEST_RUN(pts)); - TEST_STR_IN(t, "xxx", pn_condition_get_description(last_condition)); + TEST_COND_DESC(t, "xxx", last_condition); TEST_ETYPE_EQUAL(t, PN_PROACTOR_INACTIVE, PROACTOR_TEST_RUN(pts)); /* Invalid connect/listen host name */ c = pn_connection(); pn_proactor_connect(client, c, "nosuch.example.com:"); TEST_ETYPE_EQUAL(t, PN_TRANSPORT_CLOSED, PROACTOR_TEST_RUN(pts)); - TEST_STR_IN(t, "nosuch", pn_condition_get_description(last_condition)); + TEST_COND_DESC(t, "nosuch", last_condition); TEST_ETYPE_EQUAL(t, PN_PROACTOR_INACTIVE, PROACTOR_TEST_RUN(pts)); l = pn_listener(); pn_proactor_listen(server, l, "nosuch.example.com:", 1); TEST_ETYPE_EQUAL(t, PN_LISTENER_OPEN, PROACTOR_TEST_RUN(pts)); TEST_ETYPE_EQUAL(t, PN_LISTENER_CLOSE, PROACTOR_TEST_RUN(pts)); - TEST_STR_IN(t, "nosuch", pn_condition_get_description(last_condition)); + TEST_COND_DESC(t, "nosuch", last_condition); TEST_ETYPE_EQUAL(t, PN_PROACTOR_INACTIVE, PROACTOR_TEST_RUN(pts)); /* Connect with no listener */ c = pn_connection(); pn_proactor_connect(client, c, port.host_port); if (TEST_ETYPE_EQUAL(t, PN_TRANSPORT_CLOSED, PROACTOR_TEST_RUN(pts))) { - TEST_STR_IN(t, "refused", pn_condition_get_description(last_condition)); + TEST_COND_DESC(t, "refused", last_condition); TEST_ETYPE_EQUAL(t, PN_PROACTOR_INACTIVE, PROACTOR_TEST_RUN(pts)); sock_close(port.sock); PROACTOR_TEST_FREE(pts); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
