Mercurial > hg > webserver / file diff

--- a/src/server/test/uri.c	Sat Nov 22 12:49:20 2025 +0100
+++ b/src/server/test/uri.c	Sat Nov 22 14:27:01 2025 +0100
@@ -31,34 +31,34 @@
 #include "../util/util.h"
 
 
-UCX_TEST(test_util_uri_escape_alphanum) {
+CX_TEST(test_util_uri_escape_alphanum) {
     char *str1 = "/test/path/abc/";
     char str_enc[512];
     
-    UCX_TEST_BEGIN;
+    CX_TEST_DO {
     
-    char *test = util_uri_escape(str_enc, str1);
-    UCX_TEST_ASSERT(test, "util_uri_escape returned NULL");
-    UCX_TEST_ASSERT(!strcasecmp(test, str1), "test != str1");
-    
-    UCX_TEST_END;
+        char *test = util_uri_escape(str_enc, str1);
+        CX_TEST_ASSERT(test);
+        CX_TEST_ASSERT(!strcasecmp(test, str1));
+
+    }
 }
 
-UCX_TEST(test_util_uri_escape_space) {
+CX_TEST(test_util_uri_escape_space) {
     char *str1 = "/test/space in path/";
     char *str_enc_expected = "/test/space%20in%20path/";
     char str_enc[512];
     
-    UCX_TEST_BEGIN;
+    CX_TEST_DO {
     
-    char *test = util_uri_escape(str_enc, str1);
-    UCX_TEST_ASSERT(test, "util_uri_escape returned NULL");
-    UCX_TEST_ASSERT(!strcasecmp(test, str_enc_expected), "unexpected result");
+        char *test = util_uri_escape(str_enc, str1);
+        CX_TEST_ASSERT(test);
+        CX_TEST_ASSERT(!strcasecmp(test, str_enc_expected));
     
-    UCX_TEST_END;
+    }
 }
 
-UCX_TEST(test_util_uri_escape_latin) {
+CX_TEST(test_util_uri_escape_latin) {
     char *str1 = "/test/path/öäütestß/";
     char *str_enc_expected = "/test/path/%C3%B6%C3%A4%C3%BCtest%C3%9F/";
     
@@ -67,22 +67,22 @@
     
     char str_enc[512];
     
-    UCX_TEST_BEGIN;
-    
-    // test 1
-    char *test = util_uri_escape(str_enc, str1);
-    UCX_TEST_ASSERT(test, "util_uri_escape returned NULL");
-    UCX_TEST_ASSERT(!strcasecmp(test, str_enc_expected), "unexpected result");
+    CX_TEST_DO {
     
-    // test 2
-    test = util_uri_escape(str_enc, str2);
-    UCX_TEST_ASSERT(test, "(2) util_uri_escape returned NULL");
-    UCX_TEST_ASSERT(!strcasecmp(test, str2_enc_expected), "(2) unexpected result");
+        // test 1
+        char *test = util_uri_escape(str_enc, str1);
+        CX_TEST_ASSERT(test);
+        CX_TEST_ASSERT(!strcasecmp(test, str_enc_expected));
+
+        // test 2
+        test = util_uri_escape(str_enc, str2);
+        CX_TEST_ASSERT(test);
+        CX_TEST_ASSERT(!strcasecmp(test, str2_enc_expected));
     
-    UCX_TEST_END;
+    }
 }
 
-UCX_TEST(test_util_uri_escape_kanji) {
+CX_TEST(test_util_uri_escape_kanji) {
     char *str1 = "漢字";
     char *str1_enc_expected = "%E6%BC%A2%E5%AD%97";
     
@@ -91,18 +91,18 @@
     
     char str_enc[512];
     
-    UCX_TEST_BEGIN;
-    
-    // test 1
-    char *test = util_uri_escape(str_enc, str1);
-    UCX_TEST_ASSERT(test, "util_uri_escape returned NULL");
-    UCX_TEST_ASSERT(!strcasecmp(test, str1_enc_expected), "unexpected result");
+    CX_TEST_DO {
     
-    // test 2
-    test = util_uri_escape(str_enc, str2);
-    UCX_TEST_ASSERT(test, "(2) util_uri_escape returned NULL");
-    UCX_TEST_ASSERT(!strcasecmp(test, str2_enc_expected), "(2) unexpected result");
+        // test 1
+        char *test = util_uri_escape(str_enc, str1);
+        CX_TEST_ASSERT(test);
+        CX_TEST_ASSERT(!strcasecmp(test, str1_enc_expected));
+
+        // test 2
+        test = util_uri_escape(str_enc, str2);
+        CX_TEST_ASSERT(test);
+        CX_TEST_ASSERT(!strcasecmp(test, str2_enc_expected));
     
-    UCX_TEST_END;
+    }
 }