This is an automated email from the ASF dual-hosted git repository. willholley pushed a commit to branch upstream-2.20.0 in repository https://gitbox.apache.org/repos/asf/couchdb-mochiweb.git
commit 8892431f25516820400e76821b9c4d7d182e070d Author: Bob Ippolito <[email protected]> AuthorDate: Tue Mar 12 01:41:45 2019 +0000 Remove compile(tuple_calls) from test/mochiweb_request_tests --- test/mochiweb_request_tests.erl | 70 ++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/test/mochiweb_request_tests.erl b/test/mochiweb_request_tests.erl index b8f93e2..47fe7ee 100644 --- a/test/mochiweb_request_tests.erl +++ b/test/mochiweb_request_tests.erl @@ -1,162 +1,160 @@ -module(mochiweb_request_tests). --compile(tuple_calls). - -ifdef(TEST). -include_lib("eunit/include/eunit.hrl"). accepts_content_type_test() -> Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "multipart/related"}])), - ?assertEqual(true, Req1:accepts_content_type("multipart/related")), - ?assertEqual(true, Req1:accepts_content_type(<<"multipart/related">>)), + ?assertEqual(true, mochiweb_request:accepts_content_type("multipart/related", Req1)), + ?assertEqual(true, mochiweb_request:accepts_content_type(<<"multipart/related">>, Req1)), Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/html"}])), - ?assertEqual(false, Req2:accepts_content_type("multipart/related")), + ?assertEqual(false, mochiweb_request:accepts_content_type("multipart/related", Req2)), Req3 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/html, multipart/*"}])), - ?assertEqual(true, Req3:accepts_content_type("multipart/related")), + ?assertEqual(true, mochiweb_request:accepts_content_type("multipart/related", Req3)), Req4 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/html, multipart/*; q=0.0"}])), - ?assertEqual(false, Req4:accepts_content_type("multipart/related")), + ?assertEqual(false, mochiweb_request:accepts_content_type("multipart/related", Req4)), Req5 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/html, multipart/*; q=0"}])), - ?assertEqual(false, Req5:accepts_content_type("multipart/related")), + ?assertEqual(false, mochiweb_request:accepts_content_type("multipart/related", Req5)), Req6 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/html, */*; q=0.0"}])), - ?assertEqual(false, Req6:accepts_content_type("multipart/related")), + ?assertEqual(false, mochiweb_request:accepts_content_type("multipart/related", Req6)), Req7 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "multipart/*; q=0.0, */*"}])), - ?assertEqual(false, Req7:accepts_content_type("multipart/related")), + ?assertEqual(false, mochiweb_request:accepts_content_type("multipart/related", Req7)), Req8 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "*/*; q=0.0, multipart/*"}])), - ?assertEqual(true, Req8:accepts_content_type("multipart/related")), + ?assertEqual(true, mochiweb_request:accepts_content_type("multipart/related", Req8)), Req9 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "*/*; q=0.0, multipart/related"}])), - ?assertEqual(true, Req9:accepts_content_type("multipart/related")), + ?assertEqual(true, mochiweb_request:accepts_content_type("multipart/related", Req9)), Req10 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/html; level=1"}])), - ?assertEqual(true, Req10:accepts_content_type("text/html;level=1")), + ?assertEqual(true, mochiweb_request:accepts_content_type("text/html;level=1", Req10)), Req11 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/html; level=1, text/html"}])), - ?assertEqual(true, Req11:accepts_content_type("text/html")), + ?assertEqual(true, mochiweb_request:accepts_content_type("text/html", Req11)), Req12 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/html; level=1; q=0.0, text/html"}])), - ?assertEqual(false, Req12:accepts_content_type("text/html;level=1")), + ?assertEqual(false, mochiweb_request:accepts_content_type("text/html;level=1", Req12)), Req13 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/html; level=1; q=0.0, text/html"}])), - ?assertEqual(false, Req13:accepts_content_type("text/html; level=1")), + ?assertEqual(false, mochiweb_request:accepts_content_type("text/html; level=1", Req13)), Req14 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/html;level=1;q=0.1, text/html"}])), - ?assertEqual(true, Req14:accepts_content_type("text/html; level=1")). + ?assertEqual(true, mochiweb_request:accepts_content_type("text/html; level=1", Req14)). accepted_encodings_test() -> Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([])), ?assertEqual(["identity"], - Req1:accepted_encodings(["gzip", "identity"])), + mochiweb_request:accepted_encodings(["gzip", "identity"], Req1)), Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept-Encoding", "gzip, deflate"}])), ?assertEqual(["gzip", "identity"], - Req2:accepted_encodings(["gzip", "identity"])), + mochiweb_request:accepted_encodings(["gzip", "identity"], Req2)), Req3 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept-Encoding", "gzip;q=0.5, deflate"}])), ?assertEqual(["deflate", "gzip", "identity"], - Req3:accepted_encodings(["gzip", "deflate", "identity"])), + mochiweb_request:accepted_encodings(["gzip", "deflate", "identity"], Req3)), Req4 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept-Encoding", "identity, *;q=0"}])), ?assertEqual(["identity"], - Req4:accepted_encodings(["gzip", "deflate", "identity"])), + mochiweb_request:accepted_encodings(["gzip", "deflate", "identity"], Req4)), Req5 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept-Encoding", "gzip; q=0.1, *;q=0"}])), ?assertEqual(["gzip"], - Req5:accepted_encodings(["gzip", "deflate", "identity"])), + mochiweb_request:accepted_encodings(["gzip", "deflate", "identity"], Req5)), Req6 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept-Encoding", "gzip; q=, *;q=0"}])), ?assertEqual(bad_accept_encoding_value, - Req6:accepted_encodings(["gzip", "deflate", "identity"])), + mochiweb_request:accepted_encodings(["gzip", "deflate", "identity"], Req6)), Req7 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept-Encoding", "gzip;q=2.0, *;q=0"}])), ?assertEqual(bad_accept_encoding_value, - Req7:accepted_encodings(["gzip", "identity"])), + mochiweb_request:accepted_encodings(["gzip", "identity"], Req7)), Req8 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept-Encoding", "deflate, *;q=0.0"}])), ?assertEqual([], - Req8:accepted_encodings(["gzip", "identity"])). + mochiweb_request:accepted_encodings(["gzip", "identity"], Req8)). accepted_content_types_test() -> Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/html"}])), ?assertEqual(["text/html"], - Req1:accepted_content_types(["text/html", "application/json"])), + mochiweb_request:accepted_content_types(["text/html", "application/json"], Req1)), Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/html, */*;q=0"}])), ?assertEqual(["text/html"], - Req2:accepted_content_types(["text/html", "application/json"])), + mochiweb_request:accepted_content_types(["text/html", "application/json"], Req2)), Req3 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/*, */*;q=0"}])), ?assertEqual(["text/html"], - Req3:accepted_content_types(["text/html", "application/json"])), + mochiweb_request:accepted_content_types(["text/html", "application/json"], Req3)), Req4 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/*;q=0.8, */*;q=0.5"}])), ?assertEqual(["text/html", "application/json"], - Req4:accepted_content_types(["application/json", "text/html"])), + mochiweb_request:accepted_content_types(["application/json", "text/html"], Req4)), Req5 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/*;q=0.8, */*;q=0.5"}])), ?assertEqual(["text/html", "application/json"], - Req5:accepted_content_types(["text/html", "application/json"])), + mochiweb_request:accepted_content_types(["text/html", "application/json"], Req5)), Req6 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/*;q=0.5, */*;q=0.5"}])), ?assertEqual(["application/json", "text/html"], - Req6:accepted_content_types(["application/json", "text/html"])), + mochiweb_request:accepted_content_types(["application/json", "text/html"], Req6)), Req7 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make( [{"Accept", "text/html;q=0.5, application/json;q=0.5"}])), ?assertEqual(["application/json", "text/html"], - Req7:accepted_content_types(["application/json", "text/html"])), + mochiweb_request:accepted_content_types(["application/json", "text/html"], Req7)), Req8 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/html"}])), ?assertEqual([], - Req8:accepted_content_types(["application/json"])), + mochiweb_request:accepted_content_types(["application/json"], Req8)), Req9 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, mochiweb_headers:make([{"Accept", "text/*;q=0.9, text/html;q=0.5, */*;q=0.7"}])), ?assertEqual(["application/json", "text/html"], - Req9:accepted_content_types(["text/html", "application/json"])). + mochiweb_request:accepted_content_types(["text/html", "application/json"], Req9)). should_close_test() -> F = fun (V, H) -> - (mochiweb_request:new( + mochiweb_request:should_close(mochiweb_request:new( nil, 'GET', "/", V, mochiweb_headers:make(H) - )):should_close() + )) end, ?assertEqual( true,
