aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/dispatcher_prop.erl70
-rw-r--r--test/http_SUITE.erl2
-rw-r--r--test/proper_SUITE.erl37
3 files changed, 1 insertions, 108 deletions
diff --git a/test/dispatcher_prop.erl b/test/dispatcher_prop.erl
deleted file mode 100644
index 26c4f87..0000000
--- a/test/dispatcher_prop.erl
+++ /dev/null
@@ -1,70 +0,0 @@
-%% Copyright (c) 2011, Magnus Klaar <[email protected]>
-%% Copyright (c) 2011, Loïc Hoguin <[email protected]>
-%%
-%% Permission to use, copy, modify, and/or distribute this software for any
-%% purpose with or without fee is hereby granted, provided that the above
-%% copyright notice and this permission notice appear in all copies.
-%%
-%% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-%% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-%% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-%% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-%% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
--module(dispatcher_prop).
--include_lib("proper/include/proper.hrl").
-
-%% Generators.
-
-hostname_head_char() ->
- oneof([choose($a, $z), choose($A, $Z), choose($0, $9)]).
-
-hostname_char() ->
- oneof([choose($a, $z), choose($A, $Z), choose($0, $9), $-]).
-
-hostname_label() ->
- ?SUCHTHAT(Label, [hostname_head_char()|list(hostname_char())],
- length(Label) < 64).
-
-hostname() ->
- ?SUCHTHAT(Hostname,
- ?LET(Labels, list(hostname_label()), string:join(Labels, ".")),
- length(Hostname) > 0 andalso length(Hostname) =< 255).
-
-port_number() ->
- choose(1, 16#ffff).
-
-port_str() ->
- oneof(["", ?LET(Port, port_number(), ":" ++ integer_to_list(Port))]).
-
-server() ->
- ?LET({Hostname, PortStr}, {hostname(), port_str()},
- list_to_binary(Hostname ++ PortStr)).
-
-%% Properties.
-
-prop_split_host_symmetric() ->
- ?FORALL(Server, server(),
- begin case cowboy_dispatcher:split_host(Server) of
- {Tokens, RawHost, undefined} ->
- (Server == RawHost)
- and (Server == binary_join(lists:reverse(Tokens), "."));
- {Tokens, RawHost, Port} ->
- PortBin = (list_to_binary(":" ++ integer_to_list(Port))),
- (Server == << RawHost/binary, PortBin/binary >>)
- and (Server ==
- << (binary_join(lists:reverse(Tokens), "."))/binary,
- PortBin/binary >>)
- end end).
-
-%% Internal.
-
-%% Contributed by MononcQc on #erlounge.
-binary_join(Flowers, Leaf) ->
- case Flowers of
- [] -> <<>>;
- [Petal|Pot] -> iolist_to_binary(
- [Petal | [[Leaf | Pollen] || Pollen <- Pot]])
- end.
diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl
index 559903a..bb0e345 100644
--- a/test/http_SUITE.erl
+++ b/test/http_SUITE.erl
@@ -354,7 +354,7 @@ The document has moved
{400, "\r\n\r\n\r\n\r\n\r\n\r\n"},
{400, "GET / HTTP/1.1\r\nHost: ninenines.eu\r\n\r\n"},
{400, "GET http://proxy/ HTTP/1.1\r\n\r\n"},
- {400, ResponsePacket},
+ {505, ResponsePacket},
{408, "GET / HTTP/1.1\r\n"},
{408, "GET / HTTP/1.1\r\nHost: localhost"},
{408, "GET / HTTP/1.1\r\nHost: localhost\r\n"},
diff --git a/test/proper_SUITE.erl b/test/proper_SUITE.erl
deleted file mode 100644
index 113e135..0000000
--- a/test/proper_SUITE.erl
+++ /dev/null
@@ -1,37 +0,0 @@
-%% Copyright (c) 2011, Loïc Hoguin <[email protected]>
-%%
-%% Permission to use, copy, modify, and/or distribute this software for any
-%% purpose with or without fee is hereby granted, provided that the above
-%% copyright notice and this permission notice appear in all copies.
-%%
-%% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-%% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-%% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-%% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-%% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
--module(proper_SUITE).
-
--include_lib("common_test/include/ct.hrl").
-
--export([all/0, groups/0]). %% ct.
--export([dispatcher_split_host/1]). %% cowboy_dispatcher.
-
-%% ct.
-
-all() ->
- [{group, dispatcher}].
-
-groups() ->
- [{dispatcher, [], [dispatcher_split_host]}].
-
-%% cowboy_dispatcher.
-
-dispatcher_split_host(_Config) ->
- true = proper:quickcheck(dispatcher_prop:prop_split_host_symmetric(),
- [{on_output, fun(Format, Data) ->
- io:format(user, Format, Data), %% Console.
- io:format(Format, Data) %% Logs.
- end}]).