Skip to content

Commit

Permalink
whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
andreineculau committed Mar 6, 2016
1 parent 0011776 commit 2d55b99
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 26 deletions.
20 changes: 10 additions & 10 deletions src/katt.erl
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ run(From, Scenario, Params, Callbacks) ->
Failures = lists:filter(FailureFilter, TransactionResults),
Status = case Failures of
[] -> pass;
_ -> fail
_ -> fail
end,
Result = {Status, Scenario, Params, FinalParams, TransactionResults},
From ! {progress, status, Status},
Expand Down Expand Up @@ -140,7 +140,7 @@ make_params(ScenarioParams0) ->
ScenarioParams = [ {katt_util:to_list(K), V} || {K, V} <- ScenarioParams0],
Protocol = proplists:get_value("protocol", ScenarioParams, ?DEFAULT_PROTOCOL),
DefaultPort = case Protocol of
?PROTOCOL_HTTP -> ?DEFAULT_PORT_HTTP;
?PROTOCOL_HTTP -> ?DEFAULT_PORT_HTTP;
?PROTOCOL_HTTPS -> ?DEFAULT_PORT_HTTPS
end,
DefaultParams = [ {"protocol", Protocol}
Expand Down Expand Up @@ -247,9 +247,9 @@ make_katt_request( #katt_request{headers=Hdrs0, url=Url0, body=Body0} = Req
Url = make_request_url(Url1, Params),
Hdrs = RecallFun(headers, Hdrs0, Params, Callbacks),
[Hdrs, Body] = RecallFun(body, [Hdrs, Body0], Params, Callbacks),
Req#katt_request{ url = Url
Req#katt_request{ url = Url
, headers = Hdrs
, body = Body
, body = Body
}.

make_katt_response( #katt_response{headers=Hdrs0, body=Body0} = Res
Expand All @@ -261,15 +261,15 @@ make_katt_response( #katt_response{headers=Hdrs0, body=Body0} = Res
Hdrs = RecallFun(headers, Hdrs0, Params, Callbacks),
[Hdrs, Body] = RecallFun(body, [Hdrs, Body0], Params, Callbacks),
ParsedBody = ParseFun(Hdrs, Body, Params, Callbacks),
Res#katt_response{ headers = Hdrs
, body = Body
Res#katt_response{ headers = Hdrs
, body = Body
, parsed_body = ParsedBody
}.

-spec make_request_url( string()
, params()
) -> nonempty_string().
make_request_url(Url = ?PROTOCOL_HTTP "//" ++ _, _Params) -> Url;
make_request_url(Url = ?PROTOCOL_HTTP "//" ++ _, _Params) -> Url;
make_request_url(Url = ?PROTOCOL_HTTPS "//" ++ _, _Params) -> Url;
make_request_url(Path, Params) ->
Protocol = proplists:get_value("protocol", Params),
Expand All @@ -282,7 +282,7 @@ make_request_url(Path, Params) ->
], "").


make_host(?PROTOCOL_HTTP, Hostname, 80) -> Hostname;
make_host(?PROTOCOL_HTTPS, Hostname, 443) -> Hostname;
make_host(_Proto, Hostname, Port) ->
make_host(?PROTOCOL_HTTP, Hostname, 80) -> Hostname;
make_host(?PROTOCOL_HTTPS, Hostname, 443) -> Hostname;
make_host(_Proto, Hostname, Port) ->
Hostname ++ ":" ++ katt_util:to_list(Port).
16 changes: 8 additions & 8 deletions src/katt_callbacks.erl
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,12 @@ request(R = #katt_request{}, Params, Callbacks) ->
ParseFun = proplists:get_value(parse, Callbacks),
case http_request(R, Params) of
{ok, {{Code, _}, Hdrs, Body}} ->
#katt_response{ status = Code
, headers = Hdrs
, body = Body
#katt_response{ status = Code
, headers = Hdrs
, body = Body
, parsed_body = ParseFun(Hdrs, Body, Params, Callbacks)
};
Error = {error, _} ->
Error = {error, _} ->
Error
end.

Expand All @@ -176,7 +176,7 @@ request(R = #katt_request{}, Params, Callbacks) ->
validate( Expected = #katt_response{}
, Actual = #katt_response{}
, _Params
, Callbacks) ->
, Callbacks) ->
{AddParams0, Failures0} = get_params_and_failures(
validate_status(Expected, Actual, Callbacks)),
{AddParams1, Failures1} = get_params_and_failures(
Expand All @@ -188,10 +188,10 @@ validate( Expected = #katt_response{}
Failures = Failures0 ++ Failures1 ++ Failures2,
case Failures of
[] -> {pass, AddParams};
_ -> {fail, Failures}
_ -> {fail, Failures}
end;
validate(Expected, #katt_response{}, _Params, _Callbacks) -> {fail, Expected};
validate(#katt_response{}, Actual, _Params, _Callbacks) -> {fail, Actual}.
validate(#katt_response{}, Actual, _Params, _Callbacks) -> {fail, Actual}.

%% @doc Notify of scenario progress
%% @end
Expand Down Expand Up @@ -233,7 +233,7 @@ http_request( #katt_request{ method = Method
, Params) ->
Body = case Body0 of
null -> <<>>;
Bin -> Bin
Bin -> Bin
end,
Sleep = case proplists:get_value("x-katt-request-sleep", Hdrs0) of
undefined ->
Expand Down
2 changes: 1 addition & 1 deletion src/katt_callbacks_json.erl
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ parse(false = _JustCheck, _Hdrs, null, _Params, _Callbacks) ->
[];
parse(false = _JustCheck, Hdrs, Body, _Params, _Callbacks) ->
case is_json_content_type(Hdrs) of
true ->
true ->
parse_json(Body);
false ->
katt_util:from_utf8(Body)
Expand Down
2 changes: 1 addition & 1 deletion src/katt_request.erl
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ set_method(Method, #katt_request{} = Req) -> Req#katt_request{method = Method}.
get_url(#katt_request{url = Url}) -> Url.

-spec set_url(string(), request()) -> request().
set_url(Url, #katt_request{} = Req) -> Req#katt_request{url = Url}.
set_url(Url, #katt_request{} = Req) -> Req#katt_request{url = Url}.
12 changes: 6 additions & 6 deletions src/katt_util.erl
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@ merge_proplists(List1, List2) ->
, orddict:from_list(List2)
).

to_list(X) when is_atom(X) -> atom_to_list(X);
to_list(X) when is_atom(X) -> atom_to_list(X);
to_list(X) when is_integer(X) -> integer_to_list(X);
to_list(X) when is_float(X) -> my_float_to_list(X);
to_list(X) when is_binary(X) -> binary_to_list(X);
to_list(X) when is_list(X) -> X.
to_list(X) when is_float(X) -> my_float_to_list(X);
to_list(X) when is_binary(X) -> binary_to_list(X);
to_list(X) when is_list(X) -> X.

%% Transform (possibly utf8 encoded) binary to list, ignore everything else.
from_utf8(X) when is_binary(X) ->
case unicode:characters_to_list(X, utf8) of
R when is_list(R) -> R;
{error, _, _} -> binary_to_list(X);
R when is_list(R) -> R;
{error, _, _} -> binary_to_list(X);
{incomplete, _, _} -> binary_to_list(X)
end.

Expand Down

0 comments on commit 2d55b99

Please sign in to comment.