From dcf03554a0b38806bf1fe258acc423b070533d6e Mon Sep 17 00:00:00 2001 From: "David M. Lee" Date: Wed, 3 Jul 2013 16:32:00 +0000 Subject: Shuffle RESTful URL's around. This patch moves the RESTful URL's around to more appropriate locations for release. The /stasis URL's are moved to /ari, since Asterisk REST Interface was a more appropriate name than Stasis-HTTP. (Most of the code still has stasis_http references, but they will be cleaned up after there are no more outstanding branches that would have merge conflicts with such a change). A larger change was moving the ARI events WebSocket off of the shared /ws URL to its permanent home on /ari/events. The Swagger code generator was extended to handle "upgrade: websocket" and "websocketProtocol:" attributes on an operation. The WebSocket module was modified to better handle WebSocket servers that have a single registered protocol handler. If a client connections does not specify the Sec-WebSocket-Protocol header, and the server has a single protocol handler registered, the WebSocket server will go ahead and accept the client for that subprotocol. (closes issue ASTERISK-21857) Review: https://reviewboard.asterisk.org/r/2621/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393528 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- tests/test_stasis_http.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tests/test_stasis_http.c') diff --git a/tests/test_stasis_http.c b/tests/test_stasis_http.c index c094a921a..68bc4e7b7 100644 --- a/tests/test_stasis_http.c +++ b/tests/test_stasis_http.c @@ -223,7 +223,7 @@ AST_TEST_DEFINE(get_docs) basePathJson = ast_json_object_get(response->message, "basePath"); ast_test_validate(test, NULL != basePathJson); basePath = ast_json_string_get(basePathJson); - ast_test_validate(test, 0 == strcmp("http://stasis.asterisk.org/stasis", basePath)); + ast_test_validate(test, 0 == strcmp("http://stasis.asterisk.org/ari", basePath)); return AST_TEST_PASS; } @@ -343,7 +343,7 @@ AST_TEST_DEFINE(invoke_get) "head2", "head-two", "path_vars"); - stasis_http_invoke("foo", AST_HTTP_GET, get_params, headers, response); + stasis_http_invoke(NULL, "foo", AST_HTTP_GET, get_params, headers, response); ast_test_validate(test, 1 == invocation_count); ast_test_validate(test, 200 == response->response_code); @@ -380,7 +380,7 @@ AST_TEST_DEFINE(invoke_wildcard) "path_vars", "bam", "foshizzle"); - stasis_http_invoke("foo/foshizzle", AST_HTTP_GET, get_params, headers, response); + stasis_http_invoke(NULL, "foo/foshizzle", AST_HTTP_GET, get_params, headers, response); ast_test_validate(test, 1 == invocation_count); ast_test_validate(test, 200 == response->response_code); @@ -417,7 +417,7 @@ AST_TEST_DEFINE(invoke_delete) "path_vars", "bam", "foshizzle"); - stasis_http_invoke("foo/foshizzle/bang", AST_HTTP_DELETE, get_params, headers, response); + stasis_http_invoke(NULL, "foo/foshizzle/bang", AST_HTTP_DELETE, get_params, headers, response); ast_test_validate(test, 1 == invocation_count); ast_test_validate(test, 204 == response->response_code); @@ -467,7 +467,7 @@ AST_TEST_DEFINE(invoke_post) "head2", "head-two", "path_vars"); - stasis_http_invoke("foo/bar", AST_HTTP_POST, get_params, headers, response); + stasis_http_invoke(NULL, "foo/bar", AST_HTTP_POST, get_params, headers, response); ast_test_validate(test, 1 == invocation_count); ast_test_validate(test, 200 == response->response_code); @@ -496,7 +496,7 @@ AST_TEST_DEFINE(invoke_bad_post) fixture = setup_invocation_test(); response = response_alloc(); - stasis_http_invoke("foo", AST_HTTP_POST, get_params, headers, response); + stasis_http_invoke(NULL, "foo", AST_HTTP_POST, get_params, headers, response); ast_test_validate(test, 0 == invocation_count); ast_test_validate(test, 405 == response->response_code); @@ -524,7 +524,7 @@ AST_TEST_DEFINE(invoke_not_found) fixture = setup_invocation_test(); response = response_alloc(); - stasis_http_invoke("foo/fizzle/i-am-not-a-resource", AST_HTTP_GET, get_params, headers, response); + stasis_http_invoke(NULL, "foo/fizzle/i-am-not-a-resource", AST_HTTP_GET, get_params, headers, response); ast_test_validate(test, 0 == invocation_count); ast_test_validate(test, 404 == response->response_code); -- cgit v1.2.3