Refactor the dns_open_connection code so that duplicate code is removed and ensure...

[sfrench/samba-autobuild/.git] / lib / torture / torture.h

diff --git a/lib/torture/torture.h b/lib/torture/torture.h
index 39f83df4e4fd783561d5b57f393a45aabc193642..e710873fb39423c7297192eca7cf558eeaa366eb 100644 (file)
--- a/lib/torture/torture.h
+++ b/lib/torture/torture.h
@@ -288,11 +288,19 @@ void torture_result(struct torture_context *test,
 #define torture_assert_ndr_err_equal(torture_ctx,got,expected,cmt) \
        do { enum ndr_err_code __got = got, __expected = expected; \
        if (__got != __expected) { \
-               torture_result(torture_ctx, TORTURE_FAIL, __location__": "#got" was %d, expected %d (%s): %s", __got, __expected, __STRING(expected), cmt); \
+               torture_result(torture_ctx, TORTURE_FAIL, __location__": "#got" was %d (%s), expected %d (%s): %s", __got, ndr_errstr(__got), __expected, __STRING(expected), cmt); \
                return false; \
        }\
        } while(0)
 
+#define torture_assert_hresult_equal(torture_ctx, got, expected, cmt) \
+       do { HRESULT __got = got, __expected = expected; \
+       if (!HRES_IS_EQUAL(__got, __expected)) { \
+               torture_result(torture_ctx, TORTURE_FAIL, __location__": "#got" was %s, expected %s: %s", hresult_errstr(__got), hresult_errstr(__expected), cmt); \
+               return false; \
+       } \
+       } while (0)
+
 #define torture_assert_casestr_equal(torture_ctx,got,expected,cmt) \
        do { const char *__got = (got), *__expected = (expected); \
        if (!strequal(__got, __expected)) { \
@@ -414,6 +422,27 @@ void torture_result(struct torture_context *test,
        } \
        } while(0)
 
+#define torture_assert_int_not_equal(torture_ctx,got,not_expected,cmt)\
+       do { int __got = (got), __not_expected = (not_expected); \
+       if (__got == __not_expected) { \
+               torture_result(torture_ctx, TORTURE_FAIL, \
+                       __location__": "#got" was %d (0x%X), expected a different number: %s", \
+                       __got, __got, cmt); \
+               return false; \
+       } \
+       } while(0)
+
+#define torture_assert_int_not_equal_goto(torture_ctx,got,not_expected,ret,label,cmt)\
+       do { int __got = (got), __not_expected = (not_expected); \
+       if (__got == __not_expected) { \
+               torture_result(torture_ctx, TORTURE_FAIL, \
+                       __location__": "#got" was %d (0x%X), expected a different number: %s", \
+                       __got, __got, cmt); \
+               ret = false; \
+               goto label; \
+       } \
+       } while(0)
+
 #define torture_assert_u64_equal(torture_ctx,got,expected,cmt)\
        do { uint64_t __got = (got), __expected = (expected); \
        if (__got != __expected) { \
@@ -439,6 +468,29 @@ void torture_result(struct torture_context *test,
        } \
        } while(0)
 
+#define torture_assert_u64_not_equal(torture_ctx,got,not_expected,cmt)\
+       do { uint64_t __got = (got), __not_expected = (not_expected); \
+       if (__got == __not_expected) { \
+               torture_result(torture_ctx, TORTURE_FAIL, \
+                       __location__": "#got" was %llu (0x%llX), expected a different number: %s", \
+                       (unsigned long long)__got, (unsigned long long)__got, \
+                       cmt); \
+               return false; \
+       } \
+       } while(0)
+
+#define torture_assert_u64_not_equal_goto(torture_ctx,got,not_expected,ret,label,cmt)\
+       do { uint64_t __got = (got), __not_expected = (not_expected); \
+       if (__got == __not_expected) { \
+               torture_result(torture_ctx, TORTURE_FAIL, \
+                       __location__": "#got" was %llu (0x%llX), expected a different number: %s", \
+                       (unsigned long long)__got, (unsigned long long)__got, \
+                       cmt); \
+               ret = false; \
+               goto label; \
+       } \
+       } while(0)
+
 #define torture_assert_errno_equal(torture_ctx,expected,cmt)\
        do { int __expected = (expected); \
        if (errno != __expected) { \
@@ -450,7 +502,54 @@ void torture_result(struct torture_context *test,
        } \
        } while(0)
 
+#define torture_assert_guid_equal(torture_ctx,got,expected,cmt)\
+       do { struct GUID __got = (got), __expected = (expected); \
+       if (!GUID_equal(&__got, &__expected)) { \
+               torture_result(torture_ctx, TORTURE_FAIL, \
+                       __location__": "#got" was %s, expected %s: %s", \
+                       GUID_string(torture_ctx, &__got), GUID_string(torture_ctx, &__expected), cmt); \
+               return false; \
+       } \
+       } while(0)
 
+#define torture_assert_nttime_equal(torture_ctx,got,expected,cmt) \
+       do { NTTIME __got = got, __expected = expected; \
+       if (!nt_time_equal(&__got, &__expected)) { \
+               torture_result(torture_ctx, TORTURE_FAIL, __location__": "#got" was %s, expected %s: %s", nt_time_string(tctx, __got), nt_time_string(tctx, __expected), cmt); \
+               return false; \
+       }\
+       } while(0)
+
+#define torture_assert_sid_equal(torture_ctx,got,expected,cmt)\
+       do { struct dom_sid *__got = (got), *__expected = (expected); \
+       if (!dom_sid_equal(__got, __expected)) { \
+               torture_result(torture_ctx, TORTURE_FAIL, \
+                                          __location__": "#got" was %s, expected %s: %s", \
+                                          dom_sid_string(torture_ctx, __got), dom_sid_string(torture_ctx, __expected), cmt); \
+               return false; \
+       } \
+       } while(0)
+
+#define torture_assert_not_null(torture_ctx,got,cmt)\
+       do { void *__got = (got); \
+       if (__got == NULL) { \
+               torture_result(torture_ctx, TORTURE_FAIL, \
+                       __location__": "#got" was NULL, expected != NULL: %s", \
+                       cmt); \
+               return false; \
+       } \
+       } while(0)
+
+#define torture_assert_not_null_goto(torture_ctx,got,ret,label,cmt)\
+       do { void *__got = (got); \
+       if (__got == NULL) { \
+               torture_result(torture_ctx, TORTURE_FAIL, \
+                       __location__": "#got" was NULL, expected != NULL: %s", \
+                       cmt); \
+               ret = false; \
+               goto label; \
+       } \
+       } while(0)
 
 #define torture_skip(torture_ctx,cmt) do {\
                torture_result(torture_ctx, TORTURE_SKIP, __location__": %s", cmt);\
@@ -484,6 +583,9 @@ void torture_result(struct torture_context *test,
 #define torture_assert_ndr_success(torture_ctx,expr,cmt) \
                torture_assert_ndr_err_equal(torture_ctx,expr,NDR_ERR_SUCCESS,cmt)
 
+#define torture_assert_hresult_ok(torture_ctx,expr,cmt) \
+               torture_assert_hresult_equal(torture_ctx,expr,HRES_ERROR(0), cmt)
+
 /* Getting settings */
 const char *torture_setting_string(struct torture_context *test, \
                                                                   const char *name, 
@@ -530,5 +632,6 @@ struct torture_results *torture_results_init(TALLOC_CTX *mem_ctx, const struct t
 struct torture_context *torture_context_child(struct torture_context *tctx);
 
 extern const struct torture_ui_ops torture_subunit_ui_ops;
+extern const struct torture_ui_ops torture_simple_ui_ops;
 
 #endif /* __TORTURE_UI_H__ */