From 3fb6ec85d8f5ebbd0842d752379ce4cfd0036b60 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Thu, 11 Jul 2019 12:23:06 +0300 Subject: [PATCH] Change function name from *_case to *_test_case --- apps/epp_proxy/test/epp_certs_SUITE.erl | 14 ++-- apps/epp_proxy/test/epp_http_client_SUITE.erl | 18 ++--- apps/epp_proxy/test/epp_router_SUITE.erl | 42 +++++------ apps/epp_proxy/test/epp_util_SUITE.erl | 26 +++---- apps/epp_proxy/test/epp_xml_SUITE.erl | 70 ++++++++++--------- 5 files changed, 86 insertions(+), 84 deletions(-) diff --git a/apps/epp_proxy/test/epp_certs_SUITE.erl b/apps/epp_proxy/test/epp_certs_SUITE.erl index ec6ffca..5519f34 100644 --- a/apps/epp_proxy/test/epp_certs_SUITE.erl +++ b/apps/epp_proxy/test/epp_certs_SUITE.erl @@ -3,15 +3,15 @@ -include_lib("public_key/include/public_key.hrl"). -export([all/0]). --export([der_certificate_case/1, subject_from_otp_certificate_case/1, - common_name_from_subject_case/1]). +-export([der_certificate_test_case/1, subject_from_otp_certificate_test_case/1, + common_name_from_subject_test_case/1]). -all() -> [der_certificate_case, subject_from_otp_certificate_case, - common_name_from_subject_case]. +all() -> [der_certificate_test_case, subject_from_otp_certificate_test_case, + common_name_from_subject_test_case]. %% Run Unit tests. %% Todo: these should be property tests, not unit tests. -der_certificate_case(_Config) -> +der_certificate_test_case(_Config) -> PemEntries = public_key:pem_decode(certificate_pem()), {value, CertEntry} = lists:keysearch('Certificate', 1, PemEntries), {_, DerCert, _} = CertEntry, @@ -19,13 +19,13 @@ der_certificate_case(_Config) -> true = is_record(Certificate, 'OTPCertificate'), ok. -subject_from_otp_certificate_case(_Config) -> +subject_from_otp_certificate_test_case(_Config) -> Certificate = test_certificate(), Subject = epp_certs:subject_from_otp_certificate(Certificate), {rdnSequence, _ListOfAttributes} = Subject, ok. -common_name_from_subject_case(_Config) -> +common_name_from_subject_test_case(_Config) -> Certificate = test_certificate(), Subject = epp_certs:subject_from_otp_certificate(Certificate), CommonName = epp_certs:common_name_from_subject(Subject), diff --git a/apps/epp_proxy/test/epp_http_client_SUITE.erl b/apps/epp_proxy/test/epp_http_client_SUITE.erl index 86135db..d9285e1 100644 --- a/apps/epp_proxy/test/epp_http_client_SUITE.erl +++ b/apps/epp_proxy/test/epp_http_client_SUITE.erl @@ -5,15 +5,15 @@ -export([all/0]). --export([hello_request_builder_case/1, - error_request_builder_case/1, - command_request_builder_case/1]). +-export([hello_request_builder_test_case/1, + error_request_builder_test_case/1, + command_request_builder_test_case/1]). -all() -> [hello_request_builder_case, - error_request_builder_case, - command_request_builder_case]. +all() -> [hello_request_builder_test_case, + error_request_builder_test_case, + command_request_builder_test_case]. -hello_request_builder_case(_Config) -> +hello_request_builder_test_case(_Config) -> RequestMap = #{command => "hello", session_id => "Random", cl_trid => "EE-123456789", raw_frame => "", headers => [{"User-Agent", <<"EPP proxy">>}]}, @@ -25,7 +25,7 @@ hello_request_builder_case(_Config) -> true = is_record(Request, epp_request), ExpectedTuple = Request. -error_request_builder_case(_Config) -> +error_request_builder_test_case(_Config) -> RequestMap = #{command => "error", session_id => "Random", cl_trid => "EE-123456789", code => <<"2001">>, message => <<"Expected better XML">>, @@ -41,7 +41,7 @@ error_request_builder_case(_Config) -> ExpectedTuple = Request, ok. -command_request_builder_case(_Config) -> +command_request_builder_test_case(_Config) -> RequestMap = #{command => "create", session_id => "Random", cl_trid => "EE-123456789", raw_frame => "Some XML here", headers => [{"User-Agent", <<"EPP proxy">>}]}, diff --git a/apps/epp_proxy/test/epp_router_SUITE.erl b/apps/epp_proxy/test/epp_router_SUITE.erl index 2412e96..585e26f 100644 --- a/apps/epp_proxy/test/epp_router_SUITE.erl +++ b/apps/epp_proxy/test/epp_router_SUITE.erl @@ -3,18 +3,18 @@ -include_lib("common_test/include/ct.hrl"). -export([all/0]). --export([request_method_case/1, hello_url_case/1, login_url_case/1, - logout_url_case/1, check_url_case/1, info_url_case/1, poll_url_case/1, - create_url_case/1, delete_url_case/1, renew_url_case/1, - update_url_case/1, transfer_url_case/1, error_url_case/1]). +-export([request_method_test_case/1, hello_url_test_case/1, login_url_test_case/1, + logout_url_test_case/1, check_url_test_case/1, info_url_test_case/1, poll_url_test_case/1, + create_url_test_case/1, delete_url_test_case/1, renew_url_test_case/1, + update_url_test_case/1, transfer_url_test_case/1, error_url_test_case/1]). -all() -> [request_method_case, hello_url_case, login_url_case, - logout_url_case, check_url_case, info_url_case, poll_url_case, - create_url_case, delete_url_case, renew_url_case, - update_url_case, transfer_url_case, error_url_case]. +all() -> [request_method_test_case, hello_url_test_case, login_url_test_case, + logout_url_test_case, check_url_test_case, info_url_test_case, poll_url_test_case, + create_url_test_case, delete_url_test_case, renew_url_test_case, + update_url_test_case, transfer_url_test_case, error_url_test_case]. %% Run Unit tests -request_method_case(_Config) -> +request_method_test_case(_Config) -> get = epp_router:request_method("hello"), get = epp_router:request_method(<<"hello">>), get = epp_router:request_method("error"), @@ -24,62 +24,62 @@ request_method_case(_Config) -> ok. %% TODO: Make less verbose and repetitive -hello_url_case(_Config) -> +hello_url_test_case(_Config) -> "https://localhost:9292/epp/session/hello" = epp_router:route_request("hello"), "https://localhost:9292/epp/session/hello" = epp_router:route_request(<<"hello">>), ok. -login_url_case(_Config) -> +login_url_test_case(_Config) -> "https://localhost:9292/epp/session/login" = epp_router:route_request("login"), "https://localhost:9292/epp/session/login" = epp_router:route_request(<<"login">>), ok. -logout_url_case(_Config) -> +logout_url_test_case(_Config) -> "https://localhost:9292/epp/session/logout" = epp_router:route_request("logout"), "https://localhost:9292/epp/session/logout" = epp_router:route_request(<<"logout">>), ok. -check_url_case(_Config) -> +check_url_test_case(_Config) -> "https://localhost:9292/epp/command/check" = epp_router:route_request("check"), "https://localhost:9292/epp/command/check" = epp_router:route_request(<<"check">>), ok. -info_url_case(_Config) -> +info_url_test_case(_Config) -> "https://localhost:9292/epp/command/info" = epp_router:route_request("info"), "https://localhost:9292/epp/command/info" = epp_router:route_request(<<"info">>), ok. -poll_url_case(_Config) -> +poll_url_test_case(_Config) -> "https://localhost:9292/epp/command/poll" = epp_router:route_request("poll"), "https://localhost:9292/epp/command/poll" = epp_router:route_request(<<"poll">>), ok. -create_url_case(_Config) -> +create_url_test_case(_Config) -> "https://localhost:9292/epp/command/create" = epp_router:route_request("create"), "https://localhost:9292/epp/command/create" = epp_router:route_request(<<"create">>), ok. -delete_url_case(_Config) -> +delete_url_test_case(_Config) -> "https://localhost:9292/epp/command/delete" = epp_router:route_request("delete"), "https://localhost:9292/epp/command/delete" = epp_router:route_request(<<"delete">>), ok. -renew_url_case(_Config) -> +renew_url_test_case(_Config) -> "https://localhost:9292/epp/command/renew" = epp_router:route_request("renew"), "https://localhost:9292/epp/command/renew" = epp_router:route_request(<<"renew">>), ok. -update_url_case(_Config) -> +update_url_test_case(_Config) -> "https://localhost:9292/epp/command/update" = epp_router:route_request("update"), "https://localhost:9292/epp/command/update" = epp_router:route_request(<<"update">>), ok. -transfer_url_case(_Config) -> +transfer_url_test_case(_Config) -> "https://localhost:9292/epp/command/transfer" = epp_router:route_request("transfer"), "https://localhost:9292/epp/command/transfer" = epp_router:route_request(<<"transfer">>), ok. -error_url_case(_Config) -> +error_url_test_case(_Config) -> "https://localhost:9292/epp/error" = epp_router:route_request("error"), "https://localhost:9292/epp/error" = epp_router:route_request(<<"error">>), ok. diff --git a/apps/epp_proxy/test/epp_util_SUITE.erl b/apps/epp_proxy/test/epp_util_SUITE.erl index 6542400..8dd122e 100644 --- a/apps/epp_proxy/test/epp_util_SUITE.erl +++ b/apps/epp_proxy/test/epp_util_SUITE.erl @@ -3,23 +3,23 @@ -include_lib("common_test/include/ct.hrl"). -export([all/0]). --export([session_id_case/1, create_map_case/1, create_session_id_case/1, - frame_length_case/1, frame_length_to_receive_case/1, - frame_length_to_send_case/1, readable_ip_case/1]). +-export([session_id_test_case/1, create_map_test_case/1, create_session_id_test_case/1, + frame_length_test_case/1, frame_length_to_receive_test_case/1, + frame_length_to_send_test_case/1, readable_ip_test_case/1]). -all() -> [session_id_case, create_map_case, create_session_id_case, - frame_length_case, frame_length_to_receive_case, - frame_length_to_send_case, readable_ip_case]. +all() -> [session_id_test_case, create_map_test_case, create_session_id_test_case, + frame_length_test_case, frame_length_to_receive_test_case, + frame_length_to_send_test_case, readable_ip_test_case]. %% Todo: these should be property tests, not unit tests. -session_id_case(_Config) -> +session_id_test_case(_Config) -> Pid = spawn(fun () -> ok end), SessionId = epp_util:session_id(Pid), true = is_list(SessionId), true = length(SessionId) > 0, ok. -create_map_case(_Config) -> +create_map_test_case(_Config) -> Pid = spawn(fun () -> ok end), Map = epp_util:create_map(Pid), Pid = maps:get("pid", Map), @@ -27,7 +27,7 @@ create_map_case(_Config) -> true = is_float(maps:get("random", Map)), ok. -create_session_id_case(_Config) -> +create_session_id_test_case(_Config) -> Pid = list_to_pid("<0.130.0>"), Random = 0.7131518292439796, Time = "2019-05-23T14:47:52+03:00", @@ -37,25 +37,25 @@ create_session_id_case(_Config) -> "88F49C2B1BDD6F2355BF4424A67C928DA7C5616B30F7C5B35F17747348AF61EF8723ED6BE6012D879CB3D6A7EC7A187660A56910ED896AE67DE533C212D" = Hash, ok. -frame_length_case(_Config) -> +frame_length_test_case(_Config) -> 2 = epp_util:frame_length("aa"), 2 = epp_util:frame_length(<<"aa">>), 2 = epp_util:frame_length(<<"OÜ">>), ok. -frame_length_to_receive_case(_Config) -> +frame_length_to_receive_test_case(_Config) -> 2 = epp_util:frame_length_to_receive(6), 0 = epp_util:frame_length_to_receive(4), {'EXIT', {function_clause, _}} = (catch epp_util:frame_length_to_receive(-22)), ok. -frame_length_to_send_case(_Config) -> +frame_length_to_send_test_case(_Config) -> 18 = epp_util:frame_length_to_send(""), 4 = epp_util:frame_length_to_send(""), ok. -readable_ip_case(_Config) -> +readable_ip_test_case(_Config) -> <<"127.0.0.1">> = epp_util:readable_ip({127,0,0,1}), {'EXIT', {function_clause, _}} = (catch epp_util:readable_ip({127,0,0,1,0})), diff --git a/apps/epp_proxy/test/epp_xml_SUITE.erl b/apps/epp_proxy/test/epp_xml_SUITE.erl index b9eb249..bb0ae42 100644 --- a/apps/epp_proxy/test/epp_xml_SUITE.erl +++ b/apps/epp_proxy/test/epp_xml_SUITE.erl @@ -23,94 +23,96 @@ "). -export([all/0]). --export([parse_not_a_list_or_binary_case/1, parse_sample_valid_xml_binary_case/1, - parse_sample_valid_xml_list_case/1, - parse_sample_invalid_xml_binary_case/1, - parse_sample_invalid_xml_list_case/1, - find_cltrid_binary_case/1, - find_cltrid_empty_binary_case/1, - find_cltrid_empty_list_case/1, - find_cltrid_list_case/1, - get_command_success_case/1, - get_command_xml_not_epp_failure_case/1, - get_command_failure_case/1]). +-export([parse_not_a_list_or_binary_test_case/1, + parse_sample_valid_xml_binary_test_case/1, + parse_sample_valid_xml_list_test_case/1, + parse_sample_invalid_xml_binary_test_case/1, + parse_sample_invalid_xml_list_test_case/1, + find_cltrid_binary_test_case/1, + find_cltrid_empty_binary_test_case/1, + find_cltrid_empty_list_test_case/1, + find_cltrid_list_test_case/1, + get_command_success_test_case/1, + get_command_xml_not_epp_failure_test_case/1, + get_command_failure_test_case/1]). -all() -> [parse_not_a_list_or_binary_case, parse_sample_valid_xml_binary_case, - parse_sample_valid_xml_list_case, - parse_sample_invalid_xml_binary_case, - parse_sample_invalid_xml_list_case, - find_cltrid_binary_case, - find_cltrid_empty_binary_case, - find_cltrid_empty_list_case, - find_cltrid_list_case, - get_command_success_case, - get_command_xml_not_epp_failure_case, - get_command_failure_case]. +all() -> [parse_not_a_list_or_binary_test_case, + parse_sample_valid_xml_binary_test_case, + parse_sample_valid_xml_list_test_case, + parse_sample_invalid_xml_binary_test_case, + parse_sample_invalid_xml_list_test_case, + find_cltrid_binary_test_case, + find_cltrid_empty_binary_test_case, + find_cltrid_empty_list_test_case, + find_cltrid_list_test_case, + get_command_success_test_case, + get_command_xml_not_epp_failure_test_case, + get_command_failure_test_case]. -parse_not_a_list_or_binary_case(_Config) -> +parse_not_a_list_or_binary_test_case(_Config) -> Input = 1234, ExpectedOutput = {error, {fatal, {expected_binary_or_list}}}, ExpectedOutput = epp_xml:parse(Input), ok. -parse_sample_valid_xml_list_case(_Config) -> +parse_sample_valid_xml_list_test_case(_Config) -> Input = ?sampleCommandList, {ok, Record} = epp_xml:parse(Input), true = is_record(Record, xmlElement), ok. -parse_sample_valid_xml_binary_case(_Config) -> +parse_sample_valid_xml_binary_test_case(_Config) -> Input = list_to_binary(?sampleCommandList), {ok, Record} = epp_xml:parse(Input), true = is_record(Record, xmlElement), ok. -parse_sample_invalid_xml_list_case(_Config) -> +parse_sample_invalid_xml_list_test_case(_Config) -> Input = "Some text", {error, {fatal, _Details}} = epp_xml:parse(Input), ok. -parse_sample_invalid_xml_binary_case(_Config) -> +parse_sample_invalid_xml_binary_test_case(_Config) -> Input = list_to_binary("Some text"), {error, {fatal, _Details}} = epp_xml:parse(Input), ok. %% find_cltrid -find_cltrid_empty_list_case(_Config) -> +find_cltrid_empty_list_test_case(_Config) -> Input = "", nomatch = epp_xml:find_cltrid(Input), ok. -find_cltrid_list_case(_Config) -> +find_cltrid_list_test_case(_Config) -> Input = list_to_binary(?sampleCommandList), <<"sample1trid">> = epp_xml:find_cltrid(Input), ok. -find_cltrid_empty_binary_case(_Config) -> +find_cltrid_empty_binary_test_case(_Config) -> Input = <<"">>, nomatch = epp_xml:find_cltrid(Input), ok. -find_cltrid_binary_case(_Config) -> +find_cltrid_binary_test_case(_Config) -> Input = ?sampleCommandList, <<"sample1trid">> = epp_xml:find_cltrid(Input), ok. %% get_command -get_command_success_case(_Config) -> +get_command_success_test_case(_Config) -> %% We require an existing xlmElement record to pass around. {ok, XMLElement} = epp_xml:parse(?sampleCommandList), Command = epp_xml:get_command(XMLElement), "login" = Command, ok. -get_command_xml_not_epp_failure_case(_Config) -> +get_command_xml_not_epp_failure_test_case(_Config) -> {ok, XMLElement} = epp_xml:parse(?validXMLNotEPPList), Command = epp_xml:get_command(XMLElement), undefined = Command, ok. -get_command_failure_case(_Config) -> +get_command_failure_test_case(_Config) -> %% Can pass any garbage, should get back undefined., Command = epp_xml:get_command("Some random string"), undefined = Command,