Call BluetoothGatt#close() after disconnecting

device/bluetooth/test/bluetooth_test_android.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/test/bluetooth_test_android.h"
 
 #include <iterator>
 #include <sstream>
 
 #include "base/android/jni_array.h"
@@ skipping 18 matching lines @@
 }
 
 BluetoothTestAndroid::~BluetoothTestAndroid() {
 }
 
 void BluetoothTestAndroid::SetUp() {
   // Register in SetUp so that ASSERT can be used.
   ASSERT_TRUE(RegisterNativesImpl(AttachCurrentThread()));
 }
 
+void BluetoothTestAndroid::TearDown() {
+  BluetoothAdapter::DeviceList devices = adapter_->GetDevices();
+  for (auto& device : devices) {
+    DeleteDevice(device);
+  }
+  EXPECT_EQ(0, gatt_open_connections_);
+}

[scheib, 2016/02/01 18:18:48]

Also call BluetoothTest::TearDown()

[tommyt, 2016/02/02 09:48:30]

I even read the comment in bluetooth_test.h that says that this must be done,
but I still forgot it. Oh, well, I have another patchset up that adds this call

+
 bool BluetoothTestAndroid::PlatformSupportsLowEnergy() {
   return true;
 }
 
 void BluetoothTestAndroid::InitWithDefaultAdapter() {
   adapter_ =
       BluetoothAdapterAndroid::Create(
           BluetoothAdapterWrapper_CreateWithDefaultAdapter().obj()).get();
 }
 
@@ skipping 233 matching lines @@
   BluetoothRemoteGattDescriptorAndroid* descriptor_android =
       static_cast<BluetoothRemoteGattDescriptorAndroid*>(descriptor);
   Java_FakeBluetoothGattDescriptor_setWriteDescriptorWillFailSynchronouslyOnce(
       base::android::AttachCurrentThread(),
       descriptor_android->GetJavaObject().obj());
 }
 
 void BluetoothTestAndroid::OnFakeBluetoothDeviceConnectGattCalled(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller) {
+  gatt_open_connections_++;
   gatt_connection_attempts_++;
 }
 
 void BluetoothTestAndroid::OnFakeBluetoothGattDisconnect(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller) {
   gatt_disconnection_attempts_++;
 }
 
+void BluetoothTestAndroid::OnFakeBluetoothGattClose(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& caller) {
+  gatt_open_connections_--;
+
+  // close implies disconnect
+  gatt_disconnection_attempts_++;
+}
+
 void BluetoothTestAndroid::OnFakeBluetoothGattDiscoverServices(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller) {
   gatt_discovery_attempts_++;
 }
 
 void BluetoothTestAndroid::OnFakeBluetoothGattSetCharacteristicNotification(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller) {
   gatt_notify_characteristic_attempts_++;
@@ skipping 15 matching lines @@
 
 void BluetoothTestAndroid::OnFakeBluetoothGattWriteDescriptor(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller,
     const JavaParamRef<jbyteArray>& value) {
   gatt_write_descriptor_attempts_++;
   base::android::JavaByteArrayToByteVector(env, value, &last_write_value_);
 }
 
 }  // namespace device