Use a consistent naming scheme for test helper functions

1 files changed, 51 insertions, 51 deletions

diff --git a/test/test_uri.c b/test/test_uri.c
index fc5eab71..94669ad5 100644
--- a/test/test_uri.c
+++ b/test/test_uri.c
@@ -37,11 +37,11 @@ test_uri_string_has_scheme(void)
 }
 
 static void
-test_file_uri(const char* const hostname,
-              const char* const path,
-              const bool        escape,
-              const char* const expected_uri,
-              const char*       expected_path)
+check_file_uri(const char* const hostname,
+               const char* const path,
+               const bool        escape,
+               const char* const expected_uri,
+               const char*       expected_path)
 {
   if (!expected_path) {
     expected_path = path;
@@ -112,62 +112,62 @@ test_uri_to_path(void)
 static void
 test_uri_parsing(void)
 {
-  test_file_uri(NULL, "C:/My 100%", true, "file:///C:/My%20100%%", NULL);
-  test_file_uri(NULL, "/foo/bar", true, "file:///foo/bar", NULL);
-  test_file_uri("bhost", "/foo/bar", true, "file://bhost/foo/bar", NULL);
-  test_file_uri(NULL, "a/relative path", false, "a/relative path", NULL);
-  test_file_uri(
+  check_file_uri(NULL, "C:/My 100%", true, "file:///C:/My%20100%%", NULL);
+  check_file_uri(NULL, "/foo/bar", true, "file:///foo/bar", NULL);
+  check_file_uri("bhost", "/foo/bar", true, "file://bhost/foo/bar", NULL);
+  check_file_uri(NULL, "a/relative path", false, "a/relative path", NULL);
+  check_file_uri(
     NULL, "a/relative <path>", true, "a/relative%20%3Cpath%3E", NULL);
 
 #ifdef _WIN32
-  test_file_uri(
+  check_file_uri(
     NULL, "C:\\My 100%", true, "file:///C:/My%20100%%", "C:/My 100%");
 
-  test_file_uri(NULL,
-                "\\drive\\relative",
-                true,
-                "file:///drive/relative",
-                "/drive/relative");
-
-  test_file_uri(NULL,
-                "C:\\Program Files\\Serd",
-                true,
-                "file:///C:/Program%20Files/Serd",
-                "C:/Program Files/Serd");
-
-  test_file_uri("ahost",
-                "C:\\Pointless Space",
-                true,
-                "file://ahost/C:/Pointless%20Space",
-                "C:/Pointless Space");
+  check_file_uri(NULL,
+                 "\\drive\\relative",
+                 true,
+                 "file:///drive/relative",
+                 "/drive/relative");
+
+  check_file_uri(NULL,
+                 "C:\\Program Files\\Serd",
+                 true,
+                 "file:///C:/Program%20Files/Serd",
+                 "C:/Program Files/Serd");
+
+  check_file_uri("ahost",
+                 "C:\\Pointless Space",
+                 true,
+                 "file://ahost/C:/Pointless%20Space",
+                 "C:/Pointless Space");
 #else
   /* What happens with Windows paths on other platforms is a bit weird, but
      more or less unavoidable.  It doesn't work to interpret backslashes as
      path separators on any other platform. */
 
-  test_file_uri("ahost",
-                "C:\\Pointless Space",
-                true,
-                "file://ahost/C:%5CPointless%20Space",
-                "/C:\\Pointless Space");
-
-  test_file_uri(NULL,
-                "\\drive\\relative",
-                true,
-                "%5Cdrive%5Crelative",
-                "\\drive\\relative");
-
-  test_file_uri(NULL,
-                "C:\\Program Files\\Serd",
-                true,
-                "file:///C:%5CProgram%20Files%5CSerd",
-                "/C:\\Program Files\\Serd");
-
-  test_file_uri("ahost",
-                "C:\\Pointless Space",
-                true,
-                "file://ahost/C:%5CPointless%20Space",
-                "/C:\\Pointless Space");
+  check_file_uri("ahost",
+                 "C:\\Pointless Space",
+                 true,
+                 "file://ahost/C:%5CPointless%20Space",
+                 "/C:\\Pointless Space");
+
+  check_file_uri(NULL,
+                 "\\drive\\relative",
+                 true,
+                 "%5Cdrive%5Crelative",
+                 "\\drive\\relative");
+
+  check_file_uri(NULL,
+                 "C:\\Program Files\\Serd",
+                 true,
+                 "file:///C:%5CProgram%20Files%5CSerd",
+                 "/C:\\Program Files\\Serd");
+
+  check_file_uri("ahost",
+                 "C:\\Pointless Space",
+                 true,
+                 "file://ahost/C:%5CPointless%20Space",
+                 "/C:\\Pointless Space");
 #endif
 
   // Test tolerance of NULL hostname parameter