testsuite: Extracted more function to reduce redundancy from testsuite

[Version] 0.13.19
[Issue Type] Cleanup

Change-Id: Iabc1704a9001488ee467079ee60e8d926a0705ce
Signed-off-by: heechul.jeon <heechul.jeon@samsung.com>

diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index e9121ad..0f20aa0 100644 (file)
--- a/packaging/libmm-sound.spec
+++ b/packaging/libmm-sound.spec
@@ -1,6 +1,6 @@
 Name:       libmm-sound
 Summary:    MMSound Package contains client lib and focus server binary
-Version:    0.13.18
+Version:    0.13.19
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/testsuite/mm_sound_testsuite_simple.c b/testsuite/mm_sound_testsuite_simple.c
index 6c3cf07..f3c07bf 100755 (executable)
--- a/testsuite/mm_sound_testsuite_simple.c
+++ b/testsuite/mm_sound_testsuite_simple.c
@@ -105,12 +105,12 @@ static void print_device_info(MMSoundDevice_t device_h)
        if (ret != MM_ERROR_NONE)
                debug_error("failed to mm_sound_get_device_product_id(). ret:0x%x", ret);
 
-       if(vendor_id == -1)
+       if (vendor_id == -1)
                snprintf(vendor_string, MAX_STRING_LEN, "NO ID");
        else
                snprintf(vendor_string, MAX_STRING_LEN, "%d", vendor_id);
 
-       if(product_id == -1)
+       if (product_id == -1)
                snprintf(product_string, MAX_STRING_LEN, "NO ID");
        else
                snprintf(product_string, MAX_STRING_LEN, "%d", product_id);
@@ -286,7 +286,6 @@ gboolean input(GIOChannel *channel)
        return TRUE;
 }
 
-
 static void input_filename(char *filename)
 {
        MMSOUND_STRNCPY(g_file_name, filename, MAX_STRING_LEN);
@@ -300,6 +299,51 @@ static void input_dirname(char *dirname)
        g_print("\nThe input directory is '%s' \n\n", g_dir_name);
 }
 
+mm_sound_device_flags_e no2flag(char flag_no)
+{
+       switch (flag_no) {
+       case '1':
+               return MM_SOUND_DEVICE_IO_DIRECTION_IN_FLAG;
+       case '2':
+               return MM_SOUND_DEVICE_IO_DIRECTION_OUT_FLAG;
+       case '3':
+               return MM_SOUND_DEVICE_IO_DIRECTION_BOTH_FLAG;
+       case '4':
+               return MM_SOUND_DEVICE_TYPE_INTERNAL_FLAG;
+       case '5':
+               return MM_SOUND_DEVICE_TYPE_EXTERNAL_FLAG;
+       case '6':
+               return MM_SOUND_DEVICE_STATE_DEACTIVATED_FLAG;
+       case '7':
+               return MM_SOUND_DEVICE_STATE_ACTIVATED_FLAG;
+       default:
+               return MM_SOUND_DEVICE_ALL_FLAG;
+       }
+}
+
+mm_sound_device_flags_e select_device_flags(void)
+{
+       char input_string[MAX_STRING_LEN];
+
+       fflush(stdin);
+       g_print("1. IO_DIRECTION_IN_FLAG\n");
+       g_print("2. IO_DIRECTION_OUT_FLAG\n");
+       g_print("3. IO_DIRECTION_BOTH_FLAG\n");
+       g_print("4. TYPE_INTERNAL_FLAG\n");
+       g_print("5. TYPE_EXTERNAL_FLAG\n");
+       g_print("6. STATE_DEACTIVATED_FLAG\n");
+       g_print("7. STATE_ACTIVATED_FLAG\n");
+       g_print("8. ALL_FLAG\n");
+       g_print("> select three flags(eg.'2 5 7'): ");
+
+       if (!fgets(input_string, MAX_STRING_LEN-1, stdin)) {
+               g_print("### fgets return NULL. using all flags\n");
+               return MM_SOUND_DEVICE_ALL_FLAG;
+       }
+
+       return (no2flag(input_string[0]) | no2flag(input_string[2]) | no2flag(input_string[4]));
+}
+
 static void interpret(char *cmd)
 {
        int ret = 0;
@@ -643,100 +687,26 @@ static void interpret(char *cmd)
                                if (ret == MM_ERROR_NONE) {
                                        print_device_info(device_h);
                                } else {
-                                       g_print("failed to mm_sound_get_device_by_id()\n");
+                                       g_print("failed to mm_sound_get_device_by_id(), ret[0x%x]\n", ret);
                                }
 
                                ret = mm_sound_free_device(device_h);
                                if (ret)
-                                       g_print("failed to mm_sound_free_device()\n");
+                                       g_print("failed to mm_sound_free_device(), ret[0x%x]\n", ret);
                        } else {
                                g_print("### fgets return  NULL\n");
                        }
 
                } else if (strncmp(cmd, "C", 1) == 0) {
                        int ret = 0;
-                       char input_string[128];
-                       mm_sound_device_flags_e device_flag_1 = MM_SOUND_DEVICE_ALL_FLAG;
-                       mm_sound_device_flags_e device_flag_2 = MM_SOUND_DEVICE_ALL_FLAG;
-                       mm_sound_device_flags_e device_flag_3 = MM_SOUND_DEVICE_ALL_FLAG;
-
-                       char flag_1, flag_2, flag_3;
+                       mm_sound_device_flags_e flags = select_device_flags();
 
-                       fflush(stdin);
-                       g_print("1. IO_DIRECTION_IN_FLAG\n");
-                       g_print("2. IO_DIRECTION_OUT_FLAG\n");
-                       g_print("3. IO_DIRECTION_BOTH_FLAG\n");
-                       g_print("4. TYPE_INTERNAL_FLAG\n");
-                       g_print("5. TYPE_EXTERNAL_FLAG\n");
-                       g_print("6. STATE_DEACTIVATED_FLAG\n");
-                       g_print("7. STATE_ACTIVATED_FLAG\n");
-                       g_print("8. ALL_FLAG\n");
-                       g_print("> select flag numbers (total 3):  (eg. 2 5 7)");
-
-                       if (fgets(input_string, sizeof(input_string)-1, stdin)) {
-                               flag_1 = input_string[0];
-                               flag_2 = input_string[2];
-                               flag_3 = input_string[4];
-
-                               if (flag_1 == '1')
-                                       device_flag_1 = MM_SOUND_DEVICE_IO_DIRECTION_IN_FLAG;
-                               else if (flag_1 == '2')
-                                       device_flag_1 = MM_SOUND_DEVICE_IO_DIRECTION_OUT_FLAG;
-                               else if (flag_1 == '3')
-                                       device_flag_1 = MM_SOUND_DEVICE_IO_DIRECTION_BOTH_FLAG;
-                               else if (flag_1 == '4')
-                                       device_flag_1 = MM_SOUND_DEVICE_TYPE_INTERNAL_FLAG;
-                               else if (flag_1 == '5')
-                                       device_flag_1 = MM_SOUND_DEVICE_TYPE_EXTERNAL_FLAG;
-                               else if (flag_1 == '6')
-                                       device_flag_1 = MM_SOUND_DEVICE_STATE_DEACTIVATED_FLAG;
-                               else if (flag_1 == '7')
-                                       device_flag_1 = MM_SOUND_DEVICE_STATE_ACTIVATED_FLAG;
-                               else if (flag_1 == '8')
-                                       device_flag_1 = MM_SOUND_DEVICE_ALL_FLAG;
-
-                               if (flag_2 == '1')device_flag_2 = MM_SOUND_DEVICE_IO_DIRECTION_IN_FLAG;
-                               else if (flag_2 == '2')
-                                       device_flag_2 = MM_SOUND_DEVICE_IO_DIRECTION_OUT_FLAG;
-                               else if (flag_2 == '3')
-                                       device_flag_2 = MM_SOUND_DEVICE_IO_DIRECTION_BOTH_FLAG;
-                               else if (flag_2 == '4')
-                                       device_flag_2 = MM_SOUND_DEVICE_TYPE_INTERNAL_FLAG;
-                               else if (flag_2 == '5')
-                                       device_flag_2 = MM_SOUND_DEVICE_TYPE_EXTERNAL_FLAG;
-                               else if (flag_2 == '6')
-                                       device_flag_2 = MM_SOUND_DEVICE_STATE_DEACTIVATED_FLAG;
-                               else if (flag_2 == '7')
-                                       device_flag_2 = MM_SOUND_DEVICE_STATE_ACTIVATED_FLAG;
-                               else if (flag_2 == '8')
-                                       device_flag_2 = MM_SOUND_DEVICE_ALL_FLAG;
-
-                               if (flag_3 == '1')
-                                       device_flag_3 = MM_SOUND_DEVICE_IO_DIRECTION_IN_FLAG;
-                               else if (flag_3 == '2')
-                                       device_flag_3 = MM_SOUND_DEVICE_IO_DIRECTION_OUT_FLAG;
-                               else if (flag_3 == '3')
-                                       device_flag_3 = MM_SOUND_DEVICE_IO_DIRECTION_BOTH_FLAG;
-                               else if (flag_3 == '4')
-                                       device_flag_3 = MM_SOUND_DEVICE_TYPE_INTERNAL_FLAG;
-                               else if (flag_3 == '5')
-                                       device_flag_3 = MM_SOUND_DEVICE_TYPE_EXTERNAL_FLAG;
-                               else if (flag_3 == '6')
-                                       device_flag_3 = MM_SOUND_DEVICE_STATE_DEACTIVATED_FLAG;
-                               else if (flag_3 == '7')
-                                       device_flag_3 = MM_SOUND_DEVICE_STATE_ACTIVATED_FLAG;
-                               else if (flag_3 == '8')
-                                       device_flag_3 = MM_SOUND_DEVICE_ALL_FLAG;
-
-                               g_print("device_connected_callback");
-                               ret = mm_sound_add_device_connected_callback(device_flag_1|device_flag_2|device_flag_3, device_connected_cb, NULL, &g_subs_id_device_conn);
-                               if (ret)
-                                       g_print("failed to mm_sound_add_device_connected_callback(), ret[0x%x]\n", ret);
-                               else
-                                       g_print("device_flags[0x%x], callback fun[%p], subs_id[%u]\n", device_flag_1|device_flag_2|device_flag_3, device_connected_cb, g_subs_id_device_conn);
-                       } else {
-                               g_print("### fgets return  NULL\n");
-                       }
+                       g_print("device_connected_callback");
+                       ret = mm_sound_add_device_connected_callback(flags, device_connected_cb, NULL, &g_subs_id_device_conn);
+                       if (ret)
+                               g_print("failed to mm_sound_add_device_connected_callback(), ret[0x%x]\n", ret);
+                       else
+                               g_print("device_flags[0x%x], callback fun[%p], subs_id[%u]\n", flags, device_connected_cb, g_subs_id_device_conn);
 
                } else if (strncmp(cmd, "D", 1) == 0) {
                        int ret = 0;
@@ -746,90 +716,14 @@ static void interpret(char *cmd)
 
                } else if (strncmp(cmd, "Q", 1) == 0) {
                        int ret = 0;
-                       char input_string[128];
-                       mm_sound_device_flags_e device_flag_1 = MM_SOUND_DEVICE_ALL_FLAG;
-                       mm_sound_device_flags_e device_flag_2 = MM_SOUND_DEVICE_ALL_FLAG;
-                       mm_sound_device_flags_e device_flag_3 = MM_SOUND_DEVICE_ALL_FLAG;
-
-                       char flag_1, flag_2, flag_3;
-
-                       fflush(stdin);
-                       g_print("1. IO_DIRECTION_IN_FLAG\n");
-                       g_print("2. IO_DIRECTION_OUT_FLAG\n");
-                       g_print("3. IO_DIRECTION_BOTH_FLAG\n");
-                       g_print("4. TYPE_INTERNAL_FLAG\n");
-                       g_print("5. TYPE_EXTERNAL_FLAG\n");
-                       g_print("6. STATE_DEACTIVATED_FLAG\n");
-                       g_print("7. STATE_ACTIVATED_FLAG\n");
-                       g_print("8. ALL_FLAG\n");
-                       g_print("> select flag numbers (total 3):  (eg. 2 5 7)");
-
-                       if (fgets(input_string, sizeof(input_string)-1, stdin)) {
-                               flag_1 = input_string[0];
-                               flag_2 = input_string[2];
-                               flag_3 = input_string[4];
-
-                               if (flag_1 == '1')
-                                       device_flag_1 = MM_SOUND_DEVICE_IO_DIRECTION_IN_FLAG;
-                               else if (flag_1 == '2')
-                                       device_flag_1 = MM_SOUND_DEVICE_IO_DIRECTION_OUT_FLAG;
-                               else if (flag_1 == '3')
-                                       device_flag_1 = MM_SOUND_DEVICE_IO_DIRECTION_BOTH_FLAG;
-                               else if (flag_1 == '4')
-                                       device_flag_1 = MM_SOUND_DEVICE_TYPE_INTERNAL_FLAG;
-                               else if (flag_1 == '5')
-                                       device_flag_1 = MM_SOUND_DEVICE_TYPE_EXTERNAL_FLAG;
-                               else if (flag_1 == '6')
-                                       device_flag_1 = MM_SOUND_DEVICE_STATE_DEACTIVATED_FLAG;
-                               else if (flag_1 == '7')
-                                       device_flag_1 = MM_SOUND_DEVICE_STATE_ACTIVATED_FLAG;
-                               else if (flag_1 == '8')
-                                       device_flag_1 = MM_SOUND_DEVICE_ALL_FLAG;
-
-                               if (flag_2 == '1')
-                                       device_flag_2 = MM_SOUND_DEVICE_IO_DIRECTION_IN_FLAG;
-                               else if (flag_2 == '2')
-                                       device_flag_2 = MM_SOUND_DEVICE_IO_DIRECTION_OUT_FLAG;
-                               else if (flag_2 == '3')
-                                       device_flag_2 = MM_SOUND_DEVICE_IO_DIRECTION_BOTH_FLAG;
-                               else if (flag_2 == '4')
-                                       device_flag_2 = MM_SOUND_DEVICE_TYPE_INTERNAL_FLAG;
-                               else if (flag_2 == '5')
-                                       device_flag_2 = MM_SOUND_DEVICE_TYPE_EXTERNAL_FLAG;
-                               else if (flag_2 == '6')
-                                       device_flag_2 = MM_SOUND_DEVICE_STATE_DEACTIVATED_FLAG;
-                               else if (flag_2 == '7')
-                                       device_flag_2 = MM_SOUND_DEVICE_STATE_ACTIVATED_FLAG;
-                               else if (flag_2 == '8')
-                                       device_flag_2 = MM_SOUND_DEVICE_ALL_FLAG;
-
-                               if (flag_3 == '1')
-                                       device_flag_3 = MM_SOUND_DEVICE_IO_DIRECTION_IN_FLAG;
-                               else if (flag_3 == '2')
-                                       device_flag_3 = MM_SOUND_DEVICE_IO_DIRECTION_OUT_FLAG;
-                               else if (flag_3 == '3')
-                                       device_flag_3 = MM_SOUND_DEVICE_IO_DIRECTION_BOTH_FLAG;
-                               else if (flag_3 == '4')
-                                       device_flag_3 = MM_SOUND_DEVICE_TYPE_INTERNAL_FLAG;
-                               else if (flag_3 == '5')
-                                       device_flag_3 = MM_SOUND_DEVICE_TYPE_EXTERNAL_FLAG;
-                               else if (flag_3 == '6')
-                                       device_flag_3 = MM_SOUND_DEVICE_STATE_DEACTIVATED_FLAG;
-                               else if (flag_3 == '7')
-                                       device_flag_3 = MM_SOUND_DEVICE_STATE_ACTIVATED_FLAG;
-                               else if (flag_3 == '8')
-                                       device_flag_3 = MM_SOUND_DEVICE_ALL_FLAG;
-
-                               g_print("add_device_state_changed");
-                               ret = mm_sound_add_device_state_changed_callback(device_flag_1 | device_flag_2 | device_flag_3, device_state_changed_cb, NULL, &g_subs_id_device_state);
-                               if (ret)
-                                       g_print("failed to mm_sound_add_device_state_changed_callback(), ret[0x%x]\n", ret);
-                               else
-                                       g_print("device_flags[0x%x], callback fun[%p], subs_id[%u]\n", device_flag_1|device_flag_2|device_flag_3, device_state_changed_cb, g_subs_id_device_state);
+                       mm_sound_device_flags_e flags = select_device_flags();
 
-                       } else {
-                               g_print("### fgets return  NULL\n");
-                       }
+                       g_print("add_device_state_changed");
+                       ret = mm_sound_add_device_state_changed_callback(flags, device_state_changed_cb, NULL, &g_subs_id_device_state);
+                       if (ret)
+                               g_print("failed to mm_sound_add_device_state_changed_callback(), ret[0x%x]\n", ret);
+                       else
+                               g_print("device_flags[0x%x], callback fun[%p], subs_id[%u]\n", flags, device_state_changed_cb, g_subs_id_device_state);
 
                } else if (strncmp(cmd, "W", 1) == 0) {
                        int ret = 0;