From 32c967661f56774d1071123d850ea6784decbf28 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Tue, 13 Mar 2018 16:38:41 +0900 Subject: [PATCH] utests: apply coding style Change-Id: I6e063ca7ea46a9c2c7a0113fa95d9ed1d829366a --- utests/src/ut_tdm_backend_capture.cpp | 12 ++++++------ utests/src/ut_tdm_backend_display.cpp | 4 ++-- utests/src/ut_tdm_backend_pp.cpp | 24 ++++++++++++------------ utests/src/ut_tdm_buffer.cpp | 3 ++- utests/src/ut_tdm_client.cpp | 2 +- utests/src/ut_tdm_event_loop.cpp | 3 ++- utests/src/ut_tdm_helper.cpp | 9 +++++---- utests/src/ut_tdm_hwc_window.cpp | 11 ++++++----- utests/src/ut_tdm_layer.cpp | 7 ++++--- utests/src/ut_tdm_main.cpp | 2 +- utests/src/ut_tdm_output.cpp | 4 ++-- utests/src/ut_tdm_output_hwc.cpp | 3 ++- utests/src/ut_tdm_vblank.cpp | 5 ----- 13 files changed, 45 insertions(+), 44 deletions(-) diff --git a/utests/src/ut_tdm_backend_capture.cpp b/utests/src/ut_tdm_backend_capture.cpp index 6482b4b..6604be1 100644 --- a/utests/src/ut_tdm_backend_capture.cpp +++ b/utests/src/ut_tdm_backend_capture.cpp @@ -456,7 +456,7 @@ TEST_P(TDMBackendCapture, CaptureAttach) continue; ASSERT_EQ(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], - TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); + TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); for (int b = 0; b < 3; b++) ASSERT_EQ(tdm_capture_attach(capture, buffers[b]), TDM_ERROR_NONE); @@ -541,7 +541,7 @@ TEST_P(TDMBackendCapture, CaptureNoScaleNoTransformNoCSC) continue; ASSERT_EQ(TestPrepare(o, mode->hdisplay, mode->vdisplay, test_formats[f], - TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); + TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); ASSERT_EQ(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb, &done), TDM_ERROR_NONE); @@ -583,7 +583,7 @@ TEST_P(TDMBackendCapture, CaptureScaleTransformCSC) continue; ASSERT_EQ(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], - TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); + TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); ASSERT_EQ(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb, &done), TDM_ERROR_NONE); @@ -632,7 +632,7 @@ TEST_P(TDMBackendCapture, CaptureAttachFewTimesInOneCommit) continue; ASSERT_EQ(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], - TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); + TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); ASSERT_EQ(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb2, &done), TDM_ERROR_NONE); @@ -669,7 +669,7 @@ TEST_P(TDMBackendCapture, CaptureDestroyWithoutCommit) continue; ASSERT_EQ(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], - TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); + TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); ASSERT_EQ(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb2, NULL), TDM_ERROR_NONE); @@ -700,7 +700,7 @@ TEST_P(TDMBackendCapture, CaptureDestroyBeforeDone) continue; ASSERT_EQ(TestPrepare(o, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, test_formats[f], - TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); + TDM_TRANSFORM_NORMAL, TDM_CAPTURE_TYPE_ONESHOT, -1), true); ASSERT_EQ(tdm_capture_set_done_handler(capture, _ut_tdm_capture_done_cb2, NULL), TDM_ERROR_NONE); diff --git a/utests/src/ut_tdm_backend_display.cpp b/utests/src/ut_tdm_backend_display.cpp index 1d94fb9..b69ef32 100644 --- a/utests/src/ut_tdm_backend_display.cpp +++ b/utests/src/ut_tdm_backend_display.cpp @@ -58,7 +58,7 @@ void TDMBackendBasic::SetUp(void) ASSERT_GE(output_count, 0); if (output_count > 0) { - outputs = (tdm_output**)calloc(output_count, sizeof (tdm_output*)); + outputs = (tdm_output**)calloc(output_count, sizeof(tdm_output*)); ASSERT_NE(outputs, NULL); for (int o = 0; o < output_count; o++) { @@ -394,7 +394,7 @@ retry: bool done = false; TDM_UT_ASSERT_TRUE(tdm_output_commit(outputs[o], 0, _ut_tdm_backend_output_commit_cb, &done) == TDM_ERROR_NONE, - "Check output_commit(), output_set_commit_handler()"); + "Check output_commit(), output_set_commit_handler()"); while (!done) TDM_UT_ASSERT_TRUE(ut_tdm_display_handle_events(dpy) == TDM_ERROR_NONE, "Check display_get_fd(), display_handle_events()"); diff --git a/utests/src/ut_tdm_backend_pp.cpp b/utests/src/ut_tdm_backend_pp.cpp index d1c798c..b326f4a 100644 --- a/utests/src/ut_tdm_backend_pp.cpp +++ b/utests/src/ut_tdm_backend_pp.cpp @@ -334,8 +334,8 @@ TEST_P(TDMBackendPP, PPAttach) for (int f = 0; f < format_count; 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_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], + TDM_TRANSFORM_NORMAL), true); for (int b = 0; b < 3; b++) ASSERT_EQ(tdm_pp_attach(pp, srcbuf[b], dstbuf[b]), TDM_ERROR_NONE); @@ -392,8 +392,8 @@ TEST_P(TDMBackendPP, PPNoScaleNoTransformNoCSC) ASSERT_EQ(PreparePP(), true); 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_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE / 2, formats[0], + TDM_TRANSFORM_NORMAL), true); ASSERT_EQ(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb, &done), TDM_ERROR_NONE); @@ -431,8 +431,8 @@ TEST_P(TDMBackendPP, PPScaleTransformCSC) TDM_INFO("format(%c%c%c%c) ------> format(%c%c%c%c)", FOURCC_STR(format1), FOURCC_STR(format2)); 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_UT_BUFFER_SIZE * 2, TDM_UT_BUFFER_SIZE * 2, format2, + TDM_TRANSFORM_NORMAL), true); ASSERT_EQ(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb, &done), TDM_ERROR_NONE); @@ -472,8 +472,8 @@ TEST_P(TDMBackendPP, DISABLED_PPAttachFewTimesInOneCommit) snprintf(temp, sizeof temp, "%c%c%c%c", FOURCC_STR(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_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], + TDM_TRANSFORM_NORMAL), true); ASSERT_EQ(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb2, &done), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) @@ -499,8 +499,8 @@ TEST_P(TDMBackendPP, PPDestroyWithoutCommit) int f = 0; 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_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], + TDM_TRANSFORM_NORMAL), true); ASSERT_EQ(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb2, NULL), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) @@ -521,8 +521,8 @@ TEST_P(TDMBackendPP, PPDestroyBeforeDone) int f = 0; 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_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, formats[f], + TDM_TRANSFORM_NORMAL), true); ASSERT_EQ(tdm_pp_set_done_handler(pp, _ut_tdm_pp_done_cb2, NULL), TDM_ERROR_NONE); for (int b = 0; b < 3; b++) diff --git a/utests/src/ut_tdm_buffer.cpp b/utests/src/ut_tdm_buffer.cpp index c2df7ee..3443176 100644 --- a/utests/src/ut_tdm_buffer.cpp +++ b/utests/src/ut_tdm_buffer.cpp @@ -30,7 +30,8 @@ #include "ut_tdm.h" -class TDMBuffer : public TDMDisplay { +class TDMBuffer : public TDMDisplay +{ public: tbm_surface_h buffer; TDMBuffer(); diff --git a/utests/src/ut_tdm_client.cpp b/utests/src/ut_tdm_client.cpp index 3df66c8..055dbc3 100644 --- a/utests/src/ut_tdm_client.cpp +++ b/utests/src/ut_tdm_client.cpp @@ -952,7 +952,7 @@ TEST_P(TDMClient, ClientVblankWaitFewTime) 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) + while (!done1 || !done2 || !done3) ASSERT_EQ(tdm_client_handle_events_timeout(client, 3000), TDM_ERROR_NONE); end = tdm_helper_get_time(); diff --git a/utests/src/ut_tdm_event_loop.cpp b/utests/src/ut_tdm_event_loop.cpp index ddc3380..3fffecb 100644 --- a/utests/src/ut_tdm_event_loop.cpp +++ b/utests/src/ut_tdm_event_loop.cpp @@ -30,7 +30,8 @@ #include "ut_tdm.h" -class TDMEventLoop : public TDMDisplay { +class TDMEventLoop : public TDMDisplay +{ public: TDMEventLoop(); void SetUp(void); diff --git a/utests/src/ut_tdm_helper.cpp b/utests/src/ut_tdm_helper.cpp index e0fb1ba..815e388 100644 --- a/utests/src/ut_tdm_helper.cpp +++ b/utests/src/ut_tdm_helper.cpp @@ -30,7 +30,8 @@ #include "ut_tdm.h" -class TDMHelper : public TDMOutput { +class TDMHelper : public TDMOutput +{ public: TDMHelper(); void SetUp(void); @@ -462,7 +463,7 @@ TEST_P(TDMHelper, HelperCaptureOutput) ASSERT_NE(dump, NULL); 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); + _ut_tdm_helper_capture_cb, NULL), TDM_ERROR_NONE); char filename[256]; snprintf(filename, sizeof filename, "%s.png", typeid(*this).name()); @@ -478,7 +479,7 @@ TEST_P(TDMHelper, HelperCaptureOutputNullObject) tbm_surface_h dump = (tbm_surface_h)TDM_UT_INVALID_VALUE; 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); + _ut_tdm_helper_capture_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMHelper, HelperCaptureOutputNullOther) @@ -494,7 +495,7 @@ TEST_P(TDMHelper, HelperCaptureOutputNullOther) tbm_surface_h dump = (tbm_surface_h)TDM_UT_INVALID_VALUE; 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); + _ut_tdm_helper_capture_cb, NULL), TDM_ERROR_INVALID_PARAMETER); } TEST_P(TDMHelper, HelperGetDisplayInformation) diff --git a/utests/src/ut_tdm_hwc_window.cpp b/utests/src/ut_tdm_hwc_window.cpp index 2a1fdf5..222bca9 100644 --- a/utests/src/ut_tdm_hwc_window.cpp +++ b/utests/src/ut_tdm_hwc_window.cpp @@ -32,7 +32,8 @@ #define HWC_WIN_NUM 5 -class TDMHwcWindow : public TDMOutput { +class TDMHwcWindow : public TDMOutput +{ public: TDMHwcWindow(); void SetUp(void); @@ -91,9 +92,9 @@ TEST_P(TDMHwcWindow, DestroyWindowFailNull) for (int o = 0; o < output_count; o++) { if (ut_tdm_output_is_hwc_enable(outputs[o])) { - /* test: hw is NULL*/ - error = tdm_output_hwc_destroy_window(outputs[o], NULL); - ASSERT_NE(TDM_ERROR_NONE, error); + /* test: hw is NULL*/ + error = tdm_output_hwc_destroy_window(outputs[o], NULL); + ASSERT_NE(TDM_ERROR_NONE, error); } } } @@ -187,7 +188,7 @@ TEST_P(TDMHwcWindow, SetCompositionTypeFailInvalieCompositionType) TDM_UT_SKIP_FLAG(has_outputs); for (int w = 0; w < hwc_count; w++) { - error = tdm_hwc_window_set_composition_type(hwc_wins[w], tdm_hwc_window_composition(TDM_COMPOSITION_NONE-1)); + error = tdm_hwc_window_set_composition_type(hwc_wins[w], tdm_hwc_window_composition(TDM_COMPOSITION_NONE - 1)); ASSERT_NE(TDM_ERROR_NONE, error); } } diff --git a/utests/src/ut_tdm_layer.cpp b/utests/src/ut_tdm_layer.cpp index 3b830a0..7c3b143 100644 --- a/utests/src/ut_tdm_layer.cpp +++ b/utests/src/ut_tdm_layer.cpp @@ -30,7 +30,8 @@ #include "ut_tdm.h" -class TDMLayer : public TDMOutput { +class TDMLayer : public TDMOutput +{ public: bool has_layers; tdm_layer **layers; @@ -52,7 +53,7 @@ TDMLayer::TDMLayer() layers = NULL; layer_count = TDM_UT_INVALID_VALUE; - for(int b = 0; b < 3; b++) + for (int b = 0; b < 3; b++) buffers[b] = NULL; buffer_queue = NULL; @@ -105,7 +106,7 @@ void TDMLayer::TearDown(void) void TDMLayer::DestroyBuffers(void) { - for(int b = 0; b < 3; b++) { + for (int b = 0; b < 3; b++) { if (buffers[b]) { tbm_surface_destroy(buffers[b]); buffers[b] = NULL; diff --git a/utests/src/ut_tdm_main.cpp b/utests/src/ut_tdm_main.cpp index b4d9f19..8ed5556 100644 --- a/utests/src/ut_tdm_main.cpp +++ b/utests/src/ut_tdm_main.cpp @@ -52,7 +52,7 @@ int main(int argc, char **argv) AllTestSuccess = RUN_ALL_TESTS() == 0 ? true : false; } catch (const ::testing::internal::GoogleTestFailureException & e) { AllTestSuccess = false; - std::cout << "GoogleTestFailureException was thrown:"<< e.what() << std::endl; + std::cout << "GoogleTestFailureException was thrown:" << e.what() << std::endl; std::cout << "\n"; } diff --git a/utests/src/ut_tdm_output.cpp b/utests/src/ut_tdm_output.cpp index ab7dfa7..b038f81 100644 --- a/utests/src/ut_tdm_output.cpp +++ b/utests/src/ut_tdm_output.cpp @@ -50,7 +50,7 @@ void TDMOutput::SetUp(void) ASSERT_GE(output_count, 0); if (output_count > 0) { - outputs = (tdm_output**)calloc(output_count, sizeof (tdm_output*)); + outputs = (tdm_output**)calloc(output_count, sizeof(tdm_output*)); ASSERT_NE(outputs, NULL); for (int o = 0; o < output_count; o++) { @@ -1359,7 +1359,7 @@ TEST_P(TDMOutput, OutputWaitVblankBeforeDpmsOff) ASSERT_EQ(tdm_output_wait_vblank(outputs[o], 1, 0, _ut_tdm_output_done_cb, &done), TDM_ERROR_NONE); if (t == 9) ASSERT_EQ(tdm_output_set_dpms(outputs[o], TDM_OUTPUT_DPMS_OFF), TDM_ERROR_NONE); - while(!done) + while (!done) ASSERT_EQ(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 9b3e274..73bac1c 100644 --- a/utests/src/ut_tdm_output_hwc.cpp +++ b/utests/src/ut_tdm_output_hwc.cpp @@ -30,7 +30,8 @@ #include "ut_tdm.h" -class TDMOutputHwc : public TDMOutput { +class TDMOutputHwc : public TDMOutput +{ public: TDMOutputHwc(); void SetUp(void); diff --git a/utests/src/ut_tdm_vblank.cpp b/utests/src/ut_tdm_vblank.cpp index e72372e..c72da58 100644 --- a/utests/src/ut_tdm_vblank.cpp +++ b/utests/src/ut_tdm_vblank.cpp @@ -1080,11 +1080,6 @@ TEST_P(TDMVblank, VblankWaitSeqInterval) ASSERT_EQ(ut_tdm_display_handle_events(dpy), TDM_ERROR_NONE); end = tdm_helper_get_time(); -#if 0 -printf("@@@ %s(%d) cur_seq(%d) t(%d) start(%.6f) end(%.6f) diff(%.6f) (%.6f~%.6f)\n", - __FUNCTION__, __LINE__, cur_seq, t, start, end, end - start, (interval * (t - 1)), (interval * t + interval)); -#endif - /* "+ interval" consider the delay of socket communication between kernel and platform */ ASSERT_GT((end - start), (interval * (t - 1))); ASSERT_LT((end - start), (interval * t + interval)); -- 2.7.4