Modified: qpid/proton/branches/driver_abstraction/proton-c/src/scanner.c URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/scanner.c?rev=1382918&r1=1382917&r2=1382918&view=diff ============================================================================== --- qpid/proton/branches/driver_abstraction/proton-c/src/scanner.c (original) +++ qpid/proton/branches/driver_abstraction/proton-c/src/scanner.c Mon Sep 10 14:56:20 2012 @@ -81,7 +81,10 @@ pn_scanner_t *pn_scanner() void pn_scanner_free(pn_scanner_t *scanner) { - free(scanner); + if (scanner) { + pn_error_free(scanner->error); + free(scanner); + } } pn_token_t pn_scanner_token(pn_scanner_t *scanner)
Modified: qpid/proton/branches/driver_abstraction/proton-c/src/util.h URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/util.h?rev=1382918&r1=1382917&r2=1382918&view=diff ============================================================================== --- qpid/proton/branches/driver_abstraction/proton-c/src/util.h (original) +++ qpid/proton/branches/driver_abstraction/proton-c/src/util.h Mon Sep 10 14:56:20 2012 @@ -92,4 +92,7 @@ bool pn_env_bool(const char *name); char *pn_strdup(const char *src); char *pn_strndup(const char *src, size_t n); +#define pn_min(X,Y) ((X) > (Y) ? (Y) : (X)) +#define pn_max(X,Y) ((X) < (Y) ? (Y) : (X)) + #endif /* util.h */ Modified: qpid/proton/branches/driver_abstraction/tests/proton_tests/__init__.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/tests/proton_tests/__init__.py?rev=1382918&r1=1382917&r2=1382918&view=diff ============================================================================== --- qpid/proton/branches/driver_abstraction/tests/proton_tests/__init__.py (original) +++ qpid/proton/branches/driver_abstraction/tests/proton_tests/__init__.py Mon Sep 10 14:56:20 2012 @@ -21,3 +21,4 @@ import proton_tests.engine import proton_tests.message import proton_tests.messenger import proton_tests.sasl +import proton_tests.transport Modified: qpid/proton/branches/driver_abstraction/tests/proton_tests/engine.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/tests/proton_tests/engine.py?rev=1382918&r1=1382917&r2=1382918&view=diff ============================================================================== --- qpid/proton/branches/driver_abstraction/tests/proton_tests/engine.py (original) +++ qpid/proton/branches/driver_abstraction/tests/proton_tests/engine.py Mon Sep 10 14:56:20 2012 @@ -55,8 +55,10 @@ class Test(common.Test): def connection(self): c1 = pn_connection() c2 = pn_connection() - t1 = pn_transport(c1) - t2 = pn_transport(c2) + t1 = pn_transport() + pn_transport_bind(t1, c1) + t2 = pn_transport() + pn_transport_bind(t2, c2) self._wires.append((c1, t1, c2, t2)) trc = os.environ.get("PN_TRACE_FRM") if trc and trc.lower() in ("1", "2", "yes", "true"): @@ -82,7 +84,9 @@ class Test(common.Test): def cleanup(self): for c1, t1, c2, t2 in self._wires: pn_connection_free(c1) + pn_transport_free(t1) pn_connection_free(c2) + pn_transport_free(t2) def pump(self): for c1, t1, c2, t2 in self._wires: Modified: qpid/proton/branches/driver_abstraction/tests/proton_tests/message.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/tests/proton_tests/message.py?rev=1382918&r1=1382917&r2=1382918&view=diff ============================================================================== --- qpid/proton/branches/driver_abstraction/tests/proton_tests/message.py (original) +++ qpid/proton/branches/driver_abstraction/tests/proton_tests/message.py Mon Sep 10 14:56:20 2012 @@ -127,6 +127,8 @@ class CodecTest(Test): assert not cd, cd assert saved == body, (body, saved) + pn_message_free(msg2) + class LoadSaveTest(Test): @@ -172,3 +174,12 @@ class LoadSaveTest(Test): def testText(self): self._test(PN_TEXT, "this is a text string") + + def testTextLoadNone(self): + pn_message_set_format(self.msg, PN_TEXT) + pn_message_clear(self.msg) + cd = pn_message_load(self.msg, None) + assert cd == 0 + cd, saved = pn_message_save(self.msg, 1024) + assert cd >= 0 + assert saved == "" Modified: qpid/proton/branches/driver_abstraction/tests/proton_tests/messenger.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/tests/proton_tests/messenger.py?rev=1382918&r1=1382917&r2=1382918&view=diff ============================================================================== --- qpid/proton/branches/driver_abstraction/tests/proton_tests/messenger.py (original) +++ qpid/proton/branches/driver_abstraction/tests/proton_tests/messenger.py Mon Sep 10 14:56:20 2012 @@ -48,6 +48,7 @@ class Test(common.Test): pn_messenger_free(self.server) self.client = None self.server = None + pn_message_free(msg) class MessengerTest(Test): @@ -64,6 +65,7 @@ class MessengerTest(Test): pn_message_set_address(msg, reply_to) pn_messenger_put(self.server, msg) pn_messenger_stop(self.server) + pn_message_free(msg) def testSendReceive(self): msg = pn_message() @@ -86,3 +88,11 @@ class MessengerTest(Test): pn_message_free(msg) pn_message_free(reply) + + def testSendBogus(self): + msg = pn_message() + pn_message_set_address(msg, "totally-bogus-address") + assert pn_messenger_put(self.client, msg) == PN_ERR + err = pn_messenger_error(self.client) + assert "unable to send to address: totally-bogus-address (getaddrinfo:" in err, err + pn_message_free(msg) Modified: qpid/proton/branches/driver_abstraction/tests/proton_tests/sasl.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/tests/proton_tests/sasl.py?rev=1382918&r1=1382917&r2=1382918&view=diff ============================================================================== --- qpid/proton/branches/driver_abstraction/tests/proton_tests/sasl.py (original) +++ qpid/proton/branches/driver_abstraction/tests/proton_tests/sasl.py Mon Sep 10 14:56:20 2012 @@ -26,36 +26,34 @@ class Test(common.Test): class SaslTest(Test): def testPipelined(self): - cli = pn_sasl() - pn_sasl_mechanisms(cli, "ANONYMOUS") - pn_sasl_client(cli) - - srv = pn_sasl() - pn_sasl_mechanisms(srv, "ANONYMOUS") - pn_sasl_server(srv) - pn_sasl_done(srv, PN_SASL_OK) + cli = pn_transport() + cli_auth = pn_sasl(cli) + pn_sasl_mechanisms(cli_auth, "ANONYMOUS") + pn_sasl_client(cli_auth) + + assert pn_sasl_outcome(cli_auth) == PN_SASL_NONE + + srv = pn_transport() + srv_auth = pn_sasl(srv) + pn_sasl_mechanisms(srv_auth, "ANONYMOUS") + pn_sasl_server(srv_auth) + pn_sasl_done(srv_auth, PN_SASL_OK) - cli_code, cli_out = pn_sasl_output(cli, 1024) - srv_code, srv_out = pn_sasl_output(srv, 1024) + cli_code, cli_out = pn_output(cli, 1024) + srv_code, srv_out = pn_output(srv, 1024) assert cli_code > 0, cli_code assert srv_code > 0, srv_code - dummy_header = "AMQPxxxx" + n = pn_input(srv, cli_out) + assert n == len(cli_out), "(%s) %s" % (n, pn_error_text(pn_transport_error(srv))) - srv_out += dummy_header - cli_out += dummy_header + assert pn_sasl_outcome(cli_auth) == PN_SASL_NONE - n = pn_sasl_input(srv, cli_out) - assert n > 0, n - cli_out = cli_out[n:] - assert cli_out == dummy_header - n = pn_sasl_input(srv, cli_out) - assert n == PN_EOS, n - - n = pn_sasl_input(cli, srv_out) - assert n > 0, n - srv_out = srv_out[n:] - assert srv_out == dummy_header - n = pn_sasl_input(cli, srv_out) - assert n == PN_EOS, n + n = pn_input(cli, srv_out) + assert n == len(srv_out), n + + assert pn_sasl_outcome(cli_auth) == PN_SASL_OK + + pn_transport_free(cli) + pn_transport_free(srv) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
