Replace Criterion by CUnit
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek
parent
60752b3fd8
commit
74a48c5731
47 changed files with 4486 additions and 5388 deletions
|
|
@ -13,9 +13,8 @@
|
|||
|
||||
#include "ddsc/dds.h"
|
||||
#include "os/os.h"
|
||||
#include <criterion/criterion.h>
|
||||
#include <criterion/logging.h>
|
||||
#include <criterion/theories.h>
|
||||
#include "CUnit/Test.h"
|
||||
#include "CUnit/Theory.h"
|
||||
#include "Space.h"
|
||||
|
||||
|
||||
|
|
@ -63,46 +62,46 @@ registering_init(void)
|
|||
dds_qset_destination_order(qos, DDS_DESTINATIONORDER_BY_SOURCE_TIMESTAMP);
|
||||
|
||||
g_participant = dds_create_participant(DDS_DOMAIN_DEFAULT, NULL, NULL);
|
||||
cr_assert_gt(g_participant, 0, "Failed to create prerequisite g_participant");
|
||||
CU_ASSERT_FATAL(g_participant > 0);
|
||||
|
||||
g_waitset = dds_create_waitset(g_participant);
|
||||
cr_assert_gt(g_waitset, 0, "Failed to create g_waitset");
|
||||
CU_ASSERT_FATAL(g_waitset > 0);
|
||||
|
||||
g_topic = dds_create_topic(g_participant, &Space_Type1_desc, create_topic_name("ddsc_registering_test", name, sizeof name), qos, NULL);
|
||||
cr_assert_gt(g_topic, 0, "Failed to create prerequisite g_topic");
|
||||
CU_ASSERT_FATAL(g_topic > 0);
|
||||
|
||||
/* Create a reader that keeps one sample on three instances. */
|
||||
dds_qset_reliability(qos, DDS_RELIABILITY_RELIABLE, DDS_MSECS(100));
|
||||
dds_qset_resource_limits(qos, DDS_LENGTH_UNLIMITED, 3, 1);
|
||||
g_reader = dds_create_reader(g_participant, g_topic, qos, NULL);
|
||||
cr_assert_gt(g_reader, 0, "Failed to create prerequisite g_reader");
|
||||
CU_ASSERT_FATAL(g_reader > 0);
|
||||
|
||||
/* Create a writer that will not automatically dispose unregistered samples. */
|
||||
dds_qset_writer_data_lifecycle(qos, false);
|
||||
g_writer = dds_create_writer(g_participant, g_topic, qos, NULL);
|
||||
cr_assert_gt(g_writer, 0, "Failed to create prerequisite g_writer");
|
||||
CU_ASSERT_FATAL(g_writer > 0);
|
||||
|
||||
/* Sync g_writer to g_reader. */
|
||||
ret = dds_set_enabled_status(g_writer, DDS_PUBLICATION_MATCHED_STATUS);
|
||||
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed to set prerequisite g_writer status");
|
||||
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
|
||||
ret = dds_waitset_attach(g_waitset, g_writer, g_writer);
|
||||
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed to attach prerequisite g_writer");
|
||||
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
|
||||
ret = dds_waitset_wait(g_waitset, &triggered, 1, DDS_SECS(1));
|
||||
cr_assert_eq(ret, 1, "Failed prerequisite dds_waitset_wait g_writer r");
|
||||
cr_assert_eq(g_writer, (dds_entity_t)(intptr_t)triggered, "Failed prerequisite dds_waitset_wait g_writer a");
|
||||
CU_ASSERT_EQUAL_FATAL(ret, 1);
|
||||
CU_ASSERT_EQUAL_FATAL(g_writer, (dds_entity_t)(intptr_t)triggered);
|
||||
ret = dds_waitset_detach(g_waitset, g_writer);
|
||||
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed to detach prerequisite g_writer");
|
||||
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
|
||||
|
||||
/* Sync g_reader to g_writer. */
|
||||
ret = dds_set_enabled_status(g_reader, DDS_SUBSCRIPTION_MATCHED_STATUS);
|
||||
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed to set prerequisite g_reader status");
|
||||
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
|
||||
ret = dds_waitset_attach(g_waitset, g_reader, g_reader);
|
||||
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed to attach prerequisite g_reader");
|
||||
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
|
||||
ret = dds_waitset_wait(g_waitset, &triggered, 1, DDS_SECS(1));
|
||||
cr_assert_eq(ret, 1, "Failed prerequisite dds_waitset_wait g_reader r");
|
||||
cr_assert_eq(g_reader, (dds_entity_t)(intptr_t)triggered, "Failed prerequisite dds_waitset_wait g_reader a");
|
||||
CU_ASSERT_EQUAL_FATAL(ret, 1);
|
||||
CU_ASSERT_EQUAL_FATAL(g_reader, (dds_entity_t)(intptr_t)triggered);
|
||||
ret = dds_waitset_detach(g_waitset, g_reader);
|
||||
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed to detach prerequisite g_reader");
|
||||
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
|
||||
|
||||
/* Write initial samples. */
|
||||
for (int i = 0; i < INITIAL_SAMPLES; i++) {
|
||||
|
|
@ -110,7 +109,7 @@ registering_init(void)
|
|||
sample.long_2 = i*2;
|
||||
sample.long_3 = i*3;
|
||||
ret = dds_write(g_writer, &sample);
|
||||
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed prerequisite write");
|
||||
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
|
||||
}
|
||||
|
||||
/* Initialize reading buffers. */
|
||||
|
|
@ -137,89 +136,86 @@ registering_fini(void)
|
|||
}
|
||||
|
||||
|
||||
#if 0
|
||||
#else
|
||||
/**************************************************************************************************
|
||||
*
|
||||
* These will check the dds_register_instance() in various ways.
|
||||
*
|
||||
*************************************************************************************************/
|
||||
/*************************************************************************************************/
|
||||
Test(ddsc_register_instance, deleted_entity, .init=registering_init, .fini=registering_fini)
|
||||
CU_Test(ddsc_register_instance, deleted_entity, .init=registering_init, .fini=registering_fini)
|
||||
{
|
||||
dds_return_t ret;
|
||||
dds_instance_handle_t handle;
|
||||
dds_delete(g_writer);
|
||||
ret = dds_register_instance(g_writer, &handle, g_data);
|
||||
cr_assert_eq(dds_err_nr(ret), DDS_RETCODE_ALREADY_DELETED, "returned %d", dds_err_nr(ret));
|
||||
CU_ASSERT_EQUAL_FATAL(dds_err_nr(ret), DDS_RETCODE_ALREADY_DELETED);
|
||||
}
|
||||
|
||||
static dds_instance_handle_t hndle = 0;
|
||||
static Space_Type1 data;
|
||||
TheoryDataPoints(ddsc_register_instance, invalid_params) = {
|
||||
DataPoints(dds_instance_handle_t *, &hndle, NULL),
|
||||
DataPoints(void*, &data, NULL)
|
||||
CU_TheoryDataPoints(ddsc_register_instance, invalid_params) = {
|
||||
CU_DataPoints(dds_instance_handle_t *, &hndle, NULL),
|
||||
CU_DataPoints(void*, NULL, &data)
|
||||
};
|
||||
Theory((dds_instance_handle_t *hndl2, void *datap), ddsc_register_instance, invalid_params/*, .init=registering_init, .fini=registering_fini*/)
|
||||
CU_Theory((dds_instance_handle_t *hndl2, void *datap), ddsc_register_instance, invalid_params, .init=registering_init, .fini=registering_fini)
|
||||
{
|
||||
dds_return_t ret;
|
||||
|
||||
/* Only test when the combination of parameters is actually invalid.*/
|
||||
cr_assume((hndl2 == NULL) || (datap == NULL));
|
||||
CU_ASSERT_FATAL((hndl2 == NULL) || (datap == NULL));
|
||||
|
||||
OS_WARNING_MSVC_OFF(6387); /* Disable SAL warning on intentional misuse of the API */
|
||||
ret = dds_register_instance(g_writer, hndl2, datap);
|
||||
OS_WARNING_MSVC_ON(6387);
|
||||
cr_assert_eq(dds_err_nr(ret), DDS_RETCODE_BAD_PARAMETER, "returned %d != expected %d", dds_err_nr(ret), DDS_RETCODE_BAD_PARAMETER);
|
||||
CU_ASSERT_EQUAL_FATAL(dds_err_nr(ret), DDS_RETCODE_BAD_PARAMETER);
|
||||
}
|
||||
|
||||
TheoryDataPoints(ddsc_register_instance, invalid_writers) = {
|
||||
DataPoints(dds_entity_t, -2, -1, 0, 1, 100, INT_MAX, INT_MIN),
|
||||
CU_TheoryDataPoints(ddsc_register_instance, invalid_writers) = {
|
||||
CU_DataPoints(dds_entity_t, -2, -1, 0, 1, 100, INT_MAX, INT_MIN),
|
||||
};
|
||||
Theory((dds_entity_t writer), ddsc_register_instance, invalid_writers, .init=registering_init, .fini=registering_fini)
|
||||
CU_Theory((dds_entity_t writer), ddsc_register_instance, invalid_writers, .init=registering_init, .fini=registering_fini)
|
||||
{
|
||||
dds_entity_t exp = DDS_RETCODE_BAD_PARAMETER * -1;
|
||||
dds_return_t ret;
|
||||
dds_instance_handle_t handle;
|
||||
|
||||
ret = dds_register_instance(writer, &handle, g_data);
|
||||
cr_assert_eq(dds_err_nr(ret), dds_err_nr(exp), "returned %d != expected %d", dds_err_nr(ret), dds_err_nr(exp));
|
||||
CU_ASSERT_EQUAL_FATAL(dds_err_nr(ret), dds_err_nr(exp));
|
||||
}
|
||||
|
||||
TheoryDataPoints(ddsc_register_instance, non_writers) = {
|
||||
DataPoints(dds_entity_t*, &g_waitset, &g_reader, &g_topic, &g_participant),
|
||||
CU_TheoryDataPoints(ddsc_register_instance, non_writers) = {
|
||||
CU_DataPoints(dds_entity_t*, &g_waitset, &g_reader, &g_topic, &g_participant),
|
||||
};
|
||||
Theory((dds_entity_t *writer), ddsc_register_instance, non_writers, .init=registering_init, .fini=registering_fini)
|
||||
CU_Theory((dds_entity_t *writer), ddsc_register_instance, non_writers, .init=registering_init, .fini=registering_fini)
|
||||
{
|
||||
dds_return_t ret;
|
||||
dds_instance_handle_t handle;
|
||||
ret = dds_register_instance(*writer, &handle, g_data);
|
||||
cr_assert_eq(dds_err_nr(ret), DDS_RETCODE_ILLEGAL_OPERATION, "returned %d", dds_err_nr(ret));
|
||||
CU_ASSERT_EQUAL_FATAL(dds_err_nr(ret), DDS_RETCODE_ILLEGAL_OPERATION);
|
||||
}
|
||||
|
||||
Test(ddsc_register_instance, registering_new_instance, .init=registering_init, .fini=registering_fini)
|
||||
CU_Test(ddsc_register_instance, registering_new_instance, .init=registering_init, .fini=registering_fini)
|
||||
{
|
||||
dds_instance_handle_t instHndl, instHndl2;
|
||||
dds_return_t ret;
|
||||
Space_Type1 newInstance = { INITIAL_SAMPLES, 0, 0 };
|
||||
instHndl = dds_instance_lookup(g_writer, &newInstance);
|
||||
cr_assert_eq(instHndl, DDS_HANDLE_NIL);
|
||||
CU_ASSERT_EQUAL_FATAL(instHndl, DDS_HANDLE_NIL);
|
||||
ret = dds_register_instance(g_writer, &instHndl2, &newInstance);
|
||||
cr_assert_eq(ret, DDS_RETCODE_OK);
|
||||
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
|
||||
instHndl = dds_instance_lookup(g_writer, &newInstance);
|
||||
cr_assert_eq(instHndl, instHndl2);
|
||||
CU_ASSERT_EQUAL_FATAL(instHndl, instHndl2);
|
||||
}
|
||||
|
||||
Test(ddsc_register_instance, data_already_available, .init=registering_init, .fini=registering_fini)
|
||||
CU_Test(ddsc_register_instance, data_already_available, .init=registering_init, .fini=registering_fini)
|
||||
{
|
||||
dds_instance_handle_t instHndl, instHndl2;
|
||||
dds_return_t ret;
|
||||
instHndl = dds_instance_lookup(g_writer, &g_data);
|
||||
cr_assert_neq(instHndl, DDS_HANDLE_NIL);
|
||||
CU_ASSERT_NOT_EQUAL_FATAL(instHndl, DDS_HANDLE_NIL);
|
||||
ret = dds_register_instance(g_writer, &instHndl2, &g_data);
|
||||
cr_assert_eq(ret, DDS_RETCODE_OK);
|
||||
cr_assert_eq(instHndl2, instHndl);
|
||||
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
|
||||
CU_ASSERT_EQUAL_FATAL(instHndl2, instHndl);
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue