From f02cc10b4bda484996b7b93436fcaf8d714cb3da Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Tue, 12 Oct 2010 10:39:40 +0200
Subject: Update inets tests to conform with common_test standard

---
 lib/inets/test/http_format_SUITE.erl | 45 +++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 21 deletions(-)

(limited to 'lib/inets/test/http_format_SUITE.erl')

diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl
index 79945f0f4d..c53ae446d8 100644
--- a/lib/inets/test/http_format_SUITE.erl
+++ b/lib/inets/test/http_format_SUITE.erl
@@ -21,28 +21,41 @@
 -module(http_format_SUITE).
 -author('ingela@erix.ericsson.se').
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 -include("http_internal.hrl").
 
 %% Test server specific exports
--export([all/1, init_per_testcase/2, end_per_testcase/2]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases must be exported.
--export([chunk/1, chunk_decode/1, chunk_encode/1,
+-export([ chunk_decode/1, chunk_encode/1,
 	 chunk_extensions_otp_6005/1, chunk_decode_otp_6264/1,
 	 chunk_decode_empty_chunk_otp_6511/1,
 	 chunk_decode_trailer/1,
-	 http_response/1, http_request/1, validate_request_line/1, script/1,
+	 http_response/1, http_request/1, validate_request_line/1,
 	 esi_parse_headers/1, cgi_parse_headers/1,
 	 is_absolut_uri/1, convert_netscapecookie_date/1]).
 
-all(doc) ->
-    ["Test library functions to the http client and server."];
-all(suite) ->
-    [chunk,
-     http_response, http_request, validate_request_line,
-     script, is_absolut_uri, convert_netscapecookie_date].
+all() -> 
+[{group, chunk}, http_response, http_request,
+ validate_request_line, {group, script}, is_absolut_uri,
+ convert_netscapecookie_date].
+
+groups() -> 
+    [{script, [], [esi_parse_headers, cgi_parse_headers]},
+ {chunk, [],
+  [chunk_decode, chunk_encode, chunk_extensions_otp_6005,
+   chunk_decode_otp_6264,
+   chunk_decode_empty_chunk_otp_6511,
+   chunk_decode_trailer]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 init_per_testcase(_, Config) ->
     Dog = test_server:timetrap(?t:minutes(1)),
@@ -57,17 +70,7 @@ end_per_testcase(_, Config) ->
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-script(doc) ->
-    ["Test header parsing in esi/cgi functionality."];
-script(suite) ->
-    [esi_parse_headers, cgi_parse_headers].
-
-chunk(doc) ->
-    ["Test chunk encoding"];
-chunk(suite) ->
-    [chunk_decode, chunk_encode, chunk_extensions_otp_6005,
-     chunk_decode_otp_6264, chunk_decode_empty_chunk_otp_6511,
-     chunk_decode_trailer].
+
 
 %%-------------------------------------------------------------------------
 chunk_decode(doc) ->
-- 
cgit v1.2.3