Skip to content

Commit 91a9b24

Browse files
RoytakRoytak
committed
tests UPDATE replace canonical print by func call
1 parent 17acb3a commit 91a9b24

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

‎tests/utests/utests.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ struct utest_context {
933933
* @param[in] CANNONICAL_VAL expected cannonical value
934934
*/
935935
#define CHECK_LYD_VALUE_EMPTY(NODE, CANNONICAL_VAL) \
936-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
936+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
937937
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
938938
assert_non_null((NODE).realtype); \
939939
assert_int_equal((NODE).realtype->basetype, LY_TYPE_EMPTY);
@@ -951,7 +951,7 @@ struct utest_context {
951951
* CHECK_LYD_VALUE_ ## TYPE_VAL.
952952
*/
953953
#define CHECK_LYD_VALUE_UNION(NODE, CANNONICAL_VAL, TYPE_VAL, ...) \
954-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
954+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
955955
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
956956
assert_non_null((NODE).realtype); \
957957
assert_int_equal(LY_TYPE_UNION, (NODE).realtype->basetype); \
@@ -973,7 +973,7 @@ struct utest_context {
973973
* @param[in] VALUE expected array of bits names
974974
*/
975975
#define CHECK_LYD_VALUE_BITS(NODE, ...) \
976-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
976+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
977977
assert_string_equal((NODE)._canonical, _GETARG1(__VA_ARGS__, DUMMY)); \
978978
assert_non_null((NODE).realtype); \
979979
assert_int_equal(LY_TYPE_BITS, (NODE).realtype->basetype); \
@@ -997,7 +997,7 @@ struct utest_context {
997997
* @brief Example enum arr[] = {0x0, 0x1}; CHECK_LYD_VALUE(node->value, INST, "test/d", arr);
998998
*/
999999
#define CHECK_LYD_VALUE_INST(NODE, CANNONICAL_VAL, VALUE) \
1000-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
1000+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
10011001
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
10021002
assert_non_null((NODE).realtype); \
10031003
assert_int_equal(LY_TYPE_INST, (NODE).realtype->basetype); \
@@ -1020,7 +1020,7 @@ struct utest_context {
10201020
* @param[in] VALUE expected enum item name
10211021
*/
10221022
#define CHECK_LYD_VALUE_ENUM(NODE, CANNONICAL_VAL, VALUE) \
1023-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
1023+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
10241024
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
10251025
assert_non_null((NODE).realtype); \
10261026
assert_int_equal(LY_TYPE_ENUM, (NODE).realtype->basetype); \
@@ -1035,7 +1035,7 @@ struct utest_context {
10351035
* @param[in] VALUE expected inteager value (-128 to 127).
10361036
*/
10371037
#define CHECK_LYD_VALUE_INT8(NODE, CANNONICAL_VAL, VALUE) \
1038-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
1038+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
10391039
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
10401040
assert_non_null((NODE).realtype); \
10411041
assert_int_equal(LY_TYPE_INT8, (NODE).realtype->basetype); \
@@ -1050,7 +1050,7 @@ struct utest_context {
10501050
* @param[in] VALUE expected inteager value.
10511051
*/
10521052
#define CHECK_LYD_VALUE_INT16(NODE, CANNONICAL_VAL, VALUE) \
1053-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
1053+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
10541054
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
10551055
assert_non_null((NODE).realtype); \
10561056
assert_int_equal(LY_TYPE_INT16, (NODE).realtype->basetype); \
@@ -1065,7 +1065,7 @@ struct utest_context {
10651065
* @param[in] VALUE expected inteager (0 to 255).
10661066
*/
10671067
#define CHECK_LYD_VALUE_UINT8(NODE, CANNONICAL_VAL, VALUE) \
1068-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
1068+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
10691069
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
10701070
assert_non_null((NODE).realtype); \
10711071
assert_int_equal(LY_TYPE_UINT8, (NODE).realtype->basetype); \
@@ -1080,7 +1080,7 @@ struct utest_context {
10801080
* @param[in] VALUE expected inteager (0 to MAX_UINT32).
10811081
*/
10821082
#define CHECK_LYD_VALUE_UINT32(NODE, CANNONICAL_VAL, VALUE) \
1083-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
1083+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
10841084
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
10851085
assert_non_null((NODE).realtype); \
10861086
assert_int_equal(LY_TYPE_UINT32, (NODE).realtype->basetype); \
@@ -1094,7 +1094,7 @@ struct utest_context {
10941094
* @param[in] CANNONICAL_VAL expected cannonical value
10951095
*/
10961096
#define CHECK_LYD_VALUE_STRING(NODE, CANNONICAL_VAL) \
1097-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
1097+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
10981098
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
10991099
assert_non_null((NODE).realtype); \
11001100
assert_int_equal(LY_TYPE_STRING, (NODE).realtype->basetype);
@@ -1107,7 +1107,7 @@ struct utest_context {
11071107
* @param[in] CANNONICAL_VAL expected cannonical value
11081108
*/
11091109
#define CHECK_LYD_VALUE_LEAFREF(NODE, CANNONICAL_VAL) \
1110-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
1110+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
11111111
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
11121112
assert_non_null((NODE).realtype); \
11131113
assert_int_equal(LY_TYPE_LEAFREF, (NODE).realtype->basetype); \
@@ -1122,7 +1122,7 @@ struct utest_context {
11221122
* @param[in] VALUE expected value 64bit inteager
11231123
*/
11241124
#define CHECK_LYD_VALUE_DEC64(NODE, CANNONICAL_VAL, VALUE) \
1125-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
1125+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
11261126
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
11271127
assert_non_null((NODE).realtype); \
11281128
assert_int_equal(LY_TYPE_DEC64, (NODE).realtype->basetype); \
@@ -1143,7 +1143,7 @@ struct utest_context {
11431143
LYD_VALUE_GET(&(NODE), _val); \
11441144
assert_int_equal(_val->size, SIZE); \
11451145
assert_int_equal(0, memcmp(_val->data, VALUE, SIZE)); \
1146-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
1146+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
11471147
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
11481148
assert_non_null((NODE).realtype); \
11491149
assert_int_equal(LY_TYPE_BINARY, (NODE).realtype->basetype); \
@@ -1158,7 +1158,7 @@ struct utest_context {
11581158
* @param[in] VALUE expected boolean value 0,1
11591159
*/
11601160
#define CHECK_LYD_VALUE_BOOL(NODE, CANNONICAL_VAL, VALUE) \
1161-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
1161+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
11621162
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
11631163
assert_non_null((NODE).realtype); \
11641164
assert_int_equal(LY_TYPE_BOOL, (NODE).realtype->basetype); \
@@ -1173,7 +1173,7 @@ struct utest_context {
11731173
* @param[in] VALUE expected ident name
11741174
*/
11751175
#define CHECK_LYD_VALUE_IDENT(NODE, CANNONICAL_VAL, VALUE) \
1176-
assert_non_null(lysc_get_type_plugin((NODE).realtype->plugin_ref)->print(UTEST_LYCTX, &(NODE), LY_VALUE_CANON, NULL, NULL, NULL)); \
1176+
assert_non_null(lyd_value_get_canonical(UTEST_LYCTX, &(NODE))); \
11771177
assert_string_equal((NODE)._canonical, CANNONICAL_VAL); \
11781178
assert_non_null((NODE).realtype); \
11791179
assert_int_equal(LY_TYPE_IDENT, (NODE).realtype->basetype); \

0 commit comments

Comments
 (0)