diff --git a/framework/tests/bumble/Android.bp b/framework/tests/bumble/Android.bp index 8e5b342b41978bea09328d21396744fead251692..d1cfa300155fa9e58d64f77a0e5607439769ef42 100644 --- a/framework/tests/bumble/Android.bp +++ b/framework/tests/bumble/Android.bp @@ -28,6 +28,7 @@ android_test_helper_app { "compatibility-device-util-axt", "grpc-java-lite", "grpc-java-okhttp-client-lite", + "mockito-kotlin2", "opencensus-java-contrib-grpc-metrics", "pandora_experimental-grpc-java", "pandora_experimental-proto-java", diff --git a/framework/tests/bumble/src/android/bluetooth/DckTest.kt b/framework/tests/bumble/src/android/bluetooth/DckTest.kt index 320bf4182b299f43e1e6dee1cf01cb05a01e5d3a..fe7095682f31aa6534e8f57b0782905aaf4c4524 100644 --- a/framework/tests/bumble/src/android/bluetooth/DckTest.kt +++ b/framework/tests/bumble/src/android/bluetooth/DckTest.kt @@ -28,26 +28,21 @@ import java.util.concurrent.TimeUnit import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.mockito.Mockito.any -import org.mockito.Mockito.eq -import org.mockito.Mockito.mock -import org.mockito.Mockito.timeout -import org.mockito.Mockito.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.timeout +import org.mockito.kotlin.verify import pandora.HostProto.AdvertiseRequest import pandora.HostProto.OwnAddressType @RunWith(AndroidJUnit4::class) public class DckTest { - private val TAG = "DckTest" - private val TIMEOUT: Long = 2000 private val context: Context = ApplicationProvider.getApplicationContext() private val bluetoothManager = context.getSystemService(BluetoothManager::class.java)!! private val bluetoothAdapter = bluetoothManager.adapter - // CCC DK Specification R3 1.2.0 r14 section 19.2.1.2 Bluetooth Le Pairing - private val CCC_DK_UUID = UUID.fromString("0000FFF5-0000-1000-8000-00805f9b34fb") - // A Rule live from a test setup through it's teardown. // Gives shell permissions during the test. @Rule @JvmField val mPermissionRule = AdoptShellPermissionsRule() @@ -130,7 +125,7 @@ public class DckTest { // 4. Create a mock callback to handle Bluetooth GATT (Generic Attribute Profile) related // events. - val gattCallback = mock(BluetoothGattCallback::class.java) + val gattCallback = mock<BluetoothGattCallback>() // 5. Connect to the Bumble device and expect a successful connection callback. var bumbleGatt = bumbleDevice.connectGatt(context, false, gattCallback) @@ -158,4 +153,12 @@ public class DckTest { eq(BluetoothProfile.STATE_DISCONNECTED) ) } + + companion object { + private const val TAG = "DckTest" + private const val TIMEOUT: Long = 2000 + + // CCC DK Specification R3 1.2.0 r14 section 19.2.1.2 Bluetooth Le Pairing + private val CCC_DK_UUID = UUID.fromString("0000FFF5-0000-1000-8000-00805f9b34fb") + } }