Mercurial > hg > webserver / file diff

--- a/src/server/test/event.c	Sat Nov 22 12:49:20 2025 +0100
+++ b/src/server/test/event.c	Sat Nov 22 14:27:01 2025 +0100
@@ -40,29 +40,27 @@
     int i2;
 } EVTest;
 
-UCX_TEST(test_evhandler_create) {
+CX_TEST(test_evhandler_create) {
     EventHandlerConfig cfg1 = { .nthreads = 1};
     
     EventHandlerConfig cfg4 = { .nthreads = 4};
     
-    UCX_TEST_BEGIN;
-    
-    EVHandler *ev1 = evhandler_create(&cfg1);
-    UCX_TEST_ASSERT(ev1, "evhandler_create (1) failed");
-    UCX_TEST_ASSERT(ev1->numins == 1, "ev1 wrong number of instances");
-    
-    EVHandler *ev2 = evhandler_create(&cfg4);
-    UCX_TEST_ASSERT(ev2, "evhandler_create (2) failed");
-    UCX_TEST_ASSERT(ev2->numins == 4, "ev2 wrong number of instances");
-    
-    
-    evhandler_shutdown(ev1);
-    evhandler_shutdown(ev2);
-    
-    evhandler_wait_and_destroy(ev1);
-    evhandler_wait_and_destroy(ev2);
-    
-    UCX_TEST_END;
+    CX_TEST_DO {
+        EVHandler *ev1 = evhandler_create(&cfg1);
+        CX_TEST_ASSERT(ev1);
+        CX_TEST_ASSERT(ev1->numins == 1);
+
+        EVHandler *ev2 = evhandler_create(&cfg4);
+        CX_TEST_ASSERT(ev2);
+        CX_TEST_ASSERT(ev2->numins == 4);
+
+
+        evhandler_shutdown(ev1);
+        evhandler_shutdown(ev2);
+
+        evhandler_wait_and_destroy(ev1);
+        evhandler_wait_and_destroy(ev2);
+    }
 }
 
 static int test_event_send_fn(EventHandler *h, Event *event) {
@@ -91,7 +89,7 @@
     }
 }
 
-UCX_TEST(test_event_send) {
+CX_TEST(test_event_send) {
     EventHandlerConfig cfg = { .nthreads = 1};
     
     EVHandler *ev = evhandler_create(&cfg);
@@ -103,27 +101,27 @@
     pthread_mutex_init(&testdata.mutex, NULL);
     pthread_cond_init(&testdata.cond, NULL);
     
-    UCX_TEST_BEGIN;
-    
-    // test sending a single event
-    // the event signals completion in the testdata object
-    // wait up to 10 seconds for completion (it should be instantly)
-    
-    Event evt;
-    ZERO(&evt, sizeof(Event));
-    evt.fn = test_event_send_fn;
-    evt.cookie = &testdata;
+    CX_TEST_DO {
     
-    int ret = event_send(h, &evt);
-    
-    // wait for event finish
-    testdata_wait_for_completion(&testdata);
+        // test sending a single event
+        // the event signals completion in the testdata object
+        // wait up to 10 seconds for completion (it should be instantly)
+
+        Event evt;
+        ZERO(&evt, sizeof(Event));
+        evt.fn = test_event_send_fn;
+        evt.cookie = &testdata;
+
+        int ret = event_send(h, &evt);
+
+        // wait for event finish
+        testdata_wait_for_completion(&testdata);
+
+        CX_TEST_ASSERT(!ret);
+        CX_TEST_ASSERT(testdata.i1);
+        CX_TEST_ASSERT(testdata.i2);
     
-    UCX_TEST_ASSERT(!ret, "event_send failed");
-    UCX_TEST_ASSERT(testdata.i1, "event callback not called");
-    UCX_TEST_ASSERT(testdata.i2, "event callback received wrong event handler pointer");
-    
-    UCX_TEST_END;
+    }
     
     pthread_mutex_destroy(&testdata.mutex);
     pthread_cond_destroy(&testdata.cond);
@@ -176,7 +174,7 @@
     return 0;
 }
 
-UCX_TEST(test_event_send_multi) {
+CX_TEST(test_event_send_multi) {
     EventHandlerConfig cfg = { .nthreads = 1};
     
     EVHandler *ev = evhandler_create(&cfg);
@@ -188,28 +186,28 @@
     pthread_mutex_init(&testdata.mutex, NULL);
     pthread_cond_init(&testdata.cond, NULL);
     
-    UCX_TEST_BEGIN;
-    
-    // test sending multiple events
-    // the first callback test_event_send_multi_fn1 adds additional
-    // EV_TEST_NUM_EVENTS events to the handler + an additional
-    // finishing event, that notifies completion
+    CX_TEST_DO {
     
-    Event evt;
-    ZERO(&evt, sizeof(Event));
-    evt.fn = test_event_send_multi_fn1;
-    evt.cookie = &testdata;
-    
-    int ret = event_send(h, &evt);
+        // test sending multiple events
+        // the first callback test_event_send_multi_fn1 adds additional
+        // EV_TEST_NUM_EVENTS events to the handler + an additional
+        // finishing event, that notifies completion
+
+        Event evt;
+        ZERO(&evt, sizeof(Event));
+        evt.fn = test_event_send_multi_fn1;
+        evt.cookie = &testdata;
+
+        int ret = event_send(h, &evt);
+
+        // wait for event finish
+        testdata_wait_for_completion(&testdata);
+
+        CX_TEST_ASSERT(!ret);
+        CX_TEST_ASSERT(testdata.i1);
+        CX_TEST_ASSERT(testdata.i2 == EV_TEST_NUM_EVENTS);
     
-    // wait for event finish
-    testdata_wait_for_completion(&testdata);
-    
-    UCX_TEST_ASSERT(!ret, "event_send failed");
-    UCX_TEST_ASSERT(testdata.i1, "event callback not called");
-    UCX_TEST_ASSERT(testdata.i2 == EV_TEST_NUM_EVENTS, "event callback received wrong event handler pointer");
-    
-    UCX_TEST_END;
+    }
     
     pthread_mutex_destroy(&testdata.mutex);
     pthread_cond_destroy(&testdata.cond);