From 38fc60148371e1287a901d7d45433327ad545e07 Mon Sep 17 00:00:00 2001 From: Piotr Kosko Date: Fri, 2 Oct 2020 08:42:31 +0200 Subject: [PATCH] [Bluetooth] Fixed code formatting Change-Id: I2770d3735b9d606c5dd64fec877070b85942025c --- src/bluetooth/bluetooth_gatt_server.cc | 3 ++- src/bluetooth/bluetooth_gatt_server_service.cc | 10 ++++--- src/bluetooth/bluetooth_le_adapter.cc | 13 ++++++---- src/bluetooth/bluetooth_le_device.cc | 20 +++++++------- src/bluetooth/js/ut/test_toByteArray.js | 36 +++++++++++++------------- src/bluetooth/js/ut/test_toUint8Array.js | 36 +++++++++++++------------- 6 files changed, 62 insertions(+), 56 deletions(-) diff --git a/src/bluetooth/bluetooth_gatt_server.cc b/src/bluetooth/bluetooth_gatt_server.cc index d75cb0d..235802b 100644 --- a/src/bluetooth/bluetooth_gatt_server.cc +++ b/src/bluetooth/bluetooth_gatt_server.cc @@ -377,7 +377,8 @@ PlatformResult BluetoothGATTServer::DestroyAllGATTObjects() { return PlatformResult{ErrorCode::INVALID_STATE_ERR}; } - auto ret = bt_gatt_server_foreach_services(handle_, BluetoothGATTServerService::DestroyService, nullptr); + auto ret = + bt_gatt_server_foreach_services(handle_, BluetoothGATTServerService::DestroyService, nullptr); if (BT_ERROR_NONE != ret) { LoggerE("bt_gatt_server_unregister_all_services(): %d (%s)", ret, get_error_message(ret)); return BluetoothErrorToPlatformResult(ret); diff --git a/src/bluetooth/bluetooth_gatt_server_service.cc b/src/bluetooth/bluetooth_gatt_server_service.cc index 17488bc..9511717 100644 --- a/src/bluetooth/bluetooth_gatt_server_service.cc +++ b/src/bluetooth/bluetooth_gatt_server_service.cc @@ -452,7 +452,8 @@ PlatformResult BluetoothGATTServerService::SetReadValueRequestCallback( if (gatt_objects_.find(_id) == gatt_objects_.end()) { LoggerE("No GATT handle for entity with _id [%d]", _id); - return common::PlatformResult{ErrorCode::ABORT_ERR, "Failed to set read value request callback"}; + return common::PlatformResult{ErrorCode::ABORT_ERR, + "Failed to set read value request callback"}; } auto gatt_handle = gatt_objects_[_id]; @@ -509,7 +510,8 @@ PlatformResult BluetoothGATTServerService::SetWriteValueRequestCallback( if (gatt_objects_.find(_id) == gatt_objects_.end()) { LoggerE("No GATT handle for entity with _id [%d]", _id); - return common::PlatformResult{ErrorCode::ABORT_ERR, "Failed to set write value request callback"}; + return common::PlatformResult{ErrorCode::ABORT_ERR, + "Failed to set write value request callback"}; } auto gatt_handle = gatt_objects_[_id]; @@ -703,8 +705,8 @@ common::PlatformResult BluetoothGATTServerService::NotifyAboutValueChange( void BluetoothGATTServerService::ClearGATTData() { ScopeLogger(); - LoggerD("Removing %zu old GATT handles and %zu callback names", - gatt_objects_.size(), callback_names_.size()); + LoggerD("Removing %zu old GATT handles and %zu callback names", gatt_objects_.size(), + callback_names_.size()); gatt_objects_.clear(); callback_names_.clear(); } diff --git a/src/bluetooth/bluetooth_le_adapter.cc b/src/bluetooth/bluetooth_le_adapter.cc index d157cdb..6da5135 100644 --- a/src/bluetooth/bluetooth_le_adapter.cc +++ b/src/bluetooth/bluetooth_le_adapter.cc @@ -115,7 +115,8 @@ class BluetoothLEServiceData : public ParsedDataHolder { return {}; } - LoggerD("BluetoohtLEServiceData: %s : %s", uuid_str.get().c_str(), data.get().c_str()); + LoggerD("BluetoohtLEServiceData: %s : %s", uuid_str.get().c_str(), + data.get().c_str()); return BluetoothLEServiceData{std::move(*uuid), data.get()}; } @@ -658,10 +659,12 @@ void BluetoothLEAdapter::StartAdvertise(const picojson::value& data, picojson::o error_message = "Failed to start advertising: only 16 bit values of BluetoothLEServiceData::uuid are " "supported"; - } else if (BT_ERROR_ALREADY_DONE == ret) { // in case of duplicated advertiser data report it with correct message - LogAndReportError(util::GetBluetoothError(BT_ERROR_INVALID_PARAMETER, "Duplicated advertiser data"), &out, - ("bt_adapter_le_set_advertising_device_name() failed with: %d (%s)", ret, - get_error_message(ret))); + } else if (BT_ERROR_ALREADY_DONE == + ret) { // in case of duplicated advertiser data report it with correct message + LogAndReportError( + util::GetBluetoothError(BT_ERROR_INVALID_PARAMETER, "Duplicated advertiser data"), + &out, ("bt_adapter_le_set_advertising_device_name() failed with: %d (%s)", ret, + get_error_message(ret))); return; } diff --git a/src/bluetooth/bluetooth_le_device.cc b/src/bluetooth/bluetooth_le_device.cc index dbe1465..6af1201 100644 --- a/src/bluetooth/bluetooth_le_device.cc +++ b/src/bluetooth/bluetooth_le_device.cc @@ -77,7 +77,7 @@ BluetoothLEDevice::~BluetoothLEDevice() { LoggerW("Failed to unset connection state change listener: %d", ret); } - if(mac_address_.empty()) { + if (mac_address_.empty()) { LoggerD("No att mtu change listener to unset: %d", ret); return; } @@ -483,7 +483,7 @@ void BluetoothLEDevice::GetAttMtu(const picojson::value& data, picojson::object& const auto& args = util::GetArguments(data); const auto& address = common::FromJson(args, kAddress); - if(mac_address_.empty()) { + if (mac_address_.empty()) { mac_address_ == address; } @@ -491,12 +491,12 @@ void BluetoothLEDevice::GetAttMtu(const picojson::value& data, picojson::object& int ret = bt_gatt_client_get_att_mtu(client, &mtu); if (BT_ERROR_NONE != ret) { - if ( BT_ERROR_REMOTE_DEVICE_NOT_CONNECTED == ret) { - LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Device is not connected"), &out, - ("Failed to get ATT MTU: %d (%s)", ret, get_error_message(ret))); + if (BT_ERROR_REMOTE_DEVICE_NOT_CONNECTED == ret) { + LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Device is not connected"), + &out, ("Failed to get ATT MTU: %d (%s)", ret, get_error_message(ret))); } else { LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to get ATT MTU"), &out, - ("Failed to get ATT MTU: %d (%s)", ret, get_error_message(ret))); + ("Failed to get ATT MTU: %d (%s)", ret, get_error_message(ret))); } return; } @@ -511,7 +511,7 @@ void BluetoothLEDevice::RequestAttMtuChange(const picojson::value& data, picojso const auto& mtu = (unsigned int)common::FromJson(args, kMtu); const auto& address = common::FromJson(args, kAddress); - if(mac_address_.empty()) { + if (mac_address_.empty()) { mac_address_ == address; } @@ -534,7 +534,7 @@ void BluetoothLEDevice::AddAttMtuChangeListener(const picojson::value& data, const auto& args = util::GetArguments(data); const auto& address = common::FromJson(args, kAddress); - if(mac_address_.empty()) { + if (mac_address_.empty()) { mac_address_ == address; } @@ -567,7 +567,7 @@ void BluetoothLEDevice::RemoveAttMtuChangeListener(const picojson::value& data, ("bt_gatt_client_set_att_mtu_changed_cb() failed with: %d (%s)", ret, get_error_message(ret))); } else { - if(!mac_address_.empty()) { + if (!mac_address_.empty()) { mac_address_.clear(); } ReportSuccess(out); @@ -578,7 +578,7 @@ void BluetoothLEDevice::OnAttMtuValueChanged(bt_gatt_client_h client, const bt_gatt_client_att_mtu_info_s* mtu_info, void* user_data) { ScopeLogger(); - if(!mtu_info) { + if (!mtu_info) { LoggerE("mtu_info is NULL"); return; } else { diff --git a/src/bluetooth/js/ut/test_toByteArray.js b/src/bluetooth/js/ut/test_toByteArray.js index d596424..53e4d77 100644 --- a/src/bluetooth/js/ut/test_toByteArray.js +++ b/src/bluetooth/js/ut/test_toByteArray.js @@ -4,73 +4,73 @@ describe('toByteArray', function() { ///////// argument of type String // expected behaviour it('should return [10], after getting "0a" argument', function(done) { - var StringArgument = "0a"; + var StringArgument = '0a'; var expected = [10]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [12], after getting "0C" argument', function(done) { - var StringArgument = "0C"; + var StringArgument = '0C'; var expected = [12]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [11], after getting "0b" argument', function(done) { - var StringArgument = "0b"; + var StringArgument = '0b'; var expected = [11]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [13], after getting "0D" argument', function(done) { - var StringArgument = "0D"; + var StringArgument = '0D'; var expected = [13]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [14], after getting "0E" argument', function(done) { - var StringArgument = "0E"; + var StringArgument = '0E'; var expected = [14]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [15, 10, 188, 222], after getting "0F0abCDE" argument', function(done) { - var StringArgument = "0F0abCDE"; + var StringArgument = '0F0abCDE'; var expected = [15, 10, 188, 222]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [10], after getting "0x0a" argument', function(done) { - var StringArgument = "0x0a"; + var StringArgument = '0x0a'; var expected = [10]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [12], after getting "0X0C" argument', function(done) { - var StringArgument = "0X0C"; + var StringArgument = '0X0C'; var expected = [12]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [11], after getting "0x0b" argument', function(done) { - var StringArgument = "0x0b"; + var StringArgument = '0x0b'; var expected = [11]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [13], after getting "0X0D" argument', function(done) { - var StringArgument = "0x0D"; + var StringArgument = '0x0D'; var expected = [13]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [14], after getting "0x0E" argument', function(done) { - var StringArgument = "0X0E"; + var StringArgument = '0X0E'; var expected = [14]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [15, 10, 188, 222], after getting "0X0F0abCDE" argument', function(done) { - var StringArgument = "0x0F0abCDE"; + var StringArgument = '0x0F0abCDE'; var expected = [15, 10, 188, 222]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); @@ -78,37 +78,37 @@ describe('toByteArray', function() { // ignoring last character in string with odd length it('should return [0], after getting "0" argument', function(done) { - var StringArgument = "0"; + var StringArgument = '0'; var expected = [0]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [1], after getting "012" argument', function(done) { - var StringArgument = "012"; + var StringArgument = '012'; var expected = [1]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [1, 35], after getting "01234" argument', function(done) { - var StringArgument = "01234"; + var StringArgument = '01234'; var expected = [1, 35]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [1, 35, 69], after getting "0123456" argument', function(done) { - var StringArgument = "0123456"; + var StringArgument = '0123456'; var expected = [1, 35, 69]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [1, 35, 69, 103], after getting "01234567f" argument', function(done) { - var StringArgument = "01234567f"; + var StringArgument = '01234567f'; var expected = [1, 35, 69, 103]; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); }); it('should return [], after getting "1" argument', function(done) { - var StringArgument = "1"; + var StringArgument = '1'; var expected = []; chai.expect(tizen.bluetooth.toByteArray(StringArgument)).to.eql(expected); done(); diff --git a/src/bluetooth/js/ut/test_toUint8Array.js b/src/bluetooth/js/ut/test_toUint8Array.js index c4ea87c..119a557 100644 --- a/src/bluetooth/js/ut/test_toUint8Array.js +++ b/src/bluetooth/js/ut/test_toUint8Array.js @@ -4,73 +4,73 @@ describe('toUint8Array', function() { ///////// argument of type String // expected behaviour it('should return Uint8Array[10], after getting "0a" argument', function(done) { - var StringArgument = "0a"; + var StringArgument = '0a'; var expected = new Uint8Array([10]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[12], after getting "0C" argument', function(done) { - var StringArgument = "0C"; + var StringArgument = '0C'; var expected = new Uint8Array([12]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[11], after getting "0b" argument', function(done) { - var StringArgument = "0b"; + var StringArgument = '0b'; var expected = new Uint8Array([11]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[13], after getting "0D" argument', function(done) { - var StringArgument = "0D"; + var StringArgument = '0D'; var expected = new Uint8Array([13]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[14], after getting "0E" argument', function(done) { - var StringArgument = "0E"; + var StringArgument = '0E'; var expected = new Uint8Array([14]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[15, 10, 188, 222], after getting "0F0abCDE" argument', function(done) { - var StringArgument = "0F0abCDE"; + var StringArgument = '0F0abCDE'; var expected = new Uint8Array([15, 10, 188, 222]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[10], after getting "0x0a" argument', function(done) { - var StringArgument = "0x0a"; + var StringArgument = '0x0a'; var expected = new Uint8Array([10]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[12], after getting "0X0C" argument', function(done) { - var StringArgument = "0X0C"; + var StringArgument = '0X0C'; var expected = new Uint8Array([12]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[11], after getting "0x0b" argument', function(done) { - var StringArgument = "0x0b"; + var StringArgument = '0x0b'; var expected = new Uint8Array([11]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[13], after getting "0X0D" argument', function(done) { - var StringArgument = "0x0D"; + var StringArgument = '0x0D'; var expected = new Uint8Array([13]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[14], after getting "0x0E" argument', function(done) { - var StringArgument = "0X0E"; + var StringArgument = '0X0E'; var expected = new Uint8Array([14]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[15, 10, 188, 222], after getting "0X0F0abCDE" argument', function(done) { - var StringArgument = "0x0F0abCDE"; + var StringArgument = '0x0F0abCDE'; var expected = new Uint8Array([15, 10, 188, 222]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); @@ -78,37 +78,37 @@ describe('toUint8Array', function() { // ignoring last character in string with odd length it('should return Uint8Array[0], after getting "0" argument', function(done) { - var StringArgument = "0"; + var StringArgument = '0'; var expected = new Uint8Array([0]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[1], after getting "012" argument', function(done) { - var StringArgument = "012"; + var StringArgument = '012'; var expected = new Uint8Array([1]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[1, 35], after getting "01234" argument', function(done) { - var StringArgument = "01234"; + var StringArgument = '01234'; var expected = new Uint8Array([1, 35]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[1, 35, 69], after getting "0123456" argument', function(done) { - var StringArgument = "0123456"; + var StringArgument = '0123456'; var expected = new Uint8Array([1, 35, 69]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[1, 35, 69, 103], after getting "01234567f" argument', function(done) { - var StringArgument = "01234567f"; + var StringArgument = '01234567f'; var expected = new Uint8Array([1, 35, 69, 103]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); }); it('should return Uint8Array[], after getting "1" argument', function(done) { - var StringArgument = "1"; + var StringArgument = '1'; var expected = new Uint8Array([]); chai.expect(tizen.bluetooth.toUint8Array(StringArgument)).to.eql(expected); done(); -- 2.7.4