Browse Source

Unit tests: rename all test case instances

bel 9 years ago
parent
commit
bbbe470d9f
4 changed files with 105 additions and 103 deletions
  1. 33 32
      test/private.c
  2. 4 4
      test/private_exe.c
  3. 38 37
      test/public_func.c
  4. 30 30
      test/public_server.c

+ 33 - 32
test/private.c

@@ -514,38 +514,39 @@ make_private_suite(void)
 {
 {
 	Suite *const suite = suite_create("Private");
 	Suite *const suite = suite_create("Private");
 
 
-	TCase *const http_message = tcase_create("HTTP Message");
-	TCase *const url_parsing = tcase_create("URL Parsing");
-	TCase *const internal_parse = tcase_create("Internal Parsing");
-	TCase *const encode_decode = tcase_create("Encode Decode");
-	TCase *const mask_data = tcase_create("Mask Data");
-
-	tcase_add_test(http_message, test_parse_http_message);
-	tcase_add_test(http_message, test_should_keep_alive);
-	tcase_set_timeout(http_message, civetweb_min_test_timeout);
-	suite_add_tcase(suite, http_message);
-
-	tcase_add_test(url_parsing, test_match_prefix);
-	tcase_add_test(url_parsing, test_remove_double_dots_and_double_slashes);
-	tcase_add_test(url_parsing, test_is_valid_uri);
-	tcase_set_timeout(url_parsing, civetweb_min_test_timeout);
-	suite_add_tcase(suite, url_parsing);
-
-	tcase_add_test(internal_parse, test_next_option);
-	tcase_add_test(internal_parse, test_skip_quoted);
-	tcase_add_test(internal_parse, test_mg_strcasestr);
-	tcase_add_test(internal_parse, test_alloc_vprintf);
-	tcase_add_test(internal_parse, test_parse_port_string);
-	tcase_set_timeout(internal_parse, civetweb_min_test_timeout);
-	suite_add_tcase(suite, internal_parse);
-
-	tcase_add_test(encode_decode, test_encode_decode);
-	tcase_set_timeout(encode_decode, civetweb_min_test_timeout);
-	suite_add_tcase(suite, encode_decode);
-
-	tcase_add_test(mask_data, test_mask_data);
-	tcase_set_timeout(mask_data, civetweb_min_test_timeout);
-	suite_add_tcase(suite, mask_data);
+	TCase *const tcase_http_message = tcase_create("HTTP Message");
+	TCase *const tcase_url_parsing = tcase_create("URL Parsing");
+	TCase *const tcase_internal_parse = tcase_create("Internal Parsing");
+	TCase *const tcase_encode_decode = tcase_create("Encode Decode");
+	TCase *const tcase_mask_data = tcase_create("Mask Data");
+
+	tcase_add_test(tcase_http_message, test_parse_http_message);
+	tcase_add_test(tcase_http_message, test_should_keep_alive);
+	tcase_set_timeout(tcase_http_message, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_http_message);
+
+	tcase_add_test(tcase_url_parsing, test_match_prefix);
+	tcase_add_test(tcase_url_parsing,
+	               test_remove_double_dots_and_double_slashes);
+	tcase_add_test(tcase_url_parsing, test_is_valid_uri);
+	tcase_set_timeout(tcase_url_parsing, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_url_parsing);
+
+	tcase_add_test(tcase_internal_parse, test_next_option);
+	tcase_add_test(tcase_internal_parse, test_skip_quoted);
+	tcase_add_test(tcase_internal_parse, test_mg_strcasestr);
+	tcase_add_test(tcase_internal_parse, test_alloc_vprintf);
+	tcase_add_test(tcase_internal_parse, test_parse_port_string);
+	tcase_set_timeout(tcase_internal_parse, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_internal_parse);
+
+	tcase_add_test(tcase_encode_decode, test_encode_decode);
+	tcase_set_timeout(tcase_encode_decode, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_encode_decode);
+
+	tcase_add_test(tcase_mask_data, test_mask_data);
+	tcase_set_timeout(tcase_mask_data, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_mask_data);
 
 
 	return suite;
 	return suite;
 }
 }

+ 4 - 4
test/private_exe.c

@@ -67,11 +67,11 @@ make_private_exe_suite(void)
 {
 {
 	Suite *const suite = suite_create("EXE");
 	Suite *const suite = suite_create("EXE");
 
 
-	TCase *const helper_funcs = tcase_create("Helper funcs");
+	TCase *const tcase_helper_funcs = tcase_create("Helper funcs");
 
 
-	tcase_add_test(helper_funcs, test_helper_funcs);
-	tcase_set_timeout(helper_funcs, civetweb_min_test_timeout);
-	suite_add_tcase(suite, helper_funcs);
+	tcase_add_test(tcase_helper_funcs, test_helper_funcs);
+	tcase_set_timeout(tcase_helper_funcs, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_helper_funcs);
 
 
 	return suite;
 	return suite;
 }
 }

+ 38 - 37
test/public_func.c

@@ -420,43 +420,44 @@ make_public_func_suite(void)
 {
 {
 	Suite *const suite = suite_create("PublicFunc");
 	Suite *const suite = suite_create("PublicFunc");
 
 
-	TCase *const version = tcase_create("Version");
-	TCase *const get_valid_options = tcase_create("Options");
-	TCase *const get_builtin_mime_type = tcase_create("MIME types");
-	TCase *const tstrncasecmp = tcase_create("strcasecmp");
-	TCase *const urlencodingdecoding = tcase_create("URL encoding decoding");
-	TCase *const cookies = tcase_create("Cookies and variables");
-	TCase *const md5 = tcase_create("MD5");
-
-	tcase_add_test(version, test_mg_version);
-	tcase_set_timeout(version, civetweb_min_test_timeout);
-	suite_add_tcase(suite, version);
-
-	tcase_add_test(get_valid_options, test_mg_get_valid_options);
-	tcase_set_timeout(get_valid_options, civetweb_min_test_timeout);
-	suite_add_tcase(suite, get_valid_options);
-
-	tcase_add_test(get_builtin_mime_type, test_mg_get_builtin_mime_type);
-	tcase_set_timeout(get_builtin_mime_type, civetweb_min_test_timeout);
-	suite_add_tcase(suite, get_builtin_mime_type);
-
-	tcase_add_test(tstrncasecmp, test_mg_strncasecmp);
-	tcase_set_timeout(tstrncasecmp, civetweb_min_test_timeout);
-	suite_add_tcase(suite, tstrncasecmp);
-
-	tcase_add_test(urlencodingdecoding, test_mg_url_encode);
-	tcase_add_test(urlencodingdecoding, test_mg_url_decode);
-	tcase_set_timeout(urlencodingdecoding, civetweb_min_test_timeout);
-	suite_add_tcase(suite, urlencodingdecoding);
-
-	tcase_add_test(cookies, test_mg_get_cookie);
-	tcase_add_test(cookies, test_mg_get_var);
-	tcase_set_timeout(cookies, civetweb_min_test_timeout);
-	suite_add_tcase(suite, cookies);
-
-	tcase_add_test(md5, test_mg_md5);
-	tcase_set_timeout(md5, civetweb_min_test_timeout);
-	suite_add_tcase(suite, md5);
+	TCase *const tcase_version = tcase_create("Version");
+	TCase *const tcase_get_valid_options = tcase_create("Options");
+	TCase *const tcase_get_builtin_mime_type = tcase_create("MIME types");
+	TCase *const tcase_strncasecmp = tcase_create("strcasecmp");
+	TCase *const tcase_urlencodingdecoding =
+	    tcase_create("URL encoding decoding");
+	TCase *const tcase_cookies = tcase_create("Cookies and variables");
+	TCase *const tcase_md5 = tcase_create("MD5");
+
+	tcase_add_test(tcase_version, test_mg_version);
+	tcase_set_timeout(tcase_version, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_version);
+
+	tcase_add_test(tcase_get_valid_options, test_mg_get_valid_options);
+	tcase_set_timeout(tcase_get_valid_options, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_get_valid_options);
+
+	tcase_add_test(tcase_get_builtin_mime_type, test_mg_get_builtin_mime_type);
+	tcase_set_timeout(tcase_get_builtin_mime_type, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_get_builtin_mime_type);
+
+	tcase_add_test(tcase_strncasecmp, test_mg_strncasecmp);
+	tcase_set_timeout(tcase_strncasecmp, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_strncasecmp);
+
+	tcase_add_test(tcase_urlencodingdecoding, test_mg_url_encode);
+	tcase_add_test(tcase_urlencodingdecoding, test_mg_url_decode);
+	tcase_set_timeout(tcase_urlencodingdecoding, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_urlencodingdecoding);
+
+	tcase_add_test(tcase_cookies, test_mg_get_cookie);
+	tcase_add_test(tcase_cookies, test_mg_get_var);
+	tcase_set_timeout(tcase_cookies, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_cookies);
+
+	tcase_add_test(tcase_md5, test_mg_md5);
+	tcase_set_timeout(tcase_md5, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_md5);
 
 
 	return suite;
 	return suite;
 }
 }

+ 30 - 30
test/public_server.c

@@ -1329,36 +1329,36 @@ make_public_server_suite(void)
 {
 {
 	Suite *const suite = suite_create("PublicServer");
 	Suite *const suite = suite_create("PublicServer");
 
 
-	TCase *const checktestenv = tcase_create("Check test environment");
-	TCase *const startthreads = tcase_create("Start threads");
-	TCase *const startstophttp = tcase_create("Start Stop HTTP Server");
-	TCase *const startstophttps = tcase_create("Start Stop HTTPS Server");
-	TCase *const serverandclienttls = tcase_create("TLS Server Client");
-	TCase *const serverrequests = tcase_create("Server Requests");
-
-	tcase_add_test(checktestenv, test_the_test_environment);
-	tcase_set_timeout(checktestenv, civetweb_min_test_timeout);
-	suite_add_tcase(suite, checktestenv);
-
-	tcase_add_test(startthreads, test_threading);
-	tcase_set_timeout(startthreads, civetweb_min_test_timeout);
-	suite_add_tcase(suite, startthreads);
-
-	tcase_add_test(startstophttp, test_mg_start_stop_http_server);
-	tcase_set_timeout(startstophttp, civetweb_min_test_timeout);
-	suite_add_tcase(suite, startstophttp);
-
-	tcase_add_test(startstophttps, test_mg_start_stop_https_server);
-	tcase_set_timeout(startstophttps, civetweb_min_test_timeout);
-	suite_add_tcase(suite, startstophttps);
-
-	tcase_add_test(serverandclienttls, test_mg_server_and_client_tls);
-	tcase_set_timeout(serverandclienttls, civetweb_min_test_timeout);
-	suite_add_tcase(suite, serverandclienttls);
-
-	tcase_add_test(serverrequests, test_request_handlers);
-	tcase_set_timeout(serverrequests, 120);
-	suite_add_tcase(suite, serverrequests);
+	TCase *const tcase_checktestenv = tcase_create("Check test environment");
+	TCase *const tcase_startthreads = tcase_create("Start threads");
+	TCase *const tcase_startstophttp = tcase_create("Start Stop HTTP Server");
+	TCase *const tcase_startstophttps = tcase_create("Start Stop HTTPS Server");
+	TCase *const tcase_serverandclienttls = tcase_create("TLS Server Client");
+	TCase *const tcase_serverrequests = tcase_create("Server Requests");
+
+	tcase_add_test(tcase_checktestenv, test_the_test_environment);
+	tcase_set_timeout(tcase_checktestenv, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_checktestenv);
+
+	tcase_add_test(tcase_startthreads, test_threading);
+	tcase_set_timeout(tcase_startthreads, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_startthreads);
+
+	tcase_add_test(tcase_startstophttp, test_mg_start_stop_http_server);
+	tcase_set_timeout(tcase_startstophttp, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_startstophttp);
+
+	tcase_add_test(tcase_startstophttps, test_mg_start_stop_https_server);
+	tcase_set_timeout(tcase_startstophttps, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_startstophttps);
+
+	tcase_add_test(tcase_serverandclienttls, test_mg_server_and_client_tls);
+	tcase_set_timeout(tcase_serverandclienttls, civetweb_min_test_timeout);
+	suite_add_tcase(suite, tcase_serverandclienttls);
+
+	tcase_add_test(tcase_serverrequests, test_request_handlers);
+	tcase_set_timeout(tcase_serverrequests, 120);
+	suite_add_tcase(suite, tcase_serverrequests);
 
 
 	return suite;
 	return suite;
 }
 }