utests: some modification for helper

Change-Id: I3fd90c2a65425478d9bcbbdbdce77a0afd14f682

diff --git a/utests/src/ut_tdm_helper.cpp b/utests/src/ut_tdm_helper.cpp
index 815e388..9684f64 100644 (file)
--- a/utests/src/ut_tdm_helper.cpp
+++ b/utests/src/ut_tdm_helper.cpp
@@ -57,7 +57,23 @@ TEST_P(TDMHelper, HelperGetTime)
        ASSERT_GT(tdm_helper_get_time(), 0.0);
 }
 
-TEST_P(TDMHelper, HelperDumpBuffer)
+TEST_P(TDMHelper, HelperDumpBufferXR24)
+{
+       tbm_surface_h buffer;
+
+       buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_XRGB8888);
+       ASSERT_NE(buffer, NULL);
+
+       tdm_test_buffer_fill(buffer, PATTERN_SMPTE);
+
+       char filename[256];
+       snprintf(filename, sizeof filename, "%s.png", typeid(*this).name());
+       tdm_helper_dump_buffer(buffer, (const char*)filename);
+
+       tbm_surface_destroy(buffer);
+}
+
+TEST_P(TDMHelper, HelperDumpBufferAR24)
 {
        tbm_surface_h buffer;
 
@@ -97,9 +113,7 @@ TEST_P(TDMHelper, HelperClearBufferPos)
 
        tdm_helper_clear_buffer_pos(buffer, &pos);
 
-       char filename[256];
-       snprintf(filename, sizeof filename, "%s.png", typeid(*this).name());
-       tdm_helper_dump_buffer(buffer, (const char*)filename);
+       tdm_helper_dump_buffer_str(buffer, NULL, (char*)typeid(*this).name());
 
        tbm_surface_destroy(buffer);
 }
@@ -117,9 +131,7 @@ TEST_P(TDMHelper, HelperClearBufferColor)
 
        tdm_helper_clear_buffer_color(buffer, &pos, color);
 
-       char filename[256];
-       snprintf(filename, sizeof filename, "%s.png", typeid(*this).name());
-       tdm_helper_dump_buffer(buffer, (const char*)filename);
+       tdm_helper_dump_buffer_str(buffer, NULL, (char*)typeid(*this).name());
 
        tbm_surface_destroy(buffer);
 }
@@ -135,9 +147,7 @@ TEST_P(TDMHelper, HelperClearBufferARGB)
 
        tdm_helper_clear_buffer(buffer);
 
-       char filename[256];
-       snprintf(filename, sizeof filename, "%s.png", typeid(*this).name());
-       tdm_helper_dump_buffer(buffer, (const char*)filename);
+       tdm_helper_dump_buffer_str(buffer, NULL, (char*)typeid(*this).name());
 
        tbm_surface_destroy(buffer);
 }
@@ -153,9 +163,7 @@ TEST_P(TDMHelper, HelperClearBufferXRGB)
 
        tdm_helper_clear_buffer(buffer);
 
-       char filename[256];
-       snprintf(filename, sizeof filename, "%s.png", typeid(*this).name());
-       tdm_helper_dump_buffer(buffer, (const char*)filename);
+       tdm_helper_dump_buffer_str(buffer, NULL, (char*)typeid(*this).name());
 
        tbm_surface_destroy(buffer);
 }
@@ -171,9 +179,7 @@ TEST_P(TDMHelper, HelperClearBufferYUV420)
 
        tdm_helper_clear_buffer(buffer);
 
-       char filename[256];
-       snprintf(filename, sizeof filename, "%s.png", typeid(*this).name());
-       tdm_helper_dump_buffer(buffer, (const char*)filename);
+       tdm_helper_dump_buffer_str(buffer, NULL, (char*)typeid(*this).name());
 
        tbm_surface_destroy(buffer);
 }
@@ -189,9 +195,7 @@ TEST_P(TDMHelper, HelperClearBufferNV12)
 
        tdm_helper_clear_buffer(buffer);
 
-       char filename[256];
-       snprintf(filename, sizeof filename, "%s.png", typeid(*this).name());
-       tdm_helper_dump_buffer(buffer, (const char*)filename);
+       tdm_helper_dump_buffer_str(buffer, NULL, (char*)typeid(*this).name());
 
        tbm_surface_destroy(buffer);
 }
@@ -207,45 +211,7 @@ TEST_P(TDMHelper, HelperClearBufferNV21)
 
        tdm_helper_clear_buffer(buffer);
 
-       char filename[256];
-       snprintf(filename, sizeof filename, "%s.png", typeid(*this).name());
-       tdm_helper_dump_buffer(buffer, (const char*)filename);
-
-       tbm_surface_destroy(buffer);
-}
-
-TEST_P(TDMHelper, HelperClearBufferYUYV)
-{
-       tbm_surface_h buffer;
-
-       buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_YUYV);
-       ASSERT_NE(buffer, NULL);
-
-       tdm_test_buffer_fill(buffer, PATTERN_SMPTE);
-
-       tdm_helper_clear_buffer(buffer);
-
-       char filename[256];
-       snprintf(filename, sizeof filename, "%s.png", typeid(*this).name());
-       tdm_helper_dump_buffer(buffer, (const char*)filename);
-
-       tbm_surface_destroy(buffer);
-}
-
-TEST_P(TDMHelper, HelperClearBufferUYVY)
-{
-       tbm_surface_h buffer;
-
-       buffer = tbm_surface_create(TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE, TBM_FORMAT_UYVY);
-       ASSERT_NE(buffer, NULL);
-
-       tdm_test_buffer_fill(buffer, PATTERN_SMPTE);
-
-       tdm_helper_clear_buffer(buffer);
-
-       char filename[256];
-       snprintf(filename, sizeof filename, "%s.png", typeid(*this).name());
-       tdm_helper_dump_buffer(buffer, (const char*)filename);
+       tdm_helper_dump_buffer_str(buffer, NULL, (char*)typeid(*this).name());
 
        tbm_surface_destroy(buffer);
 }
@@ -284,9 +250,7 @@ TEST_P(TDMHelper, HelperConvertBufferRotate0)
 
        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());
-       tdm_helper_dump_buffer(temp, (const char*)filename);
+       tdm_helper_dump_buffer_str(temp, NULL, (char*)typeid(*this).name());
 
        tbm_surface_destroy(buffer);
        tbm_surface_destroy(temp);
@@ -309,9 +273,7 @@ TEST_P(TDMHelper, HelperConvertBufferRotate0Flip)
 
        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());
-       tdm_helper_dump_buffer(temp, (const char*)filename);
+       tdm_helper_dump_buffer_str(temp, NULL, (char*)typeid(*this).name());
 
        tbm_surface_destroy(buffer);
        tbm_surface_destroy(temp);
@@ -334,9 +296,7 @@ TEST_P(TDMHelper, HelperConvertBufferRotate90)
 
        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());
-       tdm_helper_dump_buffer(temp, (const char*)filename);
+       tdm_helper_dump_buffer_str(temp, NULL, (char*)typeid(*this).name());
 
        tbm_surface_destroy(buffer);
        tbm_surface_destroy(temp);
@@ -359,9 +319,7 @@ TEST_P(TDMHelper, HelperConvertBufferRotate180)
 
        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());
-       tdm_helper_dump_buffer(temp, (const char*)filename);
+       tdm_helper_dump_buffer_str(temp, NULL, (char*)typeid(*this).name());
 
        tbm_surface_destroy(buffer);
        tbm_surface_destroy(temp);
@@ -384,9 +342,7 @@ TEST_P(TDMHelper, HelperConvertBufferRotate270)
 
        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());
-       tdm_helper_dump_buffer(temp, (const char*)filename);
+       tdm_helper_dump_buffer_str(temp, NULL, (char*)typeid(*this).name());
 
        tbm_surface_destroy(buffer);
        tbm_surface_destroy(temp);
@@ -465,9 +421,7 @@ TEST_P(TDMHelper, HelperCaptureOutput)
                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());
-               tdm_helper_dump_buffer(dump, (const char*)filename);
+               tdm_helper_dump_buffer_str(dump, NULL, (char*)typeid(*this).name());
 
                tbm_surface_destroy(dump);
        }