Mercurial > hg > ucx / changeset

--- a/test/CMakeLists.txt	Fri Apr 15 21:28:51 2022 +0200
+++ b/test/CMakeLists.txt	Sat Apr 16 08:49:31 2022 +0200
@@ -9,7 +9,6 @@
 if (CUNIT_FOUND)
     message(CHECK_PASS "found: compiling tests.")
     set(TESTS
-            test_allocator
             test_list
             test_tree
     )
@@ -41,9 +40,10 @@
 
 set(TESTS
         selftest
+        test_allocator
         )
 foreach (test ${TESTS})
     add_executable(${test} ${test}.cpp)
     target_link_libraries(${test} PRIVATE ucx_static gtest_main)
+    gtest_discover_tests(${test})
 endforeach ()
-gtest_discover_tests(${TESTS})

--- a/test/test_allocator.c	Fri Apr 15 21:28:51 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2021 Mike Becker, Olaf Wintermann All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "cx/allocator.h"
-#include "test_config.h"
-#include <errno.h>
-
-void test_default_allocator_available(void) {
-    cx_allocator_class *clazz = cxDefaultAllocator->cl;
-    CU_ASSERT_PTR_NOT_NULL(clazz)
-}
-
-void test_default_malloc(void) {
-    void *test = cxMalloc(cxDefaultAllocator, 16);
-    CU_ASSERT_PTR_NOT_NULL(test);
-    free(test);
-}
-
-void test_default_realloc(void) {
-    void *test = calloc(8, 1);
-    memcpy(test, "Test", 5);
-    test = cxRealloc(cxDefaultAllocator, test, 16);
-    CU_ASSERT_PTR_NOT_NULL(test)
-    CU_ASSERT_STRING_EQUAL("Test", test)
-    free(test);
-}
-
-void test_default_reallocate(void) {
-    void *test = calloc(8, 1);
-    memcpy(test, "Test", 5);
-    int rval = cxReallocate(cxDefaultAllocator, &test, 16);
-    CU_ASSERT_EQUAL(rval, 0);
-    CU_ASSERT_PTR_NOT_NULL(test)
-    CU_ASSERT_STRING_EQUAL("Test", test)
-    free(test);
-}
-
-void test_default_calloc(void) {
-    void *test = cxCalloc(cxDefaultAllocator, 8, 2);
-    CU_ASSERT_PTR_NOT_NULL(test)
-    free(test);
-}
-
-void test_default_free(void) {
-    void *test = malloc(16);
-    cxFree(cxDefaultAllocator, test);
-    CU_PASS("Testing standard free is not possible.")
-}
-
-int main() {
-    CU_pSuite suite = NULL;
-
-    if (CUE_SUCCESS != CU_initialize_registry()) {
-        return CU_get_error();
-    }
-
-    suite = CU_add_suite("default allocator", NULL, NULL);
-
-    CU_add_test(suite, "default allocator available", test_default_allocator_available);
-    CU_add_test(suite, "test of malloc()", test_default_malloc);
-    CU_add_test(suite, "test of realloc()", test_default_realloc);
-    CU_add_test(suite, "test of realloc() via cxReallocate", test_default_reallocate);
-    CU_add_test(suite, "test of calloc()", test_default_calloc);
-    CU_add_test(suite, "test of free()", test_default_free);
-
-    CU_basic_set_mode(UCX_CU_BRM);
-
-    int exitcode;
-    if (CU_basic_run_tests()) {
-        exitcode = CU_get_error();
-    } else {
-        exitcode = CU_get_number_of_failures() == 0 ? 0 : 1;
-    }
-    CU_cleanup_registry();
-    return exitcode;
-}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/test_allocator.cpp	Sat Apr 16 08:49:31 2022 +0200
@@ -0,0 +1,76 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2021 Mike Becker, Olaf Wintermann All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "cx/allocator.h"
+#include <gtest/gtest.h>
+
+#define SUITE_NAME Allocator
+
+TEST(SUITE_NAME, DefaultAllocator) {
+    cx_allocator_class *clazz = cxDefaultAllocator->cl;
+    ASSERT_NE(clazz, nullptr);
+}
+
+TEST(SUITE_NAME, DefaultMalloc) {
+    void *test = cxMalloc(cxDefaultAllocator, 16);
+    ASSERT_NE(test, nullptr);
+    free(test);
+}
+
+TEST(SUITE_NAME, DefaultRealloc) {
+    void *test = calloc(8, 1);
+    memcpy(test, "Test", 5);
+    test = cxRealloc(cxDefaultAllocator, test, 16);
+    ASSERT_NE(test, nullptr);
+    EXPECT_STREQ(reinterpret_cast<char *>(test), "Test");
+    free(test);
+}
+
+TEST(SUITE_NAME, Reallocate) {
+    void *test = calloc(8, 1);
+    memcpy(test, "Test", 5);
+    int ret = cxReallocate(cxDefaultAllocator, &test, 16);
+    EXPECT_EQ(ret, 0);
+    ASSERT_NE(test, nullptr);
+    EXPECT_STREQ(reinterpret_cast<char *>(test), "Test");
+    free(test);
+}
+
+TEST(SUITE_NAME, DefaultCalloc) {
+    char *test = reinterpret_cast<char *>(cxCalloc(cxDefaultAllocator, 8, 2));
+    ASSERT_NE(test, nullptr);
+    for (int i = 0; i < 16; i++) ASSERT_EQ(test[i], 0);
+    free(test);
+}
+
+TEST(SUITE_NAME, DefaultFree) {
+    void *test = malloc(16);
+    EXPECT_NO_FATAL_FAILURE(
+            cxFree(cxDefaultAllocator, test);
+    );
+}