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

Add test for dds_qos_copy and extra check to dds_qset_partition

Browse source 
Signed-off-by: Firas Sahli <firas.sahli@adlinktech.com>
This commit is contained in:
Firas Sahli 2018-11-22 16:43:42 +01:00
parent 4b627fd9aa
commit 8aa6ceff81
No known key found for this signature in database
GPG key ID: C19E9D4A9279539F
2 changed files with 44 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/core/ddsc/src/dds_qos.c
View file

@ -493,11 +493,11 @@ void dds_qset_partition
}
if (qos->partition.strs != NULL){
for (i = 0; i < qos->partition.n; i++) {
dds_free(qos->partition.strs[i]);
}
dds_free(qos->partition.strs);
qos->partition.strs = NULL;
for (i = 0; i < qos->partition.n; i++) {
dds_free(qos->partition.strs[i]);
}
dds_free(qos->partition.strs);
qos->partition.strs = NULL;
}
qos->partition.n = n;

40
src/core/ddsc/tests/qos.c
View file

@ -14,7 +14,6 @@
#include <criterion/criterion.h>
#include <criterion/logging.h>
/* We are deliberately testing some bad arguments that SAL will complain about.
* So, silence SAL regarding these issues. */
#ifdef _MSC_VER
@ -240,6 +239,45 @@ qos_fini(void)
/****************************************************************************
* API tests
****************************************************************************/
Test(ddsc_qos, copy_bad_source, .init=qos_init, .fini=qos_fini)
{
dds_return_t result;
result = dds_qos_copy(g_qos, NULL);
cr_assert_eq(dds_err_nr(result), DDS_RETCODE_BAD_PARAMETER, "returned %d", dds_err_nr(result));
}
Test(ddsc_qos, copy_bad_destination, .init=qos_init, .fini=qos_fini)
{
dds_return_t result;
result = dds_qos_copy(NULL, g_qos);
cr_assert_eq(dds_err_nr(result), DDS_RETCODE_BAD_PARAMETER, "returned %d", dds_err_nr(result));
}
Test(ddsc_qos, copy_with_partition, .init=qos_init, .fini=qos_fini)
{
dds_return_t result;
dds_qos_t *qos;
struct pol_partition p = { 0, NULL };
qos = dds_qos_create();
cr_assert_not_null(qos);
dds_qset_partition(g_qos, g_pol_partition.n, g_pol_partition.ps);
result = dds_qos_copy(qos, g_qos);
cr_assert_eq(result, DDS_RETCODE_OK);
dds_qget_partition(qos, &p.n, &p.ps);
cr_assert_eq(p.n, g_pol_partition.n);
for (uint32_t cnt = 0; cnt < p.n; cnt++) {
cr_assert_str_eq(p.ps[cnt], g_pol_partition.ps[cnt]);
}
dds_qos_delete(qos);
}
Test(ddsc_qos, userdata, .init=qos_init, .fini=qos_fini)
{
struct pol_userdata p = { NULL, 0 };