[ros-diffs] [reactos] 01/01: [APITESTS][WIN32KNT_APITEST] Improve NtGdiCreateBitmap testcase (#1280)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e70731358bff85798eb8…

commit 0e70731358bff85798eb8d2c4e33aa2c780de4e5
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Tue Jan 22 20:52:25 2019 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Tue Jan 22 20:52:25 2019 +0900

    [APITESTS][WIN32KNT_APITEST] Improve NtGdiCreateBitmap testcase (#1280)
    
    Use ok, ok_int, ok_long and ok_ptr macros instead of obsolete TEST macros.
---
 .../apitests/win32nt/ntgdi/NtGdiCreateBitmap.c     | 179 ++++++++++-----------
 1 file changed, 89 insertions(+), 90 deletions(-)

diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c
b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c
index 27100a7fdd..828ed402be 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c
@@ -15,187 +15,186 @@ void Test_NtGdiCreateBitmap_Params(void)
 
 	/* Test simple params */
 	SetLastError(ERROR_SUCCESS);
-	TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 1, NULL)) != NULL);
-	TEST(GetLastError() == ERROR_SUCCESS);
+	ok((hBmp = NtGdiCreateBitmap(1, 1, 1, 1, NULL)) != NULL, "hBmp was NULL.\n");
+	ok_long(GetLastError(), ERROR_SUCCESS);
 	DeleteObject(hBmp);
 
 	/* Test all zero */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(0, 0, 0, 0, NULL) == NULL);
-	TEST(GetLastError() == ERROR_INVALID_PARAMETER);
+	ok_ptr(NtGdiCreateBitmap(0, 0, 0, 0, NULL), NULL);
+	ok_long(GetLastError(), ERROR_INVALID_PARAMETER);
 
 	/* Test cx == 0 */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(0, 1, 1, 1, NULL) == NULL);
-	TEST(GetLastError() == ERROR_INVALID_PARAMETER);
+	ok_ptr(NtGdiCreateBitmap(0, 1, 1, 1, NULL), NULL);
+	ok_long(GetLastError(), ERROR_INVALID_PARAMETER);
 
 	/* Test negative cx */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(-10, 1, 1, 1, NULL) == NULL);
-	TEST(GetLastError() == ERROR_INVALID_PARAMETER);
+	ok_ptr(NtGdiCreateBitmap(-10, 1, 1, 1, NULL), NULL);
+	ok_long(GetLastError(), ERROR_INVALID_PARAMETER);
 
 	/* Test cy == 0 */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(1, 0, 1, 1, NULL) == NULL);
-	TEST(GetLastError() == ERROR_INVALID_PARAMETER);
+	ok_ptr(NtGdiCreateBitmap(1, 0, 1, 1, NULL), NULL);
+	ok_long(GetLastError(), ERROR_INVALID_PARAMETER);
 
 	/* Test negative cy */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(1, -2, 1, 1, NULL) == NULL);
-	TEST(GetLastError() == ERROR_INVALID_PARAMETER);
+	ok_ptr(NtGdiCreateBitmap(1, -2, 1, 1, NULL), NULL);
+	ok_long(GetLastError(), ERROR_INVALID_PARAMETER);
 
 	/* Test negative cy and valid bits */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(1, -2, 1, 1, BitmapData) == NULL);
-	TEST(GetLastError() == ERROR_SUCCESS);
+	ok_ptr(NtGdiCreateBitmap(1, -2, 1, 1, BitmapData), NULL);
+	ok_long(GetLastError(), ERROR_SUCCESS);
 
 	/* Test negative cy and invalid bits */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(1, -2, 1, 1, (BYTE*)0x80001234) == NULL);
-	TEST(GetLastError() == ERROR_SUCCESS);
+	ok_ptr(NtGdiCreateBitmap(1, -2, 1, 1, (BYTE*)0x80001234), NULL);
+	ok_long(GetLastError(), ERROR_SUCCESS);
 
 	/* Test huge size */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(100000, 100000, 1, 1, NULL) == NULL);
-	TEST(GetLastError() == ERROR_NOT_ENOUGH_MEMORY);
+	ok_ptr(NtGdiCreateBitmap(100000, 100000, 1, 1, NULL), NULL);
+	ok_long(GetLastError(), ERROR_NOT_ENOUGH_MEMORY);
 
 	/* Test huge size and valid bits */
 	SetLastError(ERROR_SUCCESS);
 	TEST(NtGdiCreateBitmap(1000, 1000, 1, 1, BitmapData) == NULL);
-	TEST(GetLastError() == ERROR_SUCCESS);
+	ok_long(GetLastError(), ERROR_SUCCESS);
 
 	/* Test huge size and invalid bits */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(100000, 100000, 1, 1, (BYTE*)0x80001234) == NULL);
-	TEST(GetLastError() == ERROR_SUCCESS);
+	ok_ptr(NtGdiCreateBitmap(100000, 100000, 1, 1, (BYTE*)0x80001234), NULL);
+	ok_long(GetLastError(), ERROR_SUCCESS);
 
 	/* Test cPlanes == 0 */
 	SetLastError(ERROR_SUCCESS);
-	TEST((hBmp = NtGdiCreateBitmap(1, 1, 0, 1, NULL)) != NULL);
-	TEST(GetLastError() == ERROR_SUCCESS);
-	ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP));
-	TEST(bitmap.bmType == 0);
-	TEST(bitmap.bmWidth == 1);
-	TEST(bitmap.bmHeight == 1);
-	TEST(bitmap.bmWidthBytes == 2);
-	TEST(bitmap.bmPlanes == 1);
-	TEST(bitmap.bmBitsPixel == 1);
+	ok((hBmp = NtGdiCreateBitmap(1, 1, 0, 1, NULL)) != NULL, "hBmp was NULL.\n");
+	ok_long(GetLastError(), ERROR_SUCCESS);
+	ok_int(GetObject(hBmp, sizeof(BITMAP), &bitmap), (int)sizeof(BITMAP));
+	ok_int(bitmap.bmType, 0);
+	ok_int(bitmap.bmWidth, 1);
+	ok_int(bitmap.bmHeight, 1);
+	ok_int(bitmap.bmWidthBytes, 2);
+	ok_int(bitmap.bmPlanes, 1);
+	ok_int(bitmap.bmBitsPixel, 1);
 	DeleteObject(hBmp);
 
 	/* Test big cPlanes */
 	SetLastError(ERROR_SUCCESS);
-	TEST((hBmp = NtGdiCreateBitmap(1, 1, 32, 1, NULL)) != NULL);
-	TEST(GetLastError() == ERROR_SUCCESS);
+	ok((hBmp = NtGdiCreateBitmap(1, 1, 32, 1, NULL)) != NULL, "hBmp was
NULL.\n");
+	ok_long(GetLastError(), ERROR_SUCCESS);
 	DeleteObject(hBmp);
 
-	TEST(NtGdiCreateBitmap(1, 1, 33, 1, NULL) == NULL);
-	TEST(GetLastError() == ERROR_INVALID_PARAMETER);
+	ok_ptr(NtGdiCreateBitmap(1, 1, 33, 1, NULL), NULL);
+	ok_long(GetLastError(), ERROR_INVALID_PARAMETER);
 
 	/* Test cBPP == 0 */
 	SetLastError(ERROR_SUCCESS);
-	TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 0, NULL)) != NULL);
-	TEST(GetLastError() == ERROR_SUCCESS);
-	ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP));
-	TEST(bitmap.bmType == 0);
-	TEST(bitmap.bmWidth == 1);
-	TEST(bitmap.bmHeight == 1);
-	TEST(bitmap.bmWidthBytes == 2);
-	TEST(bitmap.bmPlanes == 1);
-	TEST(bitmap.bmBitsPixel == 1);
+	ok((hBmp = NtGdiCreateBitmap(1, 1, 1, 0, NULL)) != NULL, "hBmp was NULL.\n");
+	ok_long(GetLastError(), ERROR_SUCCESS);
+	ok_int(GetObject(hBmp, sizeof(BITMAP), &bitmap), (int)sizeof(BITMAP));
+	ok_int(bitmap.bmType, 0);
+	ok_int(bitmap.bmWidth, 1);
+	ok_int(bitmap.bmHeight, 1);
+	ok_int(bitmap.bmWidthBytes, 2);
+	ok_int(bitmap.bmPlanes, 1);
+	ok_int(bitmap.bmBitsPixel, 1);
 	DeleteObject(hBmp);
 
 	/* Test negative cBPP */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(1, 1, 1, -1, NULL) == NULL);
-	TEST(GetLastError() == ERROR_INVALID_PARAMETER);
+	ok_ptr(NtGdiCreateBitmap(1, 1, 1, -1, NULL), NULL);
+	ok_long(GetLastError(), ERROR_INVALID_PARAMETER);
 
 	/* Test bad cBPP */
 	SetLastError(ERROR_SUCCESS);
-	TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 3, NULL)) != NULL);
-	ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP));
-	TEST(bitmap.bmBitsPixel == 4);
+	ok((hBmp = NtGdiCreateBitmap(1, 1, 1, 3, NULL)) != NULL, "hBmp was NULL.\n");
+	ok_int(GetObject(hBmp, sizeof(BITMAP), &bitmap), (int)sizeof(BITMAP));
+	ok_int(bitmap.bmBitsPixel, 4);
 	DeleteObject(hBmp);
 
-	TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 6, NULL)) != NULL);
-	ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP));
-	TEST(bitmap.bmBitsPixel == 8);
+	ok((hBmp = NtGdiCreateBitmap(1, 1, 1, 6, NULL)) != NULL, "hBmp was NULL.\n");
+	ok_int(GetObject(hBmp, sizeof(BITMAP), &bitmap), (int)sizeof(BITMAP));
+	ok_int(bitmap.bmBitsPixel, 8);
 	DeleteObject(hBmp);
 
-	TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 15, NULL)) != NULL);
-	ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP));
-	TEST(bitmap.bmBitsPixel == 16);
+	ok((hBmp = NtGdiCreateBitmap(1, 1, 1, 15, NULL)) != NULL, "hBmp was
NULL.\n");
+	ok_int(GetObject(hBmp, sizeof(BITMAP), &bitmap), (int)sizeof(BITMAP));
+	ok_int(bitmap.bmBitsPixel, 16);
 	DeleteObject(hBmp);
 
-	TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 17, NULL)) != NULL);
-	ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP));
-	TEST(bitmap.bmBitsPixel == 24);
+	ok((hBmp = NtGdiCreateBitmap(1, 1, 1, 17, NULL)) != NULL, "hBmp was
NULL.\n");
+	ok_int(GetObject(hBmp, sizeof(BITMAP), &bitmap), (int)sizeof(BITMAP));
+	ok_int(bitmap.bmBitsPixel, 24);
 	DeleteObject(hBmp);
 
-	TEST((hBmp = NtGdiCreateBitmap(1, 1, 3, 7, NULL)) != NULL);
-	ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP));
-	TEST(bitmap.bmBitsPixel == 24);
+	ok((hBmp = NtGdiCreateBitmap(1, 1, 3, 7, NULL)) != NULL, "hBmp was NULL.\n");
+	ok_int(GetObject(hBmp, sizeof(BITMAP), &bitmap), (int)sizeof(BITMAP));
+	ok_int(bitmap.bmBitsPixel, 24);
 	DeleteObject(hBmp);
 
-	TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 25, NULL)) != NULL);
-	ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP));
-	TEST(bitmap.bmBitsPixel == 32);
+	ok((hBmp = NtGdiCreateBitmap(1, 1, 1, 25, NULL)) != NULL, "hBmp was
NULL.\n");
+	ok_int(GetObject(hBmp, sizeof(BITMAP), &bitmap), (int)sizeof(BITMAP));
+	ok_int(bitmap.bmBitsPixel, 32);
 	DeleteObject(hBmp);
 
-	TEST(GetLastError() == ERROR_SUCCESS);
+	ok_long(GetLastError(), ERROR_SUCCESS);
 
-	TEST(NtGdiCreateBitmap(1, 1, 1, 33, NULL) == NULL);
-	TEST(GetLastError() == ERROR_INVALID_PARAMETER);
+	ok_ptr(NtGdiCreateBitmap(1, 1, 1, 33, NULL), NULL);
+	ok_long(GetLastError(), ERROR_INVALID_PARAMETER);
 
 	/* Test bad pointer */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(1, 1, 1, 1, (BYTE*)0x80001234) == NULL);
-	TEST(GetLastError() == ERROR_SUCCESS);
+	ok_ptr(NtGdiCreateBitmap(1, 1, 1, 1, (BYTE*)0x80001234), NULL);
+	ok_long(GetLastError(), ERROR_SUCCESS);
 
 	/* Test pointer alignment */
 	SetLastError(ERROR_SUCCESS);
-	TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 1, &BitmapData[1])) != NULL);
-	TEST(GetLastError() == ERROR_SUCCESS);
+	ok((hBmp = NtGdiCreateBitmap(1, 1, 1, 1, &BitmapData[1])) != NULL, "hBmp was
NULL.\n");
+	ok_long(GetLastError(), ERROR_SUCCESS);
 	DeleteObject(hBmp);
 
 	/* Test normal params */
 	SetLastError(ERROR_SUCCESS);
-	TEST((hBmp = NtGdiCreateBitmap(5, 7, 2, 4, NULL)) != NULL);
-	TEST(GetLastError() == ERROR_SUCCESS);
-	ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP));
-	TEST(bitmap.bmType == 0);
-	TEST(bitmap.bmWidth == 5);
-	TEST(bitmap.bmHeight == 7);
-	TEST(bitmap.bmWidthBytes == 6);
-	TEST(bitmap.bmPlanes == 1);
-	TEST(bitmap.bmBitsPixel == 8);
+	ok((hBmp = NtGdiCreateBitmap(5, 7, 2, 4, NULL)) != NULL, "hBmp was NULL.\n");
+	ok_long(GetLastError(), ERROR_SUCCESS);
+	ok_int(GetObject(hBmp, sizeof(BITMAP), &bitmap), (int)sizeof(BITMAP));
+	ok_int(bitmap.bmType, 0);
+	ok_int(bitmap.bmWidth, 5);
+	ok_int(bitmap.bmHeight, 7);
+	ok_int(bitmap.bmWidthBytes, 6);
+	ok_int(bitmap.bmPlanes, 1);
+	ok_int(bitmap.bmBitsPixel, 8);
 	DeleteObject(hBmp);
 
 
 	/* Test height 0 params */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(1, 0, 1, 1, NULL) == NULL);
-	TEST(GetLastError() == ERROR_INVALID_PARAMETER);
+	ok_ptr(NtGdiCreateBitmap(1, 0, 1, 1, NULL), NULL);
+	ok_long(GetLastError(), ERROR_INVALID_PARAMETER);
 
 	/* Test height -1 params */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(1, -1, 1, 1, NULL) == NULL);
-	TEST(GetLastError() == ERROR_INVALID_PARAMETER);
+	ok_ptr(NtGdiCreateBitmap(1, -1, 1, 1, NULL), NULL);
+	ok_long(GetLastError(), ERROR_INVALID_PARAMETER);
 
 	/* Test witdth 0 params */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(0, 1, 1, 1, NULL) == NULL);
-	TEST(GetLastError() == ERROR_INVALID_PARAMETER);
+	ok_ptr(NtGdiCreateBitmap(0, 1, 1, 1, NULL), NULL);
+	ok_long(GetLastError(), ERROR_INVALID_PARAMETER);
 
 	/* Test witdth -1 params */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(-1, 0, 1, 1, NULL) == NULL);
-	TEST(GetLastError() == ERROR_INVALID_PARAMETER);
-
+	ok_ptr(NtGdiCreateBitmap(-1, 0, 1, 1, NULL), NULL);
+	ok_long(GetLastError(), ERROR_INVALID_PARAMETER);
 
     /* Test witdth -1 params */
 	SetLastError(ERROR_SUCCESS);
-	TEST(NtGdiCreateBitmap(0, 0, 1, 1, NULL) == NULL);
-	TEST(GetLastError() == ERROR_INVALID_PARAMETER);
+	ok_ptr(NtGdiCreateBitmap(0, 0, 1, 1, NULL), NULL);
+	ok_long(GetLastError(), ERROR_INVALID_PARAMETER);
 }
 
 START_TEST(NtGdiCreateBitmap)