On 07/16/2014 01:37 PM, Pavel Březina wrote:
On 07/10/2014 02:08 PM, Lukas Slebodnik wrote:
On (02/07/14 13:09), Pavel Březina wrote:
First patch is a minor bug in unit test I found when I was writing
new tests.
The rest is described in commit message.
From de3ed7bf0e9784058241e4b532c72e324e3dd635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Tue, 1 Jul 2014 11:55:41 +0200
Subject: [PATCH 2/4] sss_sifp: set output parameters if attribute is
NULL
There are two cases that may happen when a user calls Get or GetAll:
1) the attribute is missing
2) the attribute is empty
sss_sifp has two error code to distinguish between those two cases:
1) SSS_SIFP_ATTR_MISSING
2) SSS_SIFP_ATTR_NULL
Usually the caller is not interested on situations when the attribute
is empty and it can be considered as error. Having it as a separate
error code instead of setting the output value to NULL is necesarry
since attribute does not have to be a pointer.
This patch however sets pointer type attributes to NULL since it may
simplify the code path when the caller is actually interested in
this information (e. g. empty server list on domain objects).
It is not possible to send a NULL string over a D-Bus nor it is
possible to have hash table NULL with current code so these two
scenarios are not tested. However, it is handled in sss_sifp_attr
code for completeness.
---
src/lib/sifp/sss_sifp_attrs.c | 63 +++++---
src/tests/cmocka/test_sss_sifp.c | 338
+++++++++++++++++++++++++++++++++++++++
2 files changed, 380 insertions(+), 21 deletions(-)
diff --git a/src/lib/sifp/sss_sifp_attrs.c
b/src/lib/sifp/sss_sifp_attrs.c
index
6d10c46119989b42e79cc80f251fa275d07b1cd0..5a0241f85f734891f5273d1f04e5721be859b263
100644
--- a/src/lib/sifp/sss_sifp_attrs.c
+++ b/src/lib/sifp/sss_sifp_attrs.c
@@ -41,23 +41,31 @@
out =
attr->data.field[0]; \
} while (0)
-#define GET_ATTR_ARRAY(attrs, name, rtype, field, out_num, out_val)
do { \
+#define GET_ATTR_ARRAY(attrs, name, rtype, field, out_num, out_val,
ret) \
+do
{
\
sss_sifp_attr *attr = sss_sifp_find_attr(attrs,
name); \
\
if (attr == NULL)
{ \
- return
SSS_SIFP_ATTR_MISSING; \
+ ret =
SSS_SIFP_ATTR_MISSING; \
+
break; \
}
\
\
if (attr->type != rtype)
{ \
- return
SSS_SIFP_INCORRECT_TYPE; \
+ ret =
SSS_SIFP_INCORRECT_TYPE; \
+
break; \
}
\
\
if (attr->data.field == NULL)
{ \
- return
SSS_SIFP_ATTR_NULL; \
+ out_num =
0; \
+ out_val =
NULL; \
+ ret =
SSS_SIFP_ATTR_NULL; \
+
break; \
}
\
\
out_num =
attr->num_values; \
out_val =
attr->data.field; \
+
\
+ ret =
SSS_SIFP_OK; \
} while (0)
@@ -151,6 +159,7 @@ sss_sifp_find_attr_as_string(sss_sifp_attr **attrs,
GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_STRING, str, value);
function sss_sifp_find_attr_as_string can return SSS_SIFP_ATTR_NULL
also from code generated by macro GET_ATTR.
Do we want to set value to NULL there?
Other wise patches looks good.
LS
Thanks, fixed.
Sorry, I did not commit the changes. So one more time.
Is there any way to make git format-patch to warn if there are unstaged
changes?
From 31d1a1595d35cff6fa5aac6c8d3fd8b908747faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Wed, 2 Jul 2014 11:15:23 +0200
Subject: [PATCH 1/3] sss_sifp test: fix object path array test
---
src/tests/cmocka/test_sss_sifp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/cmocka/test_sss_sifp.c b/src/tests/cmocka/test_sss_sifp.c
index 54f2152075d860edc3a5438b4cf5cdd1a88d8f92..384bae416a8c6b3b98c8db00b9b3400aa6884b23 100644
--- a/src/tests/cmocka/test_sss_sifp.c
+++ b/src/tests/cmocka/test_sss_sifp.c
@@ -1039,7 +1039,7 @@ void test_sss_sifp_parse_attr_object_path_array(void **state)
unsigned int i;
/* prepare message */
- reply_variant_array(reply, DBUS_TYPE_STRING_AS_STRING, num_values,
+ reply_variant_array(reply, DBUS_TYPE_OBJECT_PATH_AS_STRING, num_values,
(uint8_t*)in, sizeof(const char*));
/* test */
--
1.7.11.7
From 332ef1419c28728274ec2af38c72ff6ff52b1951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Tue, 1 Jul 2014 11:55:41 +0200
Subject: [PATCH 2/3] sss_sifp: set output parameters if attribute is NULL
There are two cases that may happen when a user calls Get or GetAll:
1) the attribute is missing
2) the attribute is empty
sss_sifp has two error code to distinguish between those two cases:
1) SSS_SIFP_ATTR_MISSING
2) SSS_SIFP_ATTR_NULL
Usually the caller is not interested on situations when the attribute
is empty and it can be considered as error. Having it as a separate
error code instead of setting the output value to NULL is necesarry
since attribute does not have to be a pointer.
This patch however sets pointer type attributes to NULL since it may
simplify the code path when the caller is actually interested in
this information (e. g. empty server list on domain objects).
It is not possible to send a NULL string over a D-Bus nor it is
possible to have hash table NULL with current code so these two
scenarios are not tested. However, it is handled in sss_sifp_attr
code for completeness.
---
src/lib/sifp/sss_sifp_attrs.c | 120 +++++++++-----
src/tests/cmocka/test_sss_sifp.c | 338 +++++++++++++++++++++++++++++++++++++++
2 files changed, 415 insertions(+), 43 deletions(-)
diff --git a/src/lib/sifp/sss_sifp_attrs.c b/src/lib/sifp/sss_sifp_attrs.c
index 6d10c46119989b42e79cc80f251fa275d07b1cd0..1004252e3bd77e392b4ed07aa00b55273a50515f 100644
--- a/src/lib/sifp/sss_sifp_attrs.c
+++ b/src/lib/sifp/sss_sifp_attrs.c
@@ -23,41 +23,54 @@
#include "lib/sifp/sss_sifp.h"
#include "lib/sifp/sss_sifp_private.h"
-#define GET_ATTR(attrs, name, rtype, field, out) do { \
+#define GET_ATTR(attrs, name, rtype, field, out, ret) do { \
sss_sifp_attr *attr = sss_sifp_find_attr(attrs, name); \
\
if (attr == NULL) { \
- return SSS_SIFP_ATTR_MISSING; \
+ ret = SSS_SIFP_ATTR_MISSING; \
+ break; \
} \
\
if (attr->type != rtype) { \
- return SSS_SIFP_INCORRECT_TYPE; \
+ ret = SSS_SIFP_INCORRECT_TYPE; \
+ break; \
} \
\
if (attr->data.field == NULL) { \
- return SSS_SIFP_ATTR_NULL; \
+ ret = SSS_SIFP_ATTR_NULL; \
+ break; \
} \
\
out = attr->data.field[0]; \
+ \
+ ret = SSS_SIFP_OK; \
} while (0)
-#define GET_ATTR_ARRAY(attrs, name, rtype, field, out_num, out_val) do { \
+#define GET_ATTR_ARRAY(attrs, name, rtype, field, out_num, out_val, ret) \
+do { \
sss_sifp_attr *attr = sss_sifp_find_attr(attrs, name); \
\
if (attr == NULL) { \
- return SSS_SIFP_ATTR_MISSING; \
+ ret = SSS_SIFP_ATTR_MISSING; \
+ break; \
} \
\
if (attr->type != rtype) { \
- return SSS_SIFP_INCORRECT_TYPE; \
+ ret = SSS_SIFP_INCORRECT_TYPE; \
+ break; \
} \
\
if (attr->data.field == NULL) { \
- return SSS_SIFP_ATTR_NULL; \
+ out_num = 0; \
+ out_val = NULL; \
+ ret = SSS_SIFP_ATTR_NULL; \
+ break; \
} \
\
out_num = attr->num_values; \
out_val = attr->data.field; \
+ \
+ ret = SSS_SIFP_OK; \
} while (0)
static sss_sifp_attr *sss_sifp_find_attr(sss_sifp_attr **attrs,
@@ -83,8 +96,9 @@ sss_sifp_find_attr_as_bool(sss_sifp_attr **attrs,
const char *name,
bool *_value)
{
- GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_BOOL, boolean, *_value);
- return SSS_SIFP_OK;
+ sss_sifp_error ret;
+ GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_BOOL, boolean, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -92,8 +106,9 @@ sss_sifp_find_attr_as_int16(sss_sifp_attr **attrs,
const char *name,
int16_t *_value)
{
- GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_INT16, int16, *_value);
- return SSS_SIFP_OK;
+ sss_sifp_error ret;
+ GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_INT16, int16, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -101,8 +116,9 @@ sss_sifp_find_attr_as_uint16(sss_sifp_attr **attrs,
const char *name,
uint16_t *_value)
{
- GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_UINT16, uint16, *_value);
- return SSS_SIFP_OK;
+ sss_sifp_error ret;
+ GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_UINT16, uint16, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -110,8 +126,9 @@ sss_sifp_find_attr_as_int32(sss_sifp_attr **attrs,
const char *name,
int32_t *_value)
{
- GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_INT32, int32, *_value);
- return SSS_SIFP_OK;
+ sss_sifp_error ret;
+ GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_INT32, int32, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -119,8 +136,9 @@ sss_sifp_find_attr_as_uint32(sss_sifp_attr **attrs,
const char *name,
uint32_t *_value)
{
- GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_UINT32, uint32, *_value);
- return SSS_SIFP_OK;
+ sss_sifp_error ret;
+ GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_UINT32, uint32, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -128,8 +146,9 @@ sss_sifp_find_attr_as_int64(sss_sifp_attr **attrs,
const char *name,
int64_t *_value)
{
- GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_INT64, int64, *_value);
- return SSS_SIFP_OK;
+ sss_sifp_error ret;
+ GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_INT64, int64, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -137,8 +156,9 @@ sss_sifp_find_attr_as_uint64(sss_sifp_attr **attrs,
const char *name,
uint64_t *_value)
{
- GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_UINT64, uint64, *_value);
- return SSS_SIFP_OK;
+ sss_sifp_error ret;
+ GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_UINT64, uint64, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -146,16 +166,18 @@ sss_sifp_find_attr_as_string(sss_sifp_attr **attrs,
const char *name,
const char **_value)
{
+ sss_sifp_error ret;
const char *value = NULL;
- GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_STRING, str, value);
+ GET_ATTR(attrs, name, SSS_SIFP_ATTR_TYPE_STRING, str, value, ret);
- if (value == NULL) {
- return SSS_SIFP_ATTR_NULL;
+ if (ret == SSS_SIFP_ATTR_NULL) {
+ *_value = NULL;
+ return ret;
}
*_value = value;
- return SSS_SIFP_OK;
+ return ret;
}
sss_sifp_error
@@ -174,6 +196,7 @@ sss_sifp_find_attr_as_string_dict(sss_sifp_attr **attrs,
}
if (attr->data.str_dict == NULL) {
+ *_value = NULL;
return SSS_SIFP_ATTR_NULL;
}
@@ -196,9 +219,10 @@ sss_sifp_find_attr_as_bool_array(sss_sifp_attr **attrs,
unsigned int *_num_values,
bool **_value)
{
+ sss_sifp_error ret;
GET_ATTR_ARRAY(attrs, name, SSS_SIFP_ATTR_TYPE_BOOL, boolean,
- *_num_values, *_value);
- return SSS_SIFP_OK;
+ *_num_values, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -207,9 +231,10 @@ sss_sifp_find_attr_as_int16_array(sss_sifp_attr **attrs,
unsigned int *_num_values,
int16_t **_value)
{
+ sss_sifp_error ret;
GET_ATTR_ARRAY(attrs, name, SSS_SIFP_ATTR_TYPE_INT16, int16,
- *_num_values, *_value);
- return SSS_SIFP_OK;
+ *_num_values, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -218,9 +243,10 @@ sss_sifp_find_attr_as_uint16_array(sss_sifp_attr **attrs,
unsigned int *_num_values,
uint16_t **_value)
{
+ sss_sifp_error ret;
GET_ATTR_ARRAY(attrs, name, SSS_SIFP_ATTR_TYPE_UINT16, uint16,
- *_num_values, *_value);
- return SSS_SIFP_OK;
+ *_num_values, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -229,9 +255,10 @@ sss_sifp_find_attr_as_int32_array(sss_sifp_attr **attrs,
unsigned int *_num_values,
int32_t **_value)
{
+ sss_sifp_error ret;
GET_ATTR_ARRAY(attrs, name, SSS_SIFP_ATTR_TYPE_INT32, int32,
- *_num_values, *_value);
- return SSS_SIFP_OK;
+ *_num_values, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -240,9 +267,10 @@ sss_sifp_find_attr_as_uint32_array(sss_sifp_attr **attrs,
unsigned int *_num_values,
uint32_t **_value)
{
+ sss_sifp_error ret;
GET_ATTR_ARRAY(attrs, name, SSS_SIFP_ATTR_TYPE_UINT32, uint32,
- *_num_values, *_value);
- return SSS_SIFP_OK;
+ *_num_values, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -251,9 +279,10 @@ sss_sifp_find_attr_as_int64_array(sss_sifp_attr **attrs,
unsigned int *_num_values,
int64_t **_value)
{
+ sss_sifp_error ret;
GET_ATTR_ARRAY(attrs, name, SSS_SIFP_ATTR_TYPE_INT64, int64,
- *_num_values, *_value);
- return SSS_SIFP_OK;
+ *_num_values, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -262,9 +291,10 @@ sss_sifp_find_attr_as_uint64_array(sss_sifp_attr **attrs,
unsigned int *_num_values,
uint64_t **_value)
{
+ sss_sifp_error ret;
GET_ATTR_ARRAY(attrs, name, SSS_SIFP_ATTR_TYPE_UINT64, uint64,
- *_num_values, *_value);
- return SSS_SIFP_OK;
+ *_num_values, *_value, ret);
+ return ret;
}
sss_sifp_error
@@ -273,11 +303,15 @@ sss_sifp_find_attr_as_string_array(sss_sifp_attr **attrs,
unsigned int *_num_values,
const char * const **_value)
{
+ sss_sifp_error ret;
char **value;
GET_ATTR_ARRAY(attrs, name, SSS_SIFP_ATTR_TYPE_STRING, str,
- *_num_values, value);
- *_value = (const char * const *)value;
+ *_num_values, value, ret);
- return SSS_SIFP_OK;
+ if (ret == SSS_SIFP_OK || ret == SSS_SIFP_ATTR_NULL) {
+ *_value = (const char * const *)value;
+ }
+
+ return ret;
}
diff --git a/src/tests/cmocka/test_sss_sifp.c b/src/tests/cmocka/test_sss_sifp.c
index 384bae416a8c6b3b98c8db00b9b3400aa6884b23..3c009d9780cb8c4824ed86a3a9b1bf98e2d06c25 100644
--- a/src/tests/cmocka/test_sss_sifp.c
+++ b/src/tests/cmocka/test_sss_sifp.c
@@ -730,6 +730,42 @@ void test_sss_sifp_parse_attr_bool_array(void **state)
assert_null(attrs);
}
+void test_sss_sifp_parse_attr_bool_array_empty(void **state)
+{
+ sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
+ DBusMessage *reply = test_ctx.reply;
+ sss_sifp_error ret;
+ sss_sifp_attr **attrs = NULL;
+ const char *name = "test-attr";
+ unsigned int num_values = 0;
+ unsigned int out_num;
+ bool *out;
+
+ /* prepare message */
+ reply_variant_array(reply, DBUS_TYPE_BOOLEAN_AS_STRING, num_values,
+ NULL, sizeof(dbus_bool_t));
+
+ /* test */
+ ret = sss_sifp_parse_attr(ctx, name, reply, &attrs);
+
+ assert_int_equal(ret, SSS_SIFP_OK);
+ assert_non_null(attrs);
+ assert_non_null(attrs[0]);
+ assert_null(attrs[1]);
+
+ assert_int_equal(attrs[0]->num_values, num_values);
+ assert_int_equal(attrs[0]->type, SSS_SIFP_ATTR_TYPE_BOOL);
+ assert_string_equal(attrs[0]->name, name);
+
+ ret = sss_sifp_find_attr_as_bool_array(attrs, name, &out_num, &out);
+ assert_int_equal(ret, SSS_SIFP_ATTR_NULL);
+ assert_int_equal(num_values, out_num);
+ assert_null(out);
+
+ sss_sifp_free_attrs(ctx, &attrs);
+ assert_null(attrs);
+}
+
void test_sss_sifp_parse_attr_int16_array(void **state)
{
sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
@@ -772,6 +808,42 @@ void test_sss_sifp_parse_attr_int16_array(void **state)
assert_null(attrs);
}
+void test_sss_sifp_parse_attr_int16_array_empty(void **state)
+{
+ sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
+ DBusMessage *reply = test_ctx.reply;
+ sss_sifp_error ret;
+ sss_sifp_attr **attrs = NULL;
+ const char *name = "test-attr";
+ unsigned int num_values = 0;
+ unsigned int out_num;
+ int16_t *out;
+
+ /* prepare message */
+ reply_variant_array(reply, DBUS_TYPE_INT16_AS_STRING, num_values,
+ NULL, sizeof(int16_t));
+
+ /* test */
+ ret = sss_sifp_parse_attr(ctx, name, reply, &attrs);
+
+ assert_int_equal(ret, SSS_SIFP_OK);
+ assert_non_null(attrs);
+ assert_non_null(attrs[0]);
+ assert_null(attrs[1]);
+
+ assert_int_equal(attrs[0]->num_values, num_values);
+ assert_int_equal(attrs[0]->type, SSS_SIFP_ATTR_TYPE_INT16);
+ assert_string_equal(attrs[0]->name, name);
+
+ ret = sss_sifp_find_attr_as_int16_array(attrs, name, &out_num, &out);
+ assert_int_equal(ret, SSS_SIFP_ATTR_NULL);
+ assert_int_equal(num_values, out_num);
+ assert_null(out);
+
+ sss_sifp_free_attrs(ctx, &attrs);
+ assert_null(attrs);
+}
+
void test_sss_sifp_parse_attr_uint16_array(void **state)
{
sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
@@ -814,6 +886,42 @@ void test_sss_sifp_parse_attr_uint16_array(void **state)
assert_null(attrs);
}
+void test_sss_sifp_parse_attr_uint16_array_empty(void **state)
+{
+ sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
+ DBusMessage *reply = test_ctx.reply;
+ sss_sifp_error ret;
+ sss_sifp_attr **attrs = NULL;
+ const char *name = "test-attr";
+ unsigned int num_values = 0;
+ unsigned int out_num;
+ uint16_t *out;
+
+ /* prepare message */
+ reply_variant_array(reply, DBUS_TYPE_UINT16_AS_STRING, num_values,
+ NULL, sizeof(uint16_t));
+
+ /* test */
+ ret = sss_sifp_parse_attr(ctx, name, reply, &attrs);
+
+ assert_int_equal(ret, SSS_SIFP_OK);
+ assert_non_null(attrs);
+ assert_non_null(attrs[0]);
+ assert_null(attrs[1]);
+
+ assert_int_equal(attrs[0]->num_values, num_values);
+ assert_int_equal(attrs[0]->type, SSS_SIFP_ATTR_TYPE_UINT16);
+ assert_string_equal(attrs[0]->name, name);
+
+ ret = sss_sifp_find_attr_as_uint16_array(attrs, name, &out_num, &out);
+ assert_int_equal(ret, SSS_SIFP_ATTR_NULL);
+ assert_int_equal(num_values, out_num);
+ assert_null(out);
+
+ sss_sifp_free_attrs(ctx, &attrs);
+ assert_null(attrs);
+}
+
void test_sss_sifp_parse_attr_int32_array(void **state)
{
sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
@@ -856,6 +964,42 @@ void test_sss_sifp_parse_attr_int32_array(void **state)
assert_null(attrs);
}
+void test_sss_sifp_parse_attr_int32_array_empty(void **state)
+{
+ sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
+ DBusMessage *reply = test_ctx.reply;
+ sss_sifp_error ret;
+ sss_sifp_attr **attrs = NULL;
+ const char *name = "test-attr";
+ unsigned int num_values = 0;
+ unsigned int out_num;
+ int32_t *out;
+
+ /* prepare message */
+ reply_variant_array(reply, DBUS_TYPE_INT32_AS_STRING, num_values,
+ NULL, sizeof(int32_t));
+
+ /* test */
+ ret = sss_sifp_parse_attr(ctx, name, reply, &attrs);
+
+ assert_int_equal(ret, SSS_SIFP_OK);
+ assert_non_null(attrs);
+ assert_non_null(attrs[0]);
+ assert_null(attrs[1]);
+
+ assert_int_equal(attrs[0]->num_values, num_values);
+ assert_int_equal(attrs[0]->type, SSS_SIFP_ATTR_TYPE_INT32);
+ assert_string_equal(attrs[0]->name, name);
+
+ ret = sss_sifp_find_attr_as_int32_array(attrs, name, &out_num, &out);
+ assert_int_equal(ret, SSS_SIFP_ATTR_NULL);
+ assert_int_equal(num_values, out_num);
+ assert_null(out);
+
+ sss_sifp_free_attrs(ctx, &attrs);
+ assert_null(attrs);
+}
+
void test_sss_sifp_parse_attr_uint32_array(void **state)
{
sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
@@ -898,6 +1042,42 @@ void test_sss_sifp_parse_attr_uint32_array(void **state)
assert_null(attrs);
}
+void test_sss_sifp_parse_attr_uint32_array_empty(void **state)
+{
+ sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
+ DBusMessage *reply = test_ctx.reply;
+ sss_sifp_error ret;
+ sss_sifp_attr **attrs = NULL;
+ const char *name = "test-attr";
+ unsigned int num_values = 0;
+ unsigned int out_num;
+ uint32_t *out;
+
+ /* prepare message */
+ reply_variant_array(reply, DBUS_TYPE_UINT32_AS_STRING, num_values,
+ NULL, sizeof(uint32_t));
+
+ /* test */
+ ret = sss_sifp_parse_attr(ctx, name, reply, &attrs);
+
+ assert_int_equal(ret, SSS_SIFP_OK);
+ assert_non_null(attrs);
+ assert_non_null(attrs[0]);
+ assert_null(attrs[1]);
+
+ assert_int_equal(attrs[0]->num_values, num_values);
+ assert_int_equal(attrs[0]->type, SSS_SIFP_ATTR_TYPE_UINT32);
+ assert_string_equal(attrs[0]->name, name);
+
+ ret = sss_sifp_find_attr_as_uint32_array(attrs, name, &out_num, &out);
+ assert_int_equal(ret, SSS_SIFP_ATTR_NULL);
+ assert_int_equal(num_values, out_num);
+ assert_null(out);
+
+ sss_sifp_free_attrs(ctx, &attrs);
+ assert_null(attrs);
+}
+
void test_sss_sifp_parse_attr_int64_array(void **state)
{
sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
@@ -940,6 +1120,42 @@ void test_sss_sifp_parse_attr_int64_array(void **state)
assert_null(attrs);
}
+void test_sss_sifp_parse_attr_int64_array_empty(void **state)
+{
+ sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
+ DBusMessage *reply = test_ctx.reply;
+ sss_sifp_error ret;
+ sss_sifp_attr **attrs = NULL;
+ const char *name = "test-attr";
+ unsigned int num_values = 0;
+ unsigned int out_num;
+ int64_t *out;
+
+ /* prepare message */
+ reply_variant_array(reply, DBUS_TYPE_INT64_AS_STRING, num_values,
+ NULL, sizeof(int64_t));
+
+ /* test */
+ ret = sss_sifp_parse_attr(ctx, name, reply, &attrs);
+
+ assert_int_equal(ret, SSS_SIFP_OK);
+ assert_non_null(attrs);
+ assert_non_null(attrs[0]);
+ assert_null(attrs[1]);
+
+ assert_int_equal(attrs[0]->num_values, num_values);
+ assert_int_equal(attrs[0]->type, SSS_SIFP_ATTR_TYPE_INT64);
+ assert_string_equal(attrs[0]->name, name);
+
+ ret = sss_sifp_find_attr_as_int64_array(attrs, name, &out_num, &out);
+ assert_int_equal(ret, SSS_SIFP_ATTR_NULL);
+ assert_int_equal(num_values, out_num);
+ assert_null(out);
+
+ sss_sifp_free_attrs(ctx, &attrs);
+ assert_null(attrs);
+}
+
void test_sss_sifp_parse_attr_uint64_array(void **state)
{
sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
@@ -982,6 +1198,42 @@ void test_sss_sifp_parse_attr_uint64_array(void **state)
assert_null(attrs);
}
+void test_sss_sifp_parse_attr_uint64_array_empty(void **state)
+{
+ sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
+ DBusMessage *reply = test_ctx.reply;
+ sss_sifp_error ret;
+ sss_sifp_attr **attrs = NULL;
+ const char *name = "test-attr";
+ unsigned int num_values = 0;
+ unsigned int out_num;
+ uint64_t *out;
+
+ /* prepare message */
+ reply_variant_array(reply, DBUS_TYPE_UINT64_AS_STRING, num_values,
+ NULL, sizeof(uint64_t));
+
+ /* test */
+ ret = sss_sifp_parse_attr(ctx, name, reply, &attrs);
+
+ assert_int_equal(ret, SSS_SIFP_OK);
+ assert_non_null(attrs);
+ assert_non_null(attrs[0]);
+ assert_null(attrs[1]);
+
+ assert_int_equal(attrs[0]->num_values, num_values);
+ assert_int_equal(attrs[0]->type, SSS_SIFP_ATTR_TYPE_UINT64);
+ assert_string_equal(attrs[0]->name, name);
+
+ ret = sss_sifp_find_attr_as_uint64_array(attrs, name, &out_num, &out);
+ assert_int_equal(ret, SSS_SIFP_ATTR_NULL);
+ assert_int_equal(num_values, out_num);
+ assert_null(out);
+
+ sss_sifp_free_attrs(ctx, &attrs);
+ assert_null(attrs);
+}
+
void test_sss_sifp_parse_attr_string_array(void **state)
{
sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
@@ -1024,6 +1276,42 @@ void test_sss_sifp_parse_attr_string_array(void **state)
assert_null(attrs);
}
+void test_sss_sifp_parse_attr_string_array_empty(void **state)
+{
+ sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
+ DBusMessage *reply = test_ctx.reply;
+ sss_sifp_error ret;
+ sss_sifp_attr **attrs = NULL;
+ const char *name = "test-attr";
+ unsigned int num_values = 0;
+ unsigned int out_num;
+ const char * const *out;
+
+ /* prepare message */
+ reply_variant_array(reply, DBUS_TYPE_STRING_AS_STRING, num_values,
+ NULL, sizeof(const char*));
+
+ /* test */
+ ret = sss_sifp_parse_attr(ctx, name, reply, &attrs);
+
+ assert_int_equal(ret, SSS_SIFP_OK);
+ assert_non_null(attrs);
+ assert_non_null(attrs[0]);
+ assert_null(attrs[1]);
+
+ assert_int_equal(attrs[0]->num_values, num_values);
+ assert_int_equal(attrs[0]->type, SSS_SIFP_ATTR_TYPE_STRING);
+ assert_string_equal(attrs[0]->name, name);
+
+ ret = sss_sifp_find_attr_as_string_array(attrs, name, &out_num, &out);
+ assert_int_equal(ret, SSS_SIFP_ATTR_NULL);
+ assert_int_equal(num_values, out_num);
+ assert_null(out);
+
+ sss_sifp_free_attrs(ctx, &attrs);
+ assert_null(attrs);
+}
+
void test_sss_sifp_parse_attr_object_path_array(void **state)
{
sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
@@ -1066,6 +1354,42 @@ void test_sss_sifp_parse_attr_object_path_array(void **state)
assert_null(attrs);
}
+void test_sss_sifp_parse_attr_object_path_array_empty(void **state)
+{
+ sss_sifp_ctx *ctx = test_ctx.dbus_ctx;
+ DBusMessage *reply = test_ctx.reply;
+ sss_sifp_error ret;
+ sss_sifp_attr **attrs = NULL;
+ const char *name = "test-attr";
+ unsigned int num_values = 0;
+ unsigned int out_num;
+ const char * const *out;
+
+ /* prepare message */
+ reply_variant_array(reply, DBUS_TYPE_OBJECT_PATH_AS_STRING, num_values,
+ NULL, sizeof(const char*));
+
+ /* test */
+ ret = sss_sifp_parse_attr(ctx, name, reply, &attrs);
+
+ assert_int_equal(ret, SSS_SIFP_OK);
+ assert_non_null(attrs);
+ assert_non_null(attrs[0]);
+ assert_null(attrs[1]);
+
+ assert_int_equal(attrs[0]->num_values, num_values);
+ assert_int_equal(attrs[0]->type, SSS_SIFP_ATTR_TYPE_STRING);
+ assert_string_equal(attrs[0]->name, name);
+
+ ret = sss_sifp_find_attr_as_string_array(attrs, name, &out_num, &out);
+ assert_int_equal(ret, SSS_SIFP_ATTR_NULL);
+ assert_int_equal(num_values, out_num);
+ assert_null(out);
+
+ sss_sifp_free_attrs(ctx, &attrs);
+ assert_null(attrs);
+}
+
void test_sss_sifp_parse_attr_string_dict_array(void **state)
{
return;
@@ -1869,18 +2193,32 @@ int main(int argc, const char *argv[])
test_setup, test_teardown_parser),
unit_test_setup_teardown(test_sss_sifp_parse_attr_bool_array,
test_setup, test_teardown_parser),
+ unit_test_setup_teardown(test_sss_sifp_parse_attr_bool_array_empty,
+ test_setup, test_teardown_parser),
unit_test_setup_teardown(test_sss_sifp_parse_attr_int32_array,
test_setup, test_teardown_parser),
+ unit_test_setup_teardown(test_sss_sifp_parse_attr_int32_array_empty,
+ test_setup, test_teardown_parser),
unit_test_setup_teardown(test_sss_sifp_parse_attr_uint32_array,
test_setup, test_teardown_parser),
+ unit_test_setup_teardown(test_sss_sifp_parse_attr_uint32_array_empty,
+ test_setup, test_teardown_parser),
unit_test_setup_teardown(test_sss_sifp_parse_attr_int64_array,
test_setup, test_teardown_parser),
+ unit_test_setup_teardown(test_sss_sifp_parse_attr_int64_array_empty,
+ test_setup, test_teardown_parser),
unit_test_setup_teardown(test_sss_sifp_parse_attr_uint64_array,
test_setup, test_teardown_parser),
+ unit_test_setup_teardown(test_sss_sifp_parse_attr_uint64_array_empty,
+ test_setup, test_teardown_parser),
unit_test_setup_teardown(test_sss_sifp_parse_attr_string_array,
test_setup, test_teardown_parser),
+ unit_test_setup_teardown(test_sss_sifp_parse_attr_string_array_empty,
+ test_setup, test_teardown_parser),
unit_test_setup_teardown(test_sss_sifp_parse_attr_object_path_array,
test_setup, test_teardown_parser),
+ unit_test_setup_teardown(test_sss_sifp_parse_attr_object_path_array_empty,
+ test_setup, test_teardown_parser),
unit_test_setup_teardown(test_sss_sifp_parse_attr_string_dict_array,
test_setup, test_teardown_parser),
unit_test_setup_teardown(test_sss_sifp_parse_attr_list,
--
1.7.11.7
From e9afb3a00c4c8e6c462c46afb23287ee02cd432d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Wed, 2 Jul 2014 13:05:35 +0200
Subject: [PATCH 3/3] sss_sifp: bump version to 0:1:0
Interface did not change, only the code.
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 8d3d366b41b4bcf0a96d6b18033d9a834652e6cc..4538e161e91b28363996d9f298d145622f43a034 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -777,7 +777,7 @@ libsss_simpleifp_la_LIBADD = \
$(DHASH_LIBS)
libsss_simpleifp_la_LDFLAGS = \
-Wl,--version-script,$(srcdir)/src/lib/sifp/sss_simpleifp.exports \
- -version-info 0:0:0
+ -version-info 0:1:0
dist_noinst_DATA += src/lib/sifp/sss_simpleifp.exports
--
1.7.11.7
_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
