stdlib: Remove compose_query and dissect_query

compose_query/{1,2} and dissect_query/1 removed as the implemented
specification (HTML 2.0) is old. They will be re-implemented based
on HTML5.

1 files changed, 2 insertions, 49 deletions

diff --git a/lib/stdlib/test/uri_string_SUITE.erl b/lib/stdlib/test/uri_string_SUITE.erl
index 1567b9333a..c625da56c6 100644
--- a/lib/stdlib/test/uri_string_SUITE.erl
+++ b/lib/stdlib/test/uri_string_SUITE.erl
@@ -38,9 +38,7 @@
          recompose_query/1, recompose_parse_query/1,
          recompose_path/1, recompose_parse_path/1,
          recompose_autogen/1, parse_recompose_autogen/1,
-         transcode_basic/1, transcode_options/1, transcode_mixed/1, transcode_negative/1,
-         compose_query/1, compose_query_negative/1,
-         dissect_query/1, dissect_query_negative/1
+         transcode_basic/1, transcode_options/1, transcode_mixed/1, transcode_negative/1
         ]).
 
 
@@ -109,11 +107,7 @@ all() ->
      transcode_basic,
      transcode_options,
      transcode_mixed,
-     transcode_negative,
-     compose_query,
-     compose_query_negative,
-     dissect_query,
-     dissect_query_negative
+     transcode_negative
     ].
 
 groups() ->
@@ -829,47 +823,6 @@ transcode_negative(_Config) ->
     {error,invalid_input,<<"ö">>} =
         uri_string:transcode("foo%F6bar", [{in_encoding, utf8},{out_encoding, utf8}]).
 
-compose_query(_Config) ->
-    [] = uri_string:compose_query([]),
-    "foo=1&amp;bar=2" = uri_string:compose_query([{<<"foo">>,"1"}, {"bar", "2"}]),
-    "foo=1&amp;bar=2" = uri_string:compose_query([{"foo","1"}, {"bar", "2"}],[{separator,escaped_amp}]),
-    "foo=1&bar=2" = uri_string:compose_query([{"foo","1"}, {"bar", "2"}],[{separator,amp}]),
-    "foo=1;bar=2" = uri_string:compose_query([{"foo","1"}, {"bar", "2"}],[{separator,semicolon}]),
-    "foo+bar=1&amp;%C3%B6=2" = uri_string:compose_query([{"foo bar","1"}, {"ö", "2"}]),
-    "foo+bar=1&amp;%C3%B6=2" = uri_string:compose_query([{<<"foo bar">>,<<"1">>}, {"ö", <<"2">>}]),
-    <<"foo+bar=1&amp;%C3%B6=2">> =
-        uri_string:compose_query([{<<"foo bar">>,<<"1">>}, {<<"ö"/utf8>>, <<"2">>}]).
-
-compose_query_negative(_Config) ->
-    {error,invalid_input,4} = uri_string:compose_query([{"",4}]),
-    {error,invalid_input,5} = uri_string:compose_query([{5,""}]),
-    {error,invalid_utf8,<<"ö">>} = uri_string:compose_query([{"foo bar","1"}, {<<"ö">>, "2"}]).
-
-dissect_query(_Config) ->
-    [] = uri_string:dissect_query(""),
-    [{"foo","1"}, {"bar", "2"}] = uri_string:dissect_query("foo=1&amp;bar=2"),
-    [{"foo","1"}, {"bar", "2"}] = uri_string:dissect_query("foo=1&bar=2"),
-    [{"foo","1"}, {"bar", "2"}] = uri_string:dissect_query("foo=1;bar=2"),
-    [{"foo","1"}, {"bar", "222"}] = uri_string:dissect_query([<<"foo=1;bar=2">>,"22"]),
-    [{"foo","ö"}, {"bar", "2"}] = uri_string:dissect_query("foo=%C3%B6&amp;bar=2"),
-    [{<<"foo">>,<<"ö"/utf8>>}, {<<"bar">>, <<"2">>}] =
-        uri_string:dissect_query(<<"foo=%C3%B6&amp;bar=2">>),
-    [{"foo bar","1"},{"ö","2"}] =
-        uri_string:dissect_query([<<"foo+bar=1&amp;">>,<<"%C3%B6=2">>]).
-
-dissect_query_negative(_Config) ->
-    {error,invalid_character,";"} =
-        uri_string:dissect_query("foo=1&ap;bar=2"),
-    {error,invalid_character,"&"} =
-        uri_string:dissect_query("foo1&amp;bar=2"),
-    {error,invalid_percent_encoding,"%XX%B6"} = uri_string:dissect_query("foo=%XX%B6&amp;bar=2"),
-    {error,invalid_input,<<153,182>>} =
-        uri_string:dissect_query("foo=%99%B6&amp;bar=2"),
-    {error,invalid_character,"ö"} = uri_string:dissect_query("föo+bar=1&amp;%C3%B6=2"),
-    {error,invalid_character,"ö"} = uri_string:dissect_query(<<"föo+bar=1&amp;%C3%B6=2">>),
-    {error,invalid_input,<<"ö">>} =
-        uri_string:dissect_query([<<"foo+bar=1&amp;">>,<<"%C3%B6=2ö">>]).
-
 normalize(_Config) ->
     "/a/g" = uri_string:normalize("/a/b/c/./../../g"),
     <<"mid/6">> = uri_string:normalize(<<"mid/content=5/../6">>),