Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions tests/com_wrapper_int/com_wrapper_int.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@

#include "c_pal/gballoc_hl.h"
#include "c_pal/gballoc_hl_redirect.h"
#include "c_pal/timed_test_suite.h"

#include "real_gballoc_hl.h"

#include "test_object_custom_alloc_wrapper.h"

BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)

TEST_SUITE_INITIALIZE(suite_initialize)
TIMED_TEST_SUITE_INITIALIZE(suite_initialize, TIMED_TEST_DEFAULT_TIMEOUT_MS)
{
ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
}

TEST_SUITE_CLEANUP(suite_cleanup)
TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
{
real_gballoc_hl_deinit();
}
Expand Down Expand Up @@ -46,4 +47,4 @@ TEST_FUNCTION(custom_allocator_create_and_release_succeeds)
(void)custom_interface->lpVtbl->Release(custom_interface);
}

END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
4 changes: 2 additions & 2 deletions tests/com_wrapper_ut/com_wrapper_ut.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ DEFINE_COM_WRAPPER_OBJECT(TEST_OBJECT_NOT_ENOUGH_HANDLE, TEST_OBJECT_NOT_ENOUGH_

BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)

TEST_SUITE_INITIALIZE(suite_init)
TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
{
ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));

Expand All @@ -76,7 +76,7 @@ TEST_SUITE_INITIALIZE(suite_init)
REGISTER_GLOBAL_MOCK_HOOK(ut_custom_free, real_gballoc_hl_free);
}

TEST_SUITE_CLEANUP(suite_cleanup)
TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
{
umock_c_deinit();

Expand Down
4 changes: 3 additions & 1 deletion tests/com_wrapper_ut/com_wrapper_ut_pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

#include "c_pal/interlocked.h" /*included for mocking reasons - it will prohibit creation of mocks belonging to interlocked.h - at the moment verified through int tests - this is porting legacy code, temporary solution*/

#include "c_pal/timed_test_suite.h"

#include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
#include "c_pal/gballoc_hl.h"
#include "c_pal/gballoc_hl_redirect.h"
Expand All @@ -36,4 +38,4 @@
#include "test_object_wrapper.h"
#include "test_object_2_wrapper.h"

#endif // COM_WRAPPER_UT_PCH_H
#endif // COM_WRAPPER_UT_PCH_H
Loading