From ef7fb2e034da8db7c35bc22ca30e3816d9c13903 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Tue, 13 Mar 2018 15:52:57 +0900 Subject: [PATCH] utests: using ASSERT_XXX Change-Id: Ib3b039753e6f3400eb22672c1af2a2f12e500ff0 --- utests/src/ut_tdm_backend_capture.cpp | 170 +++++----- utests/src/ut_tdm_backend_display.cpp | 478 +++++++++++++-------------- utests/src/ut_tdm_backend_pp.cpp | 144 ++++----- utests/src/ut_tdm_buffer.cpp | 78 ++--- utests/src/ut_tdm_client.cpp | 528 +++++++++++++++--------------- utests/src/ut_tdm_display.cpp | 190 +++++------ utests/src/ut_tdm_env.cpp | 29 +- utests/src/ut_tdm_event_loop.cpp | 54 ++-- utests/src/ut_tdm_helper.cpp | 106 +++--- utests/src/ut_tdm_layer.cpp | 366 ++++++++++----------- utests/src/ut_tdm_output.cpp | 592 +++++++++++++++++----------------- utests/src/ut_tdm_output_hwc.cpp | 2 +- utests/src/ut_tdm_vblank.cpp | 530 +++++++++++++++--------------- 13 files changed, 1633 insertions(+), 1634 deletions(-) diff --git a/utests/src/ut_tdm_backend_capture.cpp b/utests/src/ut_tdm_backend_capture.cpp index ecbe06b..6482b4b 100644 --- a/utests/src/ut_tdm_backend_capture.cpp +++ b/utests/src/ut_tdm_backend_capture.cpp @@ -84,7 +84,7 @@ void TDMBackendCapture::SetUp(void) TDMBackendDisplay::SetUp(); - ASSERT_TRUE(tdm_display_get_capabilities(dpy, &dpy_capabilities) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_capabilities(dpy, &dpy_capabilities), TDM_ERROR_NONE); has_capture_cap = dpy_capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE; if (!has_capture_cap) @@ -94,7 +94,7 @@ void TDMBackendCapture::SetUp(void) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); } } @@ -107,7 +107,7 @@ void TDMBackendCapture::TearDown(void) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_unset(dpy, outputs[o]) == true); + ASSERT_EQ(ut_tdm_output_unset(dpy, outputs[o]), true); } DestroyBuffers(); @@ -293,13 +293,13 @@ TEST_P(TDMBackendCapture, CaptureDispalyGetAvaiableFormats) const tbm_format *formats = (const tbm_format *)TDM_UT_INVALID_VALUE; int count = TDM_UT_INVALID_VALUE; if (has_capture_cap) { - ASSERT_TRUE(tdm_display_get_capture_available_formats(dpy, &formats, &count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_capture_available_formats(dpy, &formats, &count), TDM_ERROR_NONE); ASSERT_TRUE(formats != NULL && formats != (const tbm_format *)TDM_UT_INVALID_VALUE); ASSERT_TRUE(count > 0 && count != TDM_UT_INVALID_VALUE); } else { - ASSERT_TRUE(tdm_display_get_capture_available_formats(dpy, &formats, &count) == TDM_ERROR_NO_CAPABILITY); - ASSERT_TRUE(formats == (const tbm_format *)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(count == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_capture_available_formats(dpy, &formats, &count), TDM_ERROR_NO_CAPABILITY); + ASSERT_EQ(formats, (const tbm_format *)TDM_UT_INVALID_VALUE); + ASSERT_EQ(count, TDM_UT_INVALID_VALUE); } } @@ -307,14 +307,14 @@ TEST_P(TDMBackendCapture, CaptureDispalyGetAvaiableFormatsNullObject) { const tbm_format *formats = (const tbm_format *)TDM_UT_INVALID_VALUE; int count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_capture_available_formats(NULL, &formats, &count) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(formats == (const tbm_format *)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(count == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_capture_available_formats(NULL, &formats, &count), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(formats, (const tbm_format *)TDM_UT_INVALID_VALUE); + ASSERT_EQ(count, TDM_UT_INVALID_VALUE); } TEST_P(TDMBackendCapture, CaptureDispalyGetAvaiableFormatsNullOther) { - ASSERT_TRUE(tdm_display_get_capture_available_formats(dpy, NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_display_get_capture_available_formats(dpy, NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBackendCapture, CaptureDispalyGetAvaiableSize) @@ -325,19 +325,19 @@ TEST_P(TDMBackendCapture, CaptureDispalyGetAvaiableSize) int max_h = TDM_UT_INVALID_VALUE; int preferred_align = TDM_UT_INVALID_VALUE; if (has_capture_cap) { - ASSERT_TRUE(tdm_display_get_capture_available_size(dpy, &min_w, &min_h, &max_w, &max_h, &preferred_align) == TDM_ERROR_NONE); - ASSERT_TRUE(min_w != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(min_h != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_w != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_h != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(preferred_align != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_capture_available_size(dpy, &min_w, &min_h, &max_w, &max_h, &preferred_align), TDM_ERROR_NONE); + ASSERT_NE(min_w, TDM_UT_INVALID_VALUE); + ASSERT_NE(min_h, TDM_UT_INVALID_VALUE); + ASSERT_NE(max_w, TDM_UT_INVALID_VALUE); + ASSERT_NE(max_h, TDM_UT_INVALID_VALUE); + ASSERT_NE(preferred_align, TDM_UT_INVALID_VALUE); } else { - ASSERT_TRUE(tdm_display_get_capture_available_size(dpy, &min_w, &min_h, &max_w, &max_h, &preferred_align) == TDM_ERROR_NO_CAPABILITY); - ASSERT_TRUE(min_w == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(min_h == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_w == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_h == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(preferred_align == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_capture_available_size(dpy, &min_w, &min_h, &max_w, &max_h, &preferred_align), TDM_ERROR_NO_CAPABILITY); + ASSERT_EQ(min_w, TDM_UT_INVALID_VALUE); + ASSERT_EQ(min_h, TDM_UT_INVALID_VALUE); + ASSERT_EQ(max_w, TDM_UT_INVALID_VALUE); + ASSERT_EQ(max_h, TDM_UT_INVALID_VALUE); + ASSERT_EQ(preferred_align, TDM_UT_INVALID_VALUE); } } @@ -348,27 +348,27 @@ TEST_P(TDMBackendCapture, CaptureDispalyGetAvaiableSizeNullObject) int max_w = TDM_UT_INVALID_VALUE; int max_h = TDM_UT_INVALID_VALUE; int preferred_align = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_capture_available_size(NULL, &min_w, &min_h, &max_w, &max_h, &preferred_align) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(min_w == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(min_h == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_w == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_h == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(preferred_align == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_capture_available_size(NULL, &min_w, &min_h, &max_w, &max_h, &preferred_align), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(min_w, TDM_UT_INVALID_VALUE); + ASSERT_EQ(min_h, TDM_UT_INVALID_VALUE); + ASSERT_EQ(max_w, TDM_UT_INVALID_VALUE); + ASSERT_EQ(max_h, TDM_UT_INVALID_VALUE); + ASSERT_EQ(preferred_align, TDM_UT_INVALID_VALUE); } TEST_P(TDMBackendCapture, CaptureDispalyGetAvaiableSizeNullOther) { if (has_capture_cap) - ASSERT_TRUE(tdm_display_get_capture_available_size(dpy, NULL, NULL, NULL, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_capture_available_size(dpy, NULL, NULL, NULL, NULL, NULL), TDM_ERROR_NONE); else - ASSERT_TRUE(tdm_display_get_capture_available_size(dpy, NULL, NULL, NULL, NULL, NULL) == TDM_ERROR_NO_CAPABILITY); + ASSERT_EQ(tdm_display_get_capture_available_size(dpy, NULL, NULL, NULL, NULL, NULL), TDM_ERROR_NO_CAPABILITY); } TEST_P(TDMBackendCapture, CaptureDestroy) { TDM_UT_SKIP_FLAG(has_capture_cap); - ASSERT_TRUE(TestPrepareDefault() == true); + ASSERT_EQ(TestPrepareDefault(), true); TestDone(); } @@ -391,16 +391,16 @@ TEST_P(TDMBackendCapture, CaptureSetInfoNullObject) tdm_info_capture info; memset(&info, 0, sizeof info); - ASSERT_TRUE(tdm_capture_set_info(NULL, &info) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_capture_set_info(NULL, &info), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBackendCapture, CaptureSetInfoNullOther) { TDM_UT_SKIP_FLAG(has_capture_cap); - ASSERT_TRUE(TestPrepareDefault() == true); + ASSERT_EQ(TestPrepareDefault(), true); - ASSERT_TRUE(tdm_capture_set_info(capture, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_capture_set_info(capture, NULL), TDM_ERROR_INVALID_PARAMETER); TestDone(); } @@ -417,9 +417,9 @@ TEST_P(TDMBackendCapture, CaptureSetDoneHandler) { TDM_UT_SKIP_FLAG(has_capture_cap); - ASSERT_TRUE(TestPrepareDefault() == true); + ASSERT_EQ(TestPrepareDefault(), true); - ASSERT_TRUE(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb, NULL), TDM_ERROR_NONE); TestDone(); } @@ -428,16 +428,16 @@ TEST_P(TDMBackendCapture, CaptureSetDoneHandlerNullObject) { TDM_UT_SKIP_FLAG(has_capture_cap); - ASSERT_TRUE(tdm_capture_set_done_handler(NULL, _ut_tdm_capture_done_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_capture_set_done_handler(NULL, _ut_tdm_capture_done_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBackendCapture, CaptureSetDoneHandlerNullOther) { TDM_UT_SKIP_FLAG(has_capture_cap); - ASSERT_TRUE(TestPrepareDefault() == true); + ASSERT_EQ(TestPrepareDefault(), true); - ASSERT_TRUE(tdm_capture_set_done_handler(capture, NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_capture_set_done_handler(capture, NULL, NULL), TDM_ERROR_INVALID_PARAMETER); TestDone(); } @@ -455,11 +455,11 @@ TEST_P(TDMBackendCapture, CaptureAttach) if (!FindFormat(test_formats[f])) continue; - ASSERT_TRUE(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], - TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1) == true); + ASSERT_EQ(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], + TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); for (int b = 0; b < 3; b++) - ASSERT_TRUE(tdm_capture_attach(capture, buffers[b]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_attach(capture, buffers[b]), TDM_ERROR_NONE); TestDone(); } @@ -472,16 +472,16 @@ TEST_P(TDMBackendCapture, CaptureAttachNullObject) tbm_surface_h buffer = (tbm_surface_h)TDM_UT_BUFFER_SIZE; - ASSERT_TRUE(tdm_capture_attach(NULL, buffer) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_capture_attach(NULL, buffer), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBackendCapture, CaptureAttachNullOther) { TDM_UT_SKIP_FLAG(has_capture_cap); - ASSERT_TRUE(TestPrepareDefault() == true); + ASSERT_EQ(TestPrepareDefault(), true); - ASSERT_TRUE(tdm_capture_attach(capture, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_capture_attach(capture, NULL), TDM_ERROR_INVALID_PARAMETER); TestDone(); } @@ -490,9 +490,9 @@ TEST_P(TDMBackendCapture, CaptureCommit) { TDM_UT_SKIP_FLAG(has_capture_cap); - ASSERT_TRUE(TestPrepareDefault() == true); + ASSERT_EQ(TestPrepareDefault(), true); - ASSERT_TRUE(tdm_capture_commit(capture) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_commit(capture), TDM_ERROR_NONE); TestDone(); } @@ -501,20 +501,20 @@ TEST_P(TDMBackendCapture, CaptureCommitNullOBject) { TDM_UT_SKIP_FLAG(has_capture_cap); - ASSERT_TRUE(tdm_capture_commit(NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_capture_commit(NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBackendCapture, CaptureCommitDpmsOff) { TDM_UT_SKIP_FLAG(has_capture_cap); - ASSERT_TRUE(TestPrepareDefault() == true); + ASSERT_EQ(TestPrepareDefault(), true); - ASSERT_TRUE(ut_tdm_output_unset(dpy, output) == true); + ASSERT_EQ(ut_tdm_output_unset(dpy, output), true); - ASSERT_TRUE(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_capture_commit(capture) == TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(tdm_capture_commit(capture), TDM_ERROR_BAD_REQUEST); TestDone(); } @@ -531,7 +531,7 @@ TEST_P(TDMBackendCapture, CaptureNoScaleNoTransformNoCSC) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_get_mode(outputs[o], &mode) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(outputs[o], &mode), TDM_ERROR_NONE); for (int f = 0; f < TEST_FORMAT_CNT; f++) { char temp[256]; @@ -540,18 +540,18 @@ TEST_P(TDMBackendCapture, CaptureNoScaleNoTransformNoCSC) if (!FindFormat(test_formats[f])) continue; - ASSERT_TRUE(TestPrepare(o, mode->hdisplay, mode->vdisplay, test_formats[f], - TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1) == true); + ASSERT_EQ(TestPrepare(o, mode->hdisplay, mode->vdisplay, test_formats[f], + TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); - ASSERT_TRUE(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb, &done), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) { done = false; - ASSERT_TRUE(tdm_capture_attach(capture, buffers[b]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_capture_commit(capture) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_attach(capture, buffers[b]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_commit(capture), TDM_ERROR_NONE); while (!done) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); DumpBuffers(b, temp); } @@ -573,7 +573,7 @@ TEST_P(TDMBackendCapture, CaptureScaleTransformCSC) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_get_mode(outputs[o], &mode) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(outputs[o], &mode), TDM_ERROR_NONE); for (int f = 0; f < TEST_FORMAT_CNT; f++) { char temp[256]; @@ -582,18 +582,18 @@ TEST_P(TDMBackendCapture, CaptureScaleTransformCSC) if (!FindFormat(test_formats[f])) continue; - ASSERT_TRUE(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], - TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1) == true); + ASSERT_EQ(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], + TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); - ASSERT_TRUE(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb, &done), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) { done = false; - ASSERT_TRUE(tdm_capture_attach(capture, buffers[b]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_capture_commit(capture) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_attach(capture, buffers[b]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_commit(capture), TDM_ERROR_NONE); while (!done) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); DumpBuffers(b, temp); } @@ -623,7 +623,7 @@ TEST_P(TDMBackendCapture, CaptureAttachFewTimesInOneCommit) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_get_mode(outputs[o], &mode) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(outputs[o], &mode), TDM_ERROR_NONE); char temp[256]; snprintf(temp, sizeof temp, "%c%c%c%c", FOURCC_STR(test_formats[f])); @@ -631,19 +631,19 @@ TEST_P(TDMBackendCapture, CaptureAttachFewTimesInOneCommit) if (!FindFormat(test_formats[f])) continue; - ASSERT_TRUE(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], - TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1) == true); + ASSERT_EQ(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], + TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); - ASSERT_TRUE(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb2, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb2, &done), TDM_ERROR_NONE); done = 0; for (int b = 0; b < 3; b++) - ASSERT_TRUE(tdm_capture_attach(capture, buffers[b]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_attach(capture, buffers[b]), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_capture_commit(capture) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_commit(capture), TDM_ERROR_NONE); while (done != 3) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) DumpBuffers(b, temp); @@ -663,18 +663,18 @@ TEST_P(TDMBackendCapture, CaptureDestroyWithoutCommit) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_get_mode(outputs[o], &mode) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(outputs[o], &mode), TDM_ERROR_NONE); if (!FindFormat(test_formats[f])) continue; - ASSERT_TRUE(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], - TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1) == true); + ASSERT_EQ(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], + TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); - ASSERT_TRUE(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb2, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb2, NULL), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) - ASSERT_TRUE(tdm_capture_attach(capture, buffers[b]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_attach(capture, buffers[b]), TDM_ERROR_NONE); tdm_capture_destroy(capture); capture = NULL; @@ -694,20 +694,20 @@ TEST_P(TDMBackendCapture, CaptureDestroyBeforeDone) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_get_mode(outputs[o], &mode) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(outputs[o], &mode), TDM_ERROR_NONE); if (!FindFormat(test_formats[f])) continue; - ASSERT_TRUE(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], - TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1) == true); + ASSERT_EQ(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], + TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); - ASSERT_TRUE(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb2, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb2, NULL), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) - ASSERT_TRUE(tdm_capture_attach(capture, buffers[b]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_attach(capture, buffers[b]), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_capture_commit(capture) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_capture_commit(capture), TDM_ERROR_NONE); tdm_capture_destroy(capture); capture = NULL; diff --git a/utests/src/ut_tdm_backend_display.cpp b/utests/src/ut_tdm_backend_display.cpp index a01c804..1d94fb9 100644 --- a/utests/src/ut_tdm_backend_display.cpp +++ b/utests/src/ut_tdm_backend_display.cpp @@ -51,21 +51,21 @@ void TDMBackendBasic::SetUp(void) TDMBackendEnv::SetUp(); dpy = tdm_display_init(&ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(dpy != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(dpy, NULL); - ASSERT_TRUE(tdm_display_get_output_count(dpy, &output_count) == TDM_ERROR_NONE); - ASSERT_TRUE(output_count >= 0); + ASSERT_EQ(tdm_display_get_output_count(dpy, &output_count), TDM_ERROR_NONE); + ASSERT_GE(output_count, 0); if (output_count > 0) { outputs = (tdm_output**)calloc(output_count, sizeof (tdm_output*)); - ASSERT_TRUE(outputs != NULL); + ASSERT_NE(outputs, NULL); for (int o = 0; o < output_count; o++) { tdm_error ret; tdm_output *output = tdm_display_get_output(dpy, o, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); outputs[o] = output; } } @@ -77,17 +77,17 @@ void TDMBackendBasic::SetUp(void) if (ut_tdm_output_is_hwc_enable(outputs[o])) continue; - ASSERT_TRUE(tdm_output_get_layer_count(outputs[o], &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count > 0); + ASSERT_EQ(tdm_output_get_layer_count(outputs[o], &count), TDM_ERROR_NONE); + ASSERT_GT(count, 0); layer_count += count; layers = (tdm_layer**)realloc((void*)layers, sizeof(tdm_layer*) * layer_count); - ASSERT_TRUE(layers != NULL); + ASSERT_NE(layers, NULL); for (int l = 0; l < count; l++) { tdm_layer *layer = tdm_output_get_layer(outputs[o], l, &ret); - ASSERT_TRUE(layer != NULL); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_NE(layer, NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); layers[old_layer_count + l] = layer; } } @@ -108,7 +108,7 @@ void TDMBackendBasic::TearDown(void) DestroyBuffers(); - ASSERT_TRUE(tbm_bufmgr_debug_get_ref_count() == 0); + ASSERT_EQ(tbm_bufmgr_debug_get_ref_count(), 0); TDMBackendEnv::TearDown(); } @@ -127,12 +127,12 @@ TEST_P(TDMBackendBasic, VerifyOutputObject) tdm_error ret; int output_count = 0; - ASSERT_TRUE(tdm_display_get_output_count(dpy, &output_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_output_count(dpy, &output_count), TDM_ERROR_NONE); TDM_UT_ASSERT_TRUE(output_count > 0, "output count(%d) should be greater than 0. Check display_get_outputs()."); for (int o = 0; o < output_count; o++) { tdm_output *output = tdm_display_get_output(dpy, o, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); TDM_UT_ASSERT_TRUE(output != NULL, "no output. (output: %d). Check display_get_outputs().", o); } } @@ -142,14 +142,14 @@ TEST_P(TDMBackendBasic, VerifyLayerObject) tdm_error ret; int output_count = 0; - ASSERT_TRUE(tdm_display_get_output_count(dpy, &output_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_output_count(dpy, &output_count), TDM_ERROR_NONE); for (int o = 0; o < output_count; o++) { tdm_output *output = tdm_display_get_output(dpy, o, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); int layer_count = 0; - ASSERT_TRUE(tdm_output_get_layer_count(output, &layer_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_layer_count(output, &layer_count), TDM_ERROR_NONE); TDM_UT_ASSERT_TRUE(layer_count > 0, "layer count(%d) should be greater than 0. (output: %d). Check output_get_layers().", layer_count, o); @@ -166,15 +166,15 @@ TEST_P(TDMBackendBasic, VerifyOutputGetProperty) tdm_error ret; int output_count = 0; - ASSERT_TRUE(tdm_display_get_output_count(dpy, &output_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_output_count(dpy, &output_count), TDM_ERROR_NONE); for (int o = 0; o < output_count; o++) { tdm_output *output = tdm_display_get_output(dpy, o, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); const tdm_prop *props = NULL; int prop_count = 0; - ASSERT_TRUE(tdm_output_get_available_properties(output, &props, &prop_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_available_properties(output, &props, &prop_count), TDM_ERROR_NONE); if (prop_count > 0) TDM_UT_ASSERT_TRUE(props != NULL, "no props. (output: %d). Check output_get_capability(), tdm_caps_output.", o); @@ -182,7 +182,7 @@ TEST_P(TDMBackendBasic, VerifyOutputGetProperty) for (int p = 0; p < prop_count; p++) { tdm_value value; value.s32 = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_property(output, props[p].id, &value) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_property(output, props[p].id, &value), TDM_ERROR_NONE); TDM_UT_ASSERT_TRUE(value.s32 != TDM_UT_INVALID_VALUE, "Getting a prop failed. (output: %d, prop_id: %d). Check output_get_property().", o, props[p].id); @@ -195,22 +195,22 @@ TEST_P(TDMBackendBasic, VerifyLayerGetProperty) tdm_error ret; int output_count = 0; - ASSERT_TRUE(tdm_display_get_output_count(dpy, &output_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_output_count(dpy, &output_count), TDM_ERROR_NONE); for (int o = 0; o < output_count; o++) { tdm_output *output = tdm_display_get_output(dpy, o, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); int layer_count = 0; - ASSERT_TRUE(tdm_output_get_layer_count(output, &layer_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_layer_count(output, &layer_count), TDM_ERROR_NONE); for (int l = 0; l < layer_count; l++) { tdm_layer *layer = tdm_output_get_layer(output, l, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); const tdm_prop *props = NULL; int prop_count = 0; - ASSERT_TRUE(tdm_layer_get_available_properties(layer, &props, &prop_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_get_available_properties(layer, &props, &prop_count), TDM_ERROR_NONE); if (prop_count > 0) TDM_UT_ASSERT_TRUE(props != NULL, "no props. (output: %d, layer: %d). Check output_get_capability(), tdm_caps_output.", o, l); @@ -218,7 +218,7 @@ TEST_P(TDMBackendBasic, VerifyLayerGetProperty) for (int p = 0; p < prop_count; p++) { tdm_value value; value.s32 = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_get_property(layer, props[p].id, &value) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_get_property(layer, props[p].id, &value), TDM_ERROR_NONE); TDM_UT_ASSERT_TRUE(value.s32 != TDM_UT_INVALID_VALUE, "Getting a prop failed. (output: %d, layer: %d, prop_id: %d). Check output_get_property().", o, l, props[p].id); @@ -239,7 +239,7 @@ TEST_P(TDMBackendBasic, VerifyOutputSetMode) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_get_available_modes(outputs[o], &modes, &count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_available_modes(outputs[o], &modes, &count), TDM_ERROR_NONE); TDM_UT_ASSERT_TRUE(count > 0, "mode's count should be greater than 0. Check output_get_capability(), tdm_caps_output."); TDM_UT_ASSERT_TRUE(modes != NULL, "mode's count should be greater than 0. Check output_get_capability(), tdm_caps_output."); @@ -251,10 +251,10 @@ TEST_P(TDMBackendBasic, VerifyOutputSetMode) } if (!set_mode && best) set_mode = best; - ASSERT_TRUE(set_mode != NULL); + ASSERT_NE(set_mode, NULL); - ASSERT_TRUE(tdm_output_set_mode(outputs[o], set_mode) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_mode(outputs[o], &got_mode) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_mode(outputs[o], set_mode), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(outputs[o], &got_mode), TDM_ERROR_NONE); TDM_UT_ASSERT_TRUE(set_mode == got_mode, "The mode which is set and got are different. Check output_set_mode(), output_get_mode()"); } } @@ -273,9 +273,9 @@ TEST_P(TDMBackendBasic, VerifyOutputSetDpms) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_get_available_modes(outputs[o], &modes, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count > 0); - ASSERT_TRUE(modes != NULL); + ASSERT_EQ(tdm_output_get_available_modes(outputs[o], &modes, &count), TDM_ERROR_NONE); + ASSERT_GT(count, 0); + ASSERT_NE(modes, NULL); for (int i = 0; i < count; i++) { if (!best) @@ -286,13 +286,13 @@ TEST_P(TDMBackendBasic, VerifyOutputSetDpms) if (!set_mode && best) set_mode = best; - ASSERT_TRUE(set_mode != NULL); - ASSERT_TRUE(tdm_output_set_mode(outputs[o], set_mode) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_mode(outputs[o], &got_mode) == TDM_ERROR_NONE); - ASSERT_TRUE(set_mode == got_mode); + ASSERT_NE(set_mode, NULL); + ASSERT_EQ(tdm_output_set_mode(outputs[o], set_mode), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(outputs[o], &got_mode), TDM_ERROR_NONE); + ASSERT_EQ(set_mode, got_mode); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], set_dpms) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_dpms(outputs[o], &got_dpms) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], set_dpms), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_dpms(outputs[o], &got_dpms), TDM_ERROR_NONE); TDM_UT_ASSERT_TRUE(set_dpms == got_dpms, "The dpms value which is set and got are different. Check output_set_dpms(), output_get_dpms()"); } } @@ -305,23 +305,23 @@ TEST_P(TDMBackendBasic, VerifyPrimaryLayerShowOneFrame) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_mode_setting(outputs[o]) == true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_output_mode_setting(outputs[o]), true); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); layer = ut_tdm_output_get_primary_layer(outputs[o]); - ASSERT_TRUE(layer != NULL); + ASSERT_NE(layer, NULL); retry: - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layer, buffers, 1, true) == true); - ASSERT_TRUE(ut_tdm_layer_set_buffer(layer, buffers[0]) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layer, buffers, 1, true), true); + ASSERT_EQ(ut_tdm_layer_set_buffer(layer, buffers[0]), true); DestroyBuffers(); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); TDM_UT_ASK_YNR("* Successed to display a frame to a primary layer? (output: %d)", o); - ASSERT_TRUE(tdm_layer_unset_buffer(layer) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layer), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); } } @@ -335,19 +335,19 @@ TEST_P(TDMBackendBasic, VerifyPrimaryLayerShowManyFrames) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_mode_setting(outputs[o]) == true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_output_mode_setting(outputs[o]), true); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); layer = ut_tdm_output_get_primary_layer(outputs[o]); - ASSERT_TRUE(layer != NULL); + ASSERT_NE(layer, NULL); retry: - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layer, buffers, 3, true) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layer, buffers, 3, true), true); /* set buffer & commit for TDM_UT_BACKEND_TEST_CNT times */ for (int t = 0; t < TDM_UT_BACKEND_TEST_CNT; t++) { - ASSERT_TRUE(ut_tdm_layer_set_buffer(layer, buffers[next_buffer]) == true); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_layer_set_buffer(layer, buffers[next_buffer]), true); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); usleep(40000); /* 40 ms */ next_buffer++; if (next_buffer == 3) @@ -358,8 +358,8 @@ retry: TDM_UT_ASK_YNR("* Successed to display many frames to a primary layer? (output: %d)", o); - ASSERT_TRUE(tdm_layer_unset_buffer(layer) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layer), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); } } @@ -381,15 +381,15 @@ TEST_P(TDMBackendBasic, VerifyPrimaryLayerShowOneFrameWithCommitHandler) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_mode_setting(outputs[o]) == true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_output_mode_setting(outputs[o]), true); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); layer = ut_tdm_output_get_primary_layer(outputs[o]); - ASSERT_TRUE(layer != NULL); + ASSERT_NE(layer, NULL); retry: - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layer, buffers, 1, true) == true); - ASSERT_TRUE(ut_tdm_layer_set_buffer(layer, buffers[0]) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layer, buffers, 1, true), true); + ASSERT_EQ(ut_tdm_layer_set_buffer(layer, buffers[0]), true); DestroyBuffers(); bool done = false; @@ -401,8 +401,8 @@ retry: TDM_UT_ASK_YNR("* Successed to display a frame to a primary layer? (output: %d)", o); - ASSERT_TRUE(tdm_layer_unset_buffer(layer) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layer), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); } } @@ -414,17 +414,17 @@ TEST_P(TDMBackendBasic, VerifyOverlayLayersShowOneFrame) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_mode_setting(outputs[o]) == true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_output_mode_setting(outputs[o]), true); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); layer = ut_tdm_output_get_primary_layer(outputs[o]); - ASSERT_TRUE(layer != NULL); + ASSERT_NE(layer, NULL); - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layer, buffers, 1, false) == true); - ASSERT_TRUE(ut_tdm_layer_set_buffer(layer, buffers[0]) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layer, buffers, 1, false), true); + ASSERT_EQ(ut_tdm_layer_set_buffer(layer, buffers[0]), true); DestroyBuffers(); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); usleep(40000); /* 40 ms */ retry: @@ -433,23 +433,23 @@ retry: if (tdm_layer_get_output(layers[l], &ret) != outputs[o]) continue; - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); if (ut_tdm_layer_is_primary_layer(layers[l])) continue; if (ut_tdm_layer_is_cursor_layer(layers[l])) continue; - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layers[l], buffers, 1, true) == true); - ASSERT_TRUE(ut_tdm_layer_set_buffer(layers[l], buffers[0]) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layers[l], buffers, 1, true), true); + ASSERT_EQ(ut_tdm_layer_set_buffer(layers[l], buffers[0]), true); DestroyBuffers(); } - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); TDM_UT_ASK_YNR("* Successed to display frames to all overlay layers? (output: %d)", o); for (int l = 0; l < layer_count; l++) - ASSERT_TRUE(tdm_layer_unset_buffer(layers[l]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); } } @@ -461,17 +461,17 @@ TEST_P(TDMBackendBasic, VerifyOverlayLayersShowManyFrames) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_mode_setting(outputs[o]) == true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_output_mode_setting(outputs[o]), true); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); layer = ut_tdm_output_get_primary_layer(outputs[o]); - ASSERT_TRUE(layer != NULL); + ASSERT_NE(layer, NULL); - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layer, buffers, 1, false) == true); - ASSERT_TRUE(ut_tdm_layer_set_buffer(layer, buffers[0]) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layer, buffers, 1, false), true); + ASSERT_EQ(ut_tdm_layer_set_buffer(layer, buffers[0]), true); DestroyBuffers(); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); usleep(40000); /* 40 ms */ for (int l = 0; l < layer_count; l++) { @@ -480,19 +480,19 @@ TEST_P(TDMBackendBasic, VerifyOverlayLayersShowManyFrames) if (tdm_layer_get_output(layers[l], &ret) != outputs[o]) continue; - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); if (ut_tdm_layer_is_primary_layer(layers[l])) continue; if (ut_tdm_layer_is_cursor_layer(layers[l])) continue; retry: - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true); /* set buffer & commit for TDM_UT_BACKEND_TEST_CNT times */ for (int t = 0; t < TDM_UT_BACKEND_TEST_CNT; t++) { - ASSERT_TRUE(ut_tdm_layer_set_buffer(layers[l], buffers[next_buffer]) == true); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_layer_set_buffer(layers[l], buffers[next_buffer]), true); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); usleep(40000); /* 40 ms */ next_buffer++; if (next_buffer == 3) @@ -503,8 +503,8 @@ retry: TDM_UT_ASK_YNR("* Successed to display many frames to a layer? (output: %d, layer: %d)", o, l); - ASSERT_TRUE(tdm_layer_unset_buffer(layers[l]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); usleep(40000); /* 40 ms */ } } @@ -532,17 +532,17 @@ TEST_P(TDMBackendBasic, VerifyOutputWaitVblank) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_mode_setting(outputs[o]) == true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_output_mode_setting(outputs[o]), true); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); layer = ut_tdm_output_get_primary_layer(outputs[o]); - ASSERT_TRUE(layer != NULL); + ASSERT_NE(layer, NULL); - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layer, buffers, 1, true) == true); - ASSERT_TRUE(ut_tdm_layer_set_buffer(layer, buffers[0]) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layer, buffers, 1, true), true); + ASSERT_EQ(ut_tdm_layer_set_buffer(layer, buffers[0]), true); DestroyBuffers(); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); /* start from 1 */ for (int t = 1; t < 10; t++) { @@ -582,17 +582,17 @@ TEST_P(TDMBackendBasic, VerifyOutputWaitVblankInterval) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_mode_setting(outputs[o]) == true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_output_mode_setting(outputs[o]), true); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); layer = ut_tdm_output_get_primary_layer(outputs[o]); - ASSERT_TRUE(layer != NULL); + ASSERT_NE(layer, NULL); - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layer, buffers, 1, true) == true); - ASSERT_TRUE(ut_tdm_layer_set_buffer(layer, buffers[0]) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layer, buffers, 1, true), true); + ASSERT_EQ(ut_tdm_layer_set_buffer(layer, buffers[0]), true); DestroyBuffers(); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); /* start from 1 */ for (int t = 1; t < 10; t++) { @@ -603,9 +603,9 @@ TEST_P(TDMBackendBasic, VerifyOutputWaitVblankInterval) done = false; start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_backend_output_done_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_backend_output_done_cb, &done), TDM_ERROR_NONE); while (!done) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ interval" consider the delay of socket communication between kernel and platform */ @@ -629,17 +629,17 @@ TEST_P(TDMBackendBasic, VerifyOutputWaitVblankFewTimesInOneVblank) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_mode_setting(outputs[o]) == true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_output_mode_setting(outputs[o]), true); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); layer = ut_tdm_output_get_primary_layer(outputs[o]); - ASSERT_TRUE(layer != NULL); + ASSERT_NE(layer, NULL); - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layer, buffers, 1, true) == true); - ASSERT_TRUE(ut_tdm_layer_set_buffer(layer, buffers[0]) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layer, buffers, 1, true), true); + ASSERT_EQ(ut_tdm_layer_set_buffer(layer, buffers[0]), true); DestroyBuffers(); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); /* start from 1 */ for (int t = 1; t < 10; t++) { @@ -649,12 +649,12 @@ TEST_P(TDMBackendBasic, VerifyOutputWaitVblankFewTimesInOneVblank) interval = ut_tdm_output_get_vblank_interval_time(outputs[o]); done1 = done2 = done3 = false; - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_backend_output_done_cb, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_backend_output_done_cb, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_backend_output_done_cb, &done3) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_backend_output_done_cb, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_backend_output_done_cb, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_backend_output_done_cb, &done3), TDM_ERROR_NONE); start = tdm_helper_get_time(); while (!done1 || !done2 || !done3) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ interval" consider the delay of socket communication between kernel and platform */ @@ -714,12 +714,12 @@ TEST_P(TDMBackendBasic, VerifyPPAvaiableSize) int max_w = 0; int max_h = 0; int preferred_align = 0; - ASSERT_TRUE(tdm_display_get_pp_available_size(dpy, &min_w, &min_h, &max_w, &max_h, &preferred_align) == TDM_ERROR_NONE); - ASSERT_TRUE(min_w != 0); - ASSERT_TRUE(min_h != 0); - ASSERT_TRUE(max_w != 0); - ASSERT_TRUE(max_h != 0); - ASSERT_TRUE(preferred_align != 0); + ASSERT_EQ(tdm_display_get_pp_available_size(dpy, &min_w, &min_h, &max_w, &max_h, &preferred_align), TDM_ERROR_NONE); + ASSERT_NE(min_w, 0); + ASSERT_NE(min_h, 0); + ASSERT_NE(max_w, 0); + ASSERT_NE(max_h, 0); + ASSERT_NE(preferred_align, 0); } TEST_P(TDMBackendBasic, VerifyPPAvaiableFormats) @@ -749,7 +749,7 @@ TEST_P(TDMBackendBasic, VerifyCaptureObject) tdm_error ret; unsigned int has_capability = 0; - ASSERT_TRUE(tdm_output_has_capture_capability(outputs[o], &has_capability) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_has_capture_capability(outputs[o], &has_capability), TDM_ERROR_NONE); if (!has_capability) { TDM_UT_INFO("Capture not supported. (output: %d)", o); continue; @@ -778,12 +778,12 @@ TEST_P(TDMBackendBasic, VerifyCaptureAvaiableSize) int max_w = 0; int max_h = 0; int preferred_align = 0; - ASSERT_TRUE(tdm_display_get_capture_available_size(dpy, &min_w, &min_h, &max_w, &max_h, &preferred_align) == TDM_ERROR_NONE); - ASSERT_TRUE(min_w != 0); - ASSERT_TRUE(min_h != 0); - ASSERT_TRUE(max_w != 0); - ASSERT_TRUE(max_h != 0); - ASSERT_TRUE(preferred_align != 0); + ASSERT_EQ(tdm_display_get_capture_available_size(dpy, &min_w, &min_h, &max_w, &max_h, &preferred_align), TDM_ERROR_NONE); + ASSERT_NE(min_w, 0); + ASSERT_NE(min_h, 0); + ASSERT_NE(max_w, 0); + ASSERT_NE(max_h, 0); + ASSERT_NE(preferred_align, 0); } TEST_P(TDMBackendBasic, VerifyCaptureAvaiableFormats) @@ -827,32 +827,32 @@ TEST_P(TDMBackendDisplay, VerifyPirmaryLayerFormat) continue; layer = ut_tdm_output_get_primary_layer(outputs[o]); - ASSERT_TRUE(layer != NULL); + ASSERT_NE(layer, NULL); - ASSERT_TRUE(tdm_layer_get_buffer_flags(layer, &flags) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_get_available_formats(layer, &formats, &format_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_get_buffer_flags(layer, &flags), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_get_available_formats(layer, &formats, &format_count), TDM_ERROR_NONE); for (int f = 0; f < format_count; f++) { - ASSERT_TRUE(ut_tdm_output_mode_setting(outputs[o]) == true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_mode(outputs[o], &mode) == TDM_ERROR_NONE); - ASSERT_TRUE(mode != NULL); + ASSERT_EQ(ut_tdm_output_mode_setting(outputs[o]), true); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(outputs[o], &mode), TDM_ERROR_NONE); + ASSERT_NE(mode, NULL); retry: TDM_UT_INFO("* testing for %c%c%c%c", FOURCC_STR(formats[f])); - ASSERT_TRUE(ut_tdm_buffer_create(mode->hdisplay, mode->vdisplay, formats[f], flags | TBM_BO_SCANOUT, true, 3, buffers) == true); + ASSERT_EQ(ut_tdm_buffer_create(mode->hdisplay, mode->vdisplay, formats[f], flags | TBM_BO_SCANOUT, true, 3, buffers), true); /* set buffer & commit for 60 times */ for (int t = 0; t < 60; t++) { tbm_surface_h displaying_buffer; - ASSERT_TRUE(ut_tdm_layer_set_buffer(layer, buffers[next_buffer]) == true); + ASSERT_EQ(ut_tdm_layer_set_buffer(layer, buffers[next_buffer]), true); done = false; - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_backend_output_commit_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_backend_output_commit_cb, &done), TDM_ERROR_NONE); while (!done) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); displaying_buffer = tdm_layer_get_displaying_buffer(layer, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(displaying_buffer == buffers[next_buffer]); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_EQ(displaying_buffer, buffers[next_buffer]); next_buffer++; if (next_buffer == 3) next_buffer = 0; @@ -867,7 +867,7 @@ retry: TEST_P(TDMBackendDisplay, VerifyOverlayLayerFormat) { - ASSERT_TRUE(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, false) == true); + ASSERT_EQ(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, false), true); for (int l = 0; l < layer_count; l++) { tdm_error ret; @@ -884,7 +884,7 @@ TEST_P(TDMBackendDisplay, VerifyOverlayLayerFormat) layer = layers[l]; output = tdm_layer_get_output(layer, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); if (!ut_tdm_output_is_connected(output)) continue; @@ -893,32 +893,32 @@ TEST_P(TDMBackendDisplay, VerifyOverlayLayerFormat) if (ut_tdm_layer_is_cursor_layer(layer)) continue; - ASSERT_TRUE(tdm_output_get_pipe(output, &pipe) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_pipe(output, &pipe), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_get_buffer_flags(layer, &flags) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_mode(output, &mode) == TDM_ERROR_NONE); - ASSERT_TRUE(mode != NULL); + ASSERT_EQ(tdm_layer_get_buffer_flags(layer, &flags), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(output, &mode), TDM_ERROR_NONE); + ASSERT_NE(mode, NULL); - ASSERT_TRUE(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_get_available_formats(layer, &formats, &format_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_get_available_formats(layer, &formats, &format_count), TDM_ERROR_NONE); for (int f = 0; f < format_count; f++) { retry: TDM_UT_INFO("* testing for %c%c%c%c", FOURCC_STR(formats[f])); - ASSERT_TRUE(ut_tdm_buffer_create(mode->hdisplay, mode->vdisplay, formats[f], flags | TBM_BO_SCANOUT, true, 3, buffers) == true); + ASSERT_EQ(ut_tdm_buffer_create(mode->hdisplay, mode->vdisplay, formats[f], flags | TBM_BO_SCANOUT, true, 3, buffers), true); /* set buffer & commit for TDM_UT_BACKEND_TEST_CNT times */ for (int t = 0; t < TDM_UT_BACKEND_TEST_CNT; t++) { tbm_surface_h displaying_buffer; - ASSERT_TRUE(ut_tdm_layer_set_buffer(layer, buffers[next_buffer]) == true); + ASSERT_EQ(ut_tdm_layer_set_buffer(layer, buffers[next_buffer]), true); done = false; - ASSERT_TRUE(tdm_output_commit(output, 0, _ut_tdm_backend_output_commit_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(output, 0, _ut_tdm_backend_output_commit_cb, &done), TDM_ERROR_NONE); while (!done) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); displaying_buffer = tdm_layer_get_displaying_buffer(layer, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(displaying_buffer == buffers[next_buffer]); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_EQ(displaying_buffer, buffers[next_buffer]); next_buffer++; if (next_buffer == 3) next_buffer = 0; @@ -929,13 +929,13 @@ retry: DestroyBuffers(); } - ASSERT_TRUE(tdm_layer_unset_buffer(layer) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layer), TDM_ERROR_NONE); } } TEST_P(TDMBackendDisplay, VerifyOverlayLayerSize) { - ASSERT_TRUE(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, false) == true); + ASSERT_EQ(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, false), true); for (int l = 0; l < layer_count; l++) { tdm_error ret; @@ -952,7 +952,7 @@ TEST_P(TDMBackendDisplay, VerifyOverlayLayerSize) layer = layers[l]; output = tdm_layer_get_output(layer, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); if (!ut_tdm_output_is_connected(output)) continue; @@ -961,15 +961,15 @@ TEST_P(TDMBackendDisplay, VerifyOverlayLayerSize) if (ut_tdm_layer_is_cursor_layer(layer)) continue; - ASSERT_TRUE(tdm_output_get_pipe(output, &pipe) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_pipe(output, &pipe), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_get_buffer_flags(layer, &flags) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_mode(output, &mode) == TDM_ERROR_NONE); - ASSERT_TRUE(mode != NULL); + ASSERT_EQ(tdm_layer_get_buffer_flags(layer, &flags), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(output, &mode), TDM_ERROR_NONE); + ASSERT_NE(mode, NULL); - ASSERT_TRUE(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_get_available_formats(layer, &formats, &format_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_get_available_formats(layer, &formats, &format_count), TDM_ERROR_NONE); for (int f = 0; f < format_count; f++) { int diffw = mode->hdisplay / (format_count + 2); @@ -978,19 +978,19 @@ TEST_P(TDMBackendDisplay, VerifyOverlayLayerSize) int h = mode->vdisplay - diffh * (f + 1); retry: TDM_UT_INFO("* testing for %c%c%c%c", FOURCC_STR(formats[f])); - ASSERT_TRUE(ut_tdm_buffer_create(w, h, formats[f], flags | TBM_BO_SCANOUT, true, 3, buffers) == true); + ASSERT_EQ(ut_tdm_buffer_create(w, h, formats[f], flags | TBM_BO_SCANOUT, true, 3, buffers), true); /* set buffer & commit for TDM_UT_BACKEND_TEST_CNT times */ for (int t = 0; t < TDM_UT_BACKEND_TEST_CNT; t++) { tbm_surface_h displaying_buffer; - ASSERT_TRUE(ut_tdm_layer_set_buffer(layer, buffers[next_buffer]) == true); + ASSERT_EQ(ut_tdm_layer_set_buffer(layer, buffers[next_buffer]), true); done = false; - ASSERT_TRUE(tdm_output_commit(output, 0, _ut_tdm_backend_output_commit_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(output, 0, _ut_tdm_backend_output_commit_cb, &done), TDM_ERROR_NONE); while (!done) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); displaying_buffer = tdm_layer_get_displaying_buffer(layer, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(displaying_buffer == buffers[next_buffer]); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_EQ(displaying_buffer, buffers[next_buffer]); next_buffer++; if (next_buffer == 3) next_buffer = 0; @@ -1002,13 +1002,13 @@ retry: FOURCC_STR(formats[f]), w, h, pipe, l); } - ASSERT_TRUE(tdm_layer_unset_buffer(layer) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layer), TDM_ERROR_NONE); } } TEST_P(TDMBackendDisplay, VerifyOverlayLayerScale) { - ASSERT_TRUE(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, false) == true); + ASSERT_EQ(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, false), true); for (int l = 0; l < layer_count; l++) { tdm_error ret; @@ -1025,9 +1025,9 @@ TEST_P(TDMBackendDisplay, VerifyOverlayLayerScale) layer = layers[l]; output = tdm_layer_get_output(layer, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_pipe(output, &pipe) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_pipe(output, &pipe), TDM_ERROR_NONE); if (!ut_tdm_output_is_connected(output)) continue; @@ -1040,18 +1040,18 @@ TEST_P(TDMBackendDisplay, VerifyOverlayLayerScale) continue; } - ASSERT_TRUE(tdm_layer_get_buffer_flags(layer, &flags) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_mode(output, &mode) == TDM_ERROR_NONE); - ASSERT_TRUE(mode != NULL); + ASSERT_EQ(tdm_layer_get_buffer_flags(layer, &flags), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(output, &mode), TDM_ERROR_NONE); + ASSERT_NE(mode, NULL); - ASSERT_TRUE(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_get_available_formats(layer, &formats, &format_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_get_available_formats(layer, &formats, &format_count), TDM_ERROR_NONE); for (int f = 0; f < format_count; f++) { retry: TDM_UT_INFO("* testing for %c%c%c%c", FOURCC_STR(formats[f])); - ASSERT_TRUE(ut_tdm_buffer_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], flags | TBM_BO_SCANOUT, true, 3, buffers) == true); + ASSERT_EQ(ut_tdm_buffer_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], flags | TBM_BO_SCANOUT, true, 3, buffers), true); tdm_info_layer info; memset(&info, 0, sizeof info); @@ -1067,19 +1067,19 @@ retry: info.dst_pos.w = mode->hdisplay; info.dst_pos.h = mode->vdisplay; info.transform = TDM_TRANSFORM_NORMAL; - ASSERT_TRUE(tdm_layer_set_info(layer, &info) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_info(layer, &info), TDM_ERROR_NONE); /* set buffer & commit for TDM_UT_BACKEND_TEST_CNT times */ for (int t = 0; t < TDM_UT_BACKEND_TEST_CNT; t++) { tbm_surface_h displaying_buffer; - ASSERT_TRUE(tdm_layer_set_buffer(layer, buffers[next_buffer]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layer, buffers[next_buffer]), TDM_ERROR_NONE); done = false; - ASSERT_TRUE(tdm_output_commit(output, 0, _ut_tdm_backend_output_commit_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(output, 0, _ut_tdm_backend_output_commit_cb, &done), TDM_ERROR_NONE); while (!done) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); displaying_buffer = tdm_layer_get_displaying_buffer(layer, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(displaying_buffer == buffers[next_buffer]); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_EQ(displaying_buffer, buffers[next_buffer]); next_buffer++; if (next_buffer == 3) next_buffer = 0; @@ -1091,13 +1091,13 @@ retry: FOURCC_STR(formats[f]), TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, pipe, l); } - ASSERT_TRUE(tdm_layer_unset_buffer(layer) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layer), TDM_ERROR_NONE); } } TEST_P(TDMBackendDisplay, VerifyOverlayLayerMovePosition) { - ASSERT_TRUE(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, false) == true); + ASSERT_EQ(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, false), true); for (int l = 0; l < layer_count; l++) { tdm_error ret; @@ -1114,7 +1114,7 @@ TEST_P(TDMBackendDisplay, VerifyOverlayLayerMovePosition) layer = layers[l]; output = tdm_layer_get_output(layer, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); if (!ut_tdm_output_is_connected(output)) continue; @@ -1123,20 +1123,20 @@ TEST_P(TDMBackendDisplay, VerifyOverlayLayerMovePosition) if (ut_tdm_layer_is_cursor_layer(layer)) continue; - ASSERT_TRUE(tdm_output_get_pipe(output, &pipe) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_pipe(output, &pipe), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_get_buffer_flags(layer, &flags) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_mode(output, &mode) == TDM_ERROR_NONE); - ASSERT_TRUE(mode != NULL); + ASSERT_EQ(tdm_layer_get_buffer_flags(layer, &flags), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(output, &mode), TDM_ERROR_NONE); + ASSERT_NE(mode, NULL); - ASSERT_TRUE(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_get_available_formats(layer, &formats, &format_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_get_available_formats(layer, &formats, &format_count), TDM_ERROR_NONE); for (int f = 0; f < format_count; f++) { retry: TDM_UT_INFO("* testing for %c%c%c%c", FOURCC_STR(formats[f])); - ASSERT_TRUE(ut_tdm_buffer_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], flags | TBM_BO_SCANOUT, true, 3, buffers) == true); + ASSERT_EQ(ut_tdm_buffer_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], flags | TBM_BO_SCANOUT, true, 3, buffers), true); /* set buffer & commit for TDM_UT_BACKEND_TEST_CNT times */ for (int t = 0; t < TDM_UT_BACKEND_TEST_CNT; t++) { @@ -1156,16 +1156,16 @@ retry: info.dst_pos.w = TDM_UT_BUFFER_SIZE; info.dst_pos.h = TDM_UT_BUFFER_SIZE; info.transform = TDM_TRANSFORM_NORMAL; - ASSERT_TRUE(tdm_layer_set_info(layer, &info) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_info(layer, &info), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_set_buffer(layer, buffers[next_buffer]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layer, buffers[next_buffer]), TDM_ERROR_NONE); done = false; - ASSERT_TRUE(tdm_output_commit(output, 0, _ut_tdm_backend_output_commit_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(output, 0, _ut_tdm_backend_output_commit_cb, &done), TDM_ERROR_NONE); while (!done) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); displaying_buffer = tdm_layer_get_displaying_buffer(layer, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(displaying_buffer == buffers[next_buffer]); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_EQ(displaying_buffer, buffers[next_buffer]); next_buffer++; if (next_buffer == 3) next_buffer = 0; @@ -1177,13 +1177,13 @@ retry: FOURCC_STR(formats[f]), TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, pipe, l); } - ASSERT_TRUE(tdm_layer_unset_buffer(layer) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layer), TDM_ERROR_NONE); } } TEST_P(TDMBackendDisplay, VerifyOverlayLayerCrop) { - ASSERT_TRUE(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, false) == true); + ASSERT_EQ(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, false), true); for (int l = 0; l < layer_count; l++) { tdm_error ret; @@ -1200,9 +1200,9 @@ TEST_P(TDMBackendDisplay, VerifyOverlayLayerCrop) layer = layers[l]; output = tdm_layer_get_output(layer, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_pipe(output, &pipe) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_pipe(output, &pipe), TDM_ERROR_NONE); if (!ut_tdm_output_is_connected(output)) continue; @@ -1215,18 +1215,18 @@ TEST_P(TDMBackendDisplay, VerifyOverlayLayerCrop) continue; } - ASSERT_TRUE(tdm_layer_get_buffer_flags(layer, &flags) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_mode(output, &mode) == TDM_ERROR_NONE); - ASSERT_TRUE(mode != NULL); + ASSERT_EQ(tdm_layer_get_buffer_flags(layer, &flags), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(output, &mode), TDM_ERROR_NONE); + ASSERT_NE(mode, NULL); - ASSERT_TRUE(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_get_available_formats(layer, &formats, &format_count) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_get_available_formats(layer, &formats, &format_count), TDM_ERROR_NONE); for (int f = 0; f < format_count; f++) { retry: TDM_UT_INFO("* testing for %c%c%c%c", FOURCC_STR(formats[f])); - ASSERT_TRUE(ut_tdm_buffer_create(mode->hdisplay, mode->vdisplay, formats[f], flags | TBM_BO_SCANOUT, true, 3, buffers) == true); + ASSERT_EQ(ut_tdm_buffer_create(mode->hdisplay, mode->vdisplay, formats[f], flags | TBM_BO_SCANOUT, true, 3, buffers), true); tdm_info_layer info; memset(&info, 0, sizeof info); @@ -1242,19 +1242,19 @@ retry: info.dst_pos.w = info.src_config.pos.w; info.dst_pos.h = info.src_config.pos.h; info.transform = TDM_TRANSFORM_NORMAL; - ASSERT_TRUE(tdm_layer_set_info(layer, &info) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_info(layer, &info), TDM_ERROR_NONE); /* set buffer & commit for TDM_UT_BACKEND_TEST_CNT times */ for (int t = 0; t < TDM_UT_BACKEND_TEST_CNT; t++) { tbm_surface_h displaying_buffer; - ASSERT_TRUE(tdm_layer_set_buffer(layer, buffers[next_buffer]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layer, buffers[next_buffer]), TDM_ERROR_NONE); done = false; - ASSERT_TRUE(tdm_output_commit(output, 0, _ut_tdm_backend_output_commit_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(output, 0, _ut_tdm_backend_output_commit_cb, &done), TDM_ERROR_NONE); while (!done) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); displaying_buffer = tdm_layer_get_displaying_buffer(layer, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(displaying_buffer == buffers[next_buffer]); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_EQ(displaying_buffer, buffers[next_buffer]); next_buffer++; if (next_buffer == 3) next_buffer = 0; @@ -1266,34 +1266,34 @@ retry: FOURCC_STR(formats[f]), pipe, l); } - ASSERT_TRUE(tdm_layer_unset_buffer(layer) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layer), TDM_ERROR_NONE); } } /* should be debugged int emulator kernel */ TEST_P(TDMBackendDisplay, DISABLED_VerifyOutputSetDpmsFromOnToOff) { - ASSERT_TRUE(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, true) == true); + ASSERT_EQ(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, true), true); for (int o = 0; o < output_count; o++) { if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); } } /* should be debugged int emulator kernel */ TEST_P(TDMBackendDisplay, DISABLED_VerifyOutputSetDpmsFromOffToOn) { - ASSERT_TRUE(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, true) == true); + ASSERT_EQ(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, true), true); for (int o = 0; o < output_count; o++) { if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); } } @@ -1304,8 +1304,8 @@ TEST_P(TDMBackendDisplay, DISABLED_VerifyOutputSetDpmsToOnBeforeSet) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_mode_setting(outputs[o]) == true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_output_mode_setting(outputs[o]), true); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); } } @@ -1316,8 +1316,8 @@ TEST_P(TDMBackendDisplay, DISABLED_VerifyOutputSetDpmsToOffBeforeSet) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_mode_setting(outputs[o]) == true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_output_mode_setting(outputs[o]), true); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); } } @@ -1328,14 +1328,14 @@ TEST_P(TDMBackendDisplay, DISABLED_VerifyOutputSetDpmsToOffAfterUnsetWithoutComm if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); tdm_layer *layer = ut_tdm_output_get_primary_layer(outputs[o]); - ASSERT_TRUE(layer != NULL); + ASSERT_NE(layer, NULL); - ASSERT_TRUE(tdm_layer_unset_buffer(layer) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layer), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); } } @@ -1346,15 +1346,15 @@ TEST_P(TDMBackendDisplay, DISABLED_VerifyOutputSetDpmsToOffAfterUnsetWithCommit) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); tdm_layer *layer = ut_tdm_output_get_primary_layer(outputs[o]); - ASSERT_TRUE(layer != NULL); + ASSERT_NE(layer, NULL); - ASSERT_TRUE(tdm_layer_unset_buffer(layer) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layer), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); } } @@ -1364,7 +1364,7 @@ TEST_P(TDMBackendDisplay, DISABLED_VerifyOutputSetDpmsAsync) TEST_P(TDMBackendDisplay, VerifyLayerGetInfo) { - ASSERT_TRUE(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, true) == true); + ASSERT_EQ(ut_tdm_output_prepare_all_output(dpy, outputs, output_count, true), true); for (int o = 0; o < output_count; o++) { if (!ut_tdm_output_is_connected(outputs[o])) @@ -1372,10 +1372,10 @@ TEST_P(TDMBackendDisplay, VerifyLayerGetInfo) tdm_info_layer info, temp; tdm_layer *layer = ut_tdm_output_get_primary_layer(outputs[o]); - ASSERT_TRUE(layer != NULL); - ASSERT_TRUE(ut_tdm_layer_fill_info(layer, -1, -1, 0, &info) == true); - ASSERT_TRUE(tdm_layer_get_info(layer, &temp) == TDM_ERROR_NONE); - ASSERT_TRUE(memcmp(&info, &temp, sizeof info) == 0); + ASSERT_NE(layer, NULL); + ASSERT_EQ(ut_tdm_layer_fill_info(layer, -1, -1, 0, &info), true); + ASSERT_EQ(tdm_layer_get_info(layer, &temp), TDM_ERROR_NONE); + ASSERT_EQ(memcmp(&info, &temp, sizeof info), 0); } } diff --git a/utests/src/ut_tdm_backend_pp.cpp b/utests/src/ut_tdm_backend_pp.cpp index dcc7fb7..d1c798c 100644 --- a/utests/src/ut_tdm_backend_pp.cpp +++ b/utests/src/ut_tdm_backend_pp.cpp @@ -76,12 +76,12 @@ void TDMBackendPP::SetUp(void) { TDMBackendDisplay::SetUp(); - ASSERT_TRUE(tdm_display_get_pp_capabilities(dpy, &capabilities) == TDM_ERROR_NONE); - ASSERT_TRUE(capabilities > 0); - ASSERT_TRUE(tdm_display_get_pp_available_formats(dpy, &formats, &format_count) == TDM_ERROR_NONE); - ASSERT_TRUE(formats != NULL); - ASSERT_TRUE(format_count > 0); - ASSERT_TRUE(tdm_display_get_pp_available_size(dpy, &min_w, &min_h, &max_w, &max_h, &preferred_align) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_pp_capabilities(dpy, &capabilities), TDM_ERROR_NONE); + ASSERT_GT(capabilities, 0); + ASSERT_EQ(tdm_display_get_pp_available_formats(dpy, &formats, &format_count), TDM_ERROR_NONE); + ASSERT_NE(formats, NULL); + ASSERT_GT(format_count, 0); + ASSERT_EQ(tdm_display_get_pp_available_size(dpy, &min_w, &min_h, &max_w, &max_h, &preferred_align), TDM_ERROR_NONE); ASSERT_TRUE(min_w == -1 || min_w > 0); ASSERT_TRUE(min_h == -1 || min_h > 0); ASSERT_TRUE(max_w == -1 || max_w > 0); @@ -216,18 +216,18 @@ TEST_P(TDMBackendPP, PPDispalyGetAvaiableFormatsNullObject) const tbm_format *formats = (const tbm_format *)TDM_UT_INVALID_VALUE; int count = TDM_UT_INVALID_VALUE; if (ut_tdm_display_has_pp_capability(dpy)) - ASSERT_TRUE(tdm_display_get_pp_available_formats(NULL, &formats, &count) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_display_get_pp_available_formats(NULL, &formats, &count), TDM_ERROR_INVALID_PARAMETER); else - ASSERT_TRUE(tdm_display_get_pp_available_formats(NULL, &formats, &count) == TDM_ERROR_NO_CAPABILITY); - ASSERT_TRUE(formats == (const tbm_format *)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(count == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_pp_available_formats(NULL, &formats, &count), TDM_ERROR_NO_CAPABILITY); + ASSERT_EQ(formats, (const tbm_format *)TDM_UT_INVALID_VALUE); + ASSERT_EQ(count, TDM_UT_INVALID_VALUE); } TEST_P(TDMBackendPP, PPDispalyGetAvaiableFormatsNullOther) { if (ut_tdm_display_has_pp_capability(dpy)) { - ASSERT_TRUE(PreparePP() == true); - ASSERT_TRUE(tdm_display_get_pp_available_formats(pp, NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(PreparePP(), true); + ASSERT_EQ(tdm_display_get_pp_available_formats(pp, NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } } @@ -239,21 +239,21 @@ TEST_P(TDMBackendPP, PPDispalyGetAvaiableSizeNullObject) int max_h = TDM_UT_INVALID_VALUE; int preferred_align = TDM_UT_INVALID_VALUE; if (ut_tdm_display_has_pp_capability(dpy)) - ASSERT_TRUE(tdm_display_get_pp_available_size(NULL, &min_w, &min_h, &max_w, &max_h, &preferred_align) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_display_get_pp_available_size(NULL, &min_w, &min_h, &max_w, &max_h, &preferred_align), TDM_ERROR_INVALID_PARAMETER); else - ASSERT_TRUE(tdm_display_get_pp_available_size(NULL, &min_w, &min_h, &max_w, &max_h, &preferred_align) == TDM_ERROR_NO_CAPABILITY); - ASSERT_TRUE(min_w == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(min_h == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_w == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_h == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(preferred_align == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_pp_available_size(NULL, &min_w, &min_h, &max_w, &max_h, &preferred_align), TDM_ERROR_NO_CAPABILITY); + ASSERT_EQ(min_w, TDM_UT_INVALID_VALUE); + ASSERT_EQ(min_h, TDM_UT_INVALID_VALUE); + ASSERT_EQ(max_w, TDM_UT_INVALID_VALUE); + ASSERT_EQ(max_h, TDM_UT_INVALID_VALUE); + ASSERT_EQ(preferred_align, TDM_UT_INVALID_VALUE); } TEST_P(TDMBackendPP, PPDispalyGetAvaiableSizeNullOther) { if (ut_tdm_display_has_pp_capability(dpy)) { - ASSERT_TRUE(PreparePP() == true); - ASSERT_TRUE(tdm_display_get_pp_available_size(pp, NULL, NULL, NULL, NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(PreparePP(), true); + ASSERT_EQ(tdm_display_get_pp_available_size(pp, NULL, NULL, NULL, NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } } @@ -261,7 +261,7 @@ TEST_P(TDMBackendPP, PPDestroy) { TDM_UT_SKIP_FLAG(ut_tdm_display_has_pp_capability(dpy)); - ASSERT_TRUE(PreparePP() == true); + ASSERT_EQ(PreparePP(), true); tdm_pp_destroy(pp); pp = NULL; } @@ -284,15 +284,15 @@ TEST_P(TDMBackendPP, PPSetInfoNullObject) tdm_info_pp info; memset(&info, 0, sizeof info); - ASSERT_TRUE(tdm_pp_set_info(NULL, &info) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_pp_set_info(NULL, &info), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBackendPP, PPSetInfoNullOther) { TDM_UT_SKIP_FLAG(ut_tdm_display_has_pp_capability(dpy)); - ASSERT_TRUE(PreparePP() == true); - ASSERT_TRUE(tdm_pp_set_info(pp, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(PreparePP(), true); + ASSERT_EQ(tdm_pp_set_info(pp, NULL), TDM_ERROR_INVALID_PARAMETER); } static void @@ -307,38 +307,38 @@ TEST_P(TDMBackendPP, PPSetDoneHandler) { TDM_UT_SKIP_FLAG(ut_tdm_display_has_pp_capability(dpy)); - ASSERT_TRUE(PreparePP() == true); - ASSERT_TRUE(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(PreparePP(), true); + ASSERT_EQ(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb, NULL), TDM_ERROR_NONE); } TEST_P(TDMBackendPP, PPSetDoneHandlerNullObject) { TDM_UT_SKIP_FLAG(ut_tdm_display_has_pp_capability(dpy)); - ASSERT_TRUE(tdm_pp_set_done_handler(NULL, _ut_tdm_pp_done_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_pp_set_done_handler(NULL, _ut_tdm_pp_done_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBackendPP, PPSetDoneHandlerNullOther) { TDM_UT_SKIP_FLAG(ut_tdm_display_has_pp_capability(dpy)); - ASSERT_TRUE(PreparePP() == true); - ASSERT_TRUE(tdm_pp_set_done_handler(pp, NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(PreparePP(), true); + ASSERT_EQ(tdm_pp_set_done_handler(pp, NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBackendPP, PPAttach) { TDM_UT_SKIP_FLAG(ut_tdm_display_has_pp_capability(dpy)); - ASSERT_TRUE(PreparePP() == true); + ASSERT_EQ(PreparePP(), true); for (int f = 0; f < format_count; f++) { - ASSERT_TRUE(PrepareBuffers(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], + ASSERT_EQ(PrepareBuffers(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], - TDM_TRANSFORM_NORMAL) == true); + TDM_TRANSFORM_NORMAL), true); for (int b = 0; b < 3; b++) - ASSERT_TRUE(tdm_pp_attach(pp, srcbuf[b], dstbuf[b]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_attach(pp, srcbuf[b], dstbuf[b]), TDM_ERROR_NONE); DestroyBuffers(); } @@ -351,32 +351,32 @@ TEST_P(TDMBackendPP, PPAttachNullObject) tbm_surface_h srcbuf = (tbm_surface_h)TDM_UT_BUFFER_SIZE; tbm_surface_h dstbuf = (tbm_surface_h)TDM_UT_BUFFER_SIZE; - ASSERT_TRUE(tdm_pp_attach(NULL, srcbuf, dstbuf) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_pp_attach(NULL, srcbuf, dstbuf), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBackendPP, PPAttachNullOther) { TDM_UT_SKIP_FLAG(ut_tdm_display_has_pp_capability(dpy)); - ASSERT_TRUE(PreparePP() == true); + ASSERT_EQ(PreparePP(), true); - ASSERT_TRUE(tdm_pp_attach(pp, NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_pp_attach(pp, NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBackendPP, PPCommit) { TDM_UT_SKIP_FLAG(ut_tdm_display_has_pp_capability(dpy)); - ASSERT_TRUE(PreparePP() == true); + ASSERT_EQ(PreparePP(), true); - ASSERT_TRUE(tdm_pp_commit(pp) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_commit(pp), TDM_ERROR_NONE); } TEST_P(TDMBackendPP, PPCommitNullOBject) { TDM_UT_SKIP_FLAG(ut_tdm_display_has_pp_capability(dpy)); - ASSERT_TRUE(tdm_pp_commit(NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_pp_commit(NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBackendPP, PPNoScaleNoTransformNoCSC) @@ -389,22 +389,22 @@ TEST_P(TDMBackendPP, PPNoScaleNoTransformNoCSC) TDM_INFO("---- format(%c%c%c%c)", FOURCC_STR(formats[0])); - ASSERT_TRUE(PreparePP() == true); + ASSERT_EQ(PreparePP(), true); - ASSERT_TRUE(PrepareBuffers(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE / 2, formats[0], + ASSERT_EQ(PrepareBuffers(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE / 2, formats[0], TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE / 2, formats[0], - TDM_TRANSFORM_NORMAL) == true); + TDM_TRANSFORM_NORMAL), true); - ASSERT_TRUE(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb, &done), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) { done = false; - ASSERT_TRUE(tdm_pp_attach(pp, srcbuf[b], dstbuf[b]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_pp_commit(pp) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_attach(pp, srcbuf[b], dstbuf[b]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_commit(pp), TDM_ERROR_NONE); while (!done) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); DumpBuffers(b, temp); } @@ -417,7 +417,7 @@ TEST_P(TDMBackendPP, PPScaleTransformCSC) { TDM_UT_SKIP_FLAG(ut_tdm_display_has_pp_capability(dpy)); - ASSERT_TRUE(PreparePP() == true); + ASSERT_EQ(PreparePP(), true); bool done; tbm_format format1, format2; @@ -430,20 +430,20 @@ TEST_P(TDMBackendPP, PPScaleTransformCSC) TDM_INFO("format(%c%c%c%c) ------> format(%c%c%c%c)", FOURCC_STR(format1), FOURCC_STR(format2)); - ASSERT_TRUE(PrepareBuffers(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, format1, + ASSERT_EQ(PrepareBuffers(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, format1, TDM_UT_BUFFER_SIZE * 2, TDM_UT_BUFFER_SIZE * 2, format2, - TDM_TRANSFORM_NORMAL) == true); + TDM_TRANSFORM_NORMAL), true); - ASSERT_TRUE(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb, &done), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) { done = false; - ASSERT_TRUE(tdm_pp_attach(pp, srcbuf[b], dstbuf[b]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_pp_commit(pp) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_attach(pp, srcbuf[b], dstbuf[b]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_commit(pp), TDM_ERROR_NONE); while (!done) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); DumpBuffers(b, NULL); } @@ -464,25 +464,25 @@ TEST_P(TDMBackendPP, DISABLED_PPAttachFewTimesInOneCommit) { TDM_UT_SKIP_FLAG(ut_tdm_display_has_pp_capability(dpy)); - ASSERT_TRUE(PreparePP() == true); + ASSERT_EQ(PreparePP(), true); int done = 0; int f = 0; char temp[256]; snprintf(temp, sizeof temp, "%c%c%c%c", FOURCC_STR(formats[f])); - ASSERT_TRUE(PrepareBuffers(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], + ASSERT_EQ(PrepareBuffers(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], - TDM_TRANSFORM_NORMAL) == true); + TDM_TRANSFORM_NORMAL), true); - ASSERT_TRUE(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb2, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb2, &done), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) - ASSERT_TRUE(tdm_pp_attach(pp, srcbuf[b], dstbuf[b]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_attach(pp, srcbuf[b], dstbuf[b]), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_pp_commit(pp) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_commit(pp), TDM_ERROR_NONE); while (done != 3) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) DumpBuffers(b, temp); @@ -494,17 +494,17 @@ TEST_P(TDMBackendPP, PPDestroyWithoutCommit) { TDM_UT_SKIP_FLAG(ut_tdm_display_has_pp_capability(dpy)); - ASSERT_TRUE(PreparePP() == true); + ASSERT_EQ(PreparePP(), true); int f = 0; - ASSERT_TRUE(PrepareBuffers(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], + ASSERT_EQ(PrepareBuffers(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], - TDM_TRANSFORM_NORMAL) == true); + TDM_TRANSFORM_NORMAL), true); - ASSERT_TRUE(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb2, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb2, NULL), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) - ASSERT_TRUE(tdm_pp_attach(pp, srcbuf[b], dstbuf[b]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_attach(pp, srcbuf[b], dstbuf[b]), TDM_ERROR_NONE); tdm_pp_destroy(pp); pp = NULL; @@ -516,19 +516,19 @@ TEST_P(TDMBackendPP, PPDestroyBeforeDone) { TDM_UT_SKIP_FLAG(ut_tdm_display_has_pp_capability(dpy)); - ASSERT_TRUE(PreparePP() == true); + ASSERT_EQ(PreparePP(), true); int f = 0; - ASSERT_TRUE(PrepareBuffers(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], + ASSERT_EQ(PrepareBuffers(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], - TDM_TRANSFORM_NORMAL) == true); + TDM_TRANSFORM_NORMAL), true); - ASSERT_TRUE(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb2, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb2, NULL), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) - ASSERT_TRUE(tdm_pp_attach(pp, srcbuf[b], dstbuf[b]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_attach(pp, srcbuf[b], dstbuf[b]), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_pp_commit(pp) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_pp_commit(pp), TDM_ERROR_NONE); tdm_pp_destroy(pp); pp = NULL; diff --git a/utests/src/ut_tdm_buffer.cpp b/utests/src/ut_tdm_buffer.cpp index 97fcf31..c2df7ee 100644 --- a/utests/src/ut_tdm_buffer.cpp +++ b/utests/src/ut_tdm_buffer.cpp @@ -48,7 +48,7 @@ void TDMBuffer::SetUp(void) TDMDisplay::SetUp(); buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); } void TDMBuffer::TearDown(void) @@ -89,13 +89,13 @@ failed: TEST_P(TDMBuffer, BufferRefBackend) { - ASSERT_TRUE(tdm_buffer_ref_backend(buffer) == buffer); + ASSERT_EQ(tdm_buffer_ref_backend(buffer), buffer); tdm_buffer_unref_backend(buffer); } TEST_P(TDMBuffer, BufferRefBackendNullOBject) { - ASSERT_TRUE(tdm_buffer_ref_backend(NULL) == NULL); + ASSERT_EQ(tdm_buffer_ref_backend(NULL), NULL); } TEST_P(TDMBuffer, BufferUnrefBackend) @@ -119,46 +119,46 @@ _ut_tdm_buffer_destroy_cb(tbm_surface_h buffer, void *user_data) TEST_P(TDMBuffer, BufferAddDestroyHandler) { bool done = false; - ASSERT_TRUE(tdm_buffer_add_destroy_handler(buffer, _ut_tdm_buffer_destroy_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_buffer_add_destroy_handler(buffer, _ut_tdm_buffer_destroy_cb, &done), TDM_ERROR_NONE); tbm_surface_destroy(buffer); buffer = NULL; - ASSERT_TRUE(done == true); + ASSERT_EQ(done, true); } TEST_P(TDMBuffer, BufferAddDestroyHandlerTwice) { - ASSERT_TRUE(tdm_buffer_add_destroy_handler(buffer, _ut_tdm_buffer_destroy_cb, NULL) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_buffer_add_destroy_handler(buffer, _ut_tdm_buffer_destroy_cb, NULL) == TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(tdm_buffer_add_destroy_handler(buffer, _ut_tdm_buffer_destroy_cb, NULL), TDM_ERROR_NONE); + ASSERT_EQ(tdm_buffer_add_destroy_handler(buffer, _ut_tdm_buffer_destroy_cb, NULL), TDM_ERROR_BAD_REQUEST); } TEST_P(TDMBuffer, BufferAddDestroyHandlerNullObject) { - ASSERT_TRUE(tdm_buffer_add_destroy_handler(NULL, _ut_tdm_buffer_destroy_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_buffer_add_destroy_handler(NULL, _ut_tdm_buffer_destroy_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBuffer, BufferAddDestroyHandlerNullOther) { - ASSERT_TRUE(tdm_buffer_add_destroy_handler(buffer, NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_buffer_add_destroy_handler(buffer, NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBuffer, BufferRemoveDestroyHandler) { bool done = false; - ASSERT_TRUE(tdm_buffer_add_destroy_handler(buffer, _ut_tdm_buffer_destroy_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_buffer_add_destroy_handler(buffer, _ut_tdm_buffer_destroy_cb, &done), TDM_ERROR_NONE); tdm_buffer_remove_destroy_handler(buffer, _ut_tdm_buffer_destroy_cb, &done); tbm_surface_destroy(buffer); buffer = NULL; - ASSERT_TRUE(done == false); + ASSERT_EQ(done, false); } TEST_P(TDMBuffer, BufferRemoveDestroyHandlerDifferentData) { bool done = false; - ASSERT_TRUE(tdm_buffer_add_destroy_handler(buffer, _ut_tdm_buffer_destroy_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_buffer_add_destroy_handler(buffer, _ut_tdm_buffer_destroy_cb, &done), TDM_ERROR_NONE); tdm_buffer_remove_destroy_handler(buffer, _ut_tdm_buffer_destroy_cb, NULL); tbm_surface_destroy(buffer); buffer = NULL; - ASSERT_TRUE(done == true); + ASSERT_EQ(done, true); } TEST_P(TDMBuffer, BufferRemoveDestroyHandlerNullObject) @@ -182,51 +182,51 @@ _ut_tdm_buffer_release_cb(tbm_surface_h buffer, void *user_data) TEST_P(TDMBuffer, BufferAddReleaseHandler) { bool done = false; - ASSERT_TRUE(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb, &done), TDM_ERROR_NONE); tdm_buffer_ref_backend(buffer); - ASSERT_TRUE(done == false); + ASSERT_EQ(done, false); tdm_buffer_unref_backend(buffer); - ASSERT_TRUE(done == true); + ASSERT_EQ(done, true); } TEST_P(TDMBuffer, BufferAddReleaseHandlerTwice) { - ASSERT_TRUE(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb, NULL) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb, NULL) == TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb, NULL), TDM_ERROR_NONE); + ASSERT_EQ(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb, NULL), TDM_ERROR_BAD_REQUEST); } TEST_P(TDMBuffer, BufferAddReleaseHandlerNullObject) { bool done = false; - ASSERT_TRUE(tdm_buffer_add_release_handler(NULL, _ut_tdm_buffer_release_cb, &done) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(done == false); + ASSERT_EQ(tdm_buffer_add_release_handler(NULL, _ut_tdm_buffer_release_cb, &done), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(done, false); } TEST_P(TDMBuffer, BufferAddReleaseHandlerNullOther) { - ASSERT_TRUE(tdm_buffer_add_release_handler(buffer, NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_buffer_add_release_handler(buffer, NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMBuffer, BufferRemoveReleaseHandler) { bool done = false; - ASSERT_TRUE(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb, &done), TDM_ERROR_NONE); tdm_buffer_ref_backend(buffer); - ASSERT_TRUE(done == false); + ASSERT_EQ(done, false); tdm_buffer_remove_release_handler(buffer, _ut_tdm_buffer_release_cb, &done); tdm_buffer_unref_backend(buffer); - ASSERT_TRUE(done == false); + ASSERT_EQ(done, false); } TEST_P(TDMBuffer, BufferRemoveReleaseHandlerDifferentData) { bool done = false; - ASSERT_TRUE(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb, &done), TDM_ERROR_NONE); tdm_buffer_ref_backend(buffer); - ASSERT_TRUE(done == false); + ASSERT_EQ(done, false); tdm_buffer_remove_release_handler(buffer, _ut_tdm_buffer_release_cb, NULL); tdm_buffer_unref_backend(buffer); - ASSERT_TRUE(done == true); + ASSERT_EQ(done, true); } static void @@ -241,36 +241,36 @@ _ut_tdm_buffer_release_cb2(tbm_surface_h buffer, void *user_data) TEST_P(TDMBuffer, BufferRemoveReleaseHandlerInHandler) { bool done = false; - ASSERT_TRUE(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb2, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb2, &done), TDM_ERROR_NONE); tdm_buffer_ref_backend(buffer); - ASSERT_TRUE(done == false); + ASSERT_EQ(done, false); tdm_buffer_unref_backend(buffer); - ASSERT_TRUE(done == true); + ASSERT_EQ(done, true); done = false; - ASSERT_TRUE(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb2, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb2, &done), TDM_ERROR_NONE); tdm_buffer_ref_backend(buffer); - ASSERT_TRUE(done == false); + ASSERT_EQ(done, false); tdm_buffer_unref_backend(buffer); - ASSERT_TRUE(done == true); + ASSERT_EQ(done, true); done = false; - ASSERT_TRUE(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb2, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb2, &done), TDM_ERROR_NONE); tdm_buffer_ref_backend(buffer); - ASSERT_TRUE(done == false); + ASSERT_EQ(done, false); tdm_buffer_unref_backend(buffer); - ASSERT_TRUE(done == true); + ASSERT_EQ(done, true); } TEST_P(TDMBuffer, BufferRemoveReleaseHandlerNullObject) { bool done = false; - ASSERT_TRUE(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_buffer_add_release_handler(buffer, _ut_tdm_buffer_release_cb, &done), TDM_ERROR_NONE); tdm_buffer_ref_backend(buffer); - ASSERT_TRUE(done == false); + ASSERT_EQ(done, false); tdm_buffer_remove_release_handler(NULL, _ut_tdm_buffer_release_cb, &done); tdm_buffer_unref_backend(buffer); - ASSERT_TRUE(done == true); + ASSERT_EQ(done, true); } TEST_P(TDMBuffer, BufferRemoveReleaseHandlerNullOther) diff --git a/utests/src/ut_tdm_client.cpp b/utests/src/ut_tdm_client.cpp index 2fd8db0..3df66c8 100644 --- a/utests/src/ut_tdm_client.cpp +++ b/utests/src/ut_tdm_client.cpp @@ -94,7 +94,7 @@ void TDMClient::ServerFork(void) return; server_pid = _ut_tdm_client_server_fork(pipe_parent, pipe_child); - ASSERT_TRUE(server_pid > 0); + ASSERT_GT(server_pid, 0); } void TDMClient::ServerKill(void) @@ -138,7 +138,7 @@ void TDMClient::SetUp(void) void TDMClient::TearDown(void) { - ASSERT_TRUE(_ut_tdm_pipe_write_msg(pipe_child[1], pipe_parent[0], TDM_UT_PIPE_MSG_DPMS_ON) == true); + ASSERT_EQ(_ut_tdm_pipe_write_msg(pipe_child[1], pipe_parent[0], TDM_UT_PIPE_MSG_DPMS_ON), true); if (vblank) tdm_client_vblank_destroy(vblank); @@ -370,14 +370,14 @@ TEST_P(TDMClient, ClientCreate) tdm_error ret; client = tdm_client_create(&ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(client != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(client, NULL); } TEST_P(TDMClient, ClientCreateNullOther) { client = tdm_client_create(NULL); - ASSERT_TRUE(client != NULL); + ASSERT_NE(client, NULL); } TEST_P(TDMClient, ClientDestroy) @@ -385,8 +385,8 @@ TEST_P(TDMClient, ClientDestroy) tdm_error ret; client = tdm_client_create(&ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(client != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(client, NULL); tdm_client_destroy(client); client = NULL; @@ -402,37 +402,37 @@ TEST_P(TDMClient, ClientGetFd) { int fd = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(PrepareClient() == true); + ASSERT_EQ(PrepareClient(), true); - ASSERT_TRUE(tdm_client_get_fd(client, &fd) == TDM_ERROR_NONE); - ASSERT_TRUE(fd >= 0); + ASSERT_EQ(tdm_client_get_fd(client, &fd), TDM_ERROR_NONE); + ASSERT_GE(fd, 0); } TEST_P(TDMClient, ClientGetFdNullObject) { int fd = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_client_get_fd(NULL, &fd) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(fd == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_client_get_fd(NULL, &fd), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(fd, TDM_UT_INVALID_VALUE); } TEST_P(TDMClient, ClientGetFdNullOther) { - ASSERT_TRUE(PrepareClient() == true); + ASSERT_EQ(PrepareClient(), true); - ASSERT_TRUE(tdm_client_get_fd(client, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_get_fd(client, NULL), TDM_ERROR_INVALID_PARAMETER); } /* tdm_client_handle_events_timeout */ TEST_P(TDMClient, DISABLED_ClientHandleEvent) { - ASSERT_TRUE(PrepareClient() == true); + ASSERT_EQ(PrepareClient(), true); -// ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); +// ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); } TEST_P(TDMClient, ClientHandleEventNullObject) { - ASSERT_TRUE(tdm_client_handle_events_timeout(NULL, 3000) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_handle_events_timeout(NULL, 3000), TDM_ERROR_INVALID_PARAMETER); } static void @@ -448,13 +448,13 @@ TEST_P(TDMClient, ClientWaitVblank) { bool done = false; - ASSERT_TRUE(PrepareClient() == true); + ASSERT_EQ(PrepareClient(), true); - ASSERT_TRUE(tdm_client_wait_vblank(client, NULL, 1, 1, 0, _ut_tdm_client_vblank_cb, &done) == TDM_ERROR_NONE); - ASSERT_TRUE(done == false); + ASSERT_EQ(tdm_client_wait_vblank(client, NULL, 1, 1, 0, _ut_tdm_client_vblank_cb, &done), TDM_ERROR_NONE); + ASSERT_EQ(done, false); while (!done) - ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); } /* tdm_client_get_output */ @@ -462,44 +462,44 @@ TEST_P(TDMClient, ClientGetOutput) { tdm_error ret; - ASSERT_TRUE(PrepareClient() == true); + ASSERT_EQ(PrepareClient(), true); output = tdm_client_get_output(client, NULL, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); } TEST_P(TDMClient, ClientGetOutputPrimary) { tdm_error ret; - ASSERT_TRUE(PrepareClient() == true); + ASSERT_EQ(PrepareClient(), true); output = tdm_client_get_output(client, (char*)"primary", &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); } TEST_P(TDMClient, ClientGetOutputDefault) { tdm_error ret; - ASSERT_TRUE(PrepareClient() == true); + ASSERT_EQ(PrepareClient(), true); output = tdm_client_get_output(client, (char*)"default", &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); } TEST_P(TDMClient, ClientGetOutputInvalidName) { tdm_error ret; - ASSERT_TRUE(PrepareClient() == true); + ASSERT_EQ(PrepareClient(), true); output = tdm_client_get_output(client, (char*)"invalid", &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(output == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(output, NULL); } TEST_P(TDMClient, ClientGetOutputNullObject) @@ -507,16 +507,16 @@ TEST_P(TDMClient, ClientGetOutputNullObject) tdm_error ret; output = tdm_client_get_output(NULL, NULL, &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(output == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(output, NULL); } TEST_P(TDMClient, ClientGetOutputNullOther) { - ASSERT_TRUE(PrepareClient() == true); + ASSERT_EQ(PrepareClient(), true); output = tdm_client_get_output(client, NULL, NULL); - ASSERT_TRUE(output != NULL); + ASSERT_NE(output, NULL); } static void @@ -543,48 +543,48 @@ TEST_P(TDMClient, ClientOutputAddChangeHandler) bool done = false; tdm_output_dpms dpms; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); - ASSERT_TRUE(tdm_client_output_add_change_handler(output, _ut_tdm_client_output_change_dpms_cb, &done) == TDM_ERROR_NONE); - ASSERT_TRUE(_ut_tdm_pipe_write_msg(pipe_child[1], pipe_parent[0], TDM_UT_PIPE_MSG_DPMS_OFF) == true); + ASSERT_EQ(tdm_client_output_add_change_handler(output, _ut_tdm_client_output_change_dpms_cb, &done), TDM_ERROR_NONE); + ASSERT_EQ(_ut_tdm_pipe_write_msg(pipe_child[1], pipe_parent[0], TDM_UT_PIPE_MSG_DPMS_OFF), true); while (!done) - ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_client_output_get_dpms(output, &dpms) == TDM_ERROR_NONE); - ASSERT_TRUE(dpms == TDM_OUTPUT_DPMS_OFF); + ASSERT_EQ(tdm_client_output_get_dpms(output, &dpms), TDM_ERROR_NONE); + ASSERT_EQ(dpms, TDM_OUTPUT_DPMS_OFF); } TEST_P(TDMClient, ClientOutputAddChangeHandlerTwice) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); - ASSERT_TRUE(tdm_client_output_add_change_handler(output, _ut_tdm_client_output_change_dpms_cb, NULL) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_client_output_add_change_handler(output, _ut_tdm_client_output_change_dpms_cb, NULL) == TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(tdm_client_output_add_change_handler(output, _ut_tdm_client_output_change_dpms_cb, NULL), TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_output_add_change_handler(output, _ut_tdm_client_output_change_dpms_cb, NULL), TDM_ERROR_BAD_REQUEST); } TEST_P(TDMClient, ClientOutputAddChangeHandlerNullObject) { - ASSERT_TRUE(tdm_client_output_add_change_handler(NULL, _ut_tdm_client_output_change_dpms_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_output_add_change_handler(NULL, _ut_tdm_client_output_change_dpms_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMClient, ClientOutputAddChangeHandlerNullOther) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); - ASSERT_TRUE(tdm_client_output_add_change_handler(output, NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_output_add_change_handler(output, NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } /* tdm_client_output_remove_change_handler */ TEST_P(TDMClient, ClientOutputRemoveChangeHandler) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); - ASSERT_TRUE(tdm_client_output_add_change_handler(output, _ut_tdm_client_output_change_dpms_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_output_add_change_handler(output, _ut_tdm_client_output_change_dpms_cb, NULL), TDM_ERROR_NONE); tdm_client_output_remove_change_handler(output, _ut_tdm_client_output_change_dpms_cb, NULL); } @@ -592,10 +592,10 @@ TEST_P(TDMClient, ClientOutputRemoveChangeHandlerDifferentData) { bool done = (bool)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); - ASSERT_TRUE(tdm_client_output_add_change_handler(output, _ut_tdm_client_output_change_dpms_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_output_add_change_handler(output, _ut_tdm_client_output_change_dpms_cb, &done), TDM_ERROR_NONE); tdm_client_output_remove_change_handler(output, _ut_tdm_client_output_change_dpms_cb, NULL); } @@ -618,15 +618,15 @@ TEST_P(TDMClient, ClientOutputRemoveChangeHandlerInHandler) { tdm_output_dpms dpms = TDM_OUTPUT_DPMS_ON; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); - ASSERT_TRUE(tdm_client_output_add_change_handler(output, _ut_tdm_client_output_change_dpms_cb2, NULL) == TDM_ERROR_NONE); - ASSERT_TRUE(_ut_tdm_pipe_write_msg(pipe_child[1], pipe_parent[0], TDM_UT_PIPE_MSG_DPMS_OFF) == true); - ASSERT_TRUE(tdm_client_output_get_dpms(output, &dpms) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_output_add_change_handler(output, _ut_tdm_client_output_change_dpms_cb2, NULL), TDM_ERROR_NONE); + ASSERT_EQ(_ut_tdm_pipe_write_msg(pipe_child[1], pipe_parent[0], TDM_UT_PIPE_MSG_DPMS_OFF), true); + ASSERT_EQ(tdm_client_output_get_dpms(output, &dpms), TDM_ERROR_NONE); while (dpms != TDM_OUTPUT_DPMS_OFF) { - ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_client_output_get_dpms(output, &dpms) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_output_get_dpms(output, &dpms), TDM_ERROR_NONE); } } @@ -637,8 +637,8 @@ TEST_P(TDMClient, ClientOutputRemoveChangeHandlerNullObject) TEST_P(TDMClient, ClientOutputRemoveChangeHandlerNullOther) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); tdm_client_output_remove_change_handler(output, NULL, NULL); } @@ -648,27 +648,27 @@ TEST_P(TDMClient, ClientOutputGetRefreshRate) { unsigned int refresh = 0; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); - ASSERT_TRUE(tdm_client_output_get_refresh_rate(output, &refresh) == TDM_ERROR_NONE); - ASSERT_TRUE(refresh > 0); + ASSERT_EQ(tdm_client_output_get_refresh_rate(output, &refresh), TDM_ERROR_NONE); + ASSERT_GT(refresh, 0); } TEST_P(TDMClient, ClientOutputGetRefreshRateNullObject) { unsigned int refresh = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_client_output_get_refresh_rate(NULL, &refresh) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(refresh == (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_client_output_get_refresh_rate(NULL, &refresh), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(refresh, (unsigned int)TDM_UT_INVALID_VALUE); } TEST_P(TDMClient, ClientOutputGetRefreshRateNullOther) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); - ASSERT_TRUE(tdm_client_output_get_refresh_rate(output, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_output_get_refresh_rate(output, NULL), TDM_ERROR_INVALID_PARAMETER); } /* tdm_client_output_get_refresh_rate */ @@ -676,27 +676,27 @@ TEST_P(TDMClient, ClientOutputGetConnStatus) { tdm_output_conn_status status = (tdm_output_conn_status)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); - ASSERT_TRUE(tdm_client_output_get_conn_status(output, &status) == TDM_ERROR_NONE); - ASSERT_TRUE(status != (tdm_output_conn_status)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_client_output_get_conn_status(output, &status), TDM_ERROR_NONE); + ASSERT_NE(status, (tdm_output_conn_status)TDM_UT_INVALID_VALUE); } TEST_P(TDMClient, ClientOutputGetConnStatusNullObject) { tdm_output_conn_status status = (tdm_output_conn_status)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_client_output_get_conn_status(NULL, &status) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(status == (tdm_output_conn_status)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_client_output_get_conn_status(NULL, &status), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(status, (tdm_output_conn_status)TDM_UT_INVALID_VALUE); } TEST_P(TDMClient, ClientOutputGetConnStatusNullOther) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); - ASSERT_TRUE(tdm_client_output_get_conn_status(output, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_output_get_conn_status(output, NULL), TDM_ERROR_INVALID_PARAMETER); } /* tdm_client_output_get_dpms */ @@ -704,27 +704,27 @@ TEST_P(TDMClient, ClientOutputGetDpms) { tdm_output_dpms dpms = (tdm_output_dpms)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); - ASSERT_TRUE(tdm_client_output_get_dpms(output, &dpms) == TDM_ERROR_NONE); - ASSERT_TRUE(dpms != (tdm_output_dpms)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_client_output_get_dpms(output, &dpms), TDM_ERROR_NONE); + ASSERT_NE(dpms, (tdm_output_dpms)TDM_UT_INVALID_VALUE); } TEST_P(TDMClient, ClientOutputGetDpmsNullObject) { tdm_output_dpms dpms = (tdm_output_dpms)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_client_output_get_dpms(NULL, &dpms) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(dpms == (tdm_output_dpms)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_client_output_get_dpms(NULL, &dpms), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(dpms, (tdm_output_dpms)TDM_UT_INVALID_VALUE); } TEST_P(TDMClient, ClientOutputGetDpmsNullOther) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); - ASSERT_TRUE(tdm_client_output_get_dpms(output, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_output_get_dpms(output, NULL), TDM_ERROR_INVALID_PARAMETER); } /* tdm_client_output_create_vblank */ @@ -732,12 +732,12 @@ TEST_P(TDMClient, ClientOutputCreateVblank) { tdm_error ret; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); vblank = tdm_client_output_create_vblank(output, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(vblank != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(vblank, NULL); } TEST_P(TDMClient, ClientOutputCreateVblankNullObject) @@ -745,17 +745,17 @@ TEST_P(TDMClient, ClientOutputCreateVblankNullObject) tdm_error ret; vblank = tdm_client_output_create_vblank(NULL, &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(vblank == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(vblank, NULL); } TEST_P(TDMClient, ClientOutputCreateVblankNullOther) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); vblank = tdm_client_output_create_vblank(output, NULL); - ASSERT_TRUE(vblank != NULL); + ASSERT_NE(vblank, NULL); } /* tdm_client_vblank_destroy */ @@ -763,12 +763,12 @@ TEST_P(TDMClient, ClientVblankDestroy) { tdm_error ret; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); vblank = tdm_client_output_create_vblank(output, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(vblank != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(vblank, NULL); tdm_client_vblank_destroy(vblank); vblank = NULL; @@ -782,126 +782,126 @@ TEST_P(TDMClient, ClientVblankDestroyNullObject) /* tdm_client_vblank_set_name */ TEST_P(TDMClient, ClientVblankSetName) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_set_name(vblank, TDM_UT_VBLANK_NAME) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_name(vblank, TDM_UT_VBLANK_NAME), TDM_ERROR_NONE); } TEST_P(TDMClient, ClientVblankSetNameTwice) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_set_name(vblank, TDM_UT_VBLANK_NAME) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_client_vblank_set_name(vblank, TDM_UT_VBLANK_NAME) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_name(vblank, TDM_UT_VBLANK_NAME), TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_name(vblank, TDM_UT_VBLANK_NAME), TDM_ERROR_NONE); } TEST_P(TDMClient, ClientVblankSetNameNullObject) { - ASSERT_TRUE(tdm_client_vblank_set_name(NULL, TDM_UT_VBLANK_NAME) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_vblank_set_name(NULL, TDM_UT_VBLANK_NAME), TDM_ERROR_INVALID_PARAMETER); } /* tdm_client_vblank_set_sync */ TEST_P(TDMClient, ClientVblankSetSync) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_set_sync(vblank, 1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_sync(vblank, 1), TDM_ERROR_NONE); } TEST_P(TDMClient, ClientVblankSetSyncTwice) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_set_sync(vblank, 1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_client_vblank_set_sync(vblank, 1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_sync(vblank, 1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_sync(vblank, 1), TDM_ERROR_NONE); } TEST_P(TDMClient, ClientVblankSetSyncNullObject) { - ASSERT_TRUE(tdm_client_vblank_set_sync(NULL, 1) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_vblank_set_sync(NULL, 1), TDM_ERROR_INVALID_PARAMETER); } /* tdm_client_vblank_set_fps */ TEST_P(TDMClient, ClientVblankSetFps) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_set_fps(vblank, 30) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_fps(vblank, 30), TDM_ERROR_NONE); } TEST_P(TDMClient, ClientVblankSetFpsTwice) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_set_fps(vblank, 30) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_client_vblank_set_fps(vblank, 30) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_fps(vblank, 30), TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_fps(vblank, 30), TDM_ERROR_NONE); } TEST_P(TDMClient, ClientVblankSetFpsNullObject) { - ASSERT_TRUE(tdm_client_vblank_set_fps(NULL, 30) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_vblank_set_fps(NULL, 30), TDM_ERROR_INVALID_PARAMETER); } /* tdm_client_vblank_set_offset */ TEST_P(TDMClient, ClientVblankSetOffset) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_set_offset(vblank, 10) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_offset(vblank, 10), TDM_ERROR_NONE); } TEST_P(TDMClient, ClientVblankSetOffsetTwice) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_set_offset(vblank, 10) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_client_vblank_set_offset(vblank, 10) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_offset(vblank, 10), TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_offset(vblank, 10), TDM_ERROR_NONE); } TEST_P(TDMClient, ClientVblankSetOffsetNullObject) { - ASSERT_TRUE(tdm_client_vblank_set_offset(NULL, 10) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_vblank_set_offset(NULL, 10), TDM_ERROR_INVALID_PARAMETER); } /* tdm_client_vblank_set_enable_fake */ TEST_P(TDMClient, ClientVblankSetEnableFake) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_set_enable_fake(vblank, 1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_enable_fake(vblank, 1), TDM_ERROR_NONE); } TEST_P(TDMClient, ClientVblankSetEnableFakeTwice) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_set_enable_fake(vblank, 1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_client_vblank_set_enable_fake(vblank, 1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_enable_fake(vblank, 1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_enable_fake(vblank, 1), TDM_ERROR_NONE); } TEST_P(TDMClient, ClientVblankSetEnableFakeNullObject) { - ASSERT_TRUE(tdm_client_vblank_set_enable_fake(NULL, 1) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_vblank_set_enable_fake(NULL, 1), TDM_ERROR_INVALID_PARAMETER); } static void @@ -922,75 +922,75 @@ TEST_P(TDMClient, ClientVblankWait) { bool done; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); done = false; - ASSERT_TRUE(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done), TDM_ERROR_NONE); start = tdm_helper_get_time(); while (!done) - ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ vrefresh_interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) < (vrefresh_interval + vrefresh_interval)); + ASSERT_LT((end - start), (vrefresh_interval + vrefresh_interval)); } TEST_P(TDMClient, ClientVblankWaitFewTime) { bool done1, done2, done3; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); done1 = done2 = done3 = false; - ASSERT_TRUE(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done3) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done3), TDM_ERROR_NONE); start = tdm_helper_get_time(); while(!done1 || !done2 || !done3) - ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ vrefresh_interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) < (vrefresh_interval + vrefresh_interval)); + ASSERT_LT((end - start), (vrefresh_interval + vrefresh_interval)); } TEST_P(TDMClient, ClientVblankWaitInterval0) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_wait(vblank, 0, _ut_tdm_client_vblank_cb2, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_vblank_wait(vblank, 0, _ut_tdm_client_vblank_cb2, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMClient, ClientVblankWaitInterval) { bool done; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); /* start from 1 */ for (int t = 1; t < 10; t++) { done = false; - ASSERT_TRUE(tdm_client_vblank_wait(vblank, t, _ut_tdm_client_vblank_cb2, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_wait(vblank, t, _ut_tdm_client_vblank_cb2, &done), TDM_ERROR_NONE); start = tdm_helper_get_time(); while (!done) - ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ vrefresh_interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) > (vrefresh_interval * (t - 1))); - ASSERT_TRUE((end - start) < (vrefresh_interval * t + vrefresh_interval)); + ASSERT_GT((end - start), (vrefresh_interval * (t - 1))); + ASSERT_LT((end - start), (vrefresh_interval * t + vrefresh_interval)); } } @@ -1009,51 +1009,51 @@ _ut_tdm_client_vblank_cb3(tdm_client_vblank *vblank, TEST_P(TDMClient, ClientVblankWaitSeq) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); for (int t = 0; t < 10; t++) { unsigned int cur_seq = 0, temp = 0; - ASSERT_TRUE(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb3, &cur_seq) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb3, &cur_seq), TDM_ERROR_NONE); while (cur_seq == 0) - ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_client_vblank_wait_seq(vblank, cur_seq + 1, _ut_tdm_client_vblank_cb3, &temp) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_wait_seq(vblank, cur_seq + 1, _ut_tdm_client_vblank_cb3, &temp), TDM_ERROR_NONE); while (temp == 0) - ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ vrefresh_interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) < (vrefresh_interval + vrefresh_interval)); + ASSERT_LT((end - start), (vrefresh_interval + vrefresh_interval)); } } TEST_P(TDMClient, ClientVblankWaitSeqInterval) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); /* start from 1 */ for (int t = 1; t < 10; t++) { unsigned int cur_seq = 0, temp = 0; - ASSERT_TRUE(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb3, &cur_seq) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb3, &cur_seq), TDM_ERROR_NONE); while (cur_seq == 0) - ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_client_vblank_wait_seq(vblank, cur_seq + t, _ut_tdm_client_vblank_cb3, &temp) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_wait_seq(vblank, cur_seq + t, _ut_tdm_client_vblank_cb3, &temp), TDM_ERROR_NONE); while (temp == 0) - ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ vrefresh_interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) > (vrefresh_interval * (t - 1))); - ASSERT_TRUE((end - start) < (vrefresh_interval * t + vrefresh_interval)); + ASSERT_GT((end - start), (vrefresh_interval * (t - 1))); + ASSERT_LT((end - start), (vrefresh_interval * t + vrefresh_interval)); } } @@ -1061,32 +1061,32 @@ TEST_P(TDMClient, ClientVblankWaitNullObject) { unsigned int cur_seq = 0; - ASSERT_TRUE(tdm_client_vblank_wait(NULL, 1, _ut_tdm_client_vblank_cb3, &cur_seq) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_vblank_wait(NULL, 1, _ut_tdm_client_vblank_cb3, &cur_seq), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMClient, ClientVblankWaitNullOther) { - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_wait(vblank, 1, NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_client_vblank_wait(vblank, 1, NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMClient, ClientVblankWaitDpmsOff) { tdm_output_dpms dpms = (tdm_output_dpms)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(_ut_tdm_pipe_write_msg(pipe_child[1], pipe_parent[0], TDM_UT_PIPE_MSG_DPMS_OFF) == true); + ASSERT_EQ(_ut_tdm_pipe_write_msg(pipe_child[1], pipe_parent[0], TDM_UT_PIPE_MSG_DPMS_OFF), true); while (dpms != TDM_OUTPUT_DPMS_OFF) - ASSERT_TRUE(tdm_client_output_get_dpms(output, &dpms) == TDM_ERROR_NONE); - ASSERT_TRUE(dpms == TDM_OUTPUT_DPMS_OFF); + ASSERT_EQ(tdm_client_output_get_dpms(output, &dpms), TDM_ERROR_NONE); + ASSERT_EQ(dpms, TDM_OUTPUT_DPMS_OFF); - ASSERT_TRUE(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, NULL) == TDM_ERROR_DPMS_OFF); + ASSERT_EQ(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, NULL), TDM_ERROR_DPMS_OFF); } TEST_P(TDMClient, ClientVblankWaitSetEnableFakeDpmsOff) @@ -1094,44 +1094,44 @@ TEST_P(TDMClient, ClientVblankWaitSetEnableFakeDpmsOff) tdm_output_dpms dpms = (tdm_output_dpms)TDM_UT_INVALID_VALUE; bool done; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(_ut_tdm_pipe_write_msg(pipe_child[1], pipe_parent[0], TDM_UT_PIPE_MSG_DPMS_OFF) == true); + ASSERT_EQ(_ut_tdm_pipe_write_msg(pipe_child[1], pipe_parent[0], TDM_UT_PIPE_MSG_DPMS_OFF), true); while (dpms != TDM_OUTPUT_DPMS_OFF) - ASSERT_TRUE(tdm_client_output_get_dpms(output, &dpms) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_output_get_dpms(output, &dpms), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_client_vblank_set_enable_fake(vblank, 1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_enable_fake(vblank, 1), TDM_ERROR_NONE); done = false; - ASSERT_TRUE(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done), TDM_ERROR_NONE); while (!done) - ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); } TEST_P(TDMClient, ClientVblankWaitSetOffset) { bool done; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_set_offset(vblank, 100) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_offset(vblank, 100), TDM_ERROR_NONE); done = false; - ASSERT_TRUE(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done), TDM_ERROR_NONE); start = tdm_helper_get_time(); while (!done) - ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ vrefresh_interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) > (0.1)); - ASSERT_TRUE((end - start) < (vrefresh_interval + vrefresh_interval + 0.1)); + ASSERT_GT((end - start), (0.1)); + ASSERT_LT((end - start), (vrefresh_interval + vrefresh_interval + 0.1)); } TEST_P(TDMClient, ClientVblankWaitSetFps) @@ -1140,24 +1140,24 @@ TEST_P(TDMClient, ClientVblankWaitSetFps) double interval; unsigned int fps = 10; - ASSERT_TRUE(PrepareClient() == true); - ASSERT_TRUE(PrepareOutput() == true); - ASSERT_TRUE(PrepareVblank() == true); + ASSERT_EQ(PrepareClient(), true); + ASSERT_EQ(PrepareOutput(), true); + ASSERT_EQ(PrepareVblank(), true); - ASSERT_TRUE(tdm_client_vblank_set_fps(vblank, fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_set_fps(vblank, fps), TDM_ERROR_NONE); interval = 1.0 / (double)fps; done = false; - ASSERT_TRUE(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_vblank_wait(vblank, 1, _ut_tdm_client_vblank_cb2, &done), TDM_ERROR_NONE); start = tdm_helper_get_time(); while (!done) - ASSERT_TRUE(tdm_client_handle_events_timeout(client, 3000) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ vrefresh_interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) > (interval - vrefresh_interval)); - ASSERT_TRUE((end - start) < (interval + vrefresh_interval)); + ASSERT_GT((end - start), (interval - vrefresh_interval)); + ASSERT_LT((end - start), (interval + vrefresh_interval)); } #if 0 @@ -1172,16 +1172,16 @@ TEST_P(TDMVblank, VblankWaitEnableDisableGlobalFps) unsigned int global_fps = 5; double start, end, interval; - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks3() == true); - ASSERT_TRUE(vblank_count == 3); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks3(), true); + ASSERT_EQ(vblank_count, 3); - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[0], &fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[0], &fps), TDM_ERROR_NONE); ASSERT_TRUE(fps >= 30 && fps != (unsigned int)TDM_UT_INVALID_VALUE); vrefresh_interval = 1.0 / (double)fps; for (int v = 0; v < 3; v++) - ASSERT_TRUE(tdm_vblank_set_fixed_fps(vblanks[v], 10 * (v + 1)) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_fixed_fps(vblanks[v], 10 * (v + 1)), TDM_ERROR_NONE); /* enable test */ tdm_vblank_enable_global_fps(1, global_fps); @@ -1189,37 +1189,37 @@ TEST_P(TDMVblank, VblankWaitEnableDisableGlobalFps) for (int v = 0; v < 3; v++) { cur_seq[v] = 0; - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq[v]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq[v]), TDM_ERROR_NONE); } start = tdm_helper_get_time(); while (cur_seq[0] == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); - ASSERT_TRUE(cur_seq[1] != 0); - ASSERT_TRUE(cur_seq[2] != 0); + ASSERT_NE(cur_seq[1], 0); + ASSERT_NE(cur_seq[2], 0); /* "+- vrefresh_interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) > (interval - vrefresh_interval)); - ASSERT_TRUE((end - start) < (interval + vrefresh_interval)); + ASSERT_GT((end - start), (interval - vrefresh_interval)); + ASSERT_LT((end - start), (interval + vrefresh_interval)); /* disable test */ tdm_vblank_enable_global_fps(0, 0); for (int v = 0; v < 3; v++) { cur_seq[v] = 0; - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq[v]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq[v]), TDM_ERROR_NONE); } while (cur_seq[0] == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); - ASSERT_TRUE(cur_seq[1] == 0); - ASSERT_TRUE(cur_seq[2] == 0); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); + ASSERT_EQ(cur_seq[1], 0); + ASSERT_EQ(cur_seq[2], 0); while (cur_seq[1] == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); - ASSERT_TRUE(cur_seq[2] == 0); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); + ASSERT_EQ(cur_seq[2], 0); } TEST_P(TDMVblank, VblankWaitIgnoreGlobalFps) @@ -1231,38 +1231,38 @@ TEST_P(TDMVblank, VblankWaitIgnoreGlobalFps) unsigned int global_fps = 5; double start, end, interval; - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks3() == true); - ASSERT_TRUE(vblank_count == 3); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks3(), true); + ASSERT_EQ(vblank_count, 3); - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[0], &fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[0], &fps), TDM_ERROR_NONE); ASSERT_TRUE(fps >= 30 && fps != (unsigned int)TDM_UT_INVALID_VALUE); interval = 1.0 / (double)fps; /* 2nd vblank will ignore the global fps. */ - ASSERT_TRUE(tdm_vblank_ignore_global_fps(vblanks[1], 1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_ignore_global_fps(vblanks[1], 1), TDM_ERROR_NONE); tdm_vblank_enable_global_fps(1, global_fps); for (int v = 0; v < 3; v++) { cur_seq[v] = 0; - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq[v]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq[v]), TDM_ERROR_NONE); } start = tdm_helper_get_time(); while (cur_seq[1] == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); - ASSERT_TRUE(cur_seq[0] == 0); - ASSERT_TRUE(cur_seq[2] == 0); + ASSERT_EQ(cur_seq[0], 0); + ASSERT_EQ(cur_seq[2], 0); /* "+ vrefresh_interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) < (interval + interval)); + ASSERT_LT((end - start), (interval + interval)); while (cur_seq[0] == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); - ASSERT_TRUE(cur_seq[2] != 0); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); + ASSERT_NE(cur_seq[2], 0); } #endif diff --git a/utests/src/ut_tdm_display.cpp b/utests/src/ut_tdm_display.cpp index c1d5043..f6aaf2d 100644 --- a/utests/src/ut_tdm_display.cpp +++ b/utests/src/ut_tdm_display.cpp @@ -47,16 +47,16 @@ void TDMDisplay::SetUp(void) TDMEnv::SetUp(); dpy = tdm_display_init(&ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(dpy != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(dpy, NULL); bufmgr = tbm_bufmgr_init(-1); - ASSERT_TRUE(bufmgr != NULL); + ASSERT_NE(bufmgr, NULL); - ASSERT_TRUE(tdm_display_get_output_count(dpy, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count > 0); + ASSERT_EQ(tdm_display_get_output_count(dpy, &count), TDM_ERROR_NONE); + ASSERT_GT(count, 0); - ASSERT_TRUE(tdm_display_get_capabilities(dpy, &capabilities) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_capabilities(dpy, &capabilities), TDM_ERROR_NONE); has_pp_cap = capabilities & TDM_DISPLAY_CAPABILITY_PP; has_capture_cap = capabilities & TDM_DISPLAY_CAPABILITY_CAPTURE; } @@ -66,7 +66,7 @@ void TDMDisplay::TearDown(void) tbm_bufmgr_deinit(bufmgr); tdm_display_deinit(dpy); - ASSERT_TRUE(tbm_bufmgr_debug_get_ref_count() == 0); + ASSERT_EQ(tbm_bufmgr_debug_get_ref_count(), 0); TDMEnv::TearDown(); } @@ -116,7 +116,7 @@ ut_tdm_display_has_capture_capability(tdm_display *dpy) TEST_P(TDMDisplay, DisplayUpdate) { - ASSERT_TRUE(tdm_display_update(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_update(dpy), TDM_ERROR_NONE); } TEST_P(TDMDisplay, DisplayUpdateWrongDpy) @@ -130,26 +130,26 @@ TEST_P(TDMDisplay, DisplayUpdateWrongDpy) TEST_P(TDMDisplay, DisplayUpdateNullObject) { - ASSERT_TRUE(tdm_display_update(NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_display_update(NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMDisplay, DisplayGetFDSuccesful) { int fd = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_fd(dpy, &fd) == TDM_ERROR_NONE); - ASSERT_TRUE(fd != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_fd(dpy, &fd), TDM_ERROR_NONE); + ASSERT_NE(fd, TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetFDNullObject) { int fd = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_fd(NULL, &fd) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(fd == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_fd(NULL, &fd), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(fd, TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetFDNullFD) { - ASSERT_TRUE(tdm_display_get_fd(dpy, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_display_get_fd(dpy, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMDisplay, DisplayGetFDWrongDpy) @@ -157,15 +157,15 @@ TEST_P(TDMDisplay, DisplayGetFDWrongDpy) tdm_display *wrong_dpy = (tdm_display *)TDM_UT_INVALID_VALUE; int fd = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_fd(wrong_dpy, &fd) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(fd == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_fd(wrong_dpy, &fd), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(fd, TDM_UT_INVALID_VALUE); } /* DISABLED */ TEST_P(TDMDisplay, DISABLED_DisplayHandleEvents) { /* TODO Generate events*/ - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } TEST_P(TDMDisplay, DisplayFlush) @@ -184,11 +184,11 @@ TEST_P(TDMDisplay, DisplayGetBackendInfo) const char *vendor = (const char*)TDM_UT_INVALID_VALUE; int major = TDM_UT_INVALID_VALUE, minor = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_backend_info(dpy, &name, &vendor, &major, &minor) == TDM_ERROR_NONE); - ASSERT_TRUE(name != (const char*)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(vendor != (const char*)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(major != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(minor != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_backend_info(dpy, &name, &vendor, &major, &minor), TDM_ERROR_NONE); + ASSERT_NE(name, (const char*)TDM_UT_INVALID_VALUE); + ASSERT_NE(vendor, (const char*)TDM_UT_INVALID_VALUE); + ASSERT_NE(major, TDM_UT_INVALID_VALUE); + ASSERT_NE(minor, TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetBackendInfoNullObject) @@ -197,35 +197,35 @@ TEST_P(TDMDisplay, DisplayGetBackendInfoNullObject) const char *vendor = (const char*)TDM_UT_INVALID_VALUE; int major = TDM_UT_INVALID_VALUE, minor = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_backend_info(NULL, &name, &vendor, &major, &minor) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(name == (const char*)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(vendor == (const char*)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(major == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(minor == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_backend_info(NULL, &name, &vendor, &major, &minor), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(name, (const char*)TDM_UT_INVALID_VALUE); + ASSERT_EQ(vendor, (const char*)TDM_UT_INVALID_VALUE); + ASSERT_EQ(major, TDM_UT_INVALID_VALUE); + ASSERT_EQ(minor, TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetBackendInfoNullOther) { - ASSERT_TRUE(tdm_display_get_backend_info(dpy, NULL, NULL, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_backend_info(dpy, NULL, NULL, NULL, NULL), TDM_ERROR_NONE); } TEST_P(TDMDisplay, DisplayGetCapabilities) { tdm_display_capability capabilities = (tdm_display_capability)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_capabilities(dpy, &capabilities) == TDM_ERROR_NONE); - ASSERT_TRUE(capabilities != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_capabilities(dpy, &capabilities), TDM_ERROR_NONE); + ASSERT_NE(capabilities, TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetCapabilitiesNullObject) { tdm_display_capability capabilities = (tdm_display_capability)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_capabilities(NULL, &capabilities) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(capabilities == (tdm_display_capability)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_capabilities(NULL, &capabilities), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(capabilities, (tdm_display_capability)TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetCapabilitiesNullOther) { - ASSERT_TRUE(tdm_display_get_capabilities(dpy, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_display_get_capabilities(dpy, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMDisplay, DisplayGetPPCapabilities) @@ -238,19 +238,19 @@ TEST_P(TDMDisplay, DisplayGetPPCapabilities) ASSERT_TRUE(ret == TDM_ERROR_NONE || ret == TDM_ERROR_NO_CAPABILITY); if (ret == TDM_ERROR_NONE) - ASSERT_TRUE(capabilities != TDM_UT_INVALID_VALUE); + ASSERT_NE(capabilities, TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetPPCapabilitiesNullObject) { tdm_pp_capability capabilities = (tdm_pp_capability)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_pp_capabilities(NULL, &capabilities) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(capabilities == (tdm_pp_capability)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_pp_capabilities(NULL, &capabilities), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(capabilities, (tdm_pp_capability)TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetPPCapabilitiesNullOther) { - ASSERT_TRUE(tdm_display_get_pp_capabilities(dpy, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_display_get_pp_capabilities(dpy, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMDisplay, DisplayGetCaptureCapabilities) @@ -265,57 +265,57 @@ TEST_P(TDMDisplay, DisplayGetCaptureCapabilities) ASSERT_TRUE(ret == TDM_ERROR_NONE || ret == TDM_ERROR_NO_CAPABILITY); if (ret == TDM_ERROR_NONE) - ASSERT_TRUE(capabilities != (tdm_capture_capability)TDM_UT_INVALID_VALUE); + ASSERT_NE(capabilities, (tdm_capture_capability)TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetCaptureCapabilitiesNullObject) { tdm_capture_capability capabilities = (tdm_capture_capability)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_capture_capabilities(NULL, &capabilities) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(capabilities == (tdm_capture_capability)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_capture_capabilities(NULL, &capabilities), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(capabilities, (tdm_capture_capability)TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetCaptureCapabilitiesNullOther) { - ASSERT_TRUE(tdm_display_get_capture_capabilities(dpy, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_display_get_capture_capabilities(dpy, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMDisplay, DisplayGetMaxLayerCount) { int max_count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_max_layer_count(dpy, &max_count) == TDM_ERROR_NONE); - ASSERT_TRUE(max_count != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_max_layer_count(dpy, &max_count), TDM_ERROR_NONE); + ASSERT_NE(max_count, TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetMaxLayerCountNullObject) { int max_count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_max_layer_count(NULL, &max_count) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(max_count == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_max_layer_count(NULL, &max_count), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(max_count, TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetMaxLayerCountNullOther) { - ASSERT_TRUE(tdm_display_get_max_layer_count(dpy, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_display_get_max_layer_count(dpy, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMDisplay, DisplayGetOutputCount) { int count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_output_count(dpy, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_output_count(dpy, &count), TDM_ERROR_NONE); + ASSERT_NE(count, TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetOutputCountNullObject) { int count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_output_count(NULL, &count) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(count == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_display_get_output_count(NULL, &count), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(count, TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, DisplayGetOutputCountNullOther) { - ASSERT_TRUE(tdm_display_get_output_count(dpy, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_display_get_output_count(dpy, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMDisplay, DisplayGetOutput) @@ -324,13 +324,13 @@ TEST_P(TDMDisplay, DisplayGetOutput) int o, count = TDM_UT_INVALID_VALUE; tdm_error ret; - ASSERT_TRUE(tdm_display_get_output_count(dpy, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count > 0); + ASSERT_EQ(tdm_display_get_output_count(dpy, &count), TDM_ERROR_NONE); + ASSERT_GT(count, 0); for (o = 0; o < count; o++) { output = tdm_display_get_output(dpy, o, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); } } @@ -339,12 +339,12 @@ TEST_P(TDMDisplay, DisplayGetOutputNullAll) tdm_output *output; int o, count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_output_count(dpy, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count > 0); + ASSERT_EQ(tdm_display_get_output_count(dpy, &count), TDM_ERROR_NONE); + ASSERT_GT(count, 0); for (o = 0; o < count; o++) { output = tdm_display_get_output(NULL, o, NULL); - ASSERT_TRUE(output == NULL); + ASSERT_EQ(output, NULL); } } @@ -354,8 +354,8 @@ TEST_P(TDMDisplay, DisplayGetOutputNullObject) tdm_error ret; output = tdm_display_get_output(NULL, 0, &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(output == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(output, NULL); } TEST_P(TDMDisplay, DisplayGetOutputNullOther) @@ -363,12 +363,12 @@ TEST_P(TDMDisplay, DisplayGetOutputNullOther) tdm_output *output; int o, count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_output_count(dpy, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count > 0); + ASSERT_EQ(tdm_display_get_output_count(dpy, &count), TDM_ERROR_NONE); + ASSERT_GT(count, 0); for (o = 0; o < count; o++) { output = tdm_display_get_output(dpy, o, NULL); - ASSERT_TRUE(output != NULL); + ASSERT_NE(output, NULL); } } @@ -378,12 +378,12 @@ TEST_P(TDMDisplay, DisplayGetOutputWrongIndex) tdm_error ret; output = tdm_display_get_output(dpy, -1, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output == NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_EQ(output, NULL); output = tdm_display_get_output(dpy, INT_MAX, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output == NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_EQ(output, NULL); } TEST_P(TDMDisplay, DisplayCreatePp) @@ -395,8 +395,8 @@ TEST_P(TDMDisplay, DisplayCreatePp) return; pp = tdm_display_create_pp(dpy, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(pp != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(pp, NULL); tdm_pp_destroy(pp); } @@ -410,8 +410,8 @@ TEST_P(TDMDisplay, DisplayCreatePpNullObject) return; pp = tdm_display_create_pp(NULL, &ret); - ASSERT_TRUE(ret != TDM_ERROR_NONE); - ASSERT_TRUE(pp == NULL); + ASSERT_NE(ret, TDM_ERROR_NONE); + ASSERT_EQ(pp, NULL); } TEST_P(TDMDisplay, ModuleGetInfo) @@ -420,8 +420,8 @@ TEST_P(TDMDisplay, ModuleGetInfo) int o, count = TDM_UT_INVALID_VALUE; tdm_error ret; - ASSERT_TRUE(tdm_display_get_output_count(dpy, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count > 0); + ASSERT_EQ(tdm_display_get_output_count(dpy, &count), TDM_ERROR_NONE); + ASSERT_GT(count, 0); for (o = 0; o < count; o++) { tdm_module *module; @@ -431,18 +431,18 @@ TEST_P(TDMDisplay, ModuleGetInfo) int minor = TDM_UT_INVALID_VALUE; output = tdm_display_get_output(dpy, o, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); module = tdm_output_get_backend_module(output, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(module != NULL); - - ASSERT_TRUE(tdm_module_get_info(module, &name, &vendor, &major, &minor) == TDM_ERROR_NONE); - ASSERT_TRUE(name != (const char *)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(vendor != (const char *)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(major != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(minor != TDM_UT_INVALID_VALUE); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(module, NULL); + + ASSERT_EQ(tdm_module_get_info(module, &name, &vendor, &major, &minor), TDM_ERROR_NONE); + ASSERT_NE(name, (const char *)TDM_UT_INVALID_VALUE); + ASSERT_NE(vendor, (const char *)TDM_UT_INVALID_VALUE); + ASSERT_NE(major, TDM_UT_INVALID_VALUE); + ASSERT_NE(minor, TDM_UT_INVALID_VALUE); } } @@ -453,11 +453,11 @@ TEST_P(TDMDisplay, ModuleGetInfoNullObject) int major = TDM_UT_INVALID_VALUE; int minor = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_module_get_info(NULL, &name, &vendor, &major, &minor) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(name == (const char *)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(vendor == (const char *)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(major == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(minor == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_module_get_info(NULL, &name, &vendor, &major, &minor), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(name, (const char *)TDM_UT_INVALID_VALUE); + ASSERT_EQ(vendor, (const char *)TDM_UT_INVALID_VALUE); + ASSERT_EQ(major, TDM_UT_INVALID_VALUE); + ASSERT_EQ(minor, TDM_UT_INVALID_VALUE); } TEST_P(TDMDisplay, ModuleGetInfoNullOther) @@ -466,21 +466,21 @@ TEST_P(TDMDisplay, ModuleGetInfoNullOther) int o, count = TDM_UT_INVALID_VALUE; tdm_error ret; - ASSERT_TRUE(tdm_display_get_output_count(dpy, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count > 0); + ASSERT_EQ(tdm_display_get_output_count(dpy, &count), TDM_ERROR_NONE); + ASSERT_GT(count, 0); for (o = 0; o < count; o++) { tdm_module *module; output = tdm_display_get_output(dpy, o, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); module = tdm_output_get_backend_module(output, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(module != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(module, NULL); - ASSERT_TRUE(tdm_module_get_info(module, NULL, NULL, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_module_get_info(module, NULL, NULL, NULL, NULL), TDM_ERROR_NONE); } } diff --git a/utests/src/ut_tdm_env.cpp b/utests/src/ut_tdm_env.cpp index d717423..217c0bf 100644 --- a/utests/src/ut_tdm_env.cpp +++ b/utests/src/ut_tdm_env.cpp @@ -76,8 +76,8 @@ TEST_P(TDMEnv, DisplayInitDeinit) tdm_error ret; dpy = tdm_display_init(&ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(dpy != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(dpy, NULL); tdm_display_deinit(dpy); } @@ -90,8 +90,8 @@ TEST_P(TDMEnv, DisplayInitDeinitWithoutEnv) TDMEnv::TearDown(); dpy = tdm_display_init(&ret); - ASSERT_TRUE(ret == TDM_ERROR_OPERATION_FAILED); - ASSERT_TRUE(dpy == NULL); + ASSERT_EQ(ret, TDM_ERROR_OPERATION_FAILED); + ASSERT_EQ(dpy, NULL); } TEST_P(TDMEnv, DisplayInitFewTimes) @@ -102,12 +102,12 @@ TEST_P(TDMEnv, DisplayInitFewTimes) for (d = 0; d < 10; d++) { dpy[d] = tdm_display_init(&ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(dpy[d] != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(dpy[d], NULL); } for (d = 0; d < 9; d++) - ASSERT_TRUE(dpy[d] == dpy[d + 1]); + ASSERT_EQ(dpy[d], dpy[d + 1]); for (d = 0; d < 10; d++) tdm_display_deinit(dpy[d]); @@ -120,11 +120,11 @@ TEST_P(TDMEnv, DisplayInitDeinitWithTBM) tdm_error ret; bufmgr = tbm_bufmgr_init(-1); - ASSERT_TRUE(bufmgr != NULL); + ASSERT_NE(bufmgr, NULL); dpy = tdm_display_init(&ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(dpy != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(dpy, NULL); tdm_display_deinit(dpy); tbm_bufmgr_deinit(bufmgr); @@ -132,7 +132,6 @@ TEST_P(TDMEnv, DisplayInitDeinitWithTBM) TEST_P(TDMEnv, DisplayInitDeinitWithoutBackends) { - ASSERT_TRUE(1); } TEST_P(TDMEnv, DisplayInitDeinitWrongDpyBadAddress) @@ -141,8 +140,8 @@ TEST_P(TDMEnv, DisplayInitDeinitWrongDpyBadAddress) tdm_error ret; dpy = tdm_display_init(&ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(dpy != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(dpy, NULL); EXPECT_EXIT({ tdm_display *wrong_dpy = (tdm_display *)TDM_UT_INVALID_VALUE; @@ -164,8 +163,8 @@ TEST_P(TDMEnv, DisplayDeinitRepeatWithSameDpy) tdm_error ret; dpy = tdm_display_init(&ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(dpy != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(dpy, NULL); EXPECT_EXIT({ tdm_display_deinit(dpy); diff --git a/utests/src/ut_tdm_event_loop.cpp b/utests/src/ut_tdm_event_loop.cpp index 0b5f930..ddc3380 100644 --- a/utests/src/ut_tdm_event_loop.cpp +++ b/utests/src/ut_tdm_event_loop.cpp @@ -70,20 +70,20 @@ TEST_P(TDMEventLoop, EventLoopAddFdHandler) bool done; int len; - ASSERT_TRUE(pipe(pipes) == 0); + ASSERT_EQ(pipe(pipes), 0); done = false; source = tdm_event_loop_add_fd_handler(dpy, pipes[0], TDM_EVENT_LOOP_READABLE, _ut_tdm_event_loop_fd_cb, &done, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(source != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(source, NULL); len = write(pipes[1], "hello", 5); - ASSERT_TRUE(len == 5); + ASSERT_EQ(len, 5); //TODO // while (!done) -// ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); +// ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); tdm_event_loop_source_remove(source); @@ -97,8 +97,8 @@ TEST_P(TDMEventLoop, EventLoopAddFdHandlerNullObject) tdm_event_loop_source *source; source = tdm_event_loop_add_fd_handler(NULL, 0, TDM_EVENT_LOOP_READABLE, _ut_tdm_event_loop_fd_cb, NULL, &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(source == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(source, NULL); } TEST_P(TDMEventLoop, EventLoopAddFdHandlerNullOther) @@ -106,8 +106,8 @@ TEST_P(TDMEventLoop, EventLoopAddFdHandlerNullOther) tdm_error ret; tdm_event_loop_source *source; source = tdm_event_loop_add_fd_handler(NULL, -1, TDM_EVENT_LOOP_READABLE, NULL, NULL, &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(source == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(source, NULL); } TEST_P(TDMEventLoop, EventLoopSourceFdUpdate) @@ -118,22 +118,22 @@ TEST_P(TDMEventLoop, EventLoopSourceFdUpdate) bool done; int len; - ASSERT_TRUE(pipe(pipes) == 0); + ASSERT_EQ(pipe(pipes), 0); done = false; source = tdm_event_loop_add_fd_handler(dpy, pipes[0], TDM_EVENT_LOOP_WRITABLE, _ut_tdm_event_loop_fd_cb, &done, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(source != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(source, NULL); - ASSERT_TRUE(tdm_event_loop_source_fd_update(source, TDM_EVENT_LOOP_READABLE) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_event_loop_source_fd_update(source, TDM_EVENT_LOOP_READABLE), TDM_ERROR_NONE); len = write(pipes[1], "hello", 5); - ASSERT_TRUE(len == 5); + ASSERT_EQ(len, 5); //TODO // while (!done) -// ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); +// ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); tdm_event_loop_source_remove(source); @@ -143,7 +143,7 @@ TEST_P(TDMEventLoop, EventLoopSourceFdUpdate) TEST_P(TDMEventLoop, EventLoopSourceFdUpdateNullObject) { - ASSERT_TRUE(tdm_event_loop_source_fd_update(NULL, TDM_EVENT_LOOP_READABLE) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_event_loop_source_fd_update(NULL, TDM_EVENT_LOOP_READABLE), TDM_ERROR_INVALID_PARAMETER); } static tdm_error @@ -160,8 +160,8 @@ TEST_P(TDMEventLoop, EventLoopAddTimerHandler) tdm_error ret; tdm_event_loop_source *source; source = tdm_event_loop_add_timer_handler(dpy, _ut_tdm_event_loop_timer_cb, NULL, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(source != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(source, NULL); tdm_event_loop_source_remove(source); } @@ -170,8 +170,8 @@ TEST_P(TDMEventLoop, EventLoopAddTimerHandlerNullObject) tdm_error ret; tdm_event_loop_source *source; source = tdm_event_loop_add_timer_handler(NULL, _ut_tdm_event_loop_timer_cb, NULL, &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(source == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(source, NULL); } @@ -180,8 +180,8 @@ TEST_P(TDMEventLoop, EventLoopAddTimerHandlerNullOther) tdm_error ret; tdm_event_loop_source *source; source = tdm_event_loop_add_timer_handler(dpy, NULL, NULL, &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(source == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(source, NULL); } TEST_P(TDMEventLoop, EventLoopSourceTimerUpdate) @@ -189,18 +189,18 @@ TEST_P(TDMEventLoop, EventLoopSourceTimerUpdate) tdm_error ret; tdm_event_loop_source *source; source = tdm_event_loop_add_timer_handler(dpy, _ut_tdm_event_loop_timer_cb, NULL, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(source != NULL); - ASSERT_TRUE(tdm_event_loop_source_timer_update(source, 100) == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(source, NULL); + ASSERT_EQ(tdm_event_loop_source_timer_update(source, 100), TDM_ERROR_NONE); //TODO // while (!done) -// ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); +// ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); tdm_event_loop_source_remove(source); } TEST_P(TDMEventLoop, EventLoopSourceTimerUpdateNullObject) { - ASSERT_TRUE(tdm_event_loop_source_timer_update(NULL, 100) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_event_loop_source_timer_update(NULL, 100), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMEventLoop, EventLoopSourceRemoveNullObject) diff --git a/utests/src/ut_tdm_helper.cpp b/utests/src/ut_tdm_helper.cpp index ddb4e44..e0fb1ba 100644 --- a/utests/src/ut_tdm_helper.cpp +++ b/utests/src/ut_tdm_helper.cpp @@ -53,7 +53,7 @@ void TDMHelper::TearDown(void) TEST_P(TDMHelper, HelperGetTime) { - ASSERT_TRUE(tdm_helper_get_time() > 0.0); + ASSERT_GT(tdm_helper_get_time(), 0.0); } TEST_P(TDMHelper, HelperDumpBuffer) @@ -61,7 +61,7 @@ TEST_P(TDMHelper, HelperDumpBuffer) tbm_surface_h buffer; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); @@ -90,7 +90,7 @@ TEST_P(TDMHelper, HelperClearBufferPos) tdm_pos pos = {.x = 40, .y = 40, .w = TDM_UT_BUFFER_SIZE - 80, .h = TDM_UT_BUFFER_SIZE - 80}; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); @@ -110,7 +110,7 @@ TEST_P(TDMHelper, HelperClearBufferColor) unsigned int color = 0xffffff00; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); @@ -128,7 +128,7 @@ TEST_P(TDMHelper, HelperClearBufferARGB) tbm_surface_h buffer; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); @@ -146,7 +146,7 @@ TEST_P(TDMHelper, HelperClearBufferXRGB) tbm_surface_h buffer; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_XRGB8888); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); @@ -164,7 +164,7 @@ TEST_P(TDMHelper, HelperClearBufferYUV420) tbm_surface_h buffer; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_YUV420); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); @@ -182,7 +182,7 @@ TEST_P(TDMHelper, HelperClearBufferNV12) tbm_surface_h buffer; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_NV12); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); @@ -200,7 +200,7 @@ TEST_P(TDMHelper, HelperClearBufferNV21) tbm_surface_h buffer; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_NV21); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); @@ -218,7 +218,7 @@ TEST_P(TDMHelper, HelperClearBufferYUYV) tbm_surface_h buffer; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_YUYV); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); @@ -236,7 +236,7 @@ TEST_P(TDMHelper, HelperClearBufferUYVY) tbm_surface_h buffer; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_UYVY); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); @@ -255,13 +255,13 @@ TEST_P(TDMHelper, HelperGetBufferFullSize) int w = TDM_UT_INVALID_VALUE, h = TDM_UT_INVALID_VALUE; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_helper_get_buffer_full_size(buffer, &w, &h); - ASSERT_TRUE(w != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(w >= tbm_surface_get_width(buffer)); - ASSERT_TRUE(h != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(h >= tbm_surface_get_height(buffer)); + ASSERT_NE(w, TDM_UT_INVALID_VALUE); + ASSERT_GE(w, tbm_surface_get_width(buffer)); + ASSERT_NE(h, TDM_UT_INVALID_VALUE); + ASSERT_GE(h, tbm_surface_get_height(buffer)); tbm_surface_destroy(buffer); } @@ -272,16 +272,16 @@ TEST_P(TDMHelper, HelperConvertBufferRotate0) tdm_pos sp, dp; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); temp = tbm_surface_create(TDM_UT_BUFFER_SIZE * 2, TDM_UT_BUFFER_SIZE * 2, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(temp != NULL); + ASSERT_NE(temp, NULL); sp.x = sp.y = 0, sp.w = sp.h = TDM_UT_BUFFER_SIZE; dp.x = dp.y = 0, dp.w = dp.h = TDM_UT_BUFFER_SIZE * 2; - ASSERT_TRUE(tdm_helper_convert_buffer(buffer, temp, &sp, &dp, TDM_TRANSFORM_NORMAL, 0) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_helper_convert_buffer(buffer, temp, &sp, &dp, TDM_TRANSFORM_NORMAL, 0), TDM_ERROR_NONE); char filename[256]; snprintf(filename, sizeof filename, "%s.png", typeid(*this).name()); @@ -297,16 +297,16 @@ TEST_P(TDMHelper, HelperConvertBufferRotate0Flip) tdm_pos sp, dp; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); temp = tbm_surface_create(TDM_UT_BUFFER_SIZE * 2, TDM_UT_BUFFER_SIZE * 2, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(temp != NULL); + ASSERT_NE(temp, NULL); sp.x = sp.y = 0, sp.w = sp.h = TDM_UT_BUFFER_SIZE; dp.x = dp.y = 0, dp.w = dp.h = TDM_UT_BUFFER_SIZE * 2; - ASSERT_TRUE(tdm_helper_convert_buffer(buffer, temp, &sp, &dp, TDM_TRANSFORM_FLIPPED, 0) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_helper_convert_buffer(buffer, temp, &sp, &dp, TDM_TRANSFORM_FLIPPED, 0), TDM_ERROR_NONE); char filename[256]; snprintf(filename, sizeof filename, "%s.png", typeid(*this).name()); @@ -322,16 +322,16 @@ TEST_P(TDMHelper, HelperConvertBufferRotate90) tdm_pos sp, dp; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); temp = tbm_surface_create(TDM_UT_BUFFER_SIZE * 2, TDM_UT_BUFFER_SIZE * 2, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(temp != NULL); + ASSERT_NE(temp, NULL); sp.x = sp.y = 0, sp.w = sp.h = TDM_UT_BUFFER_SIZE; dp.x = dp.y = 0, dp.w = dp.h = TDM_UT_BUFFER_SIZE * 2; - ASSERT_TRUE(tdm_helper_convert_buffer(buffer, temp, &sp, &dp, TDM_TRANSFORM_90, 0) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_helper_convert_buffer(buffer, temp, &sp, &dp, TDM_TRANSFORM_90, 0), TDM_ERROR_NONE); char filename[256]; snprintf(filename, sizeof filename, "%s.png", typeid(*this).name()); @@ -347,16 +347,16 @@ TEST_P(TDMHelper, HelperConvertBufferRotate180) tdm_pos sp, dp; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); temp = tbm_surface_create(TDM_UT_BUFFER_SIZE * 2, TDM_UT_BUFFER_SIZE * 2, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(temp != NULL); + ASSERT_NE(temp, NULL); sp.x = sp.y = 0, sp.w = sp.h = TDM_UT_BUFFER_SIZE; dp.x = dp.y = 0, dp.w = dp.h = TDM_UT_BUFFER_SIZE * 2; - ASSERT_TRUE(tdm_helper_convert_buffer(buffer, temp, &sp, &dp, TDM_TRANSFORM_180, 0) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_helper_convert_buffer(buffer, temp, &sp, &dp, TDM_TRANSFORM_180, 0), TDM_ERROR_NONE); char filename[256]; snprintf(filename, sizeof filename, "%s.png", typeid(*this).name()); @@ -372,16 +372,16 @@ TEST_P(TDMHelper, HelperConvertBufferRotate270) tdm_pos sp, dp; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); temp = tbm_surface_create(TDM_UT_BUFFER_SIZE * 2, TDM_UT_BUFFER_SIZE * 2, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(temp != NULL); + ASSERT_NE(temp, NULL); sp.x = sp.y = 0, sp.w = sp.h = TDM_UT_BUFFER_SIZE; dp.x = dp.y = 0, dp.w = dp.h = TDM_UT_BUFFER_SIZE * 2; - ASSERT_TRUE(tdm_helper_convert_buffer(buffer, temp, &sp, &dp, TDM_TRANSFORM_270, 0) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_helper_convert_buffer(buffer, temp, &sp, &dp, TDM_TRANSFORM_270, 0), TDM_ERROR_NONE); char filename[256]; snprintf(filename, sizeof filename, "%s.png", typeid(*this).name()); @@ -397,16 +397,16 @@ TEST_P(TDMHelper, HelperConvertBufferYUV420) tdm_pos sp, dp; buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_YUV420); - ASSERT_TRUE(buffer != NULL); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); temp = tbm_surface_create(TDM_UT_BUFFER_SIZE * 2, TDM_UT_BUFFER_SIZE * 2, TBM_FORMAT_YUV420); - ASSERT_TRUE(temp != NULL); + ASSERT_NE(temp, NULL); sp.x = sp.y = 0, sp.w = sp.h = TDM_UT_BUFFER_SIZE; dp.x = dp.y = 0, dp.w = dp.h = TDM_UT_BUFFER_SIZE * 2; - ASSERT_TRUE(tdm_helper_convert_buffer(buffer, temp, &sp, &dp, TDM_TRANSFORM_NORMAL, 0) == TDM_ERROR_OPERATION_FAILED); + ASSERT_EQ(tdm_helper_convert_buffer(buffer, temp, &sp, &dp, TDM_TRANSFORM_NORMAL, 0), TDM_ERROR_OPERATION_FAILED); tbm_surface_destroy(buffer); tbm_surface_destroy(temp); @@ -415,10 +415,10 @@ TEST_P(TDMHelper, HelperConvertBufferYUV420) TEST_P(TDMHelper, HelperGetFD) { int fd = tdm_helper_get_fd("TDM_DRM_MASTER_FD"); - ASSERT_TRUE(fd >= 0); + ASSERT_GE(fd, 0); close(fd); fd = tdm_helper_get_fd("BLURBLUR"); - ASSERT_TRUE(fd == -1); + ASSERT_EQ(fd, -1); } TEST_P(TDMHelper, HelperSetFD) @@ -450,19 +450,19 @@ TEST_P(TDMHelper, HelperCaptureOutput) tbm_surface_h dump; output = tdm_display_get_output(dpy, o, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); if (!ut_tdm_output_is_connected(output)) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, output, true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, output, true), true); dump = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_ARGB8888); - ASSERT_TRUE(dump != NULL); + ASSERT_NE(dump, NULL); - ASSERT_TRUE(tdm_helper_capture_output(output, dump, 0, 0, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, - _ut_tdm_helper_capture_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_helper_capture_output(output, dump, 0, 0, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, + _ut_tdm_helper_capture_cb, NULL), TDM_ERROR_NONE); char filename[256]; snprintf(filename, sizeof filename, "%s.png", typeid(*this).name()); @@ -477,8 +477,8 @@ TEST_P(TDMHelper, HelperCaptureOutputNullObject) { tbm_surface_h dump = (tbm_surface_h)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_helper_capture_output(NULL, dump, 0, 0, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, - _ut_tdm_helper_capture_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_helper_capture_output(NULL, dump, 0, 0, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, + _ut_tdm_helper_capture_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMHelper, HelperCaptureOutputNullOther) @@ -486,15 +486,15 @@ TEST_P(TDMHelper, HelperCaptureOutputNullOther) for (int o = 0; o < output_count; o++) { tdm_error ret; tdm_output *output = tdm_display_get_output(dpy, o, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); tdm_helper_output_commit_per_vblank_enabled(output); } tbm_surface_h dump = (tbm_surface_h)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_helper_capture_output(NULL, dump, 0, 0, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, - _ut_tdm_helper_capture_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_helper_capture_output(NULL, dump, 0, 0, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, + _ut_tdm_helper_capture_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMHelper, HelperGetDisplayInformation) @@ -505,11 +505,11 @@ TEST_P(TDMHelper, HelperGetDisplayInformation) for (int o = 0; o < output_count; o++) { tdm_error ret; tdm_output *output = tdm_display_get_output(dpy, o, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); if (!ut_tdm_output_is_connected(output)) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, output, true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, output, true), true); } tdm_helper_get_display_information(dpy, reply, &len); @@ -544,8 +544,8 @@ TEST_P(TDMHelper, HelperOutputCommitPerVblankEnabled) for (int o = 0; o < output_count; o++) { tdm_error ret; tdm_output *output = tdm_display_get_output(dpy, o, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); tdm_helper_output_commit_per_vblank_enabled(output); } } diff --git a/utests/src/ut_tdm_layer.cpp b/utests/src/ut_tdm_layer.cpp index 2a37e0e..3b830a0 100644 --- a/utests/src/ut_tdm_layer.cpp +++ b/utests/src/ut_tdm_layer.cpp @@ -71,17 +71,17 @@ void TDMLayer::SetUp(void) if (ut_tdm_output_is_hwc_enable(outputs[o])) continue; - ASSERT_TRUE(tdm_output_get_layer_count(outputs[o], &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count > 0); + ASSERT_EQ(tdm_output_get_layer_count(outputs[o], &count), TDM_ERROR_NONE); + ASSERT_GT(count, 0); layer_count += count; layers = (tdm_layer**)realloc(layers, sizeof(tdm_layer*) * layer_count); - ASSERT_TRUE(layers != NULL); + ASSERT_NE(layers, NULL); for (int l = 0; l < count; l++) { tdm_layer *layer = tdm_output_get_layer(outputs[o], l, &ret); - ASSERT_TRUE(layer != NULL); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_NE(layer, NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); layers[old_layer_count + l] = layer; } } @@ -93,7 +93,7 @@ void TDMLayer::SetUp(void) void TDMLayer::TearDown(void) { for (int l = 0; l < layer_count; l++) { - ASSERT_TRUE(tdm_layer_unset_buffer(layers[l]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE); } free(layers); @@ -381,8 +381,8 @@ TEST_P(TDMLayer, LayerGetOutput) for (int l = 0; l < layer_count; l++) { tdm_error ret; tdm_output *output = tdm_layer_get_output(layers[l], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); } } @@ -392,8 +392,8 @@ TEST_P(TDMLayer, LayerGetOutputNullObject) tdm_error ret; tdm_output *output = tdm_layer_get_output(NULL, &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(output == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(output, NULL); } TEST_P(TDMLayer, LayerGetOutputNullParam) @@ -402,7 +402,7 @@ TEST_P(TDMLayer, LayerGetOutputNullParam) for (int l = 0; l < layer_count; l++) { tdm_output *output = tdm_layer_get_output(layers[l], NULL); - ASSERT_TRUE(output != NULL); + ASSERT_NE(output, NULL); } } @@ -412,8 +412,8 @@ TEST_P(TDMLayer, LayerGetCapabilities) for (int l = 0; l < layer_count; l++) { tdm_layer_capability capabilities = (tdm_layer_capability)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_get_capabilities(layers[l], &capabilities) == TDM_ERROR_NONE); - ASSERT_TRUE(capabilities != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_layer_get_capabilities(layers[l], &capabilities), TDM_ERROR_NONE); + ASSERT_NE(capabilities, TDM_UT_INVALID_VALUE); } } @@ -422,14 +422,14 @@ TEST_P(TDMLayer, LayerGetCapabilitiesNullObject) TDM_UT_SKIP_FLAG(has_layers); tdm_layer_capability capabilities = (tdm_layer_capability)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_get_capabilities(NULL, &capabilities) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(capabilities == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_layer_get_capabilities(NULL, &capabilities), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(capabilities, TDM_UT_INVALID_VALUE); } TEST_P(TDMLayer, LayerGetCapabilitiesNullOther) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_get_capabilities(layers[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_get_capabilities(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerGetAvailableFormats) @@ -441,9 +441,9 @@ TEST_P(TDMLayer, LayerGetAvailableFormats) continue; const tbm_format *formats = (const tbm_format *)TDM_UT_INVALID_VALUE; int count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_get_available_formats(layers[l], &formats, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(formats != NULL); - ASSERT_TRUE(count > 0); + ASSERT_EQ(tdm_layer_get_available_formats(layers[l], &formats, &count), TDM_ERROR_NONE); + ASSERT_NE(formats, NULL); + ASSERT_GT(count, 0); } } @@ -453,9 +453,9 @@ TEST_P(TDMLayer, LayerGetAvailableFormatsNullObject) const tbm_format *formats = (const tbm_format *)TDM_UT_INVALID_VALUE; int count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_get_available_formats(NULL, &formats, &count) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(formats == (const tbm_format *)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(count == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_layer_get_available_formats(NULL, &formats, &count), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(formats, (const tbm_format *)TDM_UT_INVALID_VALUE); + ASSERT_EQ(count, TDM_UT_INVALID_VALUE); } TEST_P(TDMLayer, LayerGetAvailableFormatsNullOther) @@ -463,7 +463,7 @@ TEST_P(TDMLayer, LayerGetAvailableFormatsNullOther) TDM_UT_SKIP_FLAG(has_layers); if (!ut_tdm_layer_is_avaiable(layers[0])) return; - ASSERT_TRUE(tdm_layer_get_available_formats(layers[0], NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_get_available_formats(layers[0], NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerGetAvailableProperties) @@ -475,8 +475,8 @@ TEST_P(TDMLayer, LayerGetAvailableProperties) continue; const tdm_prop *props = (const tdm_prop *)TDM_UT_INVALID_VALUE; int count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_get_available_properties(layers[l], &props, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count >= 0); + ASSERT_EQ(tdm_layer_get_available_properties(layers[l], &props, &count), TDM_ERROR_NONE); + ASSERT_GE(count, 0); if (count > 0) ASSERT_TRUE(props != NULL && props != (const tdm_prop *)TDM_UT_INVALID_VALUE); } @@ -488,16 +488,16 @@ TEST_P(TDMLayer, LayerGetAvailablePropertiesNullObject) const tdm_prop *props = (const tdm_prop *)TDM_UT_INVALID_VALUE; int count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_get_available_properties(NULL, &props, &count) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(props == (const tdm_prop *)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(count == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_layer_get_available_properties(NULL, &props, &count), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(props, (const tdm_prop *)TDM_UT_INVALID_VALUE); + ASSERT_EQ(count, TDM_UT_INVALID_VALUE); } TEST_P(TDMLayer, LayerGetAvailablePropertiesNullOther) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_get_available_properties(layers[0], NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_get_available_properties(layers[0], NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerGetZpos) @@ -505,7 +505,7 @@ TEST_P(TDMLayer, LayerGetZpos) TDM_UT_SKIP_FLAG(has_layers); bool *check_table = (bool*)calloc(layer_count, output_count); - ASSERT_TRUE(check_table != NULL); + ASSERT_NE(check_table, NULL); for (int l = 0; l < layer_count; l++) { if (!ut_tdm_layer_is_avaiable(layers[l])) @@ -530,15 +530,15 @@ TEST_P(TDMLayer, LayerGetZposNullObject) TDM_UT_SKIP_FLAG(has_layers); int zpos = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_get_zpos(NULL, &zpos) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(zpos == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_layer_get_zpos(NULL, &zpos), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(zpos, TDM_UT_INVALID_VALUE); } TEST_P(TDMLayer, LayerGetZposNullParam) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_get_zpos(layers[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_get_zpos(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerSetProperty) @@ -553,11 +553,11 @@ TEST_P(TDMLayer, LayerSetProperty) int count = TDM_UT_INVALID_VALUE; tdm_value value = {.s32 = 0}; - ASSERT_TRUE(tdm_layer_get_available_properties(layers[l], &props, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count >= 0); + ASSERT_EQ(tdm_layer_get_available_properties(layers[l], &props, &count), TDM_ERROR_NONE); + ASSERT_GE(count, 0); if (count > 0) - ASSERT_TRUE(tdm_layer_set_property(layers[l], props[0].id, value) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_property(layers[l], props[0].id, value), TDM_ERROR_NONE); } } @@ -565,7 +565,7 @@ TEST_P(TDMLayer, LayerSetPropertyNullObject) { tdm_value value = {.s32 = 0}; - ASSERT_TRUE(tdm_layer_set_property(NULL, 0, value) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_set_property(NULL, 0, value), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerGetProperty) @@ -578,15 +578,15 @@ TEST_P(TDMLayer, LayerGetProperty) const tdm_prop *props = (const tdm_prop *)TDM_UT_INVALID_VALUE; int count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_get_available_properties(layers[l], &props, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count >= 0); + ASSERT_EQ(tdm_layer_get_available_properties(layers[l], &props, &count), TDM_ERROR_NONE); + ASSERT_GE(count, 0); if (count > 0) { ASSERT_TRUE(props != NULL && props != (const tdm_prop *)TDM_UT_INVALID_VALUE); for (int i = 0; i < count; i++) { tdm_value value = {.s32 = TDM_UT_INVALID_VALUE}; - ASSERT_TRUE(tdm_layer_get_property(layers[l], props[i].id, &value) == TDM_ERROR_NONE); - ASSERT_TRUE(value.s32 != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_layer_get_property(layers[l], props[i].id, &value), TDM_ERROR_NONE); + ASSERT_NE(value.s32, TDM_UT_INVALID_VALUE); } } } @@ -597,15 +597,15 @@ TEST_P(TDMLayer, LayerGetPropertyNullObject) TDM_UT_SKIP_FLAG(has_layers); tdm_value value = {.s32 = TDM_UT_INVALID_VALUE}; - ASSERT_TRUE(tdm_layer_get_property(NULL, 0, &value) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(value.s32 == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_layer_get_property(NULL, 0, &value), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(value.s32, TDM_UT_INVALID_VALUE); } TEST_P(TDMLayer, LayerGetPropertyNullOther) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_get_property(layers[0], 0, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_get_property(layers[0], 0, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerSetInfo) @@ -619,8 +619,8 @@ TEST_P(TDMLayer, LayerSetInfo) continue; tdm_info_layer info; - ASSERT_TRUE(ut_tdm_layer_fill_info(layers[l], -1, -1, 0, &info) == true); - ASSERT_TRUE(tdm_layer_set_info(layers[l], &info) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_layer_fill_info(layers[l], -1, -1, 0, &info), true); + ASSERT_EQ(tdm_layer_set_info(layers[l], &info), TDM_ERROR_NONE); } } @@ -630,14 +630,14 @@ TEST_P(TDMLayer, LayerSetInfoNullObject) tdm_info_layer info; memset(&info, 0, sizeof info); - ASSERT_TRUE(tdm_layer_set_info(NULL, &info) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_set_info(NULL, &info), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerSetInfoNullOther) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_set_info(layers[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_set_info(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, DISABLED_LayerGetInfo) @@ -650,14 +650,14 @@ TEST_P(TDMLayer, LayerGetInfoNullObject) tdm_info_layer temp; - ASSERT_TRUE(tdm_layer_get_info(NULL, &temp) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_get_info(NULL, &temp), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerGetInfoNullParam) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_get_info(layers[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_get_info(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerGetBufferFlags) @@ -669,8 +669,8 @@ TEST_P(TDMLayer, LayerGetBufferFlags) continue; unsigned int flags = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_get_buffer_flags(layers[l], &flags) == TDM_ERROR_NONE); - ASSERT_TRUE(flags != (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_layer_get_buffer_flags(layers[l], &flags), TDM_ERROR_NONE); + ASSERT_NE(flags, (unsigned int)TDM_UT_INVALID_VALUE); } } @@ -679,15 +679,15 @@ TEST_P(TDMLayer, LayerGetBufferFlagsNullObject) TDM_UT_SKIP_FLAG(has_layers); unsigned int flags = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_get_buffer_flags(NULL, &flags) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(flags == (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_layer_get_buffer_flags(NULL, &flags), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(flags, (unsigned int)TDM_UT_INVALID_VALUE); } TEST_P(TDMLayer, LayerGetBufferFlagsNullOther) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_get_buffer_flags(layers[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_get_buffer_flags(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER); } static void @@ -720,25 +720,25 @@ TEST_P(TDMLayer, LayerSetBuffer) if (ut_tdm_layer_is_video_layer(layers[l])) continue; - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true); /* set info */ int bw = tbm_surface_get_width(buffers[0]); int bh = tbm_surface_get_height(buffers[0]); tbm_format bf = tbm_surface_get_format(buffers[0]); - ASSERT_TRUE(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info) == true); + ASSERT_EQ(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info), true); - ASSERT_TRUE(tdm_layer_set_info(layers[l], &info) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_info(layers[l], &info), TDM_ERROR_NONE); /* set buffer & commit for 100 times */ for (int t = 0; t < 10; t++) { tbm_surface_h displaying_buffer = NULL; - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE); while (displaying_buffer != buffers[next_buffer]) { - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); displaying_buffer = tdm_layer_get_displaying_buffer(layers[l], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); } next_buffer++; if (next_buffer == 3) @@ -769,27 +769,27 @@ TEST_P(TDMLayer, LayerSetBufferFewTimeInOneCommit) if (ut_tdm_layer_is_video_layer(layers[l])) continue; - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true); /* set info */ int bw = tbm_surface_get_width(buffers[0]); int bh = tbm_surface_get_height(buffers[0]); tbm_format bf = tbm_surface_get_format(buffers[0]); - ASSERT_TRUE(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info) == true); - ASSERT_TRUE(tdm_layer_set_info(layers[l], &info) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info), true); + ASSERT_EQ(tdm_layer_set_info(layers[l], &info), TDM_ERROR_NONE); /* set buffer & commit for 10 times */ for (int t = 0; t < 10; t++) { tbm_surface_h displaying_buffer = NULL; - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); if (next_buffer == 3) next_buffer = 0; - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE); while (displaying_buffer != buffers[next_buffer]) { - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); displaying_buffer = tdm_layer_get_displaying_buffer(layers[l], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); } next_buffer++; if (next_buffer == 3) @@ -805,14 +805,14 @@ TEST_P(TDMLayer, LayerSetBufferNullObject) TDM_UT_SKIP_FLAG(has_layers); tbm_surface_h buffer = (tbm_surface_h)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_set_buffer(NULL, buffer) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_set_buffer(NULL, buffer), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerSetBufferNullOther) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_set_buffer(layers[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_set_buffer(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerUnsetBuffer) @@ -825,7 +825,7 @@ TEST_P(TDMLayer, LayerUnsetBuffer) if (!ut_tdm_layer_is_avaiable(layers[l])) continue; - ASSERT_TRUE(tdm_layer_unset_buffer(layers[l]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE); } } @@ -833,7 +833,7 @@ TEST_P(TDMLayer, LayerUnsetBufferNullObject) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_unset_buffer(NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_unset_buffer(NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerUnsetBufferBeforeCommit) @@ -856,26 +856,26 @@ TEST_P(TDMLayer, LayerUnsetBufferBeforeCommit) if (ut_tdm_layer_is_primary_layer(layers[l])) continue; - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true); /* set info */ int bw = tbm_surface_get_width(buffers[0]); int bh = tbm_surface_get_height(buffers[0]); tbm_format bf = tbm_surface_get_format(buffers[0]); - ASSERT_TRUE(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info) == true); - ASSERT_TRUE(tdm_layer_set_info(layers[l], &info) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info), true); + ASSERT_EQ(tdm_layer_set_info(layers[l], &info), TDM_ERROR_NONE); /* set buffer & commit for 10 times */ for (int t = 0; t < 10; t++) { - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); if (next_buffer == 3) next_buffer = 0; - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); if (next_buffer == 3) next_buffer = 0; } - ASSERT_TRUE(tdm_layer_unset_buffer(layers[l]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE); DestroyBuffers(); } @@ -901,20 +901,20 @@ TEST_P(TDMLayer, LayerUnsetBufferAfterOneCommit) if (ut_tdm_layer_is_primary_layer(layers[l])) continue; - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true); /* set info */ int bw = tbm_surface_get_width(buffers[0]); int bh = tbm_surface_get_height(buffers[0]); tbm_format bf = tbm_surface_get_format(buffers[0]); - ASSERT_TRUE(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info) == true); - ASSERT_TRUE(tdm_layer_set_info(layers[l], &info) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info), true); + ASSERT_EQ(tdm_layer_set_info(layers[l], &info), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_unset_buffer(layers[l]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE); DestroyBuffers(); } @@ -941,22 +941,22 @@ TEST_P(TDMLayer, DISABLED_LayerUnsetBufferAfterTwoCommit) if (ut_tdm_layer_is_primary_layer(layers[l])) continue; - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true); /* set info */ int bw = tbm_surface_get_width(buffers[0]); int bh = tbm_surface_get_height(buffers[0]); tbm_format bf = tbm_surface_get_format(buffers[0]); - ASSERT_TRUE(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info) == true); - ASSERT_TRUE(tdm_layer_set_info(layers[l], &info) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info), true); + ASSERT_EQ(tdm_layer_set_info(layers[l], &info), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_unset_buffer(layers[l]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE); DestroyBuffers(); } @@ -983,24 +983,24 @@ TEST_P(TDMLayer, DISABLED_LayerUnsetBufferAfterTwoCommitOneSetBuffer) if (ut_tdm_layer_is_primary_layer(layers[l])) continue; - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true); /* set info */ int bw = tbm_surface_get_width(buffers[0]); int bh = tbm_surface_get_height(buffers[0]); tbm_format bf = tbm_surface_get_format(buffers[0]); - ASSERT_TRUE(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info) == true); - ASSERT_TRUE(tdm_layer_set_info(layers[l], &info) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info), true); + ASSERT_EQ(tdm_layer_set_info(layers[l], &info), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer]), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_unset_buffer(layers[l]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE); DestroyBuffers(); } @@ -1027,26 +1027,26 @@ TEST_P(TDMLayer, LayerUnsetBufferAfterOneCommitOneDone) if (ut_tdm_layer_is_primary_layer(layers[l])) continue; - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true); /* set info */ int bw = tbm_surface_get_width(buffers[0]); int bh = tbm_surface_get_height(buffers[0]); tbm_format bf = tbm_surface_get_format(buffers[0]); - ASSERT_TRUE(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info) == true); - ASSERT_TRUE(tdm_layer_set_info(layers[l], &info) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info), true); + ASSERT_EQ(tdm_layer_set_info(layers[l], &info), TDM_ERROR_NONE); /* set buffer & commit for 10 times */ - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); done = false; - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done), TDM_ERROR_NONE); while (!done) { - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } - ASSERT_TRUE(tdm_layer_unset_buffer(layers[l]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE); DestroyBuffers(); } @@ -1073,30 +1073,30 @@ TEST_P(TDMLayer, LayerUnsetBufferAfterOneCommitOneDoneOneCommit) if (ut_tdm_layer_is_primary_layer(layers[l])) continue; - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true); /* set info */ int bw = tbm_surface_get_width(buffers[0]); int bh = tbm_surface_get_height(buffers[0]); tbm_format bf = tbm_surface_get_format(buffers[0]); - ASSERT_TRUE(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info) == true); - ASSERT_TRUE(tdm_layer_set_info(layers[l], &info) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info), true); + ASSERT_EQ(tdm_layer_set_info(layers[l], &info), TDM_ERROR_NONE); /* set buffer & commit for 10 times */ - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); done = false; - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done), TDM_ERROR_NONE); while (!done) { - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), TDM_ERROR_NONE); next_buffer = 0; - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_unset_buffer(layers[l]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE); DestroyBuffers(); } @@ -1108,8 +1108,8 @@ TEST_P(TDMLayer, LayerCommitDPMSOff) tdm_error ret; tdm_output *output = tdm_layer_get_output(layers[0], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); if (!ut_tdm_output_is_connected(output)) return; @@ -1127,7 +1127,7 @@ TEST_P(TDMLayer, LayerCommitNullObject) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_commit(NULL, _ut_tdm_layer_commit_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_commit(NULL, _ut_tdm_layer_commit_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerCommitNullOther) @@ -1136,7 +1136,7 @@ TEST_P(TDMLayer, LayerCommitNullOther) ut_tdm_output_prepare_all_output(dpy, outputs, output_count, true); - ASSERT_TRUE(tdm_layer_commit(layers[0], NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[0], NULL, NULL), TDM_ERROR_NONE); } TEST_P(TDMLayer, LayerIsCommittingNullObject) @@ -1144,15 +1144,15 @@ TEST_P(TDMLayer, LayerIsCommittingNullObject) TDM_UT_SKIP_FLAG(has_layers); unsigned int committing = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_is_committing(NULL, &committing) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(committing == (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_layer_is_committing(NULL, &committing), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(committing, (unsigned int)TDM_UT_INVALID_VALUE); } TEST_P(TDMLayer, LayerIsCommittingNullOther) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_is_committing(layers[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_is_committing(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerRemoveCommitHandler) @@ -1167,8 +1167,8 @@ TEST_P(TDMLayer, LayerRemoveCommitHandler) tdm_error ret; tdm_output *output = tdm_layer_get_output(layers[l], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); if (ut_tdm_layer_is_cursor_layer(layers[l])) continue; @@ -1177,25 +1177,25 @@ TEST_P(TDMLayer, LayerRemoveCommitHandler) if (ut_tdm_layer_is_primary_layer(layers[l])) continue; - ASSERT_TRUE(ut_tdm_layer_prepare_buffer(layers[l], buffers, 1, true) == true); + ASSERT_EQ(ut_tdm_layer_prepare_buffer(layers[l], buffers, 1, true), true); /* set info */ tdm_info_layer info; int bw = tbm_surface_get_width(buffers[0]); int bh = tbm_surface_get_height(buffers[0]); tbm_format bf = tbm_surface_get_format(buffers[0]); - ASSERT_TRUE(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info) == true); - ASSERT_TRUE(tdm_layer_set_info(layers[l], &info) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_set_buffer(layers[l], buffers[0]) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info), true); + ASSERT_EQ(tdm_layer_set_info(layers[l], &info), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer(layers[l], buffers[0]), TDM_ERROR_NONE); for (int t = 0; t < 10; t++) { bool done1 = false, done2 = false, done3 = false; - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done3) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_remove_commit_handler(layers[l], _ut_tdm_layer_commit_cb, &done2) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done3), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_remove_commit_handler(layers[l], _ut_tdm_layer_commit_cb, &done2), TDM_ERROR_NONE); while (!done1 || done2 || !done3) { - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } } @@ -1215,8 +1215,8 @@ TEST_P(TDMLayer, LayerRemoveCommitHandlerDifferentData) tdm_error ret; tdm_output *output = tdm_layer_get_output(layers[l], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); if (ut_tdm_layer_is_cursor_layer(layers[l])) continue; @@ -1227,12 +1227,12 @@ TEST_P(TDMLayer, LayerRemoveCommitHandlerDifferentData) for (int t = 0; t < 10; t++) { bool done1 = false, done2 = false, done3 = false; - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done3) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_remove_commit_handler(layers[l], _ut_tdm_layer_commit_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb, &done3), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_remove_commit_handler(layers[l], _ut_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE); while (!done1 || !done2 || !done3) { - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } } } @@ -1245,7 +1245,7 @@ _ut_tdm_layer_commit_cb2(tdm_layer *layer, unsigned int sequence, bool *done = (bool*)user_data; if (done) *done = true; - ASSERT_TRUE(tdm_layer_remove_commit_handler(layer, _ut_tdm_layer_commit_cb2, user_data) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_remove_commit_handler(layer, _ut_tdm_layer_commit_cb2, user_data), TDM_ERROR_NONE); } TEST_P(TDMLayer, LayerRemoveCommitHandlerInHandler) @@ -1260,8 +1260,8 @@ TEST_P(TDMLayer, LayerRemoveCommitHandlerInHandler) tdm_error ret; tdm_output *output = tdm_layer_get_output(layers[l], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); if (ut_tdm_layer_is_cursor_layer(layers[l])) continue; @@ -1272,11 +1272,11 @@ TEST_P(TDMLayer, LayerRemoveCommitHandlerInHandler) for (int t = 0; t < 10; t++) { bool done1 = false, done2 = false, done3 = false; - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb2, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb2, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb2, &done3) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb2, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb2, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], _ut_tdm_layer_commit_cb2, &done3), TDM_ERROR_NONE); while (!done1 || !done2 || !done3) { - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } } } @@ -1286,14 +1286,14 @@ TEST_P(TDMLayer, LayerRemoveCommitHandlerNullObject) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_remove_commit_handler(NULL, _ut_tdm_layer_commit_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_remove_commit_handler(NULL, _ut_tdm_layer_commit_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerRemoveCommitHandlerNullOther) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_remove_commit_handler(layers[0], NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_remove_commit_handler(layers[0], NULL, NULL), TDM_ERROR_NONE); } TEST_P(TDMLayer, LayerGetDisplayingBufferNullObject) @@ -1303,8 +1303,8 @@ TEST_P(TDMLayer, LayerGetDisplayingBufferNullObject) tbm_surface_h displaying_buffer; tdm_error ret; displaying_buffer = tdm_layer_get_displaying_buffer(NULL, &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(displaying_buffer == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(displaying_buffer, NULL); } TEST_P(TDMLayer, LayerGetDisplayingBufferNullOther) @@ -1313,7 +1313,7 @@ TEST_P(TDMLayer, LayerGetDisplayingBufferNullOther) tbm_surface_h displaying_buffer; displaying_buffer = tdm_layer_get_displaying_buffer(layers[0], NULL); - ASSERT_TRUE(displaying_buffer == NULL); + ASSERT_EQ(displaying_buffer, NULL); } TEST_P(TDMLayer, LayerIsUsableNullObject) @@ -1321,8 +1321,8 @@ TEST_P(TDMLayer, LayerIsUsableNullObject) TDM_UT_SKIP_FLAG(has_layers); unsigned int usable = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_is_usable(NULL, &usable) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(usable == (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_layer_is_usable(NULL, &usable), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(usable, (unsigned int)TDM_UT_INVALID_VALUE); } TEST_P(TDMLayer, LayerSetBufferQueue) @@ -1348,35 +1348,35 @@ TEST_P(TDMLayer, LayerSetBufferQueue) if (ut_tdm_layer_is_primary_layer(layers[l])) continue; - ASSERT_TRUE(ut_tdm_layer_prepare_buffer_queue(layers[l], &buffer_queue) == true); - ASSERT_TRUE(buffer_queue != NULL); + ASSERT_EQ(ut_tdm_layer_prepare_buffer_queue(layers[l], &buffer_queue), true); + ASSERT_NE(buffer_queue, NULL); /* set info */ int bw = tbm_surface_queue_get_width(buffer_queue); int bh = tbm_surface_queue_get_height(buffer_queue); tbm_format bf = tbm_surface_queue_get_format(buffer_queue); - ASSERT_TRUE(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info) == true); + ASSERT_EQ(ut_tdm_layer_fill_info(layers[l], bw, bh, bf, &info), true); - ASSERT_TRUE(tdm_layer_set_info(layers[l], &info) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_set_buffer_queue(layers[l], buffer_queue) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_info(layers[l], &info), TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_buffer_queue(layers[l], buffer_queue), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_layer_commit(layers[l], NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layers[l], NULL, NULL), TDM_ERROR_NONE); for (int t = 0; t < 10; t++) { - ASSERT_TRUE(tbm_surface_queue_dequeue(buffer_queue, &buffer) == TBM_SURFACE_QUEUE_ERROR_NONE); - ASSERT_TRUE(buffer != NULL); + ASSERT_EQ(tbm_surface_queue_dequeue(buffer_queue, &buffer), TBM_SURFACE_QUEUE_ERROR_NONE); + ASSERT_NE(buffer, NULL); tdm_test_buffer_fill(buffer, PATTERN_SMPTE); - ASSERT_TRUE(tbm_surface_queue_enqueue(buffer_queue, buffer) == TBM_SURFACE_QUEUE_ERROR_NONE); + ASSERT_EQ(tbm_surface_queue_enqueue(buffer_queue, buffer), TBM_SURFACE_QUEUE_ERROR_NONE); displaying_buffer = NULL; while (displaying_buffer != buffer) { - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); displaying_buffer = tdm_layer_get_displaying_buffer(layers[l], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); } } - ASSERT_TRUE(tdm_layer_unset_buffer_queue(layers[l]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_unset_buffer_queue(layers[l]), TDM_ERROR_NONE); DestroyBuffers(); } @@ -1420,28 +1420,28 @@ TEST_P(TDMLayer, LayerSetBufferQueueNullObject) tbm_surface_queue_h buffer_queue = (tbm_surface_queue_h)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_layer_set_buffer_queue(NULL, buffer_queue) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_set_buffer_queue(NULL, buffer_queue), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerSetBufferQueueNullOther) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_set_buffer_queue(layers[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_set_buffer_queue(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerUnsetBufferQueueNullObject) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_unset_buffer_queue(NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_unset_buffer_queue(NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerIsUsableNullOther) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_is_usable(layers[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_is_usable(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerSetVideoPos) @@ -1454,7 +1454,7 @@ TEST_P(TDMLayer, LayerSetVideoPos) if (!ut_tdm_layer_is_video_layer(layers[l])) continue; - ASSERT_TRUE(tdm_layer_set_video_pos(layers[l], -1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_set_video_pos(layers[l], -1), TDM_ERROR_NONE); } } @@ -1462,7 +1462,7 @@ TEST_P(TDMLayer, LayerSetVideoPosNullObject) { TDM_UT_SKIP_FLAG(has_layers); - ASSERT_TRUE(tdm_layer_set_video_pos(NULL, -1) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_layer_set_video_pos(NULL, -1), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMLayer, LayerSetVideoPosNoVideoLayer) @@ -1476,7 +1476,7 @@ TEST_P(TDMLayer, LayerSetVideoPosNoVideoLayer) if (ut_tdm_layer_is_video_layer(layers[l])) continue; - ASSERT_TRUE(tdm_layer_set_video_pos(layers[l], -1) == TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(tdm_layer_set_video_pos(layers[l], -1), TDM_ERROR_BAD_REQUEST); } } @@ -1493,7 +1493,7 @@ TEST_P(TDMLayer, LayerCreateCapture) capture = tdm_layer_create_capture(layers[l], &ret); if (ret == TDM_ERROR_NONE) - ASSERT_TRUE(capture != NULL); + ASSERT_NE(capture, NULL); } } @@ -1503,8 +1503,8 @@ TEST_P(TDMLayer, LayerCreateCaptureNullObject) tdm_error ret; tdm_capture *capture = tdm_layer_create_capture(NULL, &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(capture == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(capture, NULL); } #ifdef TDM_UT_TEST_WITH_PARAMS diff --git a/utests/src/ut_tdm_output.cpp b/utests/src/ut_tdm_output.cpp index 32aa528..ab7dfa7 100644 --- a/utests/src/ut_tdm_output.cpp +++ b/utests/src/ut_tdm_output.cpp @@ -46,18 +46,18 @@ void TDMOutput::SetUp(void) { TDMDisplay::SetUp(); - ASSERT_TRUE(tdm_display_get_output_count(dpy, &output_count) == TDM_ERROR_NONE); - ASSERT_TRUE(output_count >= 0); + ASSERT_EQ(tdm_display_get_output_count(dpy, &output_count), TDM_ERROR_NONE); + ASSERT_GE(output_count, 0); if (output_count > 0) { outputs = (tdm_output**)calloc(output_count, sizeof (tdm_output*)); - ASSERT_TRUE(outputs != NULL); + ASSERT_NE(outputs, NULL); for (int o = 0; o < output_count; o++) { tdm_error ret; tdm_output *output = tdm_display_get_output(dpy, o, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(output != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(output, NULL); outputs[o] = output; } has_outputs = true; @@ -70,7 +70,7 @@ void TDMOutput::TearDown(void) { if (outputs) { for (int o = 0; o < output_count; o++) { - ASSERT_TRUE(ut_tdm_output_unset(dpy, outputs[o]) == true); + ASSERT_EQ(ut_tdm_output_unset(dpy, outputs[o]), true); tdm_output_remove_change_handler(outputs[o], _ut_tdm_output_change_cb, &done1); tdm_output_remove_change_handler(outputs[o], _ut_tdm_output_change_cb, &done2); tdm_output_remove_change_handler(outputs[o], _ut_tdm_output_change_cb, &done3); @@ -291,8 +291,8 @@ TEST_P(TDMOutput, OutputGetBackendModule) for (int o = 0; o < output_count; o++) { tdm_error ret = (tdm_error)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_backend_module(outputs[o], &ret) != NULL); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_NE(tdm_output_get_backend_module(outputs[o], &ret), NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); } } @@ -301,8 +301,8 @@ TEST_P(TDMOutput, OutputGetBackendModuleNullOBject) TDM_UT_SKIP_FLAG(has_outputs); tdm_error ret = (tdm_error)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_backend_module(NULL, &ret) == NULL); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_get_backend_module(NULL, &ret), NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputGetBackendModuleNullOther) @@ -310,7 +310,7 @@ TEST_P(TDMOutput, OutputGetBackendModuleNullOther) TDM_UT_SKIP_FLAG(has_outputs); for (int o = 0; o < output_count; o++) { - ASSERT_TRUE(tdm_output_get_backend_module(outputs[o], NULL) != NULL); + ASSERT_NE(tdm_output_get_backend_module(outputs[o], NULL), NULL); } } @@ -320,8 +320,8 @@ TEST_P(TDMOutput, OutputGetCapabilities) for (int o = 0; o < output_count; o++) { tdm_output_capability capabilities = (tdm_output_capability)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_capabilities(outputs[o], &capabilities) == TDM_ERROR_NONE); - ASSERT_TRUE(capabilities != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_capabilities(outputs[o], &capabilities), TDM_ERROR_NONE); + ASSERT_NE(capabilities, TDM_UT_INVALID_VALUE); } } @@ -330,15 +330,15 @@ TEST_P(TDMOutput, OutputGetCapabilitiesNullObject) TDM_UT_SKIP_FLAG(has_outputs); tdm_output_capability capabilities = (tdm_output_capability)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_capabilities(NULL, &capabilities) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(capabilities == (tdm_output_capability)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_capabilities(NULL, &capabilities), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(capabilities, (tdm_output_capability)TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetCapabilitiesNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_capabilities(outputs[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_get_capabilities(outputs[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputGetModelInfo) @@ -347,10 +347,10 @@ TEST_P(TDMOutput, OutputGetModelInfo) for (int o = 0; o < output_count; o++) { const char *maker = NULL, *model = NULL, *name = NULL; - ASSERT_TRUE(tdm_output_get_model_info(outputs[o], &maker, &model, &name) == TDM_ERROR_NONE); - ASSERT_TRUE(maker != NULL); - ASSERT_TRUE(model != NULL); - ASSERT_TRUE(name != NULL); + ASSERT_EQ(tdm_output_get_model_info(outputs[o], &maker, &model, &name), TDM_ERROR_NONE); + ASSERT_NE(maker, NULL); + ASSERT_NE(model, NULL); + ASSERT_NE(name, NULL); } } @@ -362,17 +362,17 @@ TEST_P(TDMOutput, OutputGetModelInfoNullObject) const char *model = (const char*)TDM_UT_INVALID_VALUE; const char *name = (const char*)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_model_info(NULL, &maker, &model, &name) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(maker == (const char*)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(model == (const char*)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(name == (const char*)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_model_info(NULL, &maker, &model, &name), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(maker, (const char*)TDM_UT_INVALID_VALUE); + ASSERT_EQ(model, (const char*)TDM_UT_INVALID_VALUE); + ASSERT_EQ(name, (const char*)TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetModelInfoNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_model_info(outputs[0], NULL, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_model_info(outputs[0], NULL, NULL, NULL), TDM_ERROR_NONE); } TEST_P(TDMOutput, OutputGetConnStatus) @@ -381,8 +381,8 @@ TEST_P(TDMOutput, OutputGetConnStatus) for (int o = 0; o < output_count; o++) { tdm_output_conn_status status = (tdm_output_conn_status)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_conn_status(outputs[o], &status) == TDM_ERROR_NONE); - ASSERT_TRUE(status != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_conn_status(outputs[o], &status), TDM_ERROR_NONE); + ASSERT_NE(status, TDM_UT_INVALID_VALUE); } } @@ -392,15 +392,15 @@ TEST_P(TDMOutput, OutputGetConnStatusNullObject) tdm_output_conn_status status = (tdm_output_conn_status)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_conn_status(NULL, &status) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(status == (tdm_output_conn_status)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_conn_status(NULL, &status), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(status, (tdm_output_conn_status)TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetConnStatusNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_conn_status(outputs[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_get_conn_status(outputs[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputGetOutputType) @@ -409,8 +409,8 @@ TEST_P(TDMOutput, OutputGetOutputType) for (int o = 0; o < output_count; o++) { tdm_output_type type = (tdm_output_type)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_output_type(outputs[o], &type) == TDM_ERROR_NONE); - ASSERT_TRUE(type != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_output_type(outputs[o], &type), TDM_ERROR_NONE); + ASSERT_NE(type, TDM_UT_INVALID_VALUE); } } @@ -419,15 +419,15 @@ TEST_P(TDMOutput, OutputGetOutputTypeNullObject) TDM_UT_SKIP_FLAG(has_outputs); tdm_output_type type = (tdm_output_type)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_output_type(NULL, &type) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(type == (tdm_output_type)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_output_type(NULL, &type), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(type, (tdm_output_type)TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetOutputTypeNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_output_type(outputs[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_get_output_type(outputs[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputGetLayerCount) @@ -437,11 +437,11 @@ TEST_P(TDMOutput, OutputGetLayerCount) for (int o = 0; o < output_count; o++) { int count = TDM_UT_INVALID_VALUE; if (ut_tdm_output_is_hwc_enable(outputs[o])) { - ASSERT_TRUE(tdm_output_get_layer_count(outputs[o], &count) == TDM_ERROR_BAD_REQUEST); - ASSERT_TRUE(count == 0); + ASSERT_EQ(tdm_output_get_layer_count(outputs[o], &count), TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(count, 0); } else { - ASSERT_TRUE(tdm_output_get_layer_count(outputs[o], &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count > 0); + ASSERT_EQ(tdm_output_get_layer_count(outputs[o], &count), TDM_ERROR_NONE); + ASSERT_GT(count, 0); } } } @@ -451,15 +451,15 @@ TEST_P(TDMOutput, OutputGetLayerCountNullObject) TDM_UT_SKIP_FLAG(has_outputs); int count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_layer_count(NULL, &count) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(count == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_layer_count(NULL, &count), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(count, TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetLayerCountNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_layer_count(outputs[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_get_layer_count(outputs[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputGetLayer) @@ -472,20 +472,20 @@ TEST_P(TDMOutput, OutputGetLayer) int layer_count = TDM_UT_INVALID_VALUE; if (ut_tdm_output_is_hwc_enable(outputs[o])) { - ASSERT_TRUE(tdm_output_get_layer_count(outputs[o], &layer_count) == TDM_ERROR_BAD_REQUEST); - ASSERT_TRUE(layer_count == 0); + ASSERT_EQ(tdm_output_get_layer_count(outputs[o], &layer_count), TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(layer_count, 0); layer = tdm_output_get_layer(outputs[o], 0, &ret); - ASSERT_TRUE(ret == TDM_ERROR_BAD_REQUEST); - ASSERT_TRUE(layer == NULL); + ASSERT_EQ(ret, TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(layer, NULL); } else { - ASSERT_TRUE(tdm_output_get_layer_count(outputs[o], &layer_count) == TDM_ERROR_NONE); - ASSERT_TRUE(layer_count > 0); + ASSERT_EQ(tdm_output_get_layer_count(outputs[o], &layer_count), TDM_ERROR_NONE); + ASSERT_GT(layer_count, 0); for (int l = 0; l < layer_count; l++) { tdm_layer *layer = tdm_output_get_layer(outputs[o], l, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(layer != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(layer, NULL); } } } @@ -497,8 +497,8 @@ TEST_P(TDMOutput, OutputGetLayerNullObject) tdm_error ret; tdm_layer *layer = tdm_output_get_layer(NULL, 0, &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(layer == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(layer, NULL); } TEST_P(TDMOutput, OutputGetLayerNullOther) @@ -508,10 +508,10 @@ TEST_P(TDMOutput, OutputGetLayerNullOther) tdm_layer *layer; if (ut_tdm_output_is_hwc_enable(outputs[0])) { layer = tdm_output_get_layer(outputs[0], 0, NULL); - ASSERT_TRUE(layer == NULL); + ASSERT_EQ(layer, NULL); } else { layer = tdm_output_get_layer(outputs[0], 0, NULL); - ASSERT_TRUE(layer != NULL); + ASSERT_NE(layer, NULL); } } @@ -522,8 +522,8 @@ TEST_P(TDMOutput, OutputGetAvailableProperties) for (int o = 0; o < output_count; o++) { int count = TDM_UT_INVALID_VALUE; const tdm_prop *props = (const tdm_prop *)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_available_properties(outputs[o], &props, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count >= 0); + ASSERT_EQ(tdm_output_get_available_properties(outputs[o], &props, &count), TDM_ERROR_NONE); + ASSERT_GE(count, 0); if (count > 0) ASSERT_TRUE(props != NULL && props != (const tdm_prop *)TDM_UT_INVALID_VALUE); } @@ -535,16 +535,16 @@ TEST_P(TDMOutput, OutputGetAvailablePropertiesNullObject) const tdm_prop *props = (const tdm_prop *)TDM_UT_INVALID_VALUE; int count = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_available_properties(NULL, &props, &count) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(props == (const tdm_prop *)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(count == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_available_properties(NULL, &props, &count), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(props, (const tdm_prop *)TDM_UT_INVALID_VALUE); + ASSERT_EQ(count, TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetAvailablePropertiesNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_available_properties(outputs[0], NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_get_available_properties(outputs[0], NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputGetAvailableModes) @@ -557,8 +557,8 @@ TEST_P(TDMOutput, OutputGetAvailableModes) int count = TDM_UT_INVALID_VALUE; const tdm_output_mode *modes_array = (const tdm_output_mode *) TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_available_modes(outputs[o], &modes_array, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count > 0); + ASSERT_EQ(tdm_output_get_available_modes(outputs[o], &modes_array, &count), TDM_ERROR_NONE); + ASSERT_GT(count, 0); ASSERT_TRUE(modes_array != NULL && modes_array != (const tdm_output_mode *)TDM_UT_INVALID_VALUE); } } @@ -569,16 +569,16 @@ TEST_P(TDMOutput, OutputGetAvailableModesNullObject) int count = TDM_UT_INVALID_VALUE; const tdm_output_mode *modes_array = (const tdm_output_mode *) TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_available_modes(NULL, &modes_array, &count) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(count == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(modes_array == (const tdm_output_mode *) TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_available_modes(NULL, &modes_array, &count), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(count, TDM_UT_INVALID_VALUE); + ASSERT_EQ(modes_array, (const tdm_output_mode *) TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetAvailableModesNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_available_modes(outputs[0], NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_get_available_modes(outputs[0], NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputGetAvailableSize) @@ -592,12 +592,12 @@ TEST_P(TDMOutput, OutputGetAvailableSize) int min_w = TDM_UT_INVALID_VALUE, min_h = TDM_UT_INVALID_VALUE; int max_w = TDM_UT_INVALID_VALUE, max_h = TDM_UT_INVALID_VALUE; int preferred_align = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_available_size(outputs[o], &min_w, &min_h, &max_w, &max_h, &preferred_align) == TDM_ERROR_NONE); - ASSERT_TRUE(min_w != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(min_h != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_w != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_h != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(preferred_align != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_available_size(outputs[o], &min_w, &min_h, &max_w, &max_h, &preferred_align), TDM_ERROR_NONE); + ASSERT_NE(min_w, TDM_UT_INVALID_VALUE); + ASSERT_NE(min_h, TDM_UT_INVALID_VALUE); + ASSERT_NE(max_w, TDM_UT_INVALID_VALUE); + ASSERT_NE(max_h, TDM_UT_INVALID_VALUE); + ASSERT_NE(preferred_align, TDM_UT_INVALID_VALUE); } } @@ -608,19 +608,19 @@ TEST_P(TDMOutput, OutputGetAvailableSizeNullObject) int min_w = TDM_UT_INVALID_VALUE, min_h = TDM_UT_INVALID_VALUE; int max_w = TDM_UT_INVALID_VALUE, max_h = TDM_UT_INVALID_VALUE; int preferred_align = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_available_size(NULL, &min_w, &min_h, &max_w, &max_h, &preferred_align) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(min_w == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(min_h == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_w == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_h == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(preferred_align == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_available_size(NULL, &min_w, &min_h, &max_w, &max_h, &preferred_align), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(min_w, TDM_UT_INVALID_VALUE); + ASSERT_EQ(min_h, TDM_UT_INVALID_VALUE); + ASSERT_EQ(max_w, TDM_UT_INVALID_VALUE); + ASSERT_EQ(max_h, TDM_UT_INVALID_VALUE); + ASSERT_EQ(preferred_align, TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetAvailableSizeNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_available_size(outputs[0], NULL, NULL, NULL, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_available_size(outputs[0], NULL, NULL, NULL, NULL, NULL), TDM_ERROR_NONE); } TEST_P(TDMOutput, OutputGetCursorAvailableSize) @@ -630,18 +630,18 @@ TEST_P(TDMOutput, OutputGetCursorAvailableSize) int major = TDM_UT_INVALID_VALUE; int minor = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_backend_info(dpy, NULL, NULL, &major, &minor) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_backend_info(dpy, NULL, NULL, &major, &minor), TDM_ERROR_NONE); if (major > 1 || (major >= 1 && minor >= 5)) { for (int o = 0; o < output_count; o++) { int min_w = TDM_UT_INVALID_VALUE, min_h = TDM_UT_INVALID_VALUE; int max_w = TDM_UT_INVALID_VALUE, max_h = TDM_UT_INVALID_VALUE; int preferred_align = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_cursor_available_size(outputs[o], &min_w, &min_h, &max_w, &max_h, &preferred_align) == TDM_ERROR_NONE); - ASSERT_TRUE(min_w != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(min_h != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_w != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_h != TDM_UT_INVALID_VALUE); - ASSERT_TRUE(preferred_align != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_cursor_available_size(outputs[o], &min_w, &min_h, &max_w, &max_h, &preferred_align), TDM_ERROR_NONE); + ASSERT_NE(min_w, TDM_UT_INVALID_VALUE); + ASSERT_NE(min_h, TDM_UT_INVALID_VALUE); + ASSERT_NE(max_w, TDM_UT_INVALID_VALUE); + ASSERT_NE(max_h, TDM_UT_INVALID_VALUE); + ASSERT_NE(preferred_align, TDM_UT_INVALID_VALUE); } } } @@ -653,18 +653,18 @@ TEST_P(TDMOutput, OutputGetCursorAvailableSizeNullObject) int major = TDM_UT_INVALID_VALUE; int minor = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_backend_info(dpy, NULL, NULL, &major, &minor) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_backend_info(dpy, NULL, NULL, &major, &minor), TDM_ERROR_NONE); if (major > 1 || (major >= 1 && minor >= 5)) { for (int o = 0; o < output_count; o++) { int min_w = TDM_UT_INVALID_VALUE, min_h = TDM_UT_INVALID_VALUE; int max_w = TDM_UT_INVALID_VALUE, max_h = TDM_UT_INVALID_VALUE; int preferred_align = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_cursor_available_size(NULL, &min_w, &min_h, &max_w, &max_h, &preferred_align) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(min_w == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(min_h == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_w == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_h == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(preferred_align == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_cursor_available_size(NULL, &min_w, &min_h, &max_w, &max_h, &preferred_align), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(min_w, TDM_UT_INVALID_VALUE); + ASSERT_EQ(min_h, TDM_UT_INVALID_VALUE); + ASSERT_EQ(max_w, TDM_UT_INVALID_VALUE); + ASSERT_EQ(max_h, TDM_UT_INVALID_VALUE); + ASSERT_EQ(preferred_align, TDM_UT_INVALID_VALUE); } } } @@ -676,9 +676,9 @@ TEST_P(TDMOutput, OutputGetCursorAvailableSizeNullOther) int major = TDM_UT_INVALID_VALUE; int minor = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_backend_info(dpy, NULL, NULL, &major, &minor) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_backend_info(dpy, NULL, NULL, &major, &minor), TDM_ERROR_NONE); if (major > 1 || (major >= 1 && minor >= 5)) - ASSERT_TRUE(tdm_output_get_cursor_available_size(outputs[0], NULL, NULL, NULL, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_cursor_available_size(outputs[0], NULL, NULL, NULL, NULL, NULL), TDM_ERROR_NONE); } TEST_P(TDMOutput, OutputGetCursorAvailableSizeNoMatchVersion) @@ -688,18 +688,18 @@ TEST_P(TDMOutput, OutputGetCursorAvailableSizeNoMatchVersion) int major = TDM_UT_INVALID_VALUE; int minor = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_display_get_backend_info(dpy, NULL, NULL, &major, &minor) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_get_backend_info(dpy, NULL, NULL, &major, &minor), TDM_ERROR_NONE); if (major <= 1 && minor < 5) { for (int o = 0; o < output_count; o++) { int min_w = TDM_UT_INVALID_VALUE, min_h = TDM_UT_INVALID_VALUE; int max_w = TDM_UT_INVALID_VALUE, max_h = TDM_UT_INVALID_VALUE; int preferred_align = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_cursor_available_size(outputs[o], &min_w, &min_h, &max_w, &max_h, &preferred_align) == TDM_ERROR_BAD_REQUEST); - ASSERT_TRUE(min_w == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(min_h == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_w == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(max_h == TDM_UT_INVALID_VALUE); - ASSERT_TRUE(preferred_align == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_cursor_available_size(outputs[o], &min_w, &min_h, &max_w, &max_h, &preferred_align), TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(min_w, TDM_UT_INVALID_VALUE); + ASSERT_EQ(min_h, TDM_UT_INVALID_VALUE); + ASSERT_EQ(max_w, TDM_UT_INVALID_VALUE); + ASSERT_EQ(max_h, TDM_UT_INVALID_VALUE); + ASSERT_EQ(preferred_align, TDM_UT_INVALID_VALUE); } } } @@ -711,9 +711,9 @@ TEST_P(TDMOutput, OutputGetPhysicalSize) for (int o = 0; o < output_count; o++) { unsigned int mmWidth = (unsigned int)TDM_UT_INVALID_VALUE; unsigned int mmHeight = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_physical_size(outputs[o], &mmWidth, &mmHeight) == TDM_ERROR_NONE); - ASSERT_TRUE(mmWidth != (unsigned int)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(mmHeight != (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_physical_size(outputs[o], &mmWidth, &mmHeight), TDM_ERROR_NONE); + ASSERT_NE(mmWidth, (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_NE(mmHeight, (unsigned int)TDM_UT_INVALID_VALUE); } } @@ -723,16 +723,16 @@ TEST_P(TDMOutput, OutputGetPhysicalSizeNullObject) unsigned int mmWidth = (unsigned int)TDM_UT_INVALID_VALUE; unsigned int mmHeight = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_physical_size(NULL, &mmWidth, &mmHeight) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(mmWidth == (unsigned int)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(mmHeight == (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_physical_size(NULL, &mmWidth, &mmHeight), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(mmWidth, (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(mmHeight, (unsigned int)TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetPhysicalSizeNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_physical_size(outputs[0], NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_physical_size(outputs[0], NULL, NULL), TDM_ERROR_NONE); } TEST_P(TDMOutput, OutputGetSubpixel) @@ -741,8 +741,8 @@ TEST_P(TDMOutput, OutputGetSubpixel) for (int o = 0; o < output_count; o++) { unsigned int subpixel = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_subpixel(outputs[o], &subpixel) == TDM_ERROR_NONE); - ASSERT_TRUE(subpixel != (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_subpixel(outputs[o], &subpixel), TDM_ERROR_NONE); + ASSERT_NE(subpixel, (unsigned int)TDM_UT_INVALID_VALUE); } } @@ -751,15 +751,15 @@ TEST_P(TDMOutput, OutputGetSubpixelNullObject) TDM_UT_SKIP_FLAG(has_outputs); unsigned int subpixel = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_subpixel(NULL, &subpixel) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(subpixel == (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_subpixel(NULL, &subpixel), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(subpixel, (unsigned int)TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetSubpixelNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_subpixel(outputs[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_get_subpixel(outputs[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputGetPipe) @@ -768,8 +768,8 @@ TEST_P(TDMOutput, OutputGetPipe) for (int o = 0; o < output_count; o++) { unsigned int pipe = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_pipe(outputs[o], &pipe) == TDM_ERROR_NONE); - ASSERT_TRUE(pipe != (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_pipe(outputs[o], &pipe), TDM_ERROR_NONE); + ASSERT_NE(pipe, (unsigned int)TDM_UT_INVALID_VALUE); } } @@ -778,15 +778,15 @@ TEST_P(TDMOutput, OutputGetPipeNullObject) TDM_UT_SKIP_FLAG(has_outputs); unsigned int pipe = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_pipe(NULL, &pipe) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(pipe == (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_pipe(NULL, &pipe), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(pipe, (unsigned int)TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetPipeNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_pipe(outputs[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_get_pipe(outputs[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputGetPrimaryIndex) @@ -795,8 +795,8 @@ TEST_P(TDMOutput, OutputGetPrimaryIndex) for (int o = 0; o < output_count; o++) { int primary_index = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_primary_index(outputs[o], &primary_index) == TDM_ERROR_NONE); - ASSERT_TRUE(primary_index != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_primary_index(outputs[o], &primary_index), TDM_ERROR_NONE); + ASSERT_NE(primary_index, TDM_UT_INVALID_VALUE); } } @@ -805,15 +805,15 @@ TEST_P(TDMOutput, OutputGetPrimaryIndexNullObject) TDM_UT_SKIP_FLAG(has_outputs); int primary_index = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_primary_index(NULL, &primary_index) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(primary_index == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_primary_index(NULL, &primary_index), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(primary_index, TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetPrimaryIndexNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_primary_index(outputs[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_get_primary_index(outputs[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputSetProperty) @@ -825,11 +825,11 @@ TEST_P(TDMOutput, OutputSetProperty) int count = TDM_UT_INVALID_VALUE; tdm_value value = {.s32 = 0}; - ASSERT_TRUE(tdm_output_get_available_properties(outputs[o], &props, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count >= 0); + ASSERT_EQ(tdm_output_get_available_properties(outputs[o], &props, &count), TDM_ERROR_NONE); + ASSERT_GE(count, 0); if (count > 0) { ASSERT_TRUE(props != NULL && props != (const tdm_prop *)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(tdm_output_set_property(outputs[o], props[0].id, value) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_property(outputs[o], props[0].id, value), TDM_ERROR_NONE); } } } @@ -838,7 +838,7 @@ TEST_P(TDMOutput, OutputSetPropertyNullObject) { tdm_value value = {.s32 = 0}; - ASSERT_TRUE(tdm_output_set_property(NULL, 0, value) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_set_property(NULL, 0, value), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputGetProperty) @@ -848,15 +848,15 @@ TEST_P(TDMOutput, OutputGetProperty) for (int o = 0; o < output_count; o++) { int count = TDM_UT_INVALID_VALUE; const tdm_prop *props = (const tdm_prop *)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_available_properties(outputs[o], &props, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(count >= 0); + ASSERT_EQ(tdm_output_get_available_properties(outputs[o], &props, &count), TDM_ERROR_NONE); + ASSERT_GE(count, 0); if (count > 0) { ASSERT_TRUE(props != NULL && props != (const tdm_prop *)TDM_UT_INVALID_VALUE); for (int i = 0; i < count; i++) { tdm_value value = {.s32 = TDM_UT_INVALID_VALUE}; - ASSERT_TRUE(tdm_output_get_property(outputs[o], props[i].id, &value) == TDM_ERROR_NONE); - ASSERT_TRUE(value.s32 != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_property(outputs[o], props[i].id, &value), TDM_ERROR_NONE); + ASSERT_NE(value.s32, TDM_UT_INVALID_VALUE); } } } @@ -867,15 +867,15 @@ TEST_P(TDMOutput, OutputGetPropertyNullObject) TDM_UT_SKIP_FLAG(has_outputs); tdm_value value = {.s32 = TDM_UT_INVALID_VALUE}; - ASSERT_TRUE(tdm_output_get_property(NULL, 0, &value) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(value.s32 == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_property(NULL, 0, &value), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(value.s32, TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetPropertyNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_property(outputs[0], 0, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_get_property(outputs[0], 0, NULL), TDM_ERROR_INVALID_PARAMETER); } static void @@ -894,14 +894,14 @@ TEST_P(TDMOutput, OutputAddChangeHandler) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); done1 = false; - ASSERT_TRUE(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); - ASSERT_TRUE(done1 == true); + ASSERT_EQ(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); + ASSERT_EQ(done1, true); } } @@ -909,22 +909,22 @@ TEST_P(TDMOutput, OutputAddChangeHandlerTwice) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_add_change_handler(outputs[0], _ut_tdm_output_change_cb, NULL) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_add_change_handler(outputs[0], _ut_tdm_output_change_cb, NULL) == TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(tdm_output_add_change_handler(outputs[0], _ut_tdm_output_change_cb, NULL), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_add_change_handler(outputs[0], _ut_tdm_output_change_cb, NULL), TDM_ERROR_BAD_REQUEST); } TEST_P(TDMOutput, OutputAddChangeHandlerNullObject) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_add_change_handler(NULL, _ut_tdm_output_change_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_add_change_handler(NULL, _ut_tdm_output_change_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputAddChangeHandlerNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_add_change_handler(outputs[0], NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_add_change_handler(outputs[0], NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputRemoveChangeHandler) @@ -933,7 +933,7 @@ TEST_P(TDMOutput, OutputRemoveChangeHandler) for (int o = 0; o < output_count; o++) { for (int t = 0; t < 10; t++) { - ASSERT_TRUE(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb, NULL), TDM_ERROR_NONE); tdm_output_remove_change_handler(outputs[o], _ut_tdm_output_change_cb, NULL); } } @@ -947,14 +947,14 @@ TEST_P(TDMOutput, OutputRemoveChangeHandlerDifferentData) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); done1 = false; - ASSERT_TRUE(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb, &done1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb, &done1), TDM_ERROR_NONE); tdm_output_remove_change_handler(outputs[o], _ut_tdm_output_change_cb, NULL); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); - ASSERT_TRUE(done1 == true); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); + ASSERT_EQ(done1, true); } } @@ -975,22 +975,22 @@ TEST_P(TDMOutput, OutputRemoveChangeHandlerInHandler) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); done1 = false; - ASSERT_TRUE(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb2, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); - ASSERT_TRUE(done1 == true); + ASSERT_EQ(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb2, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); + ASSERT_EQ(done1, true); done2 = false; - ASSERT_TRUE(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); - ASSERT_TRUE(done2 == true); + ASSERT_EQ(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); + ASSERT_EQ(done2, true); done3 = false; - ASSERT_TRUE(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb2, &done3) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); - ASSERT_TRUE(done3 == true); + ASSERT_EQ(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb2, &done3), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); + ASSERT_EQ(done3, true); } } @@ -1018,12 +1018,12 @@ TEST_P(TDMOutput, OutputSetMode) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_get_available_modes(outputs[o], &modes, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(modes != NULL); - ASSERT_TRUE(count > 0); + ASSERT_EQ(tdm_output_get_available_modes(outputs[o], &modes, &count), TDM_ERROR_NONE); + ASSERT_NE(modes, NULL); + ASSERT_GT(count, 0); for (int m = 0; m < count; m++) - ASSERT_TRUE(tdm_output_set_mode(outputs[o], modes + m) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_mode(outputs[o], modes + m), TDM_ERROR_NONE); } } @@ -1032,7 +1032,7 @@ TEST_P(TDMOutput, OutputSetModeNullObject) TDM_UT_SKIP_FLAG(has_outputs); const tdm_output_mode *mode = (const tdm_output_mode *)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_set_mode(NULL, mode) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_set_mode(NULL, mode), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputSetModeNullOther) @@ -1043,7 +1043,7 @@ TEST_P(TDMOutput, OutputSetModeNullOther) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_set_mode(outputs[o], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_set_mode(outputs[o], NULL), TDM_ERROR_INVALID_PARAMETER); } } @@ -1058,15 +1058,15 @@ TEST_P(TDMOutput, OutputGetMode) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_get_available_modes(outputs[o], &modes, &count) == TDM_ERROR_NONE); - ASSERT_TRUE(modes != NULL); - ASSERT_TRUE(count > 0); + ASSERT_EQ(tdm_output_get_available_modes(outputs[o], &modes, &count), TDM_ERROR_NONE); + ASSERT_NE(modes, NULL); + ASSERT_GT(count, 0); for (int m = 0; m < count; m++) { const tdm_output_mode *current_mode; - ASSERT_TRUE(tdm_output_set_mode(outputs[o], modes + m) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_mode(outputs[o], ¤t_mode) == TDM_ERROR_NONE); - ASSERT_TRUE(current_mode == modes + m); + ASSERT_EQ(tdm_output_set_mode(outputs[o], modes + m), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(outputs[o], ¤t_mode), TDM_ERROR_NONE); + ASSERT_EQ(current_mode, modes + m); } } } @@ -1076,15 +1076,15 @@ TEST_P(TDMOutput, OutputGetModeNullObject) TDM_UT_SKIP_FLAG(has_outputs); const tdm_output_mode *current_mode = (const tdm_output_mode *)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_mode(NULL, ¤t_mode) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(current_mode == (const tdm_output_mode *)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_mode(NULL, ¤t_mode), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(current_mode, (const tdm_output_mode *)TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetModeNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_mode(outputs[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_get_mode(outputs[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputGetModeNoSet) @@ -1093,8 +1093,8 @@ TEST_P(TDMOutput, OutputGetModeNoSet) for (int o = 0; o < output_count; o++) { const tdm_output_mode *mode; - ASSERT_TRUE(tdm_output_get_mode(outputs[o], &mode) == TDM_ERROR_NONE); - ASSERT_TRUE(mode == NULL); + ASSERT_EQ(tdm_output_get_mode(outputs[o], &mode), TDM_ERROR_NONE); + ASSERT_EQ(mode, NULL); } } @@ -1106,14 +1106,14 @@ TEST_P(TDMOutput, OutputSetDpms) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_STANDBY) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_SUSPEND) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_STANDBY), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_SUSPEND), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); if (ut_tdm_output_is_aod_enable(outputs[o])) { - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_AOD) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_AOD), TDM_ERROR_NONE); } else { - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_AOD) == TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_AOD), TDM_ERROR_BAD_REQUEST); } } } @@ -1122,15 +1122,15 @@ TEST_P(TDMOutput, OutputSetDpmsNullObject) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_set_dpms(NULL, TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_set_dpms(NULL, TDM_OUTPUT_DPMS_OFF), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputSetDpmsNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_set_dpms(outputs[0], (tdm_output_dpms)-1) == TDM_ERROR_BAD_REQUEST); - ASSERT_TRUE(tdm_output_set_dpms(outputs[0], (tdm_output_dpms)INT_MAX) == TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(tdm_output_set_dpms(outputs[0], (tdm_output_dpms)-1), TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(tdm_output_set_dpms(outputs[0], (tdm_output_dpms)INT_MAX), TDM_ERROR_BAD_REQUEST); } TEST_P(TDMOutput, OutputSetDpmsAsync) @@ -1144,11 +1144,11 @@ TEST_P(TDMOutput, OutputSetDpmsAsync) continue; done1 = false; - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_set_dpms_async(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_add_change_handler(outputs[o], _ut_tdm_output_change_cb, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms_async(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); while (!done1) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); tdm_output_remove_change_handler(outputs[o], _ut_tdm_output_change_cb, &done1); } } @@ -1163,28 +1163,28 @@ TEST_P(TDMOutput, OutputGetDpms) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_dpms(outputs[o], &dpms_value) == TDM_ERROR_NONE); - ASSERT_TRUE(dpms_value == TDM_OUTPUT_DPMS_OFF); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_dpms(outputs[o], &dpms_value), TDM_ERROR_NONE); + ASSERT_EQ(dpms_value, TDM_OUTPUT_DPMS_OFF); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_STANDBY) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_dpms(outputs[o], &dpms_value) == TDM_ERROR_NONE); - ASSERT_TRUE(dpms_value == TDM_OUTPUT_DPMS_STANDBY); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_STANDBY), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_dpms(outputs[o], &dpms_value), TDM_ERROR_NONE); + ASSERT_EQ(dpms_value, TDM_OUTPUT_DPMS_STANDBY); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_SUSPEND) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_dpms(outputs[o], &dpms_value) == TDM_ERROR_NONE); - ASSERT_TRUE(dpms_value == TDM_OUTPUT_DPMS_SUSPEND); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_SUSPEND), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_dpms(outputs[o], &dpms_value), TDM_ERROR_NONE); + ASSERT_EQ(dpms_value, TDM_OUTPUT_DPMS_SUSPEND); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_dpms(outputs[o], &dpms_value) == TDM_ERROR_NONE); - ASSERT_TRUE(dpms_value == TDM_OUTPUT_DPMS_ON); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_dpms(outputs[o], &dpms_value), TDM_ERROR_NONE); + ASSERT_EQ(dpms_value, TDM_OUTPUT_DPMS_ON); if (ut_tdm_output_is_aod_enable(outputs[o])) { - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_AOD) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_dpms(outputs[o], &dpms_value) == TDM_ERROR_NONE); - ASSERT_TRUE(dpms_value == TDM_OUTPUT_DPMS_AOD); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_AOD), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_dpms(outputs[o], &dpms_value), TDM_ERROR_NONE); + ASSERT_EQ(dpms_value, TDM_OUTPUT_DPMS_AOD); } else { - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_AOD) == TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_AOD), TDM_ERROR_BAD_REQUEST); } } } @@ -1194,15 +1194,15 @@ TEST_P(TDMOutput, OutputGetDpmsNullObject) TDM_UT_SKIP_FLAG(has_outputs); tdm_output_dpms dpms_value = (tdm_output_dpms)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_output_get_dpms(NULL, &dpms_value) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(dpms_value == (tdm_output_dpms)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_dpms(NULL, &dpms_value), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(dpms_value, (tdm_output_dpms)TDM_UT_INVALID_VALUE); } TEST_P(TDMOutput, OutputGetDpmsNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_get_dpms(outputs[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_get_dpms(outputs[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputWaitVblank) @@ -1213,7 +1213,7 @@ TEST_P(TDMOutput, OutputWaitVblank) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); for (int t = 0; t < 10; t++) { double start, end, interval; @@ -1222,13 +1222,13 @@ TEST_P(TDMOutput, OutputWaitVblank) done1 = false; start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], 1, 0, _ut_tdm_output_done_cb, &done1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], 1, 0, _ut_tdm_output_done_cb, &done1), TDM_ERROR_NONE); while (!done1) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) < (interval + interval)); + ASSERT_LT((end - start), (interval + interval)); } } } @@ -1237,7 +1237,7 @@ TEST_P(TDMOutput, OutputWaitVblankNullObject) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_wait_vblank(NULL, 1, 0, _ut_tdm_output_done_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_wait_vblank(NULL, 1, 0, _ut_tdm_output_done_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputWaitVblankNullOther) @@ -1248,9 +1248,9 @@ TEST_P(TDMOutput, OutputWaitVblankNullOther) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], 1, 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], 1, 0, NULL, NULL), TDM_ERROR_NONE); } } @@ -1262,14 +1262,14 @@ TEST_P(TDMOutput, OutputWaitVblankTimeout) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], 1, 0, _ut_tdm_output_done_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], 1, 0, _ut_tdm_output_done_cb, NULL), TDM_ERROR_NONE); usleep(1100000); - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_helper_output_vblank_timer_expired(outputs[o]) > 0); + ASSERT_GT(tdm_helper_output_vblank_timer_expired(outputs[o]), 0); } } @@ -1277,7 +1277,7 @@ TEST_P(TDMOutput, OutputWaitVblankInterval0) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[0], 0, 0, _ut_tdm_output_done_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_wait_vblank(outputs[0], 0, 0, _ut_tdm_output_done_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputWaitVblankInterval) @@ -1288,7 +1288,7 @@ TEST_P(TDMOutput, OutputWaitVblankInterval) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); /* start from 1 */ for (int t = 1; t < 10; t++) { @@ -1298,14 +1298,14 @@ TEST_P(TDMOutput, OutputWaitVblankInterval) done1 = false; start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done1), TDM_ERROR_NONE); while (!done1) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) > (interval * (t - 1))); - ASSERT_TRUE((end - start) < (interval * t + interval)); + ASSERT_GT((end - start), (interval * (t - 1))); + ASSERT_LT((end - start), (interval * t + interval)); } } } @@ -1318,7 +1318,7 @@ TEST_P(TDMOutput, OutputWaitVblankFewTimesInOneVblank) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); /* start from 1 */ for (int t = 1; t < 10; t++) { @@ -1327,18 +1327,18 @@ TEST_P(TDMOutput, OutputWaitVblankFewTimesInOneVblank) interval = ut_tdm_output_get_vblank_interval_time(outputs[o]); done1 = done2 = done3 = false; - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done3) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done3), TDM_ERROR_NONE); start = tdm_helper_get_time(); while (!done1 || !done2 || !done3) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) > (interval * (t - 1))); - ASSERT_TRUE((end - start) < (interval * t + interval)); + ASSERT_GT((end - start), (interval * (t - 1))); + ASSERT_LT((end - start), (interval * t + interval)); } } } @@ -1351,16 +1351,16 @@ TEST_P(TDMOutput, OutputWaitVblankBeforeDpmsOff) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], false) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], false), true); for (int t = 0; t < 10; t++) { bool done = false; - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], 1, 0, _ut_tdm_output_done_cb, &done) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], 1, 0, _ut_tdm_output_done_cb, &done), TDM_ERROR_NONE); if (t == 9) - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); while(!done) - ASSERT_TRUE(tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_handle_events(dpy), TDM_ERROR_NONE); } } } @@ -1373,17 +1373,17 @@ TEST_P(TDMOutput, OutputRemoveVblankHandler) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); /* start from 1 */ for (int t = 1; t < 10; t++) { done1 = done2 = done3 = false; - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done3) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done3), TDM_ERROR_NONE); tdm_output_remove_vblank_handler(outputs[o], _ut_tdm_output_done_cb, &done2); while (!done1 || done2 || !done3) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } } } @@ -1401,12 +1401,12 @@ TEST_P(TDMOutput, OutputRemoveVblankHandlerDifferentData) /* start from 1 */ for (int t = 1; t < 10; t++) { done1 = done2 = done3 = false; - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done3) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done3), TDM_ERROR_NONE); tdm_output_remove_vblank_handler(outputs[o], _ut_tdm_output_done_cb, NULL); while (!done1 || !done2 || !done3) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } } } @@ -1430,16 +1430,16 @@ TEST_P(TDMOutput, OutputRemoveVblankHandlerInHandler) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); /* start from 1 */ for (int t = 1; t < 10; t++) { done1 = done2 = done3 = false; - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done3) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_wait_vblank(outputs[o], t, 0, _ut_tdm_output_done_cb, &done3), TDM_ERROR_NONE); while (!done1 || !done2 || !done3) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } } } @@ -1456,7 +1456,7 @@ TEST_P(TDMOutput, OutputCommit) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); for (int t = 0; t < 10; t++) { double start, end, interval; @@ -1465,13 +1465,13 @@ TEST_P(TDMOutput, OutputCommit) done1 = false; start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done1), TDM_ERROR_NONE); while (!done1) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) < (interval + interval)); + ASSERT_LT((end - start), (interval + interval)); } } } @@ -1480,7 +1480,7 @@ TEST_P(TDMOutput, OutputCommitNullObject) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_output_commit(NULL, 0, _ut_tdm_output_done_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_output_commit(NULL, 0, _ut_tdm_output_done_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMOutput, OutputCommitNullOther) @@ -1495,8 +1495,8 @@ TEST_P(TDMOutput, OutputCommitNullOther) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_ON), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); } } @@ -1512,11 +1512,11 @@ TEST_P(TDMOutput, OutputCommitDpmsSuspend) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_SUSPEND) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_SUSPEND), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, NULL) == TDM_ERROR_DPMS_OFF); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, NULL), TDM_ERROR_DPMS_OFF); } } @@ -1532,11 +1532,11 @@ TEST_P(TDMOutput, OutputCommitDpmsOff) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, NULL) == TDM_ERROR_DPMS_OFF); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, NULL), TDM_ERROR_DPMS_OFF); } } @@ -1555,15 +1555,15 @@ TEST_P(TDMOutput, OutputCommitDpmsAOD) if (!ut_tdm_output_is_aod_enable(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); - ASSERT_TRUE(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_AOD) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_AOD), TDM_ERROR_NONE); for (int t = 0; t < 10; t++) { done1 = false; - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done1), TDM_ERROR_NONE); while (!done1) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } } } @@ -1580,21 +1580,21 @@ TEST_P(TDMOutput, OutputCommitAfterLayerCommit) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); - ASSERT_TRUE(tdm_output_get_primary_index(outputs[o], &index) == TDM_ERROR_NONE); - ASSERT_TRUE(index != TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_output_get_primary_index(outputs[o], &index), TDM_ERROR_NONE); + ASSERT_NE(index, TDM_UT_INVALID_VALUE); layer = tdm_output_get_layer(outputs[o], index, &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(layer != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(layer, NULL); - ASSERT_TRUE(tdm_layer_commit(layer, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_layer_commit(layer, NULL, NULL), TDM_ERROR_NONE); if (!tdm_helper_output_commit_per_vblank_enabled(outputs[o])) - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE); else - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_BAD_REQUEST); } } @@ -1605,7 +1605,7 @@ TEST_P(TDMOutput, OutputCommitMismatchCommitType) for (int o = 0; o < output_count; o++) { if (!tdm_helper_output_commit_per_vblank_enabled(outputs[o])) continue; - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, NULL, NULL) == TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_BAD_REQUEST); } } @@ -1621,15 +1621,15 @@ TEST_P(TDMOutput, OutputCommitFewTimesInOneVblank) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); for (int t = 0; t < 10; t++) { done1 = done2 = done3 = false; - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done3) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done3), TDM_ERROR_NONE); while (!done1 || !done2 || !done3) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } } } @@ -1652,16 +1652,16 @@ TEST_P(TDMOutput, OutputRemoveCommitHandler) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); for (int t = 0; t < 10; t++) { done1 = done2 = done3 = false; - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done3) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done3), TDM_ERROR_NONE); tdm_output_remove_commit_handler(outputs[o], _ut_tdm_output_done_cb, &done2); while (!done1 || done2 || !done3) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } } } @@ -1678,16 +1678,16 @@ TEST_P(TDMOutput, OutputRemoveCommitHandlerDifferentData) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); for (int t = 0; t < 10; t++) { done1 = done2 = done3 = false; - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done3) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb, &done3), TDM_ERROR_NONE); tdm_output_remove_commit_handler(outputs[o], _ut_tdm_output_done_cb, NULL); while (!done1 || !done2 || !done3) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } } } @@ -1704,15 +1704,15 @@ TEST_P(TDMOutput, OutputRemoveCommitHandlerInHandler) if (!ut_tdm_output_is_connected(outputs[o])) continue; - ASSERT_TRUE(ut_tdm_output_prepare(dpy, outputs[o], true) == true); + ASSERT_EQ(ut_tdm_output_prepare(dpy, outputs[o], true), true); for (int t = 0; t < 10; t++) { done1 = done2 = done3 = false; - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb2, &done1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb2, &done2) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb2, &done3) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb2, &done1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb2, &done2), TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_commit(outputs[o], 0, _ut_tdm_output_done_cb2, &done3), TDM_ERROR_NONE); while (!done1 || !done2 || !done3) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); } } } diff --git a/utests/src/ut_tdm_output_hwc.cpp b/utests/src/ut_tdm_output_hwc.cpp index 1695e6b..9b3e274 100644 --- a/utests/src/ut_tdm_output_hwc.cpp +++ b/utests/src/ut_tdm_output_hwc.cpp @@ -312,7 +312,7 @@ TEST_P(TDMHwcWindow, GetChangedCompositionTypesSuccessful) error = tdm_output_hwc_get_changed_composition_types(outputs[o], &get_num, NULL, NULL); ASSERT_EQ(TDM_ERROR_NONE, error); - ASSERT_TRUE(get_num == validate_num); + ASSERT_EQ(get_num, validate_num); hwc_wnds = (tdm_hwc_window **)calloc(get_num, sizeof(tdm_hwc_window *)); composition_types = (tdm_hwc_window_composition *)calloc(get_num, sizeof(tdm_hwc_window_composition)); diff --git a/utests/src/ut_tdm_vblank.cpp b/utests/src/ut_tdm_vblank.cpp index a7bf51c..e72372e 100644 --- a/utests/src/ut_tdm_vblank.cpp +++ b/utests/src/ut_tdm_vblank.cpp @@ -182,8 +182,8 @@ TEST_P(TDMVblank, DISABLED_VblankSetClientVblankFps) TEST_P(TDMVblank, VblankSetClientVblankFpsNullObject) { - ASSERT_TRUE(tdm_vblank_set_client_vblank_fps(0, NULL, 60) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(tdm_vblank_set_client_vblank_fps(123, NULL, 0) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_set_client_vblank_fps(0, NULL, 60), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_set_client_vblank_fps(123, NULL, 0), TDM_ERROR_INVALID_PARAMETER); } /* tdm_vblank_set_client_vblank_fps */ @@ -194,8 +194,8 @@ TEST_P(TDMVblank, DISABLED_VblankSetClientIgnoreGlobalFps) TEST_P(TDMVblank, VblankSetClientIgnoreGlobalFpsNullObject) { - ASSERT_TRUE(tdm_vblank_set_client_ignore_global_fps(0, NULL, 0) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(tdm_vblank_set_client_ignore_global_fps(0, NULL, 1) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_set_client_ignore_global_fps(0, NULL, 0), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_set_client_ignore_global_fps(0, NULL, 1), TDM_ERROR_INVALID_PARAMETER); } /* tdm_vblank_create() */ @@ -206,8 +206,8 @@ TEST_P(TDMVblank, VblankCreateDestroy) for (int o = 0; o < output_count; o++) { tdm_error ret; tdm_vblank *vblank = tdm_vblank_create(dpy, outputs[o], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(vblank != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(vblank, NULL); tdm_vblank_destroy(vblank); } @@ -220,8 +220,8 @@ TEST_P(TDMVblank, VblankCreateNullDpy) tdm_error ret; tdm_vblank *vblank = tdm_vblank_create(NULL, outputs[0], &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(vblank == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(vblank, NULL); } TEST_P(TDMVblank, VblankCreateNullOutput) @@ -229,8 +229,8 @@ TEST_P(TDMVblank, VblankCreateNullOutput) tdm_error ret; tdm_vblank *vblank = tdm_vblank_create(dpy, NULL, &ret); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(vblank == NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(vblank, NULL); } TEST_P(TDMVblank, VblankCreateNullOther) @@ -238,7 +238,7 @@ TEST_P(TDMVblank, VblankCreateNullOther) TDM_UT_SKIP_FLAG(has_outputs); tdm_vblank *vblank = tdm_vblank_create(dpy, outputs[0], NULL); - ASSERT_TRUE(vblank != NULL); + ASSERT_NE(vblank, NULL); tdm_vblank_destroy(vblank); } @@ -262,7 +262,7 @@ TEST_P(TDMVblank, VblankAddCreateHandler) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb, this) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb, this), TDM_ERROR_NONE); for (int o = 0; o < output_count; o++) { tdm_error ret; @@ -270,9 +270,9 @@ TEST_P(TDMVblank, VblankAddCreateHandler) done = false; tdm_vblank *vblank = tdm_vblank_create(dpy, outputs[o], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(vblank != NULL); - ASSERT_TRUE(done == true); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(vblank, NULL); + ASSERT_EQ(done, true); tdm_vblank_destroy(vblank); } @@ -282,22 +282,22 @@ TEST_P(TDMVblank, VblankAddCreateHandlerTwice) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb, NULL) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb, NULL) == TDM_ERROR_BAD_REQUEST); + ASSERT_EQ(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb, NULL), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb, NULL), TDM_ERROR_BAD_REQUEST); } TEST_P(TDMVblank, VblankAddCreateHandlerNullObject) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_vblank_add_create_handler(NULL, _ut_tdm_vblank_create_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_add_create_handler(NULL, _ut_tdm_vblank_create_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankAddCreateHandlerNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_vblank_add_create_handler(dpy, NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_add_create_handler(dpy, NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } /* tdm_vblank_remove_create_handler */ @@ -305,7 +305,7 @@ TEST_P(TDMVblank, VblankRemoveCreateHandler) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb, this) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb, this), TDM_ERROR_NONE); tdm_vblank_remove_create_handler(dpy, _ut_tdm_vblank_create_cb, this); for (int o = 0; o < output_count; o++) { @@ -314,9 +314,9 @@ TEST_P(TDMVblank, VblankRemoveCreateHandler) done = false; tdm_vblank *vblank = tdm_vblank_create(dpy, outputs[o], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(vblank != NULL); - ASSERT_TRUE(done == false); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(vblank, NULL); + ASSERT_EQ(done, false); tdm_vblank_destroy(vblank); } @@ -326,7 +326,7 @@ TEST_P(TDMVblank, VblankRemoveCreateHandlerFewTimes) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb, this) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb, this), TDM_ERROR_NONE); tdm_vblank_remove_create_handler(dpy, _ut_tdm_vblank_create_cb, this); tdm_vblank_remove_create_handler(dpy, _ut_tdm_vblank_create_cb, this); @@ -338,9 +338,9 @@ TEST_P(TDMVblank, VblankRemoveCreateHandlerFewTimes) done = false; tdm_vblank *vblank = tdm_vblank_create(dpy, outputs[o], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(vblank != NULL); - ASSERT_TRUE(done == false); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(vblank, NULL); + ASSERT_EQ(done, false); tdm_vblank_destroy(vblank); } @@ -350,7 +350,7 @@ TEST_P(TDMVblank, VblankRemoveCreateHandlerDifferentData) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb, this) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb, this), TDM_ERROR_NONE); tdm_vblank_remove_create_handler(dpy, _ut_tdm_vblank_create_cb, NULL); @@ -360,9 +360,9 @@ TEST_P(TDMVblank, VblankRemoveCreateHandlerDifferentData) done = false; tdm_vblank *vblank = tdm_vblank_create(dpy, outputs[o], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(vblank != NULL); - ASSERT_TRUE(done == true); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(vblank, NULL); + ASSERT_EQ(done, true); tdm_vblank_destroy(vblank); } @@ -380,7 +380,7 @@ TEST_P(TDMVblank, VblankRemoveCreateHandlerInHandler) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb2, this) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_add_create_handler(dpy, _ut_tdm_vblank_create_cb2, this), TDM_ERROR_NONE); for (int o = 0; o < output_count; o++) { tdm_error ret; @@ -388,12 +388,12 @@ TEST_P(TDMVblank, VblankRemoveCreateHandlerInHandler) done = false; tdm_vblank *vblank = tdm_vblank_create(dpy, outputs[o], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); - ASSERT_TRUE(vblank != NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); + ASSERT_NE(vblank, NULL); if (o == 0) - ASSERT_TRUE(done == true); + ASSERT_EQ(done, true); else - ASSERT_TRUE(done == false); + ASSERT_EQ(done, false); tdm_vblank_destroy(vblank); } @@ -418,29 +418,29 @@ TEST_P(TDMVblank, VblankGetOutput) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { tdm_error ret; - ASSERT_TRUE(tdm_vblank_get_output(vblanks[v], &ret) != NULL); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_NE(tdm_vblank_get_output(vblanks[v], &ret), NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); } } TEST_P(TDMVblank, VblankGetOutputNullObject) { tdm_error ret; - ASSERT_TRUE(tdm_vblank_get_output(NULL, &ret) == NULL); - ASSERT_TRUE(ret == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_get_output(NULL, &ret), NULL); + ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankGetOutputNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); - ASSERT_TRUE(tdm_vblank_get_output(vblanks[0], NULL) != NULL); + ASSERT_NE(tdm_vblank_get_output(vblanks[0], NULL), NULL); } /* tdm_vblank_get_client_pid() */ @@ -448,30 +448,30 @@ TEST_P(TDMVblank, VblankGetClientPid) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { pid_t pid = (pid_t)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_vblank_get_client_pid(vblanks[v], &pid) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_client_pid(vblanks[v], &pid), TDM_ERROR_NONE); /* client pid should be 0 in case vblank is created in server side */ - ASSERT_TRUE(pid == 0); + ASSERT_EQ(pid, 0); } } TEST_P(TDMVblank, VblankGetClientPidNullObject) { pid_t pid = (pid_t)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_vblank_get_client_pid(NULL, &pid) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(pid == (pid_t)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_vblank_get_client_pid(NULL, &pid), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(pid, (pid_t)TDM_UT_INVALID_VALUE); } TEST_P(TDMVblank, VblankGetClientPidNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); - ASSERT_TRUE(tdm_vblank_get_client_pid(vblanks[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_get_client_pid(vblanks[0], NULL), TDM_ERROR_INVALID_PARAMETER); } /* tdm_vblank_set_name() */ @@ -479,25 +479,25 @@ TEST_P(TDMVblank, VblankSetName) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) - ASSERT_TRUE(tdm_vblank_set_name(vblanks[v], TDM_UT_VBLANK_NAME) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_name(vblanks[v], TDM_UT_VBLANK_NAME), TDM_ERROR_NONE); } TEST_P(TDMVblank, VblankSetNameNullObject) { - ASSERT_TRUE(tdm_vblank_set_name(NULL, TDM_UT_VBLANK_NAME) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_set_name(NULL, TDM_UT_VBLANK_NAME), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankSetNameNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) - ASSERT_TRUE(tdm_vblank_set_name(vblanks[v], NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_name(vblanks[v], NULL), TDM_ERROR_NONE); } /* tdm_vblank_get_name() */ @@ -505,12 +505,12 @@ TEST_P(TDMVblank, VblankGetName) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { const char *name = (const char *)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_vblank_set_name(vblanks[v], TDM_UT_VBLANK_NAME) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_get_name(vblanks[v], &name) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_name(vblanks[v], TDM_UT_VBLANK_NAME), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_name(vblanks[v], &name), TDM_ERROR_NONE); ASSERT_STREQ(name, TDM_UT_VBLANK_NAME); } } @@ -518,28 +518,28 @@ TEST_P(TDMVblank, VblankGetName) TEST_P(TDMVblank, VblankGetNameNullObject) { const char *name = (const char *)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_vblank_get_name(NULL, &name) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(name == (const char *)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_vblank_get_name(NULL, &name), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(name, (const char *)TDM_UT_INVALID_VALUE); } TEST_P(TDMVblank, VblankGetNameNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); - ASSERT_TRUE(tdm_vblank_get_name(vblanks[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_get_name(vblanks[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankGetNameNoSet) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { const char *name = (const char *)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_vblank_get_name(vblanks[v], &name) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_name(vblanks[v], &name), TDM_ERROR_NONE); ASSERT_STREQ(name, TDM_VBLANK_DEFAULT_NAME); } } @@ -549,26 +549,26 @@ TEST_P(TDMVblank, VblankSetFps) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) - ASSERT_TRUE(tdm_vblank_set_fps(vblanks[v], 60) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_fps(vblanks[v], 60), TDM_ERROR_NONE); } TEST_P(TDMVblank, VblankSetFpsNullObject) { - ASSERT_TRUE(tdm_vblank_set_fps(NULL, 60) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_set_fps(NULL, 60), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankSetFpsTwice) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { - ASSERT_TRUE(tdm_vblank_set_fps(vblanks[v], 60) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_set_fps(vblanks[v], 60) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_fps(vblanks[v], 60), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_fps(vblanks[v], 60), TDM_ERROR_NONE); } } @@ -577,26 +577,26 @@ TEST_P(TDMVblank, VblankSetFixedFps) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) - ASSERT_TRUE(tdm_vblank_set_fixed_fps(vblanks[v], 60) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_fixed_fps(vblanks[v], 60), TDM_ERROR_NONE); } TEST_P(TDMVblank, VblankSetFixedFpsNullObject) { - ASSERT_TRUE(tdm_vblank_set_fixed_fps(NULL, 60) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_set_fixed_fps(NULL, 60), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankSetFixedFpsTwice) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { - ASSERT_TRUE(tdm_vblank_set_fixed_fps(vblanks[v], 60) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_set_fixed_fps(vblanks[v], 60) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_fixed_fps(vblanks[v], 60), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_fixed_fps(vblanks[v], 60), TDM_ERROR_NONE); } } @@ -605,38 +605,38 @@ TEST_P(TDMVblank, VblankGetFps) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int fps = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_vblank_set_fps(vblanks[v], 60) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[v], &fps) == TDM_ERROR_NONE); - ASSERT_TRUE(fps == 60); + ASSERT_EQ(tdm_vblank_set_fps(vblanks[v], 60), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[v], &fps), TDM_ERROR_NONE); + ASSERT_EQ(fps, 60); } } TEST_P(TDMVblank, VblankGetFpsNullObject) { unsigned int fps = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_vblank_get_fps(NULL, &fps) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(fps == (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_vblank_get_fps(NULL, &fps), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(fps, (unsigned int)TDM_UT_INVALID_VALUE); } TEST_P(TDMVblank, VblankGetFpsNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankGetFpsNoSet) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int fps = (unsigned int)TDM_UT_INVALID_VALUE; @@ -646,17 +646,17 @@ TEST_P(TDMVblank, VblankGetFpsNoSet) if (!ut_tdm_vblank_is_avaiable(vblanks[v])) continue; - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[v], &fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[v], &fps), TDM_ERROR_NONE); ASSERT_TRUE(fps != 0 && fps != (unsigned int)TDM_UT_INVALID_VALUE); tdm_output *output = tdm_vblank_get_output(vblanks[v], &ret); - ASSERT_TRUE(output != NULL); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_NE(output, NULL); + ASSERT_EQ(ret, TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_get_mode(output, &mode) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_get_mode(output, &mode), TDM_ERROR_NONE); ASSERT_TRUE(mode != NULL && mode != (const tdm_output_mode *)TDM_UT_INVALID_VALUE); - ASSERT_TRUE(fps == mode->vrefresh); + ASSERT_EQ(fps, mode->vrefresh); } } @@ -664,54 +664,54 @@ TEST_P(TDMVblank, VblankGetFpsAfterSetFixedFps) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int fps = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_vblank_set_fps(vblanks[v], 60) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[v], &fps) == TDM_ERROR_NONE); - ASSERT_TRUE(fps == 60); + ASSERT_EQ(tdm_vblank_set_fps(vblanks[v], 60), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[v], &fps), TDM_ERROR_NONE); + ASSERT_EQ(fps, 60); - ASSERT_TRUE(tdm_vblank_set_fixed_fps(vblanks[v], 10) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[v], &fps) == TDM_ERROR_NONE); - ASSERT_TRUE(fps == 10); + ASSERT_EQ(tdm_vblank_set_fixed_fps(vblanks[v], 10), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[v], &fps), TDM_ERROR_NONE); + ASSERT_EQ(fps, 10); /* should return TDM_ERROR_NONE because tdm_vblank_set_fixed_fps would be * called by other who call tdm_vblank_set_fps. If returns error, other * can't handle error. */ - ASSERT_TRUE(tdm_vblank_set_fps(vblanks[v], 60) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[v], &fps) == TDM_ERROR_NONE); - ASSERT_TRUE(fps == 10); + ASSERT_EQ(tdm_vblank_set_fps(vblanks[v], 60), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[v], &fps), TDM_ERROR_NONE); + ASSERT_EQ(fps, 10); } } /* tdm_vblank_ignore_global_fps() */ TEST_P(TDMVblank, VblankIgnoreGlobalFpsNullObject) { - ASSERT_TRUE(tdm_vblank_ignore_global_fps(NULL, 1) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_ignore_global_fps(NULL, 1), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankIgnoreGlobalFpsSet) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) - ASSERT_TRUE(tdm_vblank_ignore_global_fps(vblanks[v], 1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_ignore_global_fps(vblanks[v], 1), TDM_ERROR_NONE); } TEST_P(TDMVblank, VblankIgnoreGlobalFpsSetTwice) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { - ASSERT_TRUE(tdm_vblank_ignore_global_fps(vblanks[v], 1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_ignore_global_fps(vblanks[v], 1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_ignore_global_fps(vblanks[v], 1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_ignore_global_fps(vblanks[v], 1), TDM_ERROR_NONE); } } @@ -719,21 +719,21 @@ TEST_P(TDMVblank, VblankIgnoreGlobalFpsUnset) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) - ASSERT_TRUE(tdm_vblank_ignore_global_fps(vblanks[v], 0) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_ignore_global_fps(vblanks[v], 0), TDM_ERROR_NONE); } TEST_P(TDMVblank, VblankIgnoreGlobalFpsUnsetTwice) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { - ASSERT_TRUE(tdm_vblank_ignore_global_fps(vblanks[v], 0) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_ignore_global_fps(vblanks[v], 0) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_ignore_global_fps(vblanks[v], 0), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_ignore_global_fps(vblanks[v], 0), TDM_ERROR_NONE); } } @@ -742,26 +742,26 @@ TEST_P(TDMVblank, VblankSetOffset) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) - ASSERT_TRUE(tdm_vblank_set_offset(vblanks[v], 10) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_offset(vblanks[v], 10), TDM_ERROR_NONE); } TEST_P(TDMVblank, VblankSetOffsetNullObject) { - ASSERT_TRUE(tdm_vblank_set_offset(NULL, 10) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_set_offset(NULL, 10), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankSetOffsetTwice) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { - ASSERT_TRUE(tdm_vblank_set_offset(vblanks[v], 10) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_set_offset(vblanks[v], 10) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_offset(vblanks[v], 10), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_offset(vblanks[v], 10), TDM_ERROR_NONE); } } @@ -770,42 +770,42 @@ TEST_P(TDMVblank, VblankGetOffset) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { int offset = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_vblank_set_offset(vblanks[v], 10) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_get_offset(vblanks[v], &offset) == TDM_ERROR_NONE); - ASSERT_TRUE(offset == 10); + ASSERT_EQ(tdm_vblank_set_offset(vblanks[v], 10), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_offset(vblanks[v], &offset), TDM_ERROR_NONE); + ASSERT_EQ(offset, 10); } } TEST_P(TDMVblank, VblankGetOffsetNullObject) { int offset = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_vblank_get_offset(NULL, &offset) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(offset == TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_vblank_get_offset(NULL, &offset), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(offset, TDM_UT_INVALID_VALUE); } TEST_P(TDMVblank, VblankGetOffsetNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); - ASSERT_TRUE(tdm_vblank_get_offset(vblanks[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_get_offset(vblanks[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankGetOffsetNoSet) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { int offset = TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_vblank_get_offset(vblanks[v], &offset) == TDM_ERROR_NONE); - ASSERT_TRUE(offset == 0); + ASSERT_EQ(tdm_vblank_get_offset(vblanks[v], &offset), TDM_ERROR_NONE); + ASSERT_EQ(offset, 0); } } @@ -814,26 +814,26 @@ TEST_P(TDMVblank, VblankSetEnableFake) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) - ASSERT_TRUE(tdm_vblank_set_enable_fake(vblanks[v], 1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_enable_fake(vblanks[v], 1), TDM_ERROR_NONE); } TEST_P(TDMVblank, VblankSetEnableFakeNullObject) { - ASSERT_TRUE(tdm_vblank_set_enable_fake(NULL, 1) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_set_enable_fake(NULL, 1), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankSetEnableFakeTwice) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { - ASSERT_TRUE(tdm_vblank_set_enable_fake(vblanks[v], 1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_set_enable_fake(vblanks[v], 1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_enable_fake(vblanks[v], 1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_enable_fake(vblanks[v], 1), TDM_ERROR_NONE); } } @@ -842,46 +842,46 @@ TEST_P(TDMVblank, VblankGetEnableFake) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int enable_fake; - ASSERT_TRUE(tdm_vblank_set_enable_fake(vblanks[v], 1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_get_enable_fake(vblanks[v], &enable_fake) == TDM_ERROR_NONE); - ASSERT_TRUE(enable_fake == 1); + ASSERT_EQ(tdm_vblank_set_enable_fake(vblanks[v], 1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_enable_fake(vblanks[v], &enable_fake), TDM_ERROR_NONE); + ASSERT_EQ(enable_fake, 1); - ASSERT_TRUE(tdm_vblank_set_enable_fake(vblanks[v], 0) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_get_enable_fake(vblanks[v], &enable_fake) == TDM_ERROR_NONE); - ASSERT_TRUE(enable_fake == 0); + ASSERT_EQ(tdm_vblank_set_enable_fake(vblanks[v], 0), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_enable_fake(vblanks[v], &enable_fake), TDM_ERROR_NONE); + ASSERT_EQ(enable_fake, 0); } } TEST_P(TDMVblank, VblankGetEnableFakeNullObject) { unsigned int enable_fake = (unsigned int)TDM_UT_INVALID_VALUE; - ASSERT_TRUE(tdm_vblank_get_enable_fake(NULL, &enable_fake) == TDM_ERROR_INVALID_PARAMETER); - ASSERT_TRUE(enable_fake == (unsigned int)TDM_UT_INVALID_VALUE); + ASSERT_EQ(tdm_vblank_get_enable_fake(NULL, &enable_fake), TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(enable_fake, (unsigned int)TDM_UT_INVALID_VALUE); } TEST_P(TDMVblank, VblankGetEnableFakeNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); - ASSERT_TRUE(tdm_vblank_get_enable_fake(vblanks[0], NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_get_enable_fake(vblanks[0], NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankGetEnableFakeNoSet) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int enable_fake; - ASSERT_TRUE(tdm_vblank_get_enable_fake(vblanks[v], &enable_fake) == TDM_ERROR_NONE); - ASSERT_TRUE(enable_fake == 0); + ASSERT_EQ(tdm_vblank_get_enable_fake(vblanks[v], &enable_fake), TDM_ERROR_NONE); + ASSERT_EQ(enable_fake, 0); } } @@ -898,8 +898,8 @@ TEST_P(TDMVblank, VblankWait) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int fps = (unsigned int)TDM_UT_INVALID_VALUE; @@ -908,7 +908,7 @@ TEST_P(TDMVblank, VblankWait) if (!ut_tdm_vblank_is_avaiable(vblanks[v])) continue; - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[v], &fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[v], &fps), TDM_ERROR_NONE); ASSERT_TRUE(fps > 0 && fps != (unsigned int)TDM_UT_INVALID_VALUE); interval = 1.0 / (double)fps; @@ -916,13 +916,13 @@ TEST_P(TDMVblank, VblankWait) unsigned int cur_seq = 0; start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq), TDM_ERROR_NONE); while (cur_seq == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) < (interval + interval)); + ASSERT_LT((end - start), (interval + interval)); } } } @@ -931,8 +931,8 @@ TEST_P(TDMVblank, VblankWaitFewTime) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int fps = (unsigned int)TDM_UT_INVALID_VALUE; @@ -941,7 +941,7 @@ TEST_P(TDMVblank, VblankWaitFewTime) if (!ut_tdm_vblank_is_avaiable(vblanks[v])) continue; - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[v], &fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[v], &fps), TDM_ERROR_NONE); ASSERT_TRUE(fps > 0 && fps != (unsigned int)TDM_UT_INVALID_VALUE); interval = 1.0 / (double)fps; @@ -950,18 +950,18 @@ TEST_P(TDMVblank, VblankWaitFewTime) cur_seq = seq1 = seq2 = 0; start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &seq1) == TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &seq2) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &seq1), TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &seq2), TDM_ERROR_NONE); while (cur_seq == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); - ASSERT_TRUE(seq1 != 0); - ASSERT_TRUE(seq2 != 0); + ASSERT_NE(seq1, 0); + ASSERT_NE(seq2, 0); /* "+ interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) < (interval + interval)); + ASSERT_LT((end - start), (interval + interval)); } } } @@ -970,18 +970,18 @@ TEST_P(TDMVblank, VblankWaitInterval0) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); - ASSERT_TRUE(tdm_vblank_wait(vblanks[0], 0, 0, 0, _ut_tdm_vblank_cb, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_wait(vblanks[0], 0, 0, 0, _ut_tdm_vblank_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankWaitInterval) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int fps = (unsigned int)TDM_UT_INVALID_VALUE; @@ -990,7 +990,7 @@ TEST_P(TDMVblank, VblankWaitInterval) if (!ut_tdm_vblank_is_avaiable(vblanks[v])) continue; - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[v], &fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[v], &fps), TDM_ERROR_NONE); ASSERT_TRUE(fps > 0 && fps != (unsigned int)TDM_UT_INVALID_VALUE); interval = 1.0 / (double)fps; @@ -999,14 +999,14 @@ TEST_P(TDMVblank, VblankWaitInterval) unsigned int cur_seq = 0; start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, t, _ut_tdm_vblank_cb, &cur_seq) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, t, _ut_tdm_vblank_cb, &cur_seq), TDM_ERROR_NONE); while (cur_seq == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) > interval * (t - 1)); - ASSERT_TRUE((end - start) < interval * t + interval); + ASSERT_GT((end - start), interval * (t - 1)); + ASSERT_LT((end - start), interval * t + interval); } } } @@ -1015,8 +1015,8 @@ TEST_P(TDMVblank, VblankWaitSeq) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int fps = (unsigned int)TDM_UT_INVALID_VALUE; @@ -1025,25 +1025,25 @@ TEST_P(TDMVblank, VblankWaitSeq) if (!ut_tdm_vblank_is_avaiable(vblanks[v])) continue; - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[v], &fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[v], &fps), TDM_ERROR_NONE); ASSERT_TRUE(fps > 0 && fps != (unsigned int)TDM_UT_INVALID_VALUE); interval = 1.0 / (double)fps; for (int t = 0; t < 10; t++) { unsigned int cur_seq = 0, temp = 0; - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq), TDM_ERROR_NONE); while (cur_seq == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_vblank_wait_seq(vblanks[v], 0, 0, cur_seq + 1, _ut_tdm_vblank_cb, &temp) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait_seq(vblanks[v], 0, 0, cur_seq + 1, _ut_tdm_vblank_cb, &temp), TDM_ERROR_NONE); while (temp == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) < (interval + interval)); + ASSERT_LT((end - start), (interval + interval)); } } } @@ -1052,8 +1052,8 @@ TEST_P(TDMVblank, VblankWaitSeqInterval) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int fps = (unsigned int)TDM_UT_INVALID_VALUE; @@ -1062,7 +1062,7 @@ TEST_P(TDMVblank, VblankWaitSeqInterval) if (!ut_tdm_vblank_is_avaiable(vblanks[v])) continue; - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[v], &fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[v], &fps), TDM_ERROR_NONE); ASSERT_TRUE(fps > 0 && fps != (unsigned int)TDM_UT_INVALID_VALUE); interval = 1.0 / (double)fps; @@ -1070,14 +1070,14 @@ TEST_P(TDMVblank, VblankWaitSeqInterval) for (int t = 1; t < 10; t++) { unsigned int cur_seq = 0, temp = 0; - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq), TDM_ERROR_NONE); while (cur_seq == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_vblank_wait_seq(vblanks[v], 0, 0, cur_seq + t, _ut_tdm_vblank_cb, &temp) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait_seq(vblanks[v], 0, 0, cur_seq + t, _ut_tdm_vblank_cb, &temp), TDM_ERROR_NONE); while (temp == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); #if 0 @@ -1086,8 +1086,8 @@ printf("@@@ %s(%d) cur_seq(%d) t(%d) start(%.6f) end(%.6f) diff(%.6f) (%.6f~%.6f #endif /* "+ interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) > (interval * (t - 1))); - ASSERT_TRUE((end - start) < (interval * t + interval)); + ASSERT_GT((end - start), (interval * (t - 1))); + ASSERT_LT((end - start), (interval * t + interval)); } } } @@ -1098,36 +1098,36 @@ TEST_P(TDMVblank, VblankWaitNullObject) unsigned int cur_seq = 0; - ASSERT_TRUE(tdm_vblank_wait(NULL, 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_wait(NULL, 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankWaitNullOther) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestCreateVblanks(), true); - ASSERT_TRUE(tdm_vblank_wait(vblanks[0], 0, 0, 0, NULL, NULL) == TDM_ERROR_INVALID_PARAMETER); + ASSERT_EQ(tdm_vblank_wait(vblanks[0], 0, 0, 0, NULL, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMVblank, VblankWaitDpmsOff) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { tdm_error ret; tdm_output *output = tdm_vblank_get_output(vblanks[v], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); if (!ut_tdm_output_is_connected(output)) continue; - ASSERT_TRUE(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, NULL) == TDM_ERROR_DPMS_OFF); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, NULL), TDM_ERROR_DPMS_OFF); } } @@ -1135,24 +1135,24 @@ TEST_P(TDMVblank, VblankWaitBeforeDpmsOff) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int temp = 0; tdm_error ret; tdm_output *output = tdm_vblank_get_output(vblanks[v], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); if (!ut_tdm_output_is_connected(output)) continue; - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &temp) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &temp), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); while (temp == 0) - ASSERT_TRUE(tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_display_handle_events(dpy), TDM_ERROR_NONE); } } @@ -1160,13 +1160,13 @@ TEST_P(TDMVblank, VblankWaitSetEnableFakeDpmsOff) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { tdm_error ret; tdm_output *output = tdm_vblank_get_output(vblanks[v], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); if (!ut_tdm_vblank_is_avaiable(vblanks[v])) continue; @@ -1174,11 +1174,11 @@ TEST_P(TDMVblank, VblankWaitSetEnableFakeDpmsOff) if (!ut_tdm_output_is_connected(output)) continue; - ASSERT_TRUE(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_OFF) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_output_set_dpms(output, TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_set_enable_fake(vblanks[v], 1) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_enable_fake(vblanks[v], 1), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, NULL), TDM_ERROR_NONE); } } @@ -1186,18 +1186,18 @@ TEST_P(TDMVblank, VblankWaitDisconnectedOutput) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { tdm_error ret; tdm_output *output = tdm_vblank_get_output(vblanks[v], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); if (ut_tdm_output_is_connected(output)) continue; - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, NULL) == TDM_ERROR_OUTPUT_DISCONNECTED); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, NULL), TDM_ERROR_OUTPUT_DISCONNECTED); } } @@ -1205,8 +1205,8 @@ TEST_P(TDMVblank, VblankWaitSetOffset) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int fps = (unsigned int)TDM_UT_INVALID_VALUE; @@ -1215,9 +1215,9 @@ TEST_P(TDMVblank, VblankWaitSetOffset) if (!ut_tdm_vblank_is_avaiable(vblanks[v])) continue; - ASSERT_TRUE(tdm_vblank_set_offset(vblanks[v], 100) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_offset(vblanks[v], 100), TDM_ERROR_NONE); - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[v], &fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[v], &fps), TDM_ERROR_NONE); ASSERT_TRUE(fps > 0 && fps != (unsigned int)TDM_UT_INVALID_VALUE); interval = 1.0 / (double)fps; @@ -1225,14 +1225,14 @@ TEST_P(TDMVblank, VblankWaitSetOffset) unsigned int cur_seq = 0; start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq), TDM_ERROR_NONE); while (cur_seq == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) > (0.1)); - ASSERT_TRUE((end - start) < (interval + interval + 0.1)); + ASSERT_GT((end - start), (0.1)); + ASSERT_LT((end - start), (interval + interval + 0.1)); } } } @@ -1241,8 +1241,8 @@ TEST_P(TDMVblank, VblankWaitSetFps) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int fps = (unsigned int)TDM_UT_INVALID_VALUE; @@ -1251,26 +1251,26 @@ TEST_P(TDMVblank, VblankWaitSetFps) if (!ut_tdm_vblank_is_avaiable(vblanks[v])) continue; - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[v], &fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[v], &fps), TDM_ERROR_NONE); ASSERT_TRUE(fps > 0 && fps != (unsigned int)TDM_UT_INVALID_VALUE); vrefresh_interval = 1.0 / (double)fps; fps /= 2; - ASSERT_TRUE(tdm_vblank_set_fps(vblanks[v], fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_fps(vblanks[v], fps), TDM_ERROR_NONE); interval = 1.0 / (double)fps; for (int t = 0; t < 3; t++) { unsigned int cur_seq = 0; start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq), TDM_ERROR_NONE); while (cur_seq == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ vrefresh_interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) > (interval - vrefresh_interval)); - ASSERT_TRUE((end - start) < (interval + vrefresh_interval)); + ASSERT_GT((end - start), (interval - vrefresh_interval)); + ASSERT_LT((end - start), (interval + vrefresh_interval)); } } } @@ -1279,8 +1279,8 @@ TEST_P(TDMVblank, VblankWaitSetFixedFps) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { unsigned int fps = (unsigned int)TDM_UT_INVALID_VALUE; @@ -1289,27 +1289,27 @@ TEST_P(TDMVblank, VblankWaitSetFixedFps) if (!ut_tdm_vblank_is_avaiable(vblanks[v])) continue; - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[v], &fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[v], &fps), TDM_ERROR_NONE); ASSERT_TRUE(fps > 0 && fps != (unsigned int)TDM_UT_INVALID_VALUE); interval = 1.0 / (double)fps; - ASSERT_TRUE(tdm_vblank_set_fixed_fps(vblanks[v], fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_fixed_fps(vblanks[v], fps), TDM_ERROR_NONE); /* this fps will be ignored because it has fixed fps value */ fps /= 2; - ASSERT_TRUE(tdm_vblank_set_fps(vblanks[v], fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_fps(vblanks[v], fps), TDM_ERROR_NONE); for (int t = 0; t < 3; t++) { unsigned int cur_seq = 0; start = tdm_helper_get_time(); - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq), TDM_ERROR_NONE); while (cur_seq == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+ vrefresh_interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) < (interval + interval)); + ASSERT_LT((end - start), (interval + interval)); } } } @@ -1324,19 +1324,19 @@ TEST_P(TDMVblank, VblankWaitEnableDisableGlobalFps) unsigned int global_fps = 5; double start, end, interval; - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks3() == true); - ASSERT_TRUE(vblank_count == 3); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks3(), true); + ASSERT_EQ(vblank_count, 3); if (!ut_tdm_vblank_is_avaiable(vblanks[0])) return; - ASSERT_TRUE(tdm_vblank_get_fps(vblanks[0], &fps) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_get_fps(vblanks[0], &fps), TDM_ERROR_NONE); ASSERT_TRUE(fps >= 30 && fps != (unsigned int)TDM_UT_INVALID_VALUE); vrefresh_interval = 1.0 / (double)fps; for (int v = 0; v < 3; v++) { - ASSERT_TRUE(tdm_vblank_set_fixed_fps(vblanks[v], 10 * (v + 1)) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_set_fixed_fps(vblanks[v], 10 * (v + 1)), TDM_ERROR_NONE); interval = 1.0 / (double)(10 * (v + 1)); } @@ -1345,57 +1345,57 @@ TEST_P(TDMVblank, VblankWaitEnableDisableGlobalFps) for (int v = 0; v < 3; v++) { cur_seq[v] = 0; - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq[v]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq[v]), TDM_ERROR_NONE); } start = tdm_helper_get_time(); while (cur_seq[2] == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); /* "+- vrefresh_interval" consider the delay of socket communication between kernel and platform */ - ASSERT_TRUE((end - start) > (interval - vrefresh_interval)); - ASSERT_TRUE((end - start) < (interval + vrefresh_interval)); + ASSERT_GT((end - start), (interval - vrefresh_interval)); + ASSERT_LT((end - start), (interval + vrefresh_interval)); - ASSERT_TRUE(cur_seq[1] == 0); - ASSERT_TRUE(cur_seq[0] == 0); + ASSERT_EQ(cur_seq[1], 0); + ASSERT_EQ(cur_seq[0], 0); while (cur_seq[1] == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); - ASSERT_TRUE(cur_seq[0] == 0); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); + ASSERT_EQ(cur_seq[0], 0); while (cur_seq[0] == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); /* disable test. global fps doesn't effect server's vblanks */ tdm_vblank_enable_global_fps(0, 0); for (int v = 0; v < 3; v++) { cur_seq[v] = 0; - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq[v]) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, &cur_seq[v]), TDM_ERROR_NONE); } while (cur_seq[2] == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); - ASSERT_TRUE(cur_seq[1] == 0); - ASSERT_TRUE(cur_seq[0] == 0); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); + ASSERT_EQ(cur_seq[1], 0); + ASSERT_EQ(cur_seq[0], 0); while (cur_seq[1] == 0) - ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE); - ASSERT_TRUE(cur_seq[0] == 0); + ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); + ASSERT_EQ(cur_seq[0], 0); } TEST_P(TDMVblank, VblankWaitSetEnableFakeDisconnected) { TDM_UT_SKIP_FLAG(has_outputs); - ASSERT_TRUE(TestPrepareOutput() == true); - ASSERT_TRUE(TestCreateVblanks() == true); + ASSERT_EQ(TestPrepareOutput(), true); + ASSERT_EQ(TestCreateVblanks(), true); for (int v = 0; v < vblank_count; v++) { tdm_error ret; tdm_output *output = tdm_vblank_get_output(vblanks[v], &ret); - ASSERT_TRUE(ret == TDM_ERROR_NONE); + ASSERT_EQ(ret, TDM_ERROR_NONE); if (!ut_tdm_vblank_is_avaiable(vblanks[v])) continue; @@ -1403,9 +1403,9 @@ TEST_P(TDMVblank, VblankWaitSetEnableFakeDisconnected) if (ut_tdm_output_is_connected(output)) continue; - ASSERT_TRUE(tdm_vblank_set_enable_fake(vblanks[v], 1) == TDM_ERROR_DPMS_OFF); + ASSERT_EQ(tdm_vblank_set_enable_fake(vblanks[v], 1), TDM_ERROR_DPMS_OFF); - ASSERT_TRUE(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, NULL) == TDM_ERROR_NONE); + ASSERT_EQ(tdm_vblank_wait(vblanks[v], 0, 0, 1, _ut_tdm_vblank_cb, NULL), TDM_ERROR_NONE); } } -- 2.7.4