niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace Criterion by CUnit

Browse source 
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek 2018-12-04 23:01:46 +01:00
parent 60752b3fd8
commit 74a48c5731
47 changed files with 4486 additions and 5388 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/core/ddsc/tests/transientlocal.c
View file

@ -12,12 +12,10 @@
#include <stdio.h>
#include "ddsc/dds.h"
#include "Space.h"
#include <criterion/criterion.h>
#include <criterion/logging.h>
#include "CUnit/Test.h"
#define TRACE_SAMPLE(info, sample) cr_log_info("%s (%d, %d, %d)\n", info, sample.long_1, sample.long_2, sample.long_3);
#define MAX_SAMPLES (7)
Test(ddsc_transient_local, late_joiner)
CU_Test(ddsc_transient_local, late_joiner)
{
Space_Type1 sample = { 0, 0, 0 };
dds_return_t ret;
@ -45,60 +43,54 @@ Test(ddsc_transient_local, late_joiner)
/* Create participant and topic. */
par = dds_create_participant(DDS_DOMAIN_DEFAULT, qos, NULL);
cr_assert_gt(par, 0, "Failed to create prerequisite par");
CU_ASSERT_FATAL(par > 0);
top = dds_create_topic(par, &Space_Type1_desc, "ddsc_transient_local_happy_days", qos, NULL);
cr_assert_gt(par, 0, "Failed to create prerequisite top");
CU_ASSERT_FATAL(par > 0);
/* Create publishing entities. */
cr_log_info("Create writer\n");
pub = dds_create_publisher(par, qos, NULL);
cr_assert_gt(pub, 0, "Failed to create prerequisite pub");
CU_ASSERT_FATAL(pub > 0);
wrt = dds_create_writer(pub, top, qos, NULL);
cr_assert_gt(wrt, 0, "Failed to create prerequisite wrt");
CU_ASSERT_FATAL(wrt > 0);
/* Write first set of samples. */
sample.long_1 = 1;
sample.long_2 = 1;
sample.long_3 = 1;
TRACE_SAMPLE("Write ", sample);
ret = dds_write(wrt, &sample);
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed prerequisite write");
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
sample.long_1 = 2;
sample.long_2 = 2;
sample.long_3 = 2;
TRACE_SAMPLE("Write ", sample);
ret = dds_write(wrt, &sample);
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed prerequisite write");
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
/* Create subscribing entities. */
cr_log_info("Create reader\n");
sub = dds_create_subscriber(par, qos, NULL);
cr_assert_gt(sub, 0, "Failed to create prerequisite sub");
CU_ASSERT_FATAL(sub > 0);
rdr = dds_create_reader(sub, top, qos, NULL);
cr_assert_gt(rdr, 0, "Failed to create prerequisite g_reader");
CU_ASSERT_FATAL(rdr > 0);
/* Write second set of samples. */
sample.long_1 = 8;
sample.long_2 = 8;
sample.long_3 = 8;
TRACE_SAMPLE("Write ", sample);
ret = dds_write(wrt, &sample);
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed prerequisite write");
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
sample.long_1 = 9;
sample.long_2 = 9;
sample.long_3 = 9;
TRACE_SAMPLE("Write ", sample);
ret = dds_write(wrt, &sample);
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed prerequisite write");
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
/* Read samples, which should be all four. */
ret = dds_read(rdr, samples, info, MAX_SAMPLES, MAX_SAMPLES);
cr_log_info("Read cnt %d\n", ret);
#if 0
for(int i = 0; i < ret; i++) {
Space_Type1 *sample = (Space_Type1*)samples[i];
TRACE_SAMPLE("Read ", (*sample));
}
cr_assert_eq(ret, 4, "# read %d, expected 4", ret);
#endif
CU_ASSERT_EQUAL_FATAL(ret, 4);
dds_delete(par);
dds_delete_qos(qos);