[UTC][streamrecorder][Non-ACR] fix build fail on SDK & add code for line coverage.

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: Id8fc231c7ee702642ed63e2acdbfd651b222a2ea

diff --git a/src/utc/streamrecorder/utc_media_streamrecorder.c b/src/utc/streamrecorder/utc_media_streamrecorder.c
index 25e0561..be3e300 100755 (executable)
--- a/src/utc/streamrecorder/utc_media_streamrecorder.c
+++ b/src/utc/streamrecorder/utc_media_streamrecorder.c
@@ -305,9 +305,12 @@ int utc_media_streamrecorder_get_audio_samplerate_n2(void)
 int utc_media_streamrecorder_get_recording_limitation_p(void)
 {
     int ret = STREAMRECORDER_ERROR_NONE;
-    int size = 0;
+    int value = 0;
+
+    ret = streamrecorder_get_recording_limit(recorder, STREAMRECORDER_RECORDING_LIMIT_TYPE_SIZE, &value);
+    assert_eq(ret, STREAMRECORDER_ERROR_NONE);
 
-    ret = streamrecorder_get_recording_limit(recorder, STREAMRECORDER_RECORDING_LIMIT_TYPE_SIZE, &size);
+    ret = streamrecorder_get_recording_limit(recorder, STREAMRECORDER_RECORDING_LIMIT_TYPE_TIME, &value);
     assert_eq(ret, STREAMRECORDER_ERROR_NONE);
 
     return 0;
@@ -330,6 +333,9 @@ int utc_media_streamrecorder_get_recording_limit_n1(void)
     ret = streamrecorder_get_recording_limit(recorder, STREAMRECORDER_RECORDING_LIMIT_TYPE_SIZE, NULL);
     assert_eq(ret, STREAMRECORDER_ERROR_INVALID_PARAMETER);
 
+    ret = streamrecorder_get_recording_limit(recorder, STREAMRECORDER_RECORDING_LIMIT_TYPE_TIME, NULL);
+    assert_eq(ret, STREAMRECORDER_ERROR_INVALID_PARAMETER);
+
     return 0;
 }
 
@@ -347,6 +353,9 @@ int utc_media_streamrecorder_get_recording_limit_n2(void)
 {
     int ret = STREAMRECORDER_ERROR_NONE;
 
+    ret = streamrecorder_get_recording_limit(NULL, STREAMRECORDER_RECORDING_LIMIT_TYPE_SIZE, NULL);
+    assert_eq(ret, STREAMRECORDER_ERROR_INVALID_PARAMETER);
+
     ret = streamrecorder_get_recording_limit(NULL, STREAMRECORDER_RECORDING_LIMIT_TYPE_TIME, NULL);
     assert_eq(ret, STREAMRECORDER_ERROR_INVALID_PARAMETER);
 
@@ -730,6 +739,9 @@ int utc_media_streamrecorder_set_recording_limit_p(void)
     ret = streamrecorder_set_recording_limit(recorder, STREAMRECORDER_RECORDING_LIMIT_TYPE_SIZE, 1000);
     assert_eq(ret, STREAMRECORDER_ERROR_NONE);
 
+    ret = streamrecorder_set_recording_limit(recorder, STREAMRECORDER_RECORDING_LIMIT_TYPE_TIME, 120);
+    assert_eq(ret, STREAMRECORDER_ERROR_NONE);
+
     return 0;
 }
 
@@ -751,6 +763,9 @@ int utc_media_streamrecorder_set_recording_limit_n1(void)
     ret = streamrecorder_set_recording_limit(recorder, STREAMRECORDER_RECORDING_LIMIT_TYPE_SIZE, -1);
     assert_eq(ret, STREAMRECORDER_ERROR_INVALID_PARAMETER);
 
+    ret = streamrecorder_set_recording_limit(recorder, STREAMRECORDER_RECORDING_LIMIT_TYPE_TIME, -1);
+    assert_eq(ret, STREAMRECORDER_ERROR_INVALID_PARAMETER);
+
     return 0;
 }
 
@@ -768,7 +783,10 @@ int utc_media_streamrecorder_set_recording_limit_n2(void)
 {
     int ret = STREAMRECORDER_ERROR_NONE;
 
-    ret = streamrecorder_set_recording_limit(NULL, STREAMRECORDER_RECORDING_LIMIT_TYPE_SIZE, -1);
+    ret = streamrecorder_set_recording_limit(NULL, STREAMRECORDER_RECORDING_LIMIT_TYPE_SIZE, 1000);
+    assert_eq(ret, STREAMRECORDER_ERROR_INVALID_PARAMETER);
+
+    ret = streamrecorder_set_recording_limit(NULL, STREAMRECORDER_RECORDING_LIMIT_TYPE_TIME, 120);
     assert_eq(ret, STREAMRECORDER_ERROR_INVALID_PARAMETER);
 
     return 0;

diff --git a/src/utc/streamrecorder/utc_media_streamrecorder_buffer.c b/src/utc/streamrecorder/utc_media_streamrecorder_buffer.c
index 748d9b4..5392f5b 100755 (executable)
--- a/src/utc/streamrecorder/utc_media_streamrecorder_buffer.c
+++ b/src/utc/streamrecorder/utc_media_streamrecorder_buffer.c
@@ -18,7 +18,6 @@
 #include <media_packet.h>
 #include <storage.h>
 #include <system_info.h>
-#include <dlog.h>
 
 #define MAX_FORMAT 10
 static char* media=".test_record.mp4";
@@ -175,8 +174,7 @@ int utc_media_streamrecorder_push_stream_buffer_n(void)
 
     assert_eq(startup_ret, STREAMRECORDER_ERROR_NONE);
     if (media_format_create(&media_format)) {
-        LOGI("media_format_create failed\n");
-        return 1;
+        assert_neq(0, 0);
     }
 
     ret = media_format_set_video_mime(media_format, MEDIA_FORMAT_I420);
@@ -188,12 +186,10 @@ int utc_media_streamrecorder_push_stream_buffer_n(void)
     media_format_set_video_height(media_format, 288);
 
     if (media_packet_create(media_format, NULL, NULL, &out_pkt)) {
-        LOGI("create video media_packet failed\n");
-        return 1;
+        assert_neq(0, 0);
     }
     if (media_packet_alloc(out_pkt)) {
-        LOGI("video media_packet alloc failed\n");
-        return 1;
+        assert_neq(0, 0);
     }
 
     assert_neq(NULL, out_pkt);

diff --git a/src/utc/streamrecorder/utc_media_streamrecorder_lifecycle.c b/src/utc/streamrecorder/utc_media_streamrecorder_lifecycle.c
index b78da24..5e2a795 100755 (executable)
--- a/src/utc/streamrecorder/utc_media_streamrecorder_lifecycle.c
+++ b/src/utc/streamrecorder/utc_media_streamrecorder_lifecycle.c
@@ -19,7 +19,6 @@
 #include <media_packet.h>
 #include <storage.h>
 #include <system_info.h>
-#include <dlog.h>
 
 static streamrecorder_h recorder = NULL;
 
@@ -65,6 +64,12 @@ static void _consume_completed_cb(void *buffer , void *user_data){
     return;
 }
 
+static void _event_notified_cb(streamrecorder_state_e previous , streamrecorder_state_e current , streamrecorder_notify_e notification,  void *user_data){
+}
+
+static void _recording_status_cb(unsigned long long elapsed_time, unsigned long long file_size,  void *user_data){
+}
+
 
 /**
  * @function            utc_media_streamrecorder_lifecycle_startup
@@ -137,7 +142,7 @@ int utc_media_streamrecorder_enable_source_buffer_n(void)
     int ret = STREAMRECORDER_ERROR_NONE;
     assert_eq(startup_ret, STREAMRECORDER_ERROR_NONE);
 
-    ret = streamrecorder_enable_source_buffer(NULL, STREAMRECORDER_SOURCE_VIDEO);
+    ret = streamrecorder_enable_source_buffer(NULL, STREAMRECORDER_SOURCE_VIDEO_AUDIO);
     assert_eq(ret, STREAMRECORDER_ERROR_INVALID_PARAMETER);
 
     return 0;
@@ -157,7 +162,7 @@ int utc_media_streamrecorder_enable_source_buffer_p(void)
     int ret = STREAMRECORDER_ERROR_NONE;
     assert_eq(startup_ret, STREAMRECORDER_ERROR_NONE);
 
-    ret = streamrecorder_enable_source_buffer(recorder, STREAMRECORDER_SOURCE_VIDEO);
+    ret = streamrecorder_enable_source_buffer(recorder, STREAMRECORDER_SOURCE_VIDEO_AUDIO);
     assert_eq(ret, STREAMRECORDER_ERROR_NONE);
 
     return 0;
@@ -205,6 +210,8 @@ int utc_media_streamrecorder_cancel_p(void)
     ret |= streamrecorder_set_video_framerate(recorder, 30);
     ret |= streamrecorder_set_filename(recorder, media_path);
     ret |= streamrecorder_set_buffer_consume_completed_cb(recorder,_consume_completed_cb,NULL);
+    ret |= streamrecorder_set_notify_cb(recorder, _event_notified_cb, NULL);
+    ret |= streamrecorder_set_recording_status_cb(recorder, _recording_status_cb, NULL);
     ret |= streamrecorder_prepare(recorder);
     if (ret != STREAMRECORDER_ERROR_NONE) {
         fclose(pvFile);
@@ -222,8 +229,6 @@ int utc_media_streamrecorder_cancel_p(void)
         media_format_create(&media_format[i]);
         ret = media_format_set_video_mime(media_format[i], MEDIA_FORMAT_I420);
         if (ret != MEDIA_FORMAT_ERROR_NONE) {
-            LOGI("media_format_set_video_mime failed. API returned %d. Invalid=%d, invalid ope=%d\n",\
-                            ret,MEDIA_FORMAT_ERROR_INVALID_PARAMETER,MEDIA_FORMAT_ERROR_INVALID_OPERATION);
             fclose(pvFile);
             assert_neq(0, 0);
         }
@@ -231,12 +236,10 @@ int utc_media_streamrecorder_cancel_p(void)
         media_format_set_video_width(media_format[i], 352);
         media_format_set_video_height(media_format[i], 288);
         if (media_packet_create(media_format[i], NULL, NULL, &vid_pkt[i])) {
-            LOGI("media_packet_create failed.");          
             fclose(pvFile);
             assert_neq(0, 0);
         }
         if (media_packet_alloc(vid_pkt[i])) {
-            LOGI("media_packet_alloc failed."); 
             fclose(pvFile);
             assert_neq(0, 0);
         }
@@ -244,13 +247,11 @@ int utc_media_streamrecorder_cancel_p(void)
         media_packet_get_buffer_data_ptr(vid_pkt[i], (void**)&dptr);
         vsize = fread(dptr, 1, vsize, pvFile);
         if (media_packet_set_buffer_size(vid_pkt[i], vsize)) {
-            LOGI("media_packet_set_buffer_size failed.");
             fclose(pvFile);
             assert_neq(0, 0);
         }
 
         if (media_packet_set_pts(vid_pkt[i], count)) {
-            LOGI("media_packet_set_pts failed.");
             fclose(pvFile);
             assert_neq(0, 0);
         }
@@ -344,8 +345,6 @@ int utc_media_streamrecorder_commit_p(void)
         media_format_create(&media_format[i]);
         ret = media_format_set_video_mime(media_format[i], MEDIA_FORMAT_I420);
         if (ret != MEDIA_FORMAT_ERROR_NONE) {
-            LOGI("media_format_set_video_mime failed. API returned %d. Invalid=%d, invalid ope=%d\n",\
-                            ret,MEDIA_FORMAT_ERROR_INVALID_PARAMETER,MEDIA_FORMAT_ERROR_INVALID_OPERATION);
             fclose(pvFile);
             assert_neq(0, 0);
         }
@@ -353,12 +352,10 @@ int utc_media_streamrecorder_commit_p(void)
         media_format_set_video_width(media_format[i], 352);
         media_format_set_video_height(media_format[i], 288);
         if (media_packet_create(media_format[i], NULL, NULL, &vid_pkt[i])) {
-            LOGI("media_packet_create failed.");          
             fclose(pvFile);
             assert_neq(0, 0);
         }
         if (media_packet_alloc(vid_pkt[i])) {
-            LOGI("media_packet_alloc failed."); 
             fclose(pvFile);
             assert_neq(0, 0);
         }
@@ -366,13 +363,11 @@ int utc_media_streamrecorder_commit_p(void)
         media_packet_get_buffer_data_ptr(vid_pkt[i], (void**)&dptr);
         vsize = fread(dptr, 1, vsize, pvFile);
         if (media_packet_set_buffer_size(vid_pkt[i], vsize)) {
-            LOGI("media_packet_set_buffer_size failed.");
             fclose(pvFile);
             assert_neq(0, 0);
         }
 
         if (media_packet_set_pts(vid_pkt[i], count)) {
-            LOGI("media_packet_set_pts failed.");
             fclose(pvFile);
             assert_neq(0, 0);
         }
@@ -531,8 +526,6 @@ int utc_media_streamrecorder_pause_p(void)
         media_format_create(&media_format[i]);
         ret = media_format_set_video_mime(media_format[i], MEDIA_FORMAT_I420);
         if (ret != MEDIA_FORMAT_ERROR_NONE) {
-            LOGI("media_format_set_video_mime failed. API returned %d. Invalid=%d, invalid ope=%d\n",\
-                            ret,MEDIA_FORMAT_ERROR_INVALID_PARAMETER,MEDIA_FORMAT_ERROR_INVALID_OPERATION);
             fclose(pvFile);
             assert_neq(0, 0);
         }
@@ -540,12 +533,10 @@ int utc_media_streamrecorder_pause_p(void)
         media_format_set_video_width(media_format[i], 352);
         media_format_set_video_height(media_format[i], 288);
         if (media_packet_create(media_format[i], NULL, NULL, &vid_pkt[i])) {
-            LOGI("media_packet_create failed.");          
             fclose(pvFile);
             assert_neq(0, 0);
         }
         if (media_packet_alloc(vid_pkt[i])) {
-            LOGI("media_packet_alloc failed."); 
             fclose(pvFile);
             assert_neq(0, 0);
         }
@@ -553,13 +544,11 @@ int utc_media_streamrecorder_pause_p(void)
         media_packet_get_buffer_data_ptr(vid_pkt[i], (void**)&dptr);
         vsize = fread(dptr, 1, vsize, pvFile);
         if (media_packet_set_buffer_size(vid_pkt[i], vsize)) {
-            LOGI("media_packet_set_buffer_size failed.");
             fclose(pvFile);
             assert_neq(0, 0);
         }
 
         if (media_packet_set_pts(vid_pkt[i], count)) {
-            LOGI("media_packet_set_pts failed.");
             fclose(pvFile);
             assert_neq(0, 0);
         }