aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-04-24 20:28:44 +0200
committerLoïc Hoguin <[email protected]>2013-04-24 20:28:44 +0200
commitad91aaf81aa7fddba016262f1c8001d479a76be5 (patch)
tree160cc2d94af30d73172cefe32be7ea5d8a9b0a4f /test
parent282e532ba9e1b0e0f1867e43dd60d1118a36c12f (diff)
downloadcowboy-ad91aaf81aa7fddba016262f1c8001d479a76be5.tar.gz
cowboy-ad91aaf81aa7fddba016262f1c8001d479a76be5.tar.bz2
cowboy-ad91aaf81aa7fddba016262f1c8001d479a76be5.zip
Reorganize the http test suite
Diffstat (limited to 'test')
-rw-r--r--test/http_SUITE.erl28
-rw-r--r--test/http_SUITE_data/http_body_qs.erl (renamed from test/http_handler_body_qs.erl)2
-rw-r--r--test/http_SUITE_data/http_chunked.erl (renamed from test/chunked_handler.erl)2
-rw-r--r--test/http_SUITE_data/http_echo_body.erl (renamed from test/http_handler_echo_body.erl)2
-rw-r--r--test/http_SUITE_data/http_errors.erl (renamed from test/http_handler_errors.erl)2
-rw-r--r--test/http_SUITE_data/http_handler.erl (renamed from test/http_handler.erl)0
-rw-r--r--test/http_SUITE_data/http_init_shutdown.erl (renamed from test/http_handler_init_shutdown.erl)2
-rw-r--r--test/http_SUITE_data/http_long_polling.erl (renamed from test/http_handler_long_polling.erl)2
-rw-r--r--test/http_SUITE_data/http_loop_recv.erl (renamed from test/http_handler_loop_recv.erl)2
-rw-r--r--test/http_SUITE_data/http_loop_timeout.erl (renamed from test/http_handler_loop_timeout.erl)2
-rw-r--r--test/http_SUITE_data/http_multipart.erl (renamed from test/http_handler_multipart.erl)2
-rw-r--r--test/http_SUITE_data/http_set_resp.erl (renamed from test/http_handler_set_resp.erl)2
-rw-r--r--test/http_SUITE_data/http_stream_body.erl (renamed from test/http_handler_stream_body.erl)2
-rw-r--r--test/http_SUITE_data/rest_empty_resource.erl (renamed from test/rest_empty_resource.erl)0
-rw-r--r--test/http_SUITE_data/rest_expires.erl (renamed from test/rest_expires.erl)0
-rw-r--r--test/http_SUITE_data/rest_forbidden_resource.erl (renamed from test/rest_forbidden_resource.erl)0
-rw-r--r--test/http_SUITE_data/rest_missing_callbacks.erl (renamed from test/rest_missing_callbacks.erl)0
-rw-r--r--test/http_SUITE_data/rest_nodelete_resource.erl (renamed from test/rest_nodelete_resource.erl)0
-rw-r--r--test/http_SUITE_data/rest_param_all.erl (renamed from test/rest_param_all.erl)0
-rw-r--r--test/http_SUITE_data/rest_patch_resource.erl (renamed from test/rest_patch_resource.erl)0
-rw-r--r--test/http_SUITE_data/rest_resource_etags.erl (renamed from test/rest_resource_etags.erl)0
-rw-r--r--test/http_SUITE_data/rest_simple_resource.erl (renamed from test/rest_simple_resource.erl)0
22 files changed, 25 insertions, 25 deletions
diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl
index be366e2..5cc63f1 100644
--- a/test/http_SUITE.erl
+++ b/test/http_SUITE.erl
@@ -319,21 +319,21 @@ end_per_group(Name, _) ->
init_dispatch(Config) ->
cowboy_router:compile([
{"localhost", [
- {"/chunked_response", chunked_handler, []},
- {"/init_shutdown", http_handler_init_shutdown, []},
- {"/long_polling", http_handler_long_polling, []},
+ {"/chunked_response", http_chunked, []},
+ {"/init_shutdown", http_init_shutdown, []},
+ {"/long_polling", http_long_polling, []},
{"/headers/dupe", http_handler,
[{headers, [{<<"connection">>, <<"close">>}]}]},
- {"/set_resp/header", http_handler_set_resp,
+ {"/set_resp/header", http_set_resp,
[{headers, [{<<"vary">>, <<"Accept">>}]}]},
- {"/set_resp/overwrite", http_handler_set_resp,
+ {"/set_resp/overwrite", http_set_resp,
[{headers, [{<<"server">>, <<"DesireDrive/1.0">>}]}]},
- {"/set_resp/body", http_handler_set_resp,
+ {"/set_resp/body", http_set_resp,
[{body, <<"A flameless dance does not equal a cycle">>}]},
- {"/stream_body/set_resp", http_handler_stream_body,
+ {"/stream_body/set_resp", http_stream_body,
[{reply, set_resp}, {body, <<"stream_body_set_resp">>}]},
{"/stream_body/set_resp_close",
- http_handler_stream_body, [
+ http_stream_body, [
{reply, set_resp_close},
{body, <<"stream_body_set_resp_close">>}]},
{"/static/[...]", cowboy_static,
@@ -343,7 +343,7 @@ init_dispatch(Config) ->
[{directory, ?config(static_dir, Config)},
{mimetypes, {fun(Path, data) when is_binary(Path) ->
[<<"text/html">>] end, data}}]},
- {"/handler_errors", http_handler_errors, []},
+ {"/handler_errors", http_errors, []},
{"/static_attribute_etag/[...]", cowboy_static,
[{directory, ?config(static_dir, Config)},
{etag, {attributes, [filepath, filesize, inode, mtime]}}]},
@@ -354,9 +354,9 @@ init_dispatch(Config) ->
[{directory, ?config(static_dir, Config)},
{mimetypes, [{<<".css">>, [<<"text/css">>]}]},
{file, <<"test_file.css">>}]},
- {"/multipart", http_handler_multipart, []},
- {"/echo/body", http_handler_echo_body, []},
- {"/echo/body_qs", http_handler_body_qs, []},
+ {"/multipart", http_multipart, []},
+ {"/echo/body", http_echo_body, []},
+ {"/echo/body_qs", http_body_qs, []},
{"/param_all", rest_param_all, []},
{"/bad_accept", rest_simple_resource, []},
{"/bad_content_type", rest_patch_resource, []},
@@ -370,8 +370,8 @@ init_dispatch(Config) ->
{"/resetags", rest_resource_etags, []},
{"/rest_expires", rest_expires, []},
{"/rest_empty_resource", rest_empty_resource, []},
- {"/loop_recv", http_handler_loop_recv, []},
- {"/loop_timeout", http_handler_loop_timeout, []},
+ {"/loop_recv", http_loop_recv, []},
+ {"/loop_timeout", http_loop_timeout, []},
{"/", http_handler, []}
]}
]).
diff --git a/test/http_handler_body_qs.erl b/test/http_SUITE_data/http_body_qs.erl
index 306f4dc..2280981 100644
--- a/test/http_handler_body_qs.erl
+++ b/test/http_SUITE_data/http_body_qs.erl
@@ -1,6 +1,6 @@
%% Feel free to use, reuse and abuse the code in this file.
--module(http_handler_body_qs).
+-module(http_body_qs).
-behaviour(cowboy_http_handler).
-export([init/3, handle/2, terminate/3]).
diff --git a/test/chunked_handler.erl b/test/http_SUITE_data/http_chunked.erl
index e486afe..447c0f6 100644
--- a/test/chunked_handler.erl
+++ b/test/http_SUITE_data/http_chunked.erl
@@ -1,6 +1,6 @@
%% Feel free to use, reuse and abuse the code in this file.
--module(chunked_handler).
+-module(http_chunked).
-behaviour(cowboy_http_handler).
-export([init/3, handle/2, terminate/3]).
diff --git a/test/http_handler_echo_body.erl b/test/http_SUITE_data/http_echo_body.erl
index 4b9e765..014e05a 100644
--- a/test/http_handler_echo_body.erl
+++ b/test/http_SUITE_data/http_echo_body.erl
@@ -1,6 +1,6 @@
%% Feel free to use, reuse and abuse the code in this file.
--module(http_handler_echo_body).
+-module(http_echo_body).
-behaviour(cowboy_http_handler).
-export([init/3, handle/2, terminate/3]).
diff --git a/test/http_handler_errors.erl b/test/http_SUITE_data/http_errors.erl
index 2d1066c..8831362 100644
--- a/test/http_handler_errors.erl
+++ b/test/http_SUITE_data/http_errors.erl
@@ -1,6 +1,6 @@
%% Feel free to use, reuse and abuse the code in this file.
--module(http_handler_errors).
+-module(http_errors).
-behaviour(cowboy_http_handler).
-export([init/3, handle/2, terminate/3]).
diff --git a/test/http_handler.erl b/test/http_SUITE_data/http_handler.erl
index e1f1665..e1f1665 100644
--- a/test/http_handler.erl
+++ b/test/http_SUITE_data/http_handler.erl
diff --git a/test/http_handler_init_shutdown.erl b/test/http_SUITE_data/http_init_shutdown.erl
index fd01983..1445569 100644
--- a/test/http_handler_init_shutdown.erl
+++ b/test/http_SUITE_data/http_init_shutdown.erl
@@ -1,6 +1,6 @@
%% Feel free to use, reuse and abuse the code in this file.
--module(http_handler_init_shutdown).
+-module(http_init_shutdown).
-behaviour(cowboy_http_handler).
-export([init/3, handle/2, terminate/3]).
diff --git a/test/http_handler_long_polling.erl b/test/http_SUITE_data/http_long_polling.erl
index e8cf610..ad4e66e 100644
--- a/test/http_handler_long_polling.erl
+++ b/test/http_SUITE_data/http_long_polling.erl
@@ -1,6 +1,6 @@
%% Feel free to use, reuse and abuse the code in this file.
--module(http_handler_long_polling).
+-module(http_long_polling).
-behaviour(cowboy_http_handler).
-export([init/3, handle/2, info/3, terminate/3]).
diff --git a/test/http_handler_loop_recv.erl b/test/http_SUITE_data/http_loop_recv.erl
index 4d0a321..d0577f0 100644
--- a/test/http_handler_loop_recv.erl
+++ b/test/http_SUITE_data/http_loop_recv.erl
@@ -1,6 +1,6 @@
%% Feel free to use, reuse and abuse the code in this file.
--module(http_handler_loop_recv).
+-module(http_loop_recv).
-behaviour(cowboy_loop_handler).
-export([init/3, info/3, terminate/3]).
diff --git a/test/http_handler_loop_timeout.erl b/test/http_SUITE_data/http_loop_timeout.erl
index 0155b1e..dd3472c 100644
--- a/test/http_handler_loop_timeout.erl
+++ b/test/http_SUITE_data/http_loop_timeout.erl
@@ -1,6 +1,6 @@
%% Feel free to use, reuse and abuse the code in this file.
--module(http_handler_loop_timeout).
+-module(http_loop_timeout).
-behaviour(cowboy_loop_handler).
-export([init/3, info/3, terminate/3]).
diff --git a/test/http_handler_multipart.erl b/test/http_SUITE_data/http_multipart.erl
index 8209535..c94739f 100644
--- a/test/http_handler_multipart.erl
+++ b/test/http_SUITE_data/http_multipart.erl
@@ -1,6 +1,6 @@
%% Feel free to use, reuse and abuse the code in this file.
--module(http_handler_multipart).
+-module(http_multipart).
-behaviour(cowboy_http_handler).
-export([init/3, handle/2, terminate/3]).
diff --git a/test/http_handler_set_resp.erl b/test/http_SUITE_data/http_set_resp.erl
index d00d72a..821cc1d 100644
--- a/test/http_handler_set_resp.erl
+++ b/test/http_SUITE_data/http_set_resp.erl
@@ -1,6 +1,6 @@
%% Feel free to use, reuse and abuse the code in this file.
--module(http_handler_set_resp).
+-module(http_set_resp).
-behaviour(cowboy_http_handler).
-export([init/3, handle/2, terminate/3]).
diff --git a/test/http_handler_stream_body.erl b/test/http_SUITE_data/http_stream_body.erl
index 5e42fa7..4f45656 100644
--- a/test/http_handler_stream_body.erl
+++ b/test/http_SUITE_data/http_stream_body.erl
@@ -1,6 +1,6 @@
%% Feel free to use, reuse and abuse the code in this file.
--module(http_handler_stream_body).
+-module(http_stream_body).
-behaviour(cowboy_http_handler).
-export([init/3, handle/2, terminate/3]).
diff --git a/test/rest_empty_resource.erl b/test/http_SUITE_data/rest_empty_resource.erl
index 7e7c00a..7e7c00a 100644
--- a/test/rest_empty_resource.erl
+++ b/test/http_SUITE_data/rest_empty_resource.erl
diff --git a/test/rest_expires.erl b/test/http_SUITE_data/rest_expires.erl
index 4209041..4209041 100644
--- a/test/rest_expires.erl
+++ b/test/http_SUITE_data/rest_expires.erl
diff --git a/test/rest_forbidden_resource.erl b/test/http_SUITE_data/rest_forbidden_resource.erl
index 287ff62..287ff62 100644
--- a/test/rest_forbidden_resource.erl
+++ b/test/http_SUITE_data/rest_forbidden_resource.erl
diff --git a/test/rest_missing_callbacks.erl b/test/http_SUITE_data/rest_missing_callbacks.erl
index 171c856..171c856 100644
--- a/test/rest_missing_callbacks.erl
+++ b/test/http_SUITE_data/rest_missing_callbacks.erl
diff --git a/test/rest_nodelete_resource.erl b/test/http_SUITE_data/rest_nodelete_resource.erl
index 9f9670c..9f9670c 100644
--- a/test/rest_nodelete_resource.erl
+++ b/test/http_SUITE_data/rest_nodelete_resource.erl
diff --git a/test/rest_param_all.erl b/test/http_SUITE_data/rest_param_all.erl
index 09b8cd3..09b8cd3 100644
--- a/test/rest_param_all.erl
+++ b/test/http_SUITE_data/rest_param_all.erl
diff --git a/test/rest_patch_resource.erl b/test/http_SUITE_data/rest_patch_resource.erl
index e265f6f..e265f6f 100644
--- a/test/rest_patch_resource.erl
+++ b/test/http_SUITE_data/rest_patch_resource.erl
diff --git a/test/rest_resource_etags.erl b/test/http_SUITE_data/rest_resource_etags.erl
index 43f1e05..43f1e05 100644
--- a/test/rest_resource_etags.erl
+++ b/test/http_SUITE_data/rest_resource_etags.erl
diff --git a/test/rest_simple_resource.erl b/test/http_SUITE_data/rest_simple_resource.erl
index 97145dd..97145dd 100644
--- a/test/rest_simple_resource.erl
+++ b/test/http_SUITE_data/rest_simple_resource.erl