enhanced the constant value handling
This commit is contained in:
@ -187,7 +187,7 @@ static int test2 ()
|
||||
{
|
||||
qse_char_t tmp[64];
|
||||
qse_strxfmt(tmp, QSE_COUNTOF(tmp), QSE_T("test-%d-%d"), j, i);
|
||||
attr = qse_raddic_addattr (dic, tmp, j, QSE_RADDIC_ATTR_TYPE_STRING, i, &f);
|
||||
attr = qse_raddic_addattr (dic, tmp, j, QSE_RADDIC_ATTR_TYPE_UINT32, i, &f);
|
||||
_assert (attr != QSE_NULL, QSE_T("unable to add an attribute"));
|
||||
_assert (attr->attr == QSE_RADDIC_ATTR_MAKE(j, i), QSE_T("wrong attr value"));
|
||||
_assert (qse_strcasecmp(attr->name, tmp) == 0, QSE_T("wrong attr name"));
|
||||
@ -218,13 +218,13 @@ static int test2 ()
|
||||
{
|
||||
qse_char_t tmp[64];
|
||||
qse_strxfmt(tmp, QSE_COUNTOF(tmp), QSE_T("testx-%d-%d"), j, i);
|
||||
attr = qse_raddic_addattr (dic, tmp, j, QSE_RADDIC_ATTR_TYPE_STRING, i, &f);
|
||||
attr = qse_raddic_addattr (dic, tmp, j, QSE_RADDIC_ATTR_TYPE_UINT32, i, &f);
|
||||
_assert (attr != QSE_NULL, QSE_T("unable to add an attribute"));
|
||||
_assert (attr->attr == QSE_RADDIC_ATTR_MAKE(j, i), QSE_T("wrong attr value"));
|
||||
_assert (qse_strcasecmp(attr->name, tmp) == 0, QSE_T("wrong attr name"));
|
||||
|
||||
qse_strxfmt(tmp, QSE_COUNTOF(tmp), QSE_T("testy-%d-%d"), j, i);
|
||||
attr = qse_raddic_addattr (dic, tmp, j, QSE_RADDIC_ATTR_TYPE_STRING, i, &f);
|
||||
attr = qse_raddic_addattr (dic, tmp, j, QSE_RADDIC_ATTR_TYPE_UINT32, i, &f);
|
||||
_assert (attr != QSE_NULL, QSE_T("unable to add an attribute"));
|
||||
_assert (attr->attr == QSE_RADDIC_ATTR_MAKE(j, i), QSE_T("wrong attr value"));
|
||||
_assert (qse_strcasecmp(attr->name, tmp) == 0, QSE_T("wrong attr name"));
|
||||
@ -339,11 +339,17 @@ static int test2 ()
|
||||
for (i = 1; i <= 255; i++)
|
||||
{
|
||||
qse_char_t constr[64], attrstr[64];
|
||||
qse_raddic_const_value_t v;
|
||||
|
||||
memset (&v, 0, QSE_SIZEOF(v));
|
||||
v.type = QSE_RADDIC_ATTR_TYPE_UINT32;
|
||||
v.u.ui32 = 10;
|
||||
|
||||
qse_strxfmt(attrstr, QSE_COUNTOF(attrstr), QSE_T("test-%d-%d"), j, i);
|
||||
qse_strxfmt(constr, QSE_COUNTOF(constr), QSE_T("const-%d-%d"), j, i);
|
||||
con = qse_raddic_addconst (dic, constr, attrstr, 10);
|
||||
con = qse_raddic_addconst (dic, constr, attrstr, &v);
|
||||
_assert (con != QSE_NULL, QSE_T("unable to add an constant"));
|
||||
_assert (con->value == 10, QSE_T("wrong constant value"));
|
||||
_assert (con->value.type == QSE_RADDIC_ATTR_TYPE_UINT32 || con->value.u.ui32 == 10, QSE_T("wrong constant value"));
|
||||
_assert (qse_strcasecmp(con->name, constr) == 0, QSE_T("wrong constant name"));
|
||||
}
|
||||
}
|
||||
@ -353,16 +359,22 @@ static int test2 ()
|
||||
for (i = 1; i <= 255; i++)
|
||||
{
|
||||
qse_char_t constr[64];
|
||||
qse_raddic_const_value_t v;
|
||||
|
||||
memset (&v, 0, QSE_SIZEOF(v));
|
||||
v.type = QSE_RADDIC_ATTR_TYPE_UINT32;
|
||||
v.u.ui32 = 10;
|
||||
|
||||
qse_strxfmt(constr, QSE_COUNTOF(constr), QSE_T("const-%d-%d"), j, i);
|
||||
|
||||
con = qse_raddic_findconstbyname (dic, QSE_RADDIC_ATTR_MAKE(j, i), constr);
|
||||
_assert (con != QSE_NULL, QSE_T("unable to find an constant"));
|
||||
_assert (con->attr == QSE_RADDIC_ATTR_MAKE(j, i), QSE_T("wrong constant value"));
|
||||
_assert (con->value == 10, QSE_T("wrong constant value"));
|
||||
_assert (con->value.type == QSE_RADDIC_ATTR_TYPE_UINT32 || con->value.u.ui32 == 10, QSE_T("wrong constant value"));
|
||||
|
||||
con = qse_raddic_findconstbyvalue (dic, QSE_RADDIC_ATTR_MAKE(j, i), 10);
|
||||
con = qse_raddic_findconstbyvalue (dic, QSE_RADDIC_ATTR_MAKE(j, i), &v);
|
||||
_assert (con != QSE_NULL, QSE_T("unable to find an constant"));
|
||||
_assert (con->value == 10, QSE_T("wrong constant value"));
|
||||
_assert (con->value.type == QSE_RADDIC_ATTR_TYPE_UINT32 || con->value.u.ui32 == 10, QSE_T("wrong constant value"));
|
||||
_assert (con->attr == QSE_RADDIC_ATTR_MAKE(j, i), QSE_T("wrong constant value"));
|
||||
}
|
||||
}
|
||||
@ -370,19 +382,27 @@ static int test2 ()
|
||||
|
||||
{
|
||||
int n;
|
||||
qse_raddic_const_value_t v;
|
||||
|
||||
memset (&v, 0, QSE_SIZEOF(v));
|
||||
v.type = QSE_RADDIC_ATTR_TYPE_UINT32;
|
||||
|
||||
n = qse_raddic_deleteconstbyname (dic, QSE_RADDIC_ATTR_MAKE(1,1), QSE_T("const-1-1"));
|
||||
_assert (n == 0, QSE_T("errorneous constant deletion failure"));
|
||||
|
||||
n = qse_raddic_deleteconstbyname (dic, QSE_RADDIC_ATTR_MAKE(1,1), QSE_T("const-1-1"));
|
||||
_assert (n <= -1, QSE_T("errorneous constant deletion success"));
|
||||
|
||||
n = qse_raddic_deleteconstbyvalue (dic, QSE_RADDIC_ATTR_MAKE(2,2), 20);
|
||||
v.u.ui32 = 20;
|
||||
n = qse_raddic_deleteconstbyvalue (dic, QSE_RADDIC_ATTR_MAKE(2,2), &v);
|
||||
_assert (n <= -1, QSE_T("errorneous constant deletion success"));
|
||||
|
||||
n = qse_raddic_deleteconstbyvalue (dic, QSE_RADDIC_ATTR_MAKE(2,2), 10);
|
||||
v.u.ui32 = 10;
|
||||
n = qse_raddic_deleteconstbyvalue (dic, QSE_RADDIC_ATTR_MAKE(2,2), &v);
|
||||
_assert (n == 0, QSE_T("errorneous constant deletion success"));
|
||||
|
||||
n = qse_raddic_deleteconstbyvalue (dic, QSE_RADDIC_ATTR_MAKE(2,2), 10);
|
||||
v.u.ui32 = 10;
|
||||
n = qse_raddic_deleteconstbyvalue (dic, QSE_RADDIC_ATTR_MAKE(2,2), &v);
|
||||
_assert (n <= -1, QSE_T("errorneous constant deletion success"));
|
||||
}
|
||||
|
||||
@ -393,6 +413,8 @@ static int test2 ()
|
||||
static int test3 ()
|
||||
{
|
||||
qse_raddic_t* dic;
|
||||
qse_raddic_vendor_t* v;
|
||||
qse_raddic_const_t* c;
|
||||
int n, trait;
|
||||
|
||||
dic = qse_raddic_open (QSE_MMGR_GETDFL(), 0);
|
||||
@ -402,9 +424,15 @@ static int test3 ()
|
||||
n = qse_raddic_setopt (dic, QSE_RADDIC_TRAIT, &trait);
|
||||
_assert (n == 0, QSE_T("cannot set trait"));
|
||||
|
||||
n = qse_raddic_load (dic, QSE_T("fr/dictionary"));
|
||||
n = qse_raddic_load (dic, QSE_T("fr2/dictionary"));
|
||||
_assert (n == 0, qse_raddic_geterrmsg(dic));
|
||||
|
||||
v = qse_raddic_findvendorbyname (dic, QSE_T("cisco"));
|
||||
_assert (v && v->vendorpec == 9, "wrong vendor value");
|
||||
|
||||
c = qse_raddic_findconstbyname (dic, QSE_RADDIC_ATTR_MAKE(0,49), QSE_T("Reauthentication-Failure"));
|
||||
_assert (c && c->value.type == QSE_RADDIC_ATTR_TYPE_UINT32 && c->value.u.ui32 == 20, QSE_T("wrong constant value"));
|
||||
|
||||
qse_raddic_close (dic);
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user