From 2e916777233d8d82b93cbca9b754a023a6ca63c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Mon, 22 Apr 2013 15:55:22 +0200
Subject: Reorganize the websocket test suite

We now have the suite specific modules in the data folder.
Compilation is performed by the Makefile instead of ct_run.
---
 test/ws_SUITE.erl | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'test/ws_SUITE.erl')

diff --git a/test/ws_SUITE.erl b/test/ws_SUITE.erl
index b6709ca..fbef41a 100644
--- a/test/ws_SUITE.erl
+++ b/test/ws_SUITE.erl
@@ -90,30 +90,30 @@ end_per_group(Listener, _Config) ->
 init_dispatch() ->
 	cowboy_router:compile([
 		{"localhost", [
-			{"/websocket", websocket_handler, []},
-			{"/ws_echo_handler", websocket_echo_handler, []},
-			{"/ws_init_shutdown", websocket_handler_init_shutdown, []},
-			{"/ws_send_many", ws_send_many_handler, [
+			{"/ws_echo_timer", ws_echo_timer, []},
+			{"/ws_echo", ws_echo, []},
+			{"/ws_init_shutdown", ws_init_shutdown, []},
+			{"/ws_send_many", ws_send_many, [
 				{sequence, [
 					{text, <<"one">>},
 					{text, <<"two">>},
 					{text, <<"seven!">>}]}
 			]},
-			{"/ws_send_close", ws_send_many_handler, [
+			{"/ws_send_close", ws_send_many, [
 				{sequence, [
 					{text, <<"send">>},
 					close,
 					{text, <<"won't be received">>}]}
 			]},
-			{"/ws_send_close_payload", ws_send_many_handler, [
+			{"/ws_send_close_payload", ws_send_many, [
 				{sequence, [
 					{text, <<"send">>},
 					{close, 1001, <<"some text!">>},
 					{text, <<"won't be received">>}]}
 			]},
-			{"/ws_timeout_hibernate", ws_timeout_hibernate_handler, []},
-			{"/ws_timeout_cancel", ws_timeout_cancel_handler, []},
-			{"/ws_upgrade_with_opts", ws_upgrade_with_opts_handler,
+			{"/ws_timeout_hibernate", ws_timeout_hibernate, []},
+			{"/ws_timeout_cancel", ws_timeout_cancel, []},
+			{"/ws_upgrade_with_opts", ws_upgrade_with_opts,
 				<<"failure">>}
 		]}
 	]).
@@ -126,7 +126,7 @@ ws0(Config) ->
 	{ok, Socket} = gen_tcp:connect("localhost", Port,
 		[binary, {active, false}, {packet, raw}]),
 	ok = gen_tcp:send(Socket,
-		"GET /websocket HTTP/1.1\r\n"
+		"GET /ws_echo_timer HTTP/1.1\r\n"
 		"Host: localhost\r\n"
 		"Connection: Upgrade\r\n"
 		"Upgrade: WebSocket\r\n"
@@ -143,7 +143,7 @@ ws8(Config) ->
 	{ok, Socket} = gen_tcp:connect("localhost", Port,
 		[binary, {active, false}, {packet, raw}]),
 	ok = gen_tcp:send(Socket, [
-		"GET /websocket HTTP/1.1\r\n"
+		"GET /ws_echo_timer HTTP/1.1\r\n"
 		"Host: localhost\r\n"
 		"Connection: Upgrade\r\n"
 		"Upgrade: websocket\r\n"
@@ -203,7 +203,7 @@ ws8_single_bytes(Config) ->
 	{ok, Socket} = gen_tcp:connect("localhost", Port,
 		[binary, {active, false}, {packet, raw}]),
 	ok = gen_tcp:send(Socket, [
-		"GET /websocket HTTP/1.1\r\n"
+		"GET /ws_echo_timer HTTP/1.1\r\n"
 		"Host: localhost\r\n"
 		"Connection: Upgrade\r\n"
 		"Upgrade: websocket\r\n"
@@ -263,7 +263,7 @@ ws13(Config) ->
 	{ok, Socket} = gen_tcp:connect("localhost", Port,
 		[binary, {active, false}, {packet, raw}]),
 	ok = gen_tcp:send(Socket, [
-		"GET /websocket HTTP/1.1\r\n"
+		"GET /ws_echo_timer HTTP/1.1\r\n"
 		"Host: localhost\r\n"
 		"Connection: Upgrade\r\n"
 		"Origin: http://localhost\r\n"
@@ -404,7 +404,7 @@ ws_text_fragments(Config) ->
 	{ok, Socket} = gen_tcp:connect("localhost", Port,
 		[binary, {active, false}, {packet, raw}]),
 	ok = gen_tcp:send(Socket, [
-		"GET /ws_echo_handler HTTP/1.1\r\n"
+		"GET /ws_echo HTTP/1.1\r\n"
 		"Host: localhost\r\n"
 		"Connection: Upgrade\r\n"
 		"Upgrade: websocket\r\n"
-- 
cgit v1.2.3