From 1a591cbdfa75b84e21adee614755fd6ea44b53b6 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Tue, 22 Jan 2019 21:10:22 +0900 Subject: [PATCH] [APITESTS][WIN32KNT_APITEST] Improve NtGdiFlushUserBatch testcase (#1287) Use ok, ok_int, ok_long, and ok_ptr macros instead of TEST and ASSERT macros. --- .../win32nt/ntgdi/NtGdiFlushUserBatch.c | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c index b799078a537..842e50ba3c8 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c @@ -21,16 +21,16 @@ START_TEST(NtGdiFlushUserBatch) return APISTATUS_NOT_FOUND; pTeb = NtCurrentTeb(); - ASSERT(pTeb); + ok(pTeb != NULL, "pTeb was NULL.\n"); pRet = (PVOID)pNtGdiFlushUserBatch(); - TEST(pRet != 0); - TEST(pRet == &pTeb->RealClientId); + ok(pRet != NULL, "pRet was NULL.\n"); + ok_ptr(pRet, &pTeb->RealClientId); - TEST(pTeb->GdiBatchCount == 0); - TEST(pTeb->GdiTebBatch.Offset == 0); - TEST(pTeb->GdiTebBatch.HDC == 0); + ok_long(pTeb->GdiBatchCount, 0); + ok_long(pTeb->GdiTebBatch.Offset, 0); + ok_ptr(pTeb->GdiTebBatch.HDC, NULL); /* Set up some bullshit */ pTeb->InDbgPrint = 1; @@ -39,11 +39,10 @@ START_TEST(NtGdiFlushUserBatch) pTeb->GdiTebBatch.HDC = (HDC)123; pRet = (PVOID)pNtGdiFlushUserBatch(); - TEST(pRet == &pTeb->RealClientId); - - TEST(pTeb->InDbgPrint == 0); - TEST(pTeb->GdiBatchCount == 12); - TEST(pTeb->GdiTebBatch.Offset == 0); - TEST(pTeb->GdiTebBatch.HDC == 0); + ok_ptr(pRet, &pTeb->RealClientId); + ok_int(pTeb->InDbgPrint, 0); + ok_long(pTeb->GdiBatchCount, 12); + ok_long(pTeb->GdiTebBatch.Offset, 0); + ok_ptr(pTeb->GdiTebBatch.HDC, NULL); }