Add test for cowboy middle protocol support

Author: define-null

Makefile

@@ -13,7 +13,7 @@ ct: compile test_deps
 	-@ct_run -noshell -pa ebin \
 		-pa deps/*/ebin \
 		-pa test/deps/*/ebin \
-		-name test \
+		-sname test \
 		-logdir ./logs \
 		-env TEST_DIR ./test \
 		-spec ./test/test_specs.spec \

test/soap_SUITE.erl

@@ -112,6 +112,12 @@ groups() ->
       ,{soap_11_client, [sequence], [client_11_ok ,client_11_fault]}
       ,{soap_12_client, [sequence], [client_12_ok ,client_12_fault]}
       ]}
+  ,{cowboy_middle_protocol, [sequence],
+      [correct_sms
+      ,sms_fault
+      ,sms_invalid_xml
+      ,sms_wrong_method
+      ]}
   ,{mochi_server, [sequence],
       [correct_sms
       ,sms_fault
@@ -197,6 +203,15 @@ init_per_group(cowboy_server, Config) ->
                 {"[0-9]{13,}", throw},
                 {http_server, cowboy_version()}]),
   Config;
+init_per_group(cowboy_middle_protocol, Config) ->
+  {ok, _} = soap:start_server(sendService_test_server, 
+               [{"[a-zA-Z]+", invalid}, 
+                {"^\\+?[0-9]{4,12}$", valid},
+                {"[0-9]{13,}", throw},
+                {http_server, test_cowboy_middle_protocol},
+                {cowboy_version, cowboy_version()}
+               ]),
+  Config;
 init_per_group(inets_server, Config) ->
   {ok, _} = soap:start_server(sendService_test_server, 
                [{http_server, soap_server_inets},
@@ -298,6 +313,9 @@ end_per_group(inets_server, _Config) ->
 end_per_group(cowboy_server, _Config) ->
   soap:stop_server(sendService_test_server),
   ok;
+end_per_group(cowboy_middle_protocol, _Config) ->
+  soap:stop_server(sendService_test_server),
+  ok;
 end_per_group(tempconvert_local, _Config) ->
   soap:stop_server(tempconvert_server),
   ok;
@@ -325,21 +343,22 @@ end_per_group(_, _Config) ->
 %%--------------------------------------------------------------------      
 all() -> 
   [{group, cowboy_server},
-  {group, inets_server},
-  {group, tempconvert},
-  {group, tempconvert_12},
-  {group, client},
-  {group, soap_req},
-  {group, wsdls}, %% takes a long time
-  {group, erlang2wsdl},
-  {group, wsdl2erlang},
-  {group, attachments},
-  {group, wsdl_2_0},
-  %% for some reason the mochi server 
-  %% seems to continue answering requests after shutdown
-  %% for a while, therefore put it last.
-  {group, mochi_server},
-  issue_4_encoded
+   {group, cowboy_middle_protocol},
+   {group, inets_server},
+   {group, tempconvert},
+   {group, tempconvert_12},
+   {group, client},
+   {group, soap_req},
+   {group, wsdls}, %% takes a long time
+   {group, erlang2wsdl},
+   {group, wsdl2erlang},
+   {group, attachments},
+   {group, wsdl_2_0},
+   %% for some reason the mochi server 
+   %% seems to continue answering requests after shutdown
+   %% for a while, therefore put it last.
+   {group, mochi_server},
+   issue_4_encoded
   ].
 
 %%-------------------------------------------------------------------------

test/test_cowboy_middle_protocol.erl

@@ -0,0 +1,61 @@
+-module(test_cowboy_middle_protocol).
+
+-export([start/1]).
+-export([start/2]).
+-export([stop/0]).
+-export([init/3, init/2]).
+-export([on_request/1]).
+-export([upgrade/4, upgrade/6]).
+
+start(Module) ->
+  start(Module, []).
+
+start(Module, Options) ->
+  
+  Port = proplists:get_value(port, Options, 8080),
+  Acceptors = proplists:get_value(nr_acceptors, Options, 100),
+  {ok, _} = application:ensure_all_started(cowboy),
+  Dispatch = cowboy_router:compile([
+                                    {'_', [{'_', ?MODULE, {Module, Options}}]}]),
+  {ok, _} = cowboy:start_http(http, Acceptors, [{port, Port}], 
+                              [ {env, [{dispatch, Dispatch}]},
+                                {onrequest, fun ?MODULE:on_request/1}
+                              ]).
+
+stop() ->
+  cowboy:stop_listener(http),
+  application:stop(cowboy), 
+  application:stop(ranch).
+
+on_request(Req0) ->
+  {ok, Body, Req1} = cowboy_req:body(Req0),
+  cowboy_req:set_meta(body, Body, Req1).
+    
+%% cowboy 1 callback
+init(_, _Req, {_Module, Options}) ->
+  %% The module 'soap_cowboy_protocol' will be called
+  %% for each request, with Module (= the handler module) and 
+  %% the options as parameter. 
+  soap_server_cowboy_1 = proplists:get_value(cowboy_version, Options),
+  {upgrade, protocol, ?MODULE}.
+
+%% cowboy 1 callback
+upgrade(Cowboy_req, Env, Soap_handler, {Handler, Options}) ->
+  Options2 = proplists:delete(cowboy_version, Options),
+  {Message, Cowboy_req2} = cowboy_req:meta(body, Cowboy_req),
+
+  soap_cowboy_1_protocol:upgrade(
+    Cowboy_req2, Env, Soap_handler, {Handler, Options2}, Message).
+
+%% cowboy 2 callback
+init(Req, {Module, Options}) ->
+  soap_server_cowboy_2 = proplists:get_value(cowboy_version, Options),
+  {?MODULE, Req, {Module, Options}}.
+
+%% cowboy 2 callback
+upgrade(Cowboy_req, Env, Soap_handler, {Handler, Options}, Timeout, Hibernate) ->
+  Options2 = proplists:delete(cowboy_version, Options),
+  {Message, Cowboy_req2} = cowboy_req:meta(body, Cowboy_req),
+
+  soap_cowboy_2_protocol:upgrade(
+    Cowboy_req2, Env, Soap_handler, {Handler, Options2}, Timeout, Hibernate, Message).