-#define CHECK_VALUE(v, correct) do { \
- if ((v) != (correct)) { \
- printf("(%s) Incorrect value %s=%d - should be %d\n", \
- __location__, #v, v, correct); \
- ret = False; \
- }} while (0)
-
-#define CHECK_STRING(v, correct) do { \
- if ((v) != (correct) && \
- ((v)==NULL || (correct)==NULL || StrCaseCmp(v, correct) != 0)) { \
- printf("(%s) Incorrect value %s='%s' - should be '%s'\n", \
- __location__, #v, v, correct); \
- ret = False; \
- }} while (0)
-
-#define CHECK_NAME(_name, correct) do { \
- CHECK_STRING((_name).name, (correct).name); \
- CHECK_VALUE((_name).type, (correct).type); \
- CHECK_STRING((_name).scope, (correct).scope); \
+#define CHECK_STRING(tctx, v, correct) \
+ torture_assert_casestr_equal(tctx, v, correct, "Incorrect value")
+
+#define CHECK_NAME(tctx, _name, correct) do { \
+ CHECK_STRING(tctx, (_name).name, (correct).name); \
+ CHECK_VALUE(tctx, (uint8_t)(_name).type, (uint8_t)(correct).type); \
+ CHECK_STRING(tctx, (_name).scope, (correct).scope); \