X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=test%2Fbluetooth-frwk-test.c;h=9e6359d8838cd2e64ea9c766053920fa50958876;hb=57d67c05e3b841729bffe79e41896e9e35ca2e43;hp=7cdc87022eef66119687527530672d5073769a7b;hpb=5c92ccc658b5dcabc7e247ccda463e5d80f6849c;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/test/bluetooth-frwk-test.c b/test/bluetooth-frwk-test.c
index 7cdc870..9e6359d 100644
--- a/test/bluetooth-frwk-test.c
+++ b/test/bluetooth-frwk-test.c
@@ -23,9 +23,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include <dbus/dbus-glib.h>
+#include <gio/gio.h>
 #include <pthread.h>
-#include <dbus/dbus.h>
 #include <stdint.h>
 
 #include "bluetooth-api.h"
@@ -563,7 +562,7 @@ int test_input_callback(void *data)
 		ret = bluetooth_authorize_device(&device_address, FALSE);
 		if (ret < 0)
 			TC_PRT("%s failed with [0x%04x]", tc_table[23].tc_name, ret);
-			break;
+		break;
 	}
 	case 25:
 	{
@@ -785,6 +784,7 @@ int test_input_callback(void *data)
 		TC_PRT("randomizer_len: %d\n", g_local_oob_data.oob_data.randomizer_len);
 
 		if (bluetooth_oob_add_remote_data(&g_local_oob_data.address,
+			BLUETOOTH_BDADDR_BREDR,
 			&g_local_oob_data.oob_data))
 			TC_PRT("ERROR in bluetooth_oob_add_remote_data\n");
 		else
@@ -1144,35 +1144,40 @@ int test_input_callback(void *data)
 
 	case 92:
 	{
+#if TODO_40
 		ret = bluetooth_gatt_init();
 		if (ret < 0)
 			TC_PRT("gatt init failed with [0x%04x]", ret);
+#endif
 		break;
 	}
 
 	case 93:
 	{
+#if TODO_40
 		ret = bluetooth_gatt_deinit();
 		if (ret < 0)
 			TC_PRT("gatt deinit failed with [0x%04x]", ret);
-
+#endif
 		break;
 	}
 
 	case 94:
 	{
+#if TODO_40
 		char *service_uuid = g_strdup("00001802-0000-1000-8000-00805f9b34fb");
 
 		ret = bluetooth_gatt_add_service(service_uuid,
 			&svc_obj_path);
 
 		TC_PRT("service obj_path is %s", svc_obj_path);
-
+#endif
 		break;
 	}
 
 	case 95:
 	{
+#if TODO_40
 		/* testing with dummy values*/
 		char *char_uuid = g_strdup("00002a06-0000-1000-8000-00805f9b34fb");
 		bt_gatt_permission_t perms = 0;
@@ -1186,11 +1191,12 @@ int test_input_callback(void *data)
 			perms, props, &char_obj_path);
 
 		TC_PRT("characteristic obj_path is %s", char_obj_path);
-
+#endif
 		break;
 	}
 
 	case 96: {
+#if TODO_40
 		char *desc_uuid = g_strdup("000026ff-0000-1000-8000-00805f9b34fb");
 		bt_gatt_permission_t perms = BLUETOOTH_GATT_PERMISSION_READ |
 				BLUETOOTH_GATT_PERMISSION_WRITE;
@@ -1198,47 +1204,52 @@ int test_input_callback(void *data)
 		ret = bluetooth_gatt_add_descriptor(char_obj_path,
 			desc_uuid, perms, &desc_obj_path);
 		TC_PRT("add descriptor error is %d", ret);
-
+#endif
 		break;
 	}
 
 	case 97: {
+#if TODO_40
 		ret = bluetooth_gatt_register_service(svc_obj_path);
 		TC_PRT("register service error is %d", ret);
-
+#endif
 		break;
 	}
 
 	case 98: {
+#if TODO_40
 		ret = bluetooth_gatt_register_application();
 
 		TC_PRT("register service error is %d", ret);
-
+#endif
 		break;
 	}
 
 	case 99: {
+#if TODO_40
 		char char_data[4] = {10, 20, 30, 40};
 		int char_length = 4;
 		ret = bluetooth_gatt_update_characteristic(char_obj_path,
 					char_data, char_length);
 
 		TC_PRT("update_characteristic error is %d", ret);
-
+#endif
 		break;
 	}
 
 	case 100: {
+#if TODO_40
 		ret = bluetooth_gatt_unregister_service(svc_obj_path);
 		TC_PRT("service removed with error is %d", ret);
-
+#endif
 		break;
 	}
 
 	case 101:
+#if TODO_40
 		ret = bluetooth_gatt_delete_services();
 		TC_PRT("services deleted with error is %d", ret);
-
+#endif
 		break;
 
 	default:
@@ -1251,8 +1262,6 @@ void startup()
 {
 	TC_PRT("bluetooth framework TC startup");
 
-	dbus_threads_init_default();
-
 	main_loop = g_main_loop_new(NULL, FALSE);
 }