Add testcase for +pc and io:printable_range/0

Also fixed otp_10302 to test both on a node with +pc unicode and
a node with +pc latin1.

1 files changed, 93 insertions, 3 deletions

diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index aa698ecaa2..3d4945f30e 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -29,9 +29,12 @@
          manpage/1, otp_6708/1, otp_7084/1, otp_7421/1,
 	 io_lib_collect_line_3_wb/1, cr_whitespace_in_string/1,
 	 io_fread_newlines/1, otp_8989/1, io_lib_fread_literal/1,
+	 printable_range/1,
 	 io_lib_print_binary_depth_one/1, otp_10302/1, otp_10755/1,
 	 otp_10836/1]).
 
+-export([pretty/2]).
+
 %-define(debug, true).
 
 -ifdef(debug).
@@ -66,6 +69,7 @@ all() ->
      manpage, otp_6708, otp_7084, otp_7421,
      io_lib_collect_line_3_wb, cr_whitespace_in_string,
      io_fread_newlines, otp_8989, io_lib_fread_literal,
+     printable_range,
      io_lib_print_binary_depth_one, otp_10302, otp_10755, otp_10836].
 
 groups() -> 
@@ -2026,6 +2030,80 @@ io_lib_fread_literal(Suite) when is_list(Suite) ->
     ?line {done,{ok,[]},[]} = io_lib:fread(C2, "d\n", " d"),
     ok.
 
+
+printable_range(doc) ->
+    "Check that the printable range set by the user actually works";
+printable_range(Suite) when is_list(Suite) ->
+    Pa = filename:dirname(code:which(?MODULE)),
+    {ok, UNode} = test_server:start_node(printable_range_unicode, slave, 
+					 [{args, " +pc unicode -pa " ++ Pa}]),
+    {ok, LNode} = test_server:start_node(printable_range_latin1, slave, 
+					 [{args, " +pc latin1 -pa " ++ Pa}]),
+    {ok, DNode} = test_server:start_node(printable_range_default, slave, 
+					 [{args, " -pa " ++ Pa}]),
+    unicode = rpc:call(UNode,io,printable_range,[]),
+    latin1 = rpc:call(LNode,io,printable_range,[]),
+    latin1 = rpc:call(DNode,io,printable_range,[]),
+    test_server:stop_node(UNode),
+    test_server:stop_node(LNode),
+    {ok, UNode} = test_server:start_node(printable_range_unicode, slave, 
+					 [{args, " +pcunicode -pa " ++ Pa}]),
+    {ok, LNode} = test_server:start_node(printable_range_latin1, slave, 
+					 [{args, " +pclatin1 -pa " ++ Pa}]),
+    unicode = rpc:call(UNode,io,printable_range,[]),
+    latin1 = rpc:call(LNode,io,printable_range,[]),
+    {error, _} = test_server:start_node(printable_range_unnicode, slave, 
+					[{args, " +pcunnicode -pa " ++ Pa}]),
+    PrettyOptions = [{column,1},
+		     {line_length,109},
+		     {depth,30},
+		     {max_chars,60},
+		     {record_print_fun,
+		      fun(_,_) -> no end},
+		     {encoding,unicode}],
+    1025 = lists:max(lists:flatten(rpc:call(UNode,io_lib_pretty,print,
+					    [{hello, [1024,1025]},
+					     PrettyOptions]))),
+    125 = lists:max(lists:flatten(rpc:call(LNode,io_lib_pretty,print,
+					   [{hello, [1024,1025]},
+					    PrettyOptions]))),
+    125 = lists:max(lists:flatten(rpc:call(DNode,io_lib_pretty,print,
+					   [{hello, [1024,1025]},
+					    PrettyOptions]))),
+    1025 = lists:max(lists:flatten(rpc:call(UNode,io_lib_pretty,print,
+					    [{hello, <<1024/utf8,1025/utf8>>},
+					     PrettyOptions]))),
+    125 = lists:max(lists:flatten(rpc:call(LNode,io_lib_pretty,print,
+					   [{hello, <<1024/utf8,1025/utf8>>},
+					    PrettyOptions]))),
+    125 = lists:max(lists:flatten(rpc:call(DNode,io_lib_pretty,print,
+					   [{hello, <<1024/utf8,1025/utf8>>},
+					    PrettyOptions]))),
+    
+    1025 = lists:max(lists:flatten(rpc:call(UNode,io_lib,format,
+					    ["~tp",[{hello, [1024,1025]}]]))),
+    125 = lists:max(lists:flatten(rpc:call(LNode,io_lib,format,
+					   ["~tp",[{hello, [1024,1025]}]]))),
+    125 = lists:max(lists:flatten(rpc:call(DNode,io_lib,format,
+					   ["~tp",[{hello, [1024,1025]}]]))),
+    1025 = lists:max(lists:flatten(rpc:call(UNode,io_lib,format,
+					    ["~tp",
+					     [{hello, 
+					       <<1024/utf8,1025/utf8>>}]]))),
+    125 = lists:max(lists:flatten(rpc:call(LNode,io_lib,format,
+					   ["~tp",
+					    [{hello, 
+					      <<1024/utf8,1025/utf8>>}]]))),
+    125 = lists:max(lists:flatten(rpc:call(DNode,io_lib,format,
+					   ["~tp",
+					    [{hello, 
+					      <<1024/utf8,1025/utf8>>}]]))),
+    test_server:stop_node(UNode),
+    test_server:stop_node(LNode),
+    test_server:stop_node(DNode),
+    ok.
+    
+
 io_lib_print_binary_depth_one(doc) ->
     "Test binaries printed with a depth of one behave correctly";
 io_lib_print_binary_depth_one(Suite) when is_list(Suite) ->
@@ -2040,10 +2118,22 @@ io_lib_print_binary_depth_one(Suite) when is_list(Suite) ->
 otp_10302(doc) ->
     "OTP-10302. Unicode";
 otp_10302(Suite) when is_list(Suite) ->
-    "\"\x{400}\"" = pretty("\x{400}", -1),
-    "<<\"\x{400}\"/utf8>>" = pretty(<<"\x{400}"/utf8>>, -1),
+    Pa = filename:dirname(code:which(?MODULE)),
+    {ok, UNode} = test_server:start_node(printable_range_unicode, slave, 
+					 [{args, " +pc unicode -pa " ++ Pa}]),
+    {ok, LNode} = test_server:start_node(printable_range_latin1, slave, 
+					 [{args, " +pc latin1 -pa " ++ Pa}]),
+    "\"\x{400}\"" = rpc:call(UNode,?MODULE,pretty,["\x{400}", -1]),
+    "<<\"\x{400}\"/utf8>>" = rpc:call(UNode,?MODULE,pretty,[<<"\x{400}"/utf8>>, -1]),
+
+    "<<\"\x{400}foo\"/utf8>>" = rpc:call(UNode,?MODULE,pretty,[<<"\x{400}foo"/utf8>>, 2]),
+    "[1024]" = rpc:call(LNode,?MODULE,pretty,["\x{400}", -1]),
+    "<<208,128>>" = rpc:call(LNode,?MODULE,pretty,[<<"\x{400}"/utf8>>, -1]),
+
+    "<<208,...>>" = rpc:call(LNode,?MODULE,pretty,[<<"\x{400}foo"/utf8>>, 2]),
+    test_server:stop_node(UNode),
+    test_server:stop_node(LNode),
 
-    "<<\"\x{400}foo\"/utf8>>" = pretty(<<"\x{400}foo"/utf8>>, 2),
     "<<\"äppl\"/utf8>>" = pretty(<<"äppl"/utf8>>, 2),
     "<<\"äppl\"/utf8...>>" = pretty(<<"äpple"/utf8>>, 2),
     "<<\"apel\">>" = pretty(<<"apel">>, 2),