[socket-nif|test] Add more ttest (gen_tcp and socket) test cases

Added a number of ttest test cases with transport gen_tcp and socket.
Server with transport = gen_tcp, active = once and client
using transport = socket(tcp) (and active = false, once and true).
Also fixed a counting error in the server (forgot to include the
header, 16 bytes, in the byte count).

OTP-14831

2 files changed, 477 insertions, 6 deletions

diff --git a/erts/emulator/test/socket_SUITE.erl b/erts/emulator/test/socket_SUITE.erl
index fee7c59178..5bd8816ee7 100644
--- a/erts/emulator/test/socket_SUITE.erl
+++ b/erts/emulator/test/socket_SUITE.erl
@@ -191,10 +191,30 @@
          ttest_sgeno_cgent_medium_tcp4/1,
          ttest_sgeno_cgent_medium_tcp6/1,
          ttest_sgeno_cgent_large_tcp4/1,
-         ttest_sgeno_cgent_large_tcp6/1
+         ttest_sgeno_cgent_large_tcp6/1,
 
          %% Server: transport = gen_tcp, active = once
          %% Client: transport = socket(tcp)
+         ttest_sgeno_csockf_small_tcp4/1,
+         ttest_sgeno_csockf_small_tcp6/1,
+         ttest_sgeno_csockf_medium_tcp4/1,
+         ttest_sgeno_csockf_medium_tcp6/1,
+         ttest_sgeno_csockf_large_tcp4/1,
+         ttest_sgeno_csockf_large_tcp6/1,
+
+         ttest_sgeno_csocko_small_tcp4/1,
+         ttest_sgeno_csocko_small_tcp6/1,
+         ttest_sgeno_csocko_medium_tcp4/1,
+         ttest_sgeno_csocko_medium_tcp6/1,
+         ttest_sgeno_csocko_large_tcp4/1,
+         ttest_sgeno_csocko_large_tcp6/1,
+
+         ttest_sgeno_csockt_small_tcp4/1,
+         ttest_sgeno_csockt_small_tcp6/1,
+         ttest_sgeno_csockt_medium_tcp4/1,
+         ttest_sgeno_csockt_medium_tcp6/1,
+         ttest_sgeno_csockt_large_tcp4/1,
+         ttest_sgeno_csockt_large_tcp6/1
 
          %% Server: transport = gen_tcp, active = true
          %% Client: transport = gen_tcp
@@ -272,7 +292,8 @@ all() ->
      {group, ttest},
      {group, ttest_sgenf_cgen},
      {group, ttest_sgenf_csock},
-     {group, ttest_sgeno_cgen}
+     {group, ttest_sgeno_cgen},
+     {group, ttest_sgeno_csock}
 
      %% {group, tickets}
     ].
@@ -300,7 +321,11 @@ groups() ->
      {ttest_sgeno_cgen,    [], ttest_sgeno_cgen_cases()},
      {ttest_sgeno_cgenf,   [], ttest_sgeno_cgenf_cases()},
      {ttest_sgeno_cgeno,   [], ttest_sgeno_cgeno_cases()},
-     {ttest_sgeno_cgent,   [], ttest_sgeno_cgent_cases()}
+     {ttest_sgeno_cgent,   [], ttest_sgeno_cgent_cases()},
+     {ttest_sgeno_csock,   [], ttest_sgeno_csock_cases()},
+     {ttest_sgeno_csockf,  [], ttest_sgeno_csockf_cases()},
+     {ttest_sgeno_csocko,  [], ttest_sgeno_csocko_cases()},
+     {ttest_sgeno_csockt,  [], ttest_sgeno_csockt_cases()}
 
      %% {tickets,             [], ticket_cases()}
     ].
@@ -453,11 +478,16 @@ ttest_cases() ->
 
      %% Server: transport = gen_tcp, active = false
      %% Client: transport = socket(tcp) (active = false, once and true)
-     {group, ttest_sgenf_cgen},
+     {group, ttest_sgenf_csock},
 
      %% Server: transport = gen_tcp, active = once
      %% Client: transport = gen_tcp (active = false, once and true)
-     {group, ttest_sgeno_cgen}
+     {group, ttest_sgeno_cgen},
+
+     %% Server: transport = gen_tcp, active = once
+     %% Client: transport = socket(tcp) (active = false, once and true)
+     {group, ttest_sgeno_csock}
+
     ].
 
 
@@ -608,6 +638,51 @@ ttest_sgeno_cgent_cases() ->
      ttest_sgeno_cgent_large_tcp6
     ].
 
+%% Server: transport = gen_tcp, active = once
+%% Client: transport = socket(tcp)
+ttest_sgeno_csock_cases() ->
+    [
+     {group, ttest_sgeno_csockf},
+     {group, ttest_sgeno_csocko},
+     {group, ttest_sgeno_csockt}
+    ].
+
+ttest_sgeno_csockf_cases() ->
+    [
+     ttest_sgeno_csockf_small_tcp4,
+     ttest_sgeno_csockf_small_tcp6,
+
+     ttest_sgeno_csockf_medium_tcp4,
+     ttest_sgeno_csockf_medium_tcp6,
+
+     ttest_sgeno_csockf_large_tcp4,
+     ttest_sgeno_csockf_large_tcp6
+    ].
+
+ttest_sgeno_csocko_cases() ->
+    [
+     ttest_sgeno_csocko_small_tcp4,
+     ttest_sgeno_csocko_small_tcp6,
+
+     ttest_sgeno_csocko_medium_tcp4,
+     ttest_sgeno_csocko_medium_tcp6,
+
+     ttest_sgeno_csocko_large_tcp4,
+     ttest_sgeno_csocko_large_tcp6
+    ].
+
+ttest_sgeno_csockt_cases() ->
+    [
+     ttest_sgeno_csockt_small_tcp4,
+     ttest_sgeno_csockt_small_tcp6,
+
+     ttest_sgeno_csockt_medium_tcp4,
+     ttest_sgeno_csockt_medium_tcp6,
+
+     ttest_sgeno_csockt_large_tcp4,
+     ttest_sgeno_csockt_large_tcp6
+    ].
+
 %% ticket_cases() ->
 %%     [].
 
@@ -11601,6 +11676,402 @@ ttest_sgeno_cgent_large_tcp6(_Config) when is_list(_Config) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csockf_small_tcp4(suite) ->
+    [];
+ttest_sgeno_csockf_small_tcp4(doc) ->
+    [];
+ttest_sgeno_csockf_small_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csockf_small_tcp4,
+              inet,
+              gen, once,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csockf_small_tcp6(suite) ->
+    [];
+ttest_sgeno_csockf_small_tcp6(doc) ->
+    [];
+ttest_sgeno_csockf_small_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csockf_small_tcp6,
+              inet6,
+              gen, once,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csockf_medium_tcp4(suite) ->
+    [];
+ttest_sgeno_csockf_medium_tcp4(doc) ->
+    [];
+ttest_sgeno_csockf_medium_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csockf_medium_tcp4,
+              inet,
+              gen, once,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csockf_medium_tcp6(suite) ->
+    [];
+ttest_sgeno_csockf_medium_tcp6(doc) ->
+    [];
+ttest_sgeno_csockf_medium_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csockf_medium_tcp6,
+              inet6,
+              gen, once,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csockf_large_tcp4(suite) ->
+    [];
+ttest_sgeno_csockf_large_tcp4(doc) ->
+    [];
+ttest_sgeno_csockf_large_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csockf_large_tcp4,
+              inet,
+              gen, once,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csockf_large_tcp6(suite) ->
+    [];
+ttest_sgeno_csockf_large_tcp6(doc) ->
+    [];
+ttest_sgeno_csockf_large_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csockf_large_tcp6,
+              inet6,
+              gen, once,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csocko_small_tcp4(suite) ->
+    [];
+ttest_sgeno_csocko_small_tcp4(doc) ->
+    [];
+ttest_sgeno_csocko_small_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csocko_small_tcp4,
+              inet,
+              gen, once,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csocko_small_tcp6(suite) ->
+    [];
+ttest_sgeno_csocko_small_tcp6(doc) ->
+    [];
+ttest_sgeno_csocko_small_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csocko_small_tcp6,
+              inet6,
+              gen, once,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csocko_medium_tcp4(suite) ->
+    [];
+ttest_sgeno_csocko_medium_tcp4(doc) ->
+    [];
+ttest_sgeno_csocko_medium_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csocko_medium_tcp4,
+              inet,
+              gen, once,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csocko_medium_tcp6(suite) ->
+    [];
+ttest_sgeno_csocko_medium_tcp6(doc) ->
+    [];
+ttest_sgeno_csocko_medium_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csocko_medium_tcp6,
+              inet6,
+              gen, once,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csocko_large_tcp4(suite) ->
+    [];
+ttest_sgeno_csocko_large_tcp4(doc) ->
+    [];
+ttest_sgeno_csocko_large_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csocko_large_tcp4,
+              inet,
+              gen, once,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csocko_large_tcp6(suite) ->
+    [];
+ttest_sgeno_csocko_large_tcp6(doc) ->
+    [];
+ttest_sgeno_csocko_large_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csocko_large_tcp6,
+              inet6,
+              gen, once,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csockt_small_tcp4(suite) ->
+    [];
+ttest_sgeno_csockt_small_tcp4(doc) ->
+    [];
+ttest_sgeno_csockt_small_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csockt_small_tcp4,
+              inet,
+              gen, once,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csockt_small_tcp6(suite) ->
+    [];
+ttest_sgeno_csockt_small_tcp6(doc) ->
+    [];
+ttest_sgeno_csockt_small_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csocko_small_tcp6,
+              inet6,
+              gen, once,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csockt_medium_tcp4(suite) ->
+    [];
+ttest_sgeno_csockt_medium_tcp4(doc) ->
+    [];
+ttest_sgeno_csockt_medium_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csockt_medium_tcp4,
+              inet,
+              gen, once,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csockt_medium_tcp6(suite) ->
+    [];
+ttest_sgeno_csockt_medium_tcp6(doc) ->
+    [];
+ttest_sgeno_csockt_medium_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csockt_medium_tcp6,
+              inet6,
+              gen, once,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csockt_large_tcp4(suite) ->
+    [];
+ttest_sgeno_csockt_large_tcp4(doc) ->
+    [];
+ttest_sgeno_csockt_large_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csockt_large_tcp4,
+              inet,
+              gen, once,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csockt_large_tcp6(suite) ->
+    [];
+ttest_sgeno_csockt_large_tcp6(doc) ->
+    [];
+ttest_sgeno_csockt_large_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgeno_csockt_large_tcp6,
+              inet6,
+              gen, once,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 ttest_tcp(TC,
           Domain,
diff --git a/erts/emulator/test/socket_test_ttest_tcp_server.erl b/erts/emulator/test/socket_test_ttest_tcp_server.erl
index 7506e7f932..e8d626e3d8 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_server.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_server.erl
@@ -428,7 +428,7 @@ handler_process_data(<<?TTEST_TAG:32,
     <<Body:SZ/binary, Rest2/binary>> = Rest,
     case handler_send_reply(Mod, Sock, ID, Body) of
  	ok ->
- 	    handler_process_data(Rest2, Mod, Sock, MCnt+1, BCnt+SZ, ID);
+ 	    handler_process_data(Rest2, Mod, Sock, MCnt+1, BCnt+16+SZ, ID);
  	{error, _} = ERROR ->
  	    ERROR
     end;