stricter warning checks and the corresponding fixes
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson
eboasson
parent
87e4780446
commit
b7487b18a6
101 changed files with 1756 additions and 1615 deletions
|
|
@ -104,7 +104,7 @@ qos_init(void)
|
|||
g_pol_liveliness.lease_duration.sec = 40000;
|
||||
g_pol_liveliness.lease_duration.nanosec = 44000;
|
||||
|
||||
g_pol_time_based_filter.minimum_separation.sec = 50000;
|
||||
g_pol_time_based_filter.minimum_separation.sec = 12000;
|
||||
g_pol_time_based_filter.minimum_separation.nanosec = 55000;
|
||||
|
||||
g_pol_partition.name._buffer = (char**)c_partitions;
|
||||
|
|
@ -127,7 +127,7 @@ qos_init(void)
|
|||
|
||||
g_pol_durability_service.history_depth = 1;
|
||||
g_pol_durability_service.history_kind = DDS_KEEP_LAST_HISTORY_QOS;
|
||||
g_pol_durability_service.max_samples = 2;
|
||||
g_pol_durability_service.max_samples = 12;
|
||||
g_pol_durability_service.max_instances = 3;
|
||||
g_pol_durability_service.max_samples_per_instance = 4;
|
||||
g_pol_durability_service.service_cleanup_delay.sec = 90000;
|
||||
|
|
@ -170,7 +170,7 @@ teardown(void)
|
|||
int64_t from_ddsi_duration (DDS_Duration_t x)
|
||||
{
|
||||
int64_t t;
|
||||
t = x.sec * 10^9 + x.nanosec;
|
||||
t = (int64_t)x.sec * T_SECOND + x.nanosec;
|
||||
return t;
|
||||
}
|
||||
|
||||
|
|
@ -627,12 +627,13 @@ Test(ddsc_builtin_topics, datareader_qos, .init = setup, .fini = teardown)
|
|||
dds_qset_destination_order(g_qos, (dds_destination_order_kind_t)g_pol_destination_order.kind);
|
||||
dds_qset_userdata(g_qos, g_pol_userdata.value._buffer, g_pol_userdata.value._length);
|
||||
dds_qset_time_based_filter(g_qos, from_ddsi_duration(g_pol_time_based_filter.minimum_separation));
|
||||
dds_qset_presentation(g_qos, g_pol_presentation.access_scope, g_pol_presentation.coherent_access, g_pol_presentation.ordered_access);
|
||||
dds_qset_presentation(g_qos, (dds_presentation_access_scope_kind_t)g_pol_presentation.access_scope, g_pol_presentation.coherent_access, g_pol_presentation.ordered_access);
|
||||
dds_qset_partition(g_qos, g_pol_partition.name._length, c_partitions);
|
||||
dds_qset_topicdata(g_qos, g_pol_topicdata.value._buffer, g_pol_topicdata.value._length);
|
||||
dds_qset_groupdata(g_qos, g_pol_groupdata.value._buffer, g_pol_groupdata.value._length);
|
||||
|
||||
rdr = dds_create_reader(g_subscriber, g_topic, g_qos, NULL);
|
||||
cr_assert_gt(rdr, 0, "Failed to create a data reader.");
|
||||
|
||||
subscription_samples[0] = DDS_SubscriptionBuiltinTopicData__alloc();
|
||||
|
||||
|
|
@ -693,7 +694,7 @@ Test(ddsc_builtin_topics, datawriter_qos, .init = setup, .fini = teardown)
|
|||
void * publication_samples[MAX_SAMPLES];
|
||||
|
||||
|
||||
dds_qset_durability(g_qos, g_pol_durability.kind);
|
||||
dds_qset_durability(g_qos, (dds_durability_kind_t)g_pol_durability.kind);
|
||||
dds_qset_deadline(g_qos, from_ddsi_duration(g_pol_deadline.period));
|
||||
dds_qset_latency_budget(g_qos, from_ddsi_duration(g_pol_latency_budget.duration));
|
||||
dds_qset_liveliness(g_qos, (dds_liveliness_kind_t)g_pol_liveliness.kind, from_ddsi_duration(g_pol_liveliness.lease_duration));
|
||||
|
|
@ -703,11 +704,12 @@ Test(ddsc_builtin_topics, datawriter_qos, .init = setup, .fini = teardown)
|
|||
dds_qset_userdata(g_qos, g_pol_userdata.value._buffer, g_pol_userdata.value._length);
|
||||
dds_qset_ownership(g_qos, (dds_ownership_kind_t)g_pol_ownership.kind);
|
||||
dds_qset_ownership_strength(g_qos, g_pol_ownership_strength.value);
|
||||
dds_qset_presentation(g_qos, g_pol_presentation.access_scope, g_pol_presentation.coherent_access, g_pol_presentation.ordered_access);
|
||||
dds_qset_presentation(g_qos, (dds_presentation_access_scope_kind_t)g_pol_presentation.access_scope, g_pol_presentation.coherent_access, g_pol_presentation.ordered_access);
|
||||
dds_qset_partition(g_qos, g_pol_partition.name._length, c_partitions);
|
||||
dds_qset_topicdata(g_qos, g_pol_topicdata.value._buffer, g_pol_topicdata.value._length);
|
||||
|
||||
wrtr = dds_create_writer(g_publisher, g_topic, g_qos, NULL);
|
||||
cr_assert_gt(wrtr, 0, "Failed to create a data writer.");
|
||||
|
||||
publication_samples[0] = DDS_PublicationBuiltinTopicData__alloc();
|
||||
|
||||
|
|
@ -771,7 +773,7 @@ Test(ddsc_builtin_topics, topic_qos, .init = setup, .fini = teardown)
|
|||
|
||||
void * topic_samples[MAX_SAMPLES];
|
||||
|
||||
dds_qset_durability(g_qos, g_pol_durability.kind);
|
||||
dds_qset_durability(g_qos, (dds_durability_kind_t)g_pol_durability.kind);
|
||||
dds_qset_durability_service(g_qos,
|
||||
from_ddsi_duration(g_pol_durability_service.service_cleanup_delay),
|
||||
(dds_history_kind_t)g_pol_durability_service.history_kind,
|
||||
|
|
@ -794,6 +796,7 @@ Test(ddsc_builtin_topics, topic_qos, .init = setup, .fini = teardown)
|
|||
|
||||
|
||||
tpc = dds_create_topic(g_participant, &Space_Type1_desc, "SpaceType1", g_qos, NULL);
|
||||
cr_assert_gt(tpc, 0, "Failed to create a topic.");
|
||||
|
||||
topic_samples[0] = DDS_PublicationBuiltinTopicData__alloc();
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ create_topic_name(const char *prefix, char *name, size_t size)
|
|||
static void
|
||||
disposing_init(void)
|
||||
{
|
||||
Space_Type1 sample = { 0 };
|
||||
Space_Type1 sample = { 0, 0, 0 };
|
||||
dds_qos_t *qos = dds_qos_create ();
|
||||
dds_attach_t triggered;
|
||||
dds_return_t ret;
|
||||
|
|
|
|||
|
|
@ -15,8 +15,10 @@
|
|||
|
||||
/* We are deliberately testing some bad arguments that SAL will complain about.
|
||||
* So, silence SAL regarding these issues. */
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 6387 28020)
|
||||
#endif
|
||||
|
||||
/* Add --verbose command line argument to get the cr_log_info traces (if there are any). */
|
||||
|
||||
|
|
@ -320,13 +322,13 @@ Test(ddsc_entity, get_entities, .init = create_entity, .fini = delete_entity)
|
|||
/* Get Children, of which there are currently none. */
|
||||
status = dds_get_children (entity, NULL, 0);
|
||||
if (status > 0) {
|
||||
cr_assert("dds_get_children(entity, NULL, 0) un-expectantly found children");
|
||||
cr_assert(false, "dds_get_children(entity, NULL, 0) un-expectantly found children");
|
||||
} else {
|
||||
cr_assert_eq(status, 0, "dds_get_children(entity, NULL, 0) failed");
|
||||
}
|
||||
status = dds_get_children (entity, &child, 1);
|
||||
if (status > 0) {
|
||||
cr_assert("dds_get_children(entity, child, 1) un-expectantly returned children");
|
||||
cr_assert(false, "dds_get_children(entity, child, 1) un-expectantly returned children");
|
||||
} else {
|
||||
cr_assert_eq(status, 0, "dds_get_children(entity, child, 1) failed");
|
||||
}
|
||||
|
|
@ -362,4 +364,6 @@ Test(ddsc_entity, delete, .init = create_entity)
|
|||
entity = 0;
|
||||
}
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ static dds_entity_t g_querycond = 0;
|
|||
static bool
|
||||
accept_all(const void * sample)
|
||||
{
|
||||
(void)sample;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -840,7 +841,7 @@ Test(ddsc_entity_explicit_subscriber, invalid_topic)
|
|||
Test(ddsc_entity_get_children, implicit_publisher)
|
||||
{
|
||||
dds_entity_t participant;
|
||||
dds_entity_t publisher;
|
||||
dds_entity_t publisher = 0;
|
||||
dds_entity_t writer;
|
||||
dds_entity_t topic;
|
||||
dds_entity_t child[2], child2[2];
|
||||
|
|
@ -885,7 +886,7 @@ Test(ddsc_entity_get_children, implicit_publisher)
|
|||
Test(ddsc_entity_get_children, implicit_subscriber)
|
||||
{
|
||||
dds_entity_t participant;
|
||||
dds_entity_t subscriber;
|
||||
dds_entity_t subscriber = 0;
|
||||
dds_entity_t reader;
|
||||
dds_entity_t topic;
|
||||
dds_entity_t child[2], child2[2];
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ Test(ddsc_entity_status, publication_matched, .init=init_entity_status, .fini=fi
|
|||
|
||||
/* Wait for publication matched status */
|
||||
ret = dds_waitset_wait(waitSetwr, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
ret = dds_get_publication_matched_status(wri, &publication_matched);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
cr_assert_eq(publication_matched.current_count, 1);
|
||||
|
|
@ -149,7 +149,7 @@ Test(ddsc_entity_status, publication_matched, .init=init_entity_status, .fini=fi
|
|||
|
||||
/* Wait for publication matched status */
|
||||
ret = dds_waitset_wait(waitSetwr, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
ret = dds_get_publication_matched_status(wri, &publication_matched);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
cr_assert_eq(publication_matched.current_count, 0);
|
||||
|
|
@ -167,7 +167,7 @@ Test(ddsc_entity_status, subscription_matched, .init=init_entity_status, .fini=f
|
|||
|
||||
/* Wait for subscription matched status */
|
||||
ret = dds_waitset_wait(waitSetrd, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
ret = dds_get_subscription_matched_status(rea, &subscription_matched);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
cr_assert_eq(subscription_matched.current_count, 1);
|
||||
|
|
@ -186,7 +186,7 @@ Test(ddsc_entity_status, subscription_matched, .init=init_entity_status, .fini=f
|
|||
|
||||
/* Wait for subscription matched status */
|
||||
ret = dds_waitset_wait(waitSetrd, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
ret = dds_get_subscription_matched_status(rea, &subscription_matched);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
cr_assert_eq(subscription_matched.current_count, 0);
|
||||
|
|
@ -199,8 +199,10 @@ Test(ddsc_entity_status, subscription_matched, .init=init_entity_status, .fini=f
|
|||
Test(ddsc_entity, incompatible_qos, .init=init_entity_status, .fini=fini_entity_status)
|
||||
{
|
||||
dds_entity_t reader2;
|
||||
dds_requested_incompatible_qos_status_t req_incompatible_qos = {0};
|
||||
dds_offered_incompatible_qos_status_t off_incompatible_qos = {0};
|
||||
dds_requested_incompatible_qos_status_t req_incompatible_qos;
|
||||
dds_offered_incompatible_qos_status_t off_incompatible_qos;
|
||||
memset (&req_incompatible_qos, 0, sizeof (req_incompatible_qos));
|
||||
memset (&off_incompatible_qos, 0, sizeof (off_incompatible_qos));
|
||||
dds_qset_durability (qos, DDS_DURABILITY_PERSISTENT);
|
||||
|
||||
/* Create a reader with persistent durability */
|
||||
|
|
@ -236,7 +238,7 @@ Test(ddsc_entity, incompatible_qos, .init=init_entity_status, .fini=fini_entity_
|
|||
|
||||
/* Wait for offered incompatible QoS status */
|
||||
ret = dds_waitset_wait(waitSetwr, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
ret = dds_get_offered_incompatible_qos_status (wri, &off_incompatible_qos);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
cr_assert_eq(off_incompatible_qos.total_count, 1);
|
||||
|
|
@ -267,7 +269,7 @@ Test(ddsc_entity, liveliness_changed, .init=init_entity_status, .fini=fini_entit
|
|||
|
||||
/* wait for LIVELINESS_CHANGED status */
|
||||
ret = dds_waitset_wait(waitSetrd, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
|
||||
ret = dds_get_liveliness_changed_status (rea, &liveliness_changed);
|
||||
cr_assert_eq(ret, DDS_RETCODE_OK);
|
||||
|
|
@ -288,7 +290,7 @@ Test(ddsc_entity, liveliness_changed, .init=init_entity_status, .fini=fini_entit
|
|||
|
||||
/* wait for LIVELINESS_CHANGED when a writer is deleted */
|
||||
ret = dds_waitset_wait(waitSetrd, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
|
||||
ret = dds_get_liveliness_changed_status (rea, &liveliness_changed);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
|
|
@ -301,10 +303,12 @@ Test(ddsc_entity, liveliness_changed, .init=init_entity_status, .fini=fini_entit
|
|||
|
||||
Test(ddsc_entity, sample_rejected, .init=init_entity_status, .fini=fini_entity_status)
|
||||
{
|
||||
dds_sample_rejected_status_t sample_rejected = {0};
|
||||
dds_sample_rejected_status_t sample_rejected;
|
||||
|
||||
/* Topic instance */
|
||||
RoundTripModule_DataType sample = { 0 };
|
||||
RoundTripModule_DataType sample;
|
||||
memset (&sample_rejected, 0, sizeof (sample_rejected));
|
||||
memset (&sample, 0, sizeof (sample));
|
||||
|
||||
ret = dds_set_enabled_status(wri, DDS_PUBLICATION_MATCHED_STATUS);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
|
|
@ -313,9 +317,9 @@ Test(ddsc_entity, sample_rejected, .init=init_entity_status, .fini=fini_entity_s
|
|||
|
||||
/* Wait for subscription matched and publication matched */
|
||||
ret = dds_waitset_wait(waitSetwr, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
ret = dds_waitset_wait(waitSetrd, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
|
||||
ret = dds_set_enabled_status(rea, DDS_SAMPLE_REJECTED_STATUS);
|
||||
cr_assert_eq(ret, DDS_RETCODE_OK);
|
||||
|
|
@ -329,7 +333,7 @@ Test(ddsc_entity, sample_rejected, .init=init_entity_status, .fini=fini_entity_s
|
|||
|
||||
/* wait for sample rejected status */
|
||||
ret = dds_waitset_wait(waitSetrd, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
ret = dds_get_sample_rejected_status (rea, &sample_rejected);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
cr_assert_eq(sample_rejected.total_count, 4);
|
||||
|
|
@ -360,7 +364,7 @@ Test(ddsc_entity, inconsistent_topic)
|
|||
|
||||
/* Wait for pub inconsistent topic status callback */
|
||||
ret = dds_waitset_wait(waitSetwr, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
ret = dds_get_inconsistent_topic_status (top, &topic_status);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
cr_assert_gt(topic_status.total_count, 0);
|
||||
|
|
@ -387,10 +391,12 @@ Test(ddsc_entity, inconsistent_topic)
|
|||
Test(ddsc_entity, sample_lost, .init=init_entity_status, .fini=fini_entity_status)
|
||||
{
|
||||
|
||||
dds_sample_lost_status_t sample_lost = {0};
|
||||
dds_sample_lost_status_t sample_lost;
|
||||
dds_time_t time1;
|
||||
/* Topic instance */
|
||||
RoundTripModule_DataType sample = { 0 };
|
||||
RoundTripModule_DataType sample;
|
||||
memset (&sample_lost, 0, sizeof (sample_lost));
|
||||
memset (&sample, 0, sizeof (sample));
|
||||
|
||||
ret = dds_set_enabled_status(wri, DDS_PUBLICATION_MATCHED_STATUS);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
|
|
@ -399,9 +405,9 @@ Test(ddsc_entity, sample_lost, .init=init_entity_status, .fini=fini_entity_statu
|
|||
|
||||
/* Wait for subscription matched and publication matched */
|
||||
ret = dds_waitset_wait(waitSetwr, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
ret = dds_waitset_wait(waitSetrd, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
|
||||
ret = dds_set_enabled_status(rea, DDS_SAMPLE_LOST_STATUS);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
|
|
@ -418,7 +424,7 @@ Test(ddsc_entity, sample_lost, .init=init_entity_status, .fini=fini_entity_statu
|
|||
|
||||
/* wait for sample lost status */
|
||||
ret = dds_waitset_wait(waitSetrd, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
ret = dds_get_sample_lost_status (rea, &sample_lost);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
cr_assert_eq(sample_lost.total_count, 1);
|
||||
|
|
@ -432,7 +438,8 @@ Test(ddsc_entity, sample_lost, .init=init_entity_status, .fini=fini_entity_statu
|
|||
|
||||
Test(ddsc_entity, data_available, .init=init_entity_status, .fini=fini_entity_status)
|
||||
{
|
||||
RoundTripModule_DataType sample = { 0 };
|
||||
RoundTripModule_DataType sample;
|
||||
memset (&sample, 0, sizeof (sample));
|
||||
|
||||
ret = dds_set_enabled_status(wri, DDS_PUBLICATION_MATCHED_STATUS);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
|
|
@ -441,9 +448,9 @@ Test(ddsc_entity, data_available, .init=init_entity_status, .fini=fini_entity_st
|
|||
|
||||
/* Wait for subscription and publication matched status */
|
||||
ret = dds_waitset_wait(waitSetwr, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
ret = dds_waitset_wait(waitSetrd, wsresults2, wsresultsize2, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
|
||||
/* Write the sample */
|
||||
ret = dds_write (wri, &sample);
|
||||
|
|
@ -455,7 +462,7 @@ Test(ddsc_entity, data_available, .init=init_entity_status, .fini=fini_entity_st
|
|||
cr_assert_eq(sta, DDS_SUBSCRIPTION_MATCHED_STATUS);
|
||||
|
||||
ret = dds_waitset_wait(waitSetrd, wsresults2, wsresultsize2, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
|
||||
ret = dds_get_status_changes (rea, &sta);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
|
|
@ -477,10 +484,11 @@ Test(ddsc_entity, all_data_available, .init=init_entity_status, .fini=fini_entit
|
|||
dds_sample_info_t info;
|
||||
|
||||
/* Topic instance */
|
||||
RoundTripModule_DataType p_sample = { 0 };
|
||||
RoundTripModule_DataType p_sample;
|
||||
void * s_samples[1];
|
||||
RoundTripModule_DataType s_sample;
|
||||
|
||||
memset (&p_sample, 0, sizeof (p_sample));
|
||||
memset (&s_sample, 0, sizeof (s_sample));
|
||||
s_samples[0] = &s_sample;
|
||||
|
||||
|
|
@ -500,13 +508,13 @@ Test(ddsc_entity, all_data_available, .init=init_entity_status, .fini=fini_entit
|
|||
|
||||
/* Wait for publication matched status */
|
||||
ret = dds_waitset_wait(waitSetwr, wsresults, wsresultsize, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
|
||||
/* Wait for subscription matched status on both readers */
|
||||
ret = dds_waitset_wait(waitSetrd, wsresults2, wsresultsize2, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
ret = dds_waitset_wait(waitSetrd2, wsresults2, wsresultsize2, waitTimeout);
|
||||
cr_assert_eq(ret, wsresultsize);
|
||||
cr_assert_eq(ret, (dds_return_t)wsresultsize);
|
||||
|
||||
ret = dds_write (wri, &p_sample);
|
||||
cr_assert_dds_return_t_eq(ret, DDS_RETCODE_OK);
|
||||
|
|
|
|||
|
|
@ -83,17 +83,17 @@ static dds_entity_t cb_writer = 0;
|
|||
static dds_entity_t cb_reader = 0;
|
||||
static dds_entity_t cb_subscriber = 0;
|
||||
|
||||
static dds_inconsistent_topic_status_t cb_inconsistent_topic_status = { 0 };
|
||||
static dds_liveliness_lost_status_t cb_liveliness_lost_status = { 0 };
|
||||
static dds_offered_deadline_missed_status_t cb_offered_deadline_missed_status = { 0 };
|
||||
static dds_offered_incompatible_qos_status_t cb_offered_incompatible_qos_status = { 0 };
|
||||
static dds_sample_lost_status_t cb_sample_lost_status = { 0 };
|
||||
static dds_sample_rejected_status_t cb_sample_rejected_status = { 0 };
|
||||
static dds_liveliness_changed_status_t cb_liveliness_changed_status = { 0 };
|
||||
static dds_requested_deadline_missed_status_t cb_requested_deadline_missed_status = { 0 };
|
||||
static dds_requested_incompatible_qos_status_t cb_requested_incompatible_qos_status= { 0 };
|
||||
static dds_publication_matched_status_t cb_publication_matched_status = { 0 };
|
||||
static dds_subscription_matched_status_t cb_subscription_matched_status = { 0 };
|
||||
static dds_inconsistent_topic_status_t cb_inconsistent_topic_status;
|
||||
static dds_liveliness_lost_status_t cb_liveliness_lost_status;
|
||||
static dds_offered_deadline_missed_status_t cb_offered_deadline_missed_status;
|
||||
static dds_offered_incompatible_qos_status_t cb_offered_incompatible_qos_status;
|
||||
static dds_sample_lost_status_t cb_sample_lost_status;
|
||||
static dds_sample_rejected_status_t cb_sample_rejected_status;
|
||||
static dds_liveliness_changed_status_t cb_liveliness_changed_status;
|
||||
static dds_requested_deadline_missed_status_t cb_requested_deadline_missed_status;
|
||||
static dds_requested_incompatible_qos_status_t cb_requested_incompatible_qos_status;
|
||||
static dds_publication_matched_status_t cb_publication_matched_status;
|
||||
static dds_subscription_matched_status_t cb_subscription_matched_status;
|
||||
|
||||
|
||||
static void
|
||||
|
|
@ -101,6 +101,7 @@ inconsistent_topic_cb(
|
|||
dds_entity_t topic,
|
||||
const dds_inconsistent_topic_status_t status, void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
os_mutexLock(&g_mutex);
|
||||
cb_topic = topic;
|
||||
cb_inconsistent_topic_status = status;
|
||||
|
|
@ -115,6 +116,7 @@ liveliness_lost_cb(
|
|||
const dds_liveliness_lost_status_t status,
|
||||
void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
os_mutexLock(&g_mutex);
|
||||
cb_writer = writer;
|
||||
cb_liveliness_lost_status = status;
|
||||
|
|
@ -129,6 +131,7 @@ offered_deadline_missed_cb(
|
|||
const dds_offered_deadline_missed_status_t status,
|
||||
void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
os_mutexLock(&g_mutex);
|
||||
cb_writer = writer;
|
||||
cb_offered_deadline_missed_status = status;
|
||||
|
|
@ -143,6 +146,7 @@ offered_incompatible_qos_cb(
|
|||
const dds_offered_incompatible_qos_status_t status,
|
||||
void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
os_mutexLock(&g_mutex);
|
||||
cb_writer = writer;
|
||||
cb_offered_incompatible_qos_status = status;
|
||||
|
|
@ -156,6 +160,7 @@ data_on_readers_cb(
|
|||
dds_entity_t subscriber,
|
||||
void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
os_mutexLock(&g_mutex);
|
||||
cb_subscriber = subscriber;
|
||||
cb_called |= DDS_DATA_ON_READERS_STATUS;
|
||||
|
|
@ -169,6 +174,7 @@ sample_lost_cb(
|
|||
const dds_sample_lost_status_t status,
|
||||
void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
os_mutexLock(&g_mutex);
|
||||
cb_reader = reader;
|
||||
cb_sample_lost_status = status;
|
||||
|
|
@ -182,6 +188,7 @@ data_available_cb(
|
|||
dds_entity_t reader,
|
||||
void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
os_mutexLock(&g_mutex);
|
||||
cb_reader = reader;
|
||||
cb_called |= DDS_DATA_AVAILABLE_STATUS;
|
||||
|
|
@ -195,6 +202,7 @@ sample_rejected_cb(
|
|||
const dds_sample_rejected_status_t status,
|
||||
void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
os_mutexLock(&g_mutex);
|
||||
cb_reader = reader;
|
||||
cb_sample_rejected_status = status;
|
||||
|
|
@ -209,6 +217,7 @@ liveliness_changed_cb(
|
|||
const dds_liveliness_changed_status_t status,
|
||||
void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
os_mutexLock(&g_mutex);
|
||||
cb_reader = reader;
|
||||
cb_liveliness_changed_status = status;
|
||||
|
|
@ -223,6 +232,7 @@ requested_deadline_missed_cb(
|
|||
const dds_requested_deadline_missed_status_t status,
|
||||
void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
os_mutexLock(&g_mutex);
|
||||
cb_reader = reader;
|
||||
cb_requested_deadline_missed_status = status;
|
||||
|
|
@ -237,6 +247,7 @@ requested_incompatible_qos_cb(
|
|||
const dds_requested_incompatible_qos_status_t status,
|
||||
void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
os_mutexLock(&g_mutex);
|
||||
cb_reader = reader;
|
||||
cb_requested_incompatible_qos_status = status;
|
||||
|
|
@ -251,6 +262,7 @@ publication_matched_cb(
|
|||
const dds_publication_matched_status_t status,
|
||||
void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
os_mutexLock(&g_mutex);
|
||||
cb_writer = writer;
|
||||
cb_publication_matched_status = status;
|
||||
|
|
@ -265,6 +277,7 @@ subscription_matched_cb(
|
|||
const dds_subscription_matched_status_t status,
|
||||
void* arg)
|
||||
{
|
||||
(void)arg;
|
||||
os_mutexLock(&g_mutex);
|
||||
cb_reader = reader;
|
||||
cb_subscription_matched_status = status;
|
||||
|
|
@ -584,12 +597,13 @@ Test(ddsc_listener, getters_setters)
|
|||
****************************************************************************/
|
||||
Test(ddsc_listener, propagation, .init=init_triggering_base, .fini=fini_triggering_base)
|
||||
{
|
||||
RoundTripModule_DataType sample = { 0 };
|
||||
dds_listener_t *listener_par = NULL;
|
||||
dds_listener_t *listener_pub = NULL;
|
||||
dds_listener_t *listener_sub = NULL;
|
||||
uint32_t triggered;
|
||||
dds_return_t ret;
|
||||
RoundTripModule_DataType sample;
|
||||
memset (&sample, 0, sizeof (sample));
|
||||
|
||||
/* Let participant be interested in data. */
|
||||
listener_par = dds_listener_create(NULL);
|
||||
|
|
@ -807,7 +821,8 @@ Test(ddsc_listener, data_available, .init=init_triggering_test, .fini=fini_trigg
|
|||
dds_return_t ret;
|
||||
uint32_t triggered;
|
||||
uint32_t status;
|
||||
RoundTripModule_DataType sample = { 0 };
|
||||
RoundTripModule_DataType sample;
|
||||
memset (&sample, 0, sizeof (sample));
|
||||
|
||||
/* We are interested in data available notifications. */
|
||||
dds_lset_data_available(g_listener, data_available_cb);
|
||||
|
|
@ -837,7 +852,8 @@ Test(ddsc_listener, data_on_readers, .init=init_triggering_test, .fini=fini_trig
|
|||
dds_return_t ret;
|
||||
uint32_t triggered;
|
||||
uint32_t status;
|
||||
RoundTripModule_DataType sample = { 0 };
|
||||
RoundTripModule_DataType sample;
|
||||
memset (&sample, 0, sizeof (sample));
|
||||
|
||||
/* We are interested in data available notifications. */
|
||||
dds_lset_data_on_readers(g_listener, data_on_readers_cb);
|
||||
|
|
@ -875,7 +891,8 @@ Test(ddsc_listener, sample_lost, .init=init_triggering_test, .fini=fini_triggeri
|
|||
uint32_t triggered;
|
||||
dds_time_t the_past;
|
||||
uint32_t status;
|
||||
RoundTripModule_DataType sample = { 0 };
|
||||
RoundTripModule_DataType sample;
|
||||
memset (&sample, 0, sizeof (sample));
|
||||
|
||||
/* Get a time that should be historic on all platforms.*/
|
||||
the_past = dds_time() - 1000000;
|
||||
|
|
@ -911,7 +928,8 @@ Test(ddsc_listener, sample_rejected, .init=init_triggering_test, .fini=fini_trig
|
|||
dds_return_t ret;
|
||||
uint32_t triggered;
|
||||
uint32_t status;
|
||||
RoundTripModule_DataType sample = { 0 };
|
||||
RoundTripModule_DataType sample;
|
||||
memset (&sample, 0, sizeof (sample));
|
||||
|
||||
/* We are interested in sample rejected notifications. */
|
||||
dds_lset_sample_rejected(g_listener, sample_rejected_cb);
|
||||
|
|
|
|||
|
|
@ -15,14 +15,19 @@
|
|||
|
||||
/* We are deliberately testing some bad arguments that SAL will complain about.
|
||||
* So, silence SAL regarding these issues. */
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 28020)
|
||||
|
||||
#endif
|
||||
|
||||
#define cr_assert_status_eq(s1, s2, ...) cr_assert_eq(dds_err_nr(s1), s2, __VA_ARGS__)
|
||||
|
||||
/* Dummy callback */
|
||||
static void data_available_cb(dds_entity_t reader, void* arg) {}
|
||||
static void data_available_cb(dds_entity_t reader, void* arg)
|
||||
{
|
||||
(void)reader;
|
||||
(void)arg;
|
||||
}
|
||||
|
||||
|
||||
Test(ddsc_publisher, create)
|
||||
|
|
@ -62,8 +67,10 @@ Test(ddsc_publisher, create)
|
|||
dds_delete(publisher);
|
||||
|
||||
/* Somehow, the compiler thinks the char arrays might not be zero-terminated... */
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 6054)
|
||||
#endif
|
||||
|
||||
/* Use qos with single partition */
|
||||
dds_qset_partition (qos, 1, singlePartitions);
|
||||
|
|
@ -83,7 +90,9 @@ Test(ddsc_publisher, create)
|
|||
cr_assert_gt(publisher, 0, "dds_create_publisher(participant,qos,NULL) where qos with duplicate partitions");
|
||||
dds_delete(publisher);
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
/* Use listener(NULL) */
|
||||
listener = dds_listener_create(NULL);
|
||||
|
|
@ -265,4 +274,6 @@ Test(ddsc_publisher, coherency)
|
|||
return;
|
||||
}
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -15,13 +15,12 @@
|
|||
#include <criterion/logging.h>
|
||||
|
||||
|
||||
#if 0
|
||||
#else
|
||||
/* We are deliberately testing some bad arguments that SAL will complain about.
|
||||
* So, silence SAL regarding these issues. */
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 6387 28020)
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
|
|
@ -243,7 +242,7 @@ qos_fini(void)
|
|||
****************************************************************************/
|
||||
Test(ddsc_qos, userdata, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_userdata p = { 0 };
|
||||
struct pol_userdata p = { NULL, 0 };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_userdata(NULL, g_pol_userdata.value, g_pol_userdata.sz);
|
||||
|
|
@ -261,7 +260,7 @@ Test(ddsc_qos, userdata, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, topicdata, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_topicdata p = { 0 };
|
||||
struct pol_topicdata p = { NULL, 0 };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_topicdata(NULL, g_pol_topicdata.value, g_pol_topicdata.sz);
|
||||
|
|
@ -279,7 +278,7 @@ Test(ddsc_qos, topicdata, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, groupdata, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_groupdata p = { 0 };
|
||||
struct pol_groupdata p = { NULL, 0 };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_groupdata(NULL, g_pol_groupdata.value, g_pol_groupdata.sz);
|
||||
|
|
@ -297,7 +296,7 @@ Test(ddsc_qos, groupdata, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, durability, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_durability p = { 0 };
|
||||
struct pol_durability p = { DDS_DURABILITY_VOLATILE };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_durability(NULL, g_pol_durability.kind);
|
||||
|
|
@ -312,7 +311,7 @@ Test(ddsc_qos, durability, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, history, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_history p = { 0 };
|
||||
struct pol_history p = { DDS_HISTORY_KEEP_ALL, 0 };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_history(NULL, g_pol_history.kind, g_pol_history.depth);
|
||||
|
|
@ -328,7 +327,7 @@ Test(ddsc_qos, history, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, resource_limits, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_resource_limits p = { 0 };
|
||||
struct pol_resource_limits p = { 0, 0, 0 };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_resource_limits(NULL, g_pol_resource_limits.max_samples, g_pol_resource_limits.max_instances, g_pol_resource_limits.max_samples_per_instance);
|
||||
|
|
@ -345,7 +344,7 @@ Test(ddsc_qos, resource_limits, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, presentation, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_presentation p = { 0 };
|
||||
struct pol_presentation p = { DDS_PRESENTATION_INSTANCE, false, false };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_presentation(NULL, g_pol_presentation.access_scope, g_pol_presentation.coherent_access, g_pol_presentation.ordered_access);
|
||||
|
|
@ -407,7 +406,7 @@ Test(ddsc_qos, latency_budget, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, ownership, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_ownership p = { 0 };
|
||||
struct pol_ownership p = { DDS_OWNERSHIP_SHARED };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_ownership(NULL, g_pol_ownership.kind);
|
||||
|
|
@ -437,7 +436,7 @@ Test(ddsc_qos, ownership_strength, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, liveliness, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_liveliness p = { 0 };
|
||||
struct pol_liveliness p = { DDS_LIVELINESS_AUTOMATIC, 0 };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_liveliness(NULL, g_pol_liveliness.kind, g_pol_liveliness.lease_duration);
|
||||
|
|
@ -468,7 +467,7 @@ Test(ddsc_qos, time_base_filter, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, partition, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_partition p = { 0 };
|
||||
struct pol_partition p = { 0, NULL };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_partition(NULL, g_pol_partition.n, c_partitions);
|
||||
|
|
@ -490,7 +489,7 @@ Test(ddsc_qos, partition, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, reliability, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_reliability p = { 0 };
|
||||
struct pol_reliability p = { DDS_RELIABILITY_BEST_EFFORT, 0 };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_reliability(NULL, g_pol_reliability.kind, g_pol_reliability.max_blocking_time);
|
||||
|
|
@ -521,7 +520,7 @@ Test(ddsc_qos, transport_priority, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, destination_order, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_destination_order p = { 0 };
|
||||
struct pol_destination_order p = { DDS_DESTINATIONORDER_BY_RECEPTION_TIMESTAMP };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_destination_order(NULL, g_pol_destination_order.kind);
|
||||
|
|
@ -536,7 +535,7 @@ Test(ddsc_qos, destination_order, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, writer_data_lifecycle, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_writer_data_lifecycle p = { 0 };
|
||||
struct pol_writer_data_lifecycle p = { false };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_writer_data_lifecycle(NULL, g_pol_writer_data_lifecycle.autodispose);
|
||||
|
|
@ -551,7 +550,7 @@ Test(ddsc_qos, writer_data_lifecycle, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, reader_data_lifecycle, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_reader_data_lifecycle p = { 0 };
|
||||
struct pol_reader_data_lifecycle p = { 0, 0 };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_reader_data_lifecycle(NULL, g_pol_reader_data_lifecycle.autopurge_nowriter_samples_delay, g_pol_reader_data_lifecycle.autopurge_disposed_samples_delay);
|
||||
|
|
@ -567,7 +566,7 @@ Test(ddsc_qos, reader_data_lifecycle, .init=qos_init, .fini=qos_fini)
|
|||
|
||||
Test(ddsc_qos, durability_service, .init=qos_init, .fini=qos_fini)
|
||||
{
|
||||
struct pol_durability_service p = { 0 };
|
||||
struct pol_durability_service p = { 0, DDS_HISTORY_KEEP_LAST, 0, 0, 0, 0 };
|
||||
|
||||
/* NULLs shouldn't crash and be a noops. */
|
||||
dds_qset_durability_service(NULL,
|
||||
|
|
@ -615,7 +614,6 @@ Test(ddsc_qos, durability_service, .init=qos_init, .fini=qos_fini)
|
|||
cr_assert_eq(p.max_samples_per_instance, g_pol_durability_service.max_samples_per_instance);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ create_topic_name(const char *prefix, char *name, size_t size)
|
|||
static void
|
||||
querycondition_init(void)
|
||||
{
|
||||
Space_Type1 sample = { 0 };
|
||||
Space_Type1 sample = { 0, 0, 0 };
|
||||
dds_qos_t *qos = dds_qos_create ();
|
||||
dds_attach_t triggered;
|
||||
dds_return_t ret;
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ static Space_Type1 g_data[MAX_SAMPLES];
|
|||
static dds_sample_info_t g_info[MAX_SAMPLES];
|
||||
|
||||
static dds_instance_handle_t g_hdl_valid;
|
||||
static dds_instance_handle_t g_hdl_nil = DDS_HANDLE_NIL;
|
||||
|
||||
static bool
|
||||
filter_mod2(const void * sample)
|
||||
|
|
@ -89,7 +88,7 @@ create_topic_name(const char *prefix, char *name, size_t size)
|
|||
static void
|
||||
read_instance_init(void)
|
||||
{
|
||||
Space_Type1 sample = { 0 };
|
||||
Space_Type1 sample = { 0, 0, 0 };
|
||||
dds_attach_t triggered;
|
||||
dds_return_t ret;
|
||||
char name[100];
|
||||
|
|
@ -180,6 +179,7 @@ read_instance_init(void)
|
|||
for(int i = 0; i < ret; i++) {
|
||||
Space_Type1 *s = (Space_Type1*)g_samples[i];
|
||||
PRINT_SAMPLE("INIT: Read ", (*s));
|
||||
(void)s;
|
||||
}
|
||||
/* | long_1 | long_2 | long_3 | sst | vst | ist |
|
||||
* ----------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ create_topic_name(const char *prefix, char *name, size_t size)
|
|||
static void
|
||||
readcondition_init(void)
|
||||
{
|
||||
Space_Type1 sample = { 0 };
|
||||
Space_Type1 sample = { 0, 0, 0 };
|
||||
dds_qos_t *qos = dds_qos_create ();
|
||||
dds_attach_t triggered;
|
||||
dds_return_t ret;
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ create_topic_name(const char *prefix, char *name, size_t size)
|
|||
static void
|
||||
reader_init(void)
|
||||
{
|
||||
Space_Type1 sample = { 0 };
|
||||
Space_Type1 sample = { 0, 0, 0 };
|
||||
dds_attach_t triggered;
|
||||
dds_return_t ret;
|
||||
char name[100];
|
||||
|
|
@ -174,6 +174,7 @@ reader_init(void)
|
|||
for(int i = 0; i < ret; i++) {
|
||||
Space_Type1 *s = (Space_Type1*)g_samples[i];
|
||||
PRINT_SAMPLE("INIT: Read ", (*s));
|
||||
(void)s;
|
||||
}
|
||||
|
||||
/* Re-write the samples that should be not_read&old_view. */
|
||||
|
|
@ -2499,7 +2500,7 @@ Test(ddsc_take_mask, take_instance_last_sample)
|
|||
int expected_long_3 = 2;
|
||||
#endif
|
||||
dds_return_t expected_cnt = 1;
|
||||
Space_Type1 sample = { 0 };
|
||||
Space_Type1 sample = { 0, 0, 0 };
|
||||
dds_attach_t triggered;
|
||||
dds_return_t ret;
|
||||
char name[100];
|
||||
|
|
|
|||
|
|
@ -89,9 +89,6 @@ static void* g_samples[MAX_SAMPLES];
|
|||
static Space_Type1 g_data[MAX_SAMPLES];
|
||||
static dds_sample_info_t g_info[MAX_SAMPLES];
|
||||
|
||||
static dds_instance_handle_t g_hdl_valid;
|
||||
static dds_instance_handle_t g_hdl_nil = DDS_HANDLE_NIL;
|
||||
|
||||
static char*
|
||||
create_topic_name(const char *prefix, char *name, size_t size)
|
||||
{
|
||||
|
|
@ -128,7 +125,7 @@ filter_mod2(const void * sample)
|
|||
static void
|
||||
reader_iterator_init(void)
|
||||
{
|
||||
Space_Type1 sample = { 0 };
|
||||
Space_Type1 sample = { 0, 0, 0 };
|
||||
dds_attach_t triggered;
|
||||
dds_return_t ret;
|
||||
char name[100];
|
||||
|
|
@ -364,9 +361,9 @@ Test(ddsc_read_next, reader, .init=reader_iterator_init, .fini=reader_iterator_f
|
|||
dds_instance_state_t expected_ist = SAMPLE_IST(expected_long_1);
|
||||
|
||||
/* Check data. */
|
||||
cr_assert_eq(sample->long_1, expected_long_1 );
|
||||
cr_assert_eq(sample->long_2, expected_long_2 );
|
||||
cr_assert_eq(sample->long_3, expected_long_2 *2);
|
||||
cr_assert_eq(sample->long_1, expected_long_1);
|
||||
cr_assert_eq(sample->long_2, expected_long_2);
|
||||
cr_assert_eq(sample->long_3, expected_long_3);
|
||||
|
||||
/* Check states. */
|
||||
cr_assert_eq(g_info[0].valid_data, true);
|
||||
|
|
@ -399,7 +396,7 @@ Theory((dds_entity_t rdr), ddsc_read_next, invalid_readers, .init=reader_iterato
|
|||
dds_return_t ret;
|
||||
|
||||
ret = dds_read_next(rdr, g_samples, g_info);
|
||||
cr_assert_eq(dds_err_nr(ret), dds_err_nr(exp), "returned %d != expected %d", dds_err_str(ret), dds_err_nr(exp));
|
||||
cr_assert_eq(dds_err_nr(ret), dds_err_nr(exp), "returned %d != expected %d", dds_err_nr(ret), dds_err_nr(exp));
|
||||
}
|
||||
/*************************************************************************************************/
|
||||
|
||||
|
|
@ -476,9 +473,9 @@ Test(ddsc_read_next_wl, reader, .init=reader_iterator_init, .fini=reader_iterato
|
|||
dds_instance_state_t expected_ist = SAMPLE_IST(expected_long_1);
|
||||
|
||||
/* Check data. */
|
||||
cr_assert_eq(sample->long_1, expected_long_2/3 );
|
||||
cr_assert_eq(sample->long_2, expected_long_2 );
|
||||
cr_assert_eq(sample->long_3, expected_long_2 *2);
|
||||
cr_assert_eq(sample->long_1, expected_long_1);
|
||||
cr_assert_eq(sample->long_2, expected_long_2);
|
||||
cr_assert_eq(sample->long_3, expected_long_3);
|
||||
|
||||
/* Check states. */
|
||||
cr_assert_eq(g_info[0].valid_data, true);
|
||||
|
|
@ -590,9 +587,9 @@ Test(ddsc_take_next, reader, .init=reader_iterator_init, .fini=reader_iterator_f
|
|||
dds_instance_state_t expected_ist = SAMPLE_IST(expected_long_1);
|
||||
|
||||
/* Check data. */
|
||||
cr_assert_eq(sample->long_1, expected_long_1 );
|
||||
cr_assert_eq(sample->long_2, expected_long_2 );
|
||||
cr_assert_eq(sample->long_3, expected_long_2 *2);
|
||||
cr_assert_eq(sample->long_1, expected_long_1);
|
||||
cr_assert_eq(sample->long_2, expected_long_2);
|
||||
cr_assert_eq(sample->long_3, expected_long_3);
|
||||
|
||||
/* Check states. */
|
||||
cr_assert_eq(g_info[0].valid_data, true);
|
||||
|
|
@ -700,9 +697,9 @@ Test(ddsc_take_next_wl, reader, .init=reader_iterator_init, .fini=reader_iterato
|
|||
dds_instance_state_t expected_ist = SAMPLE_IST(expected_long_1);
|
||||
|
||||
/* Check data. */
|
||||
cr_assert_eq(sample->long_1, expected_long_2/3 );
|
||||
cr_assert_eq(sample->long_2, expected_long_2 );
|
||||
cr_assert_eq(sample->long_3, expected_long_2 *2);
|
||||
cr_assert_eq(sample->long_1, expected_long_1);
|
||||
cr_assert_eq(sample->long_2, expected_long_2);
|
||||
cr_assert_eq(sample->long_3, expected_long_3);
|
||||
|
||||
/* Check states. */
|
||||
cr_assert_eq(g_info[0].valid_data, true);
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ static dds_time_t g_present = 0;
|
|||
|
||||
static void* g_samples[MAX_SAMPLES];
|
||||
static Space_Type1 g_data[MAX_SAMPLES];
|
||||
static dds_sample_info_t g_info[MAX_SAMPLES];
|
||||
|
||||
static char*
|
||||
create_topic_name(const char *prefix, char *name, size_t size)
|
||||
|
|
@ -54,7 +53,7 @@ create_topic_name(const char *prefix, char *name, size_t size)
|
|||
static void
|
||||
registering_init(void)
|
||||
{
|
||||
Space_Type1 sample = { 0 };
|
||||
Space_Type1 sample = { 0, 0, 0 };
|
||||
dds_qos_t *qos = dds_qos_create ();
|
||||
dds_attach_t triggered;
|
||||
dds_return_t ret;
|
||||
|
|
@ -163,7 +162,6 @@ TheoryDataPoints(ddsc_register_instance, invalid_params) = {
|
|||
};
|
||||
Theory((dds_instance_handle_t *hndl2, void *datap), ddsc_register_instance, invalid_params/*, .init=registering_init, .fini=registering_fini*/)
|
||||
{
|
||||
dds_return_t exp = DDS_RETCODE_BAD_PARAMETER * -1;
|
||||
dds_return_t ret;
|
||||
|
||||
/* Only test when the combination of parameters is actually invalid.*/
|
||||
|
|
|
|||
|
|
@ -92,19 +92,27 @@ Test(ddsc_reader, return_loan_bad_params, .init = create_entities, .fini = delet
|
|||
DDS_TO_STRING(DDS_RETCODE_BAD_PARAMETER),
|
||||
dds_err_str(result));
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 6387)
|
||||
#endif
|
||||
result = dds_return_loan(reader, buf, 10);
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
cr_expect_eq(dds_err_nr(result), DDS_RETCODE_BAD_PARAMETER, "Invalid buffer size, Expected(%s) Returned(%s)",
|
||||
DDS_TO_STRING(DDS_RETCODE_BAD_PARAMETER),
|
||||
dds_err_str(result));
|
||||
|
||||
buf = create_loan_buf(10, false);
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 28020)
|
||||
#endif
|
||||
result = dds_return_loan(0, buf, 10);
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
cr_expect_eq(dds_err_nr(result), DDS_RETCODE_BAD_PARAMETER, "Invalid entity, Expected(%s) Returned(%s)",
|
||||
DDS_TO_STRING(DDS_RETCODE_BAD_PARAMETER),
|
||||
dds_err_str(result));
|
||||
|
|
|
|||
|
|
@ -17,11 +17,23 @@
|
|||
|
||||
/* We are deliberately testing some bad arguments that SAL will complain about.
|
||||
* So, silence SAL regarding these issues. */
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 6387 28020)
|
||||
#endif
|
||||
|
||||
static void on_data_available(dds_entity_t reader, void* arg) {}
|
||||
static void on_publication_matched(dds_entity_t writer, const dds_publication_matched_status_t status, void* arg) {}
|
||||
static void on_data_available(dds_entity_t reader, void* arg)
|
||||
{
|
||||
(void)reader;
|
||||
(void)arg;
|
||||
}
|
||||
|
||||
static void on_publication_matched(dds_entity_t writer, const dds_publication_matched_status_t status, void* arg)
|
||||
{
|
||||
(void)writer;
|
||||
(void)status;
|
||||
(void)arg;
|
||||
}
|
||||
|
||||
Test(ddsc_subscriber, notify_readers) {
|
||||
dds_entity_t participant;
|
||||
|
|
@ -108,4 +120,6 @@ Test(ddsc_subscriber, create) {
|
|||
dds_delete(participant);
|
||||
}
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ static Space_Type1 g_data[MAX_SAMPLES];
|
|||
static dds_sample_info_t g_info[MAX_SAMPLES];
|
||||
|
||||
static dds_instance_handle_t g_hdl_valid;
|
||||
static dds_instance_handle_t g_hdl_nil = DDS_HANDLE_NIL;
|
||||
|
||||
static bool
|
||||
filter_mod2(const void * sample)
|
||||
|
|
@ -89,7 +88,7 @@ create_topic_name(const char *prefix, char *name, size_t size)
|
|||
static void
|
||||
take_instance_init(void)
|
||||
{
|
||||
Space_Type1 sample = { 0 };
|
||||
Space_Type1 sample = { 0, 0, 0 };
|
||||
dds_attach_t triggered;
|
||||
dds_return_t ret;
|
||||
char name[100];
|
||||
|
|
@ -180,6 +179,7 @@ take_instance_init(void)
|
|||
for(int i = 0; i < ret; i++) {
|
||||
Space_Type1 *s = (Space_Type1*)g_samples[i];
|
||||
PRINT_SAMPLE("INIT: Read ", (*s));
|
||||
(void)s;
|
||||
}
|
||||
/* | long_1 | long_2 | long_3 | sst | vst | ist |
|
||||
* ----------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#define MAX_SAMPLES (7)
|
||||
Test(ddsc_transient_local, late_joiner)
|
||||
{
|
||||
Space_Type1 sample = { 0 };
|
||||
Space_Type1 sample = { 0, 0, 0 };
|
||||
dds_return_t ret;
|
||||
dds_entity_t par;
|
||||
dds_entity_t pub;
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ create_topic_name(const char *prefix, char *name, size_t size)
|
|||
static void
|
||||
unregistering_init(void)
|
||||
{
|
||||
Space_Type1 sample = { 0 };
|
||||
Space_Type1 sample = { 0, 0, 0 };
|
||||
dds_qos_t *qos = dds_qos_create ();
|
||||
dds_attach_t triggered;
|
||||
dds_return_t ret;
|
||||
|
|
|
|||
|
|
@ -664,11 +664,10 @@ TheoryDataPoints(ddsc_waitset_wait, invalid_params) = {
|
|||
};
|
||||
Theory((dds_attach_t *a, size_t size, int msec), ddsc_waitset_wait, invalid_params, .init=ddsc_waitset_basic_init, .fini=ddsc_waitset_basic_fini)
|
||||
{
|
||||
dds_return_t exp = DDS_RETCODE_BAD_PARAMETER * -1;
|
||||
dds_return_t ret;
|
||||
|
||||
/* Only test when the combination of parameters is actually invalid. */
|
||||
cr_assume(((a == NULL) && (size != 0)) || ((a != NULL) && (size == 0)) || (size < 0) || (msec < 0));
|
||||
cr_assume(((a == NULL) && (size != 0)) || ((a != NULL) && (size == 0)) || (msec < 0));
|
||||
|
||||
ret = dds_waitset_wait(waitset, a, size, DDS_MSECS(msec));
|
||||
cr_assert_eq(dds_err_nr(ret), DDS_RETCODE_BAD_PARAMETER, "returned %d != expected %d", dds_err_nr(ret), DDS_RETCODE_BAD_PARAMETER);
|
||||
|
|
@ -722,11 +721,10 @@ TheoryDataPoints(ddsc_waitset_wait_until, invalid_params) = {
|
|||
};
|
||||
Theory((dds_attach_t *a, size_t size), ddsc_waitset_wait_until, invalid_params, .init=ddsc_waitset_basic_init, .fini=ddsc_waitset_basic_fini)
|
||||
{
|
||||
dds_return_t exp = DDS_RETCODE_BAD_PARAMETER * -1;
|
||||
dds_return_t ret;
|
||||
|
||||
/* Only test when the combination of parameters is actually invalid. */
|
||||
cr_assume(((a == NULL) && (size != 0)) || ((a != NULL) && (size == 0)) || (size < 0));
|
||||
cr_assume(((a == NULL) && (size != 0)) || ((a != NULL) && (size == 0)));
|
||||
|
||||
ret = dds_waitset_wait_until(waitset, a, size, dds_time());
|
||||
cr_assert_eq(dds_err_nr(ret), DDS_RETCODE_BAD_PARAMETER, "returned %d != expected %d", dds_err_nr(ret), DDS_RETCODE_BAD_PARAMETER);
|
||||
|
|
@ -820,7 +818,7 @@ Theory((size_t size), ddsc_waitset_get_entities, array_sizes, .init=ddsc_waitset
|
|||
}
|
||||
|
||||
/* Every found entity should be a known one. */
|
||||
cr_assert_eq(NumberOfSetBits(found), ret, "Not all found entities are known");
|
||||
cr_assert_eq((dds_return_t)NumberOfSetBits(found), ret, "Not all found entities are known");
|
||||
}
|
||||
/*************************************************************************************************/
|
||||
|
||||
|
|
@ -839,7 +837,6 @@ Test(ddsc_waitset_get_entities, no_array, .init=ddsc_waitset_attached_init, .fin
|
|||
/*************************************************************************************************/
|
||||
Test(ddsc_waitset_get_entities, deleted_waitset, .init=ddsc_waitset_attached_init, .fini=ddsc_waitset_attached_fini)
|
||||
{
|
||||
uint32_t found = 0;
|
||||
dds_return_t ret;
|
||||
dds_entity_t entities[MAX_ENTITIES_CNT];
|
||||
dds_delete(waitset);
|
||||
|
|
@ -1078,7 +1075,6 @@ static os_result
|
|||
thread_reached_state(thread_state_t *actual, thread_state_t expected, int32_t msec)
|
||||
{
|
||||
/* Convenience function. */
|
||||
bool stopped = false;
|
||||
os_time msec10 = { 0, 10000000 };
|
||||
while ((msec > 0) && (*actual != expected)) {
|
||||
os_nanoSleep(msec10);
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
/* Tests in this file only concern themselves with very basic api tests of
|
||||
dds_write and dds_write_ts */
|
||||
|
||||
static const int payloadSize = 32;
|
||||
static RoundTripModule_DataType data = { 0 };
|
||||
static const uint32_t payloadSize = 32;
|
||||
static RoundTripModule_DataType data;
|
||||
|
||||
static dds_entity_t participant = 0;
|
||||
static dds_entity_t topic = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue