Loading android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpBipClient.java +5 −2 Original line number Diff line number Diff line Loading @@ -26,6 +26,7 @@ import android.os.Message; import android.util.Log; import com.android.bluetooth.BluetoothObexTransport; import com.android.internal.annotations.VisibleForTesting; import com.android.obex.ClientSession; import com.android.obex.HeaderSet; import com.android.obex.ResponseCodes; Loading Loading @@ -229,7 +230,8 @@ public class AvrcpBipClient { /** * Update our client's connection state and notify of the new status */ private void setConnectionState(int state) { @VisibleForTesting void setConnectionState(int state) { int oldState = -1; synchronized (this) { oldState = mState; Loading Loading @@ -428,7 +430,8 @@ public class AvrcpBipClient { } } private String getStateName() { @VisibleForTesting String getStateName() { int state = getState(); switch (state) { case BluetoothProfile.STATE_DISCONNECTED: Loading android/app/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpBipClientTest.java 0 → 100644 +144 −0 Original line number Diff line number Diff line /* * Copyright 2022 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.android.bluetooth.avrcpcontroller; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import androidx.test.filters.SmallTest; import androidx.test.rule.ServiceTestRule; import androidx.test.runner.AndroidJUnit4; import com.android.bluetooth.TestUtils; import com.android.bluetooth.btservice.AdapterService; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @SmallTest @RunWith(AndroidJUnit4.class) public class AvrcpBipClientTest { private static final int TEST_PSM = 1; @Rule public final ServiceTestRule mServiceRule = new ServiceTestRule(); @Mock private AdapterService mAdapterService; private BluetoothAdapter mAdapter; private BluetoothDevice mTestDevice; private AvrcpControllerService mService = null; private AvrcpCoverArtManager mArtManager; private AvrcpBipClient mClient; @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); TestUtils.setAdapterService(mAdapterService); doReturn(true, false).when(mAdapterService).isStartedProfile(anyString()); TestUtils.startService(mServiceRule, AvrcpControllerService.class); mService = AvrcpControllerService.getAvrcpControllerService(); mAdapter = BluetoothAdapter.getDefaultAdapter(); mTestDevice = mAdapter.getRemoteDevice("00:01:02:03:04:05"); AvrcpCoverArtManager.Callback callback = (device, event) -> { }; mArtManager = new AvrcpCoverArtManager(mService, callback); mClient = new AvrcpBipClient(mTestDevice, TEST_PSM, mArtManager.new BipClientCallback(mTestDevice)); } @After public void tearDown() throws Exception { TestUtils.stopService(mServiceRule, AvrcpControllerService.class); mService = AvrcpControllerService.getAvrcpControllerService(); assertThat(mService).isNull(); TestUtils.clearAdapterService(mAdapterService); mArtManager.cleanup(); } @Test public void constructor() { AvrcpBipClient client = new AvrcpBipClient(mTestDevice, TEST_PSM, mArtManager.new BipClientCallback(mTestDevice)); assertThat(client.getL2capPsm()).isEqualTo(TEST_PSM); } @Test public void constructor_withNullDevice() { assertThrows(NullPointerException.class, () -> new AvrcpBipClient(null, TEST_PSM, mArtManager.new BipClientCallback(mTestDevice))); } @Test public void constructor_withNullCallback() { assertThrows(NullPointerException.class, () -> new AvrcpBipClient(mTestDevice, TEST_PSM, null)); } @Test public void setConnectionState() { mClient.setConnectionState(BluetoothProfile.STATE_CONNECTING); assertThat(mClient.getState()).isEqualTo(BluetoothProfile.STATE_CONNECTING); } @Test public void getConnectionState() { mClient.setConnectionState(BluetoothProfile.STATE_DISCONNECTED); assertThat(mClient.getStateName()).isEqualTo("Disconnected"); mClient.setConnectionState(BluetoothProfile.STATE_CONNECTING); assertThat(mClient.getStateName()).isEqualTo("Connecting"); mClient.setConnectionState(BluetoothProfile.STATE_CONNECTED); assertThat(mClient.getStateName()).isEqualTo("Connected"); mClient.setConnectionState(BluetoothProfile.STATE_DISCONNECTING); assertThat(mClient.getStateName()).isEqualTo("Disconnecting"); int invalidState = 4; mClient.setConnectionState(invalidState); assertThat(mClient.getStateName()).isEqualTo("Unknown"); } @Test public void toString_returnsClientInfo() { AvrcpBipClient client = new AvrcpBipClient(mTestDevice, TEST_PSM, mArtManager.new BipClientCallback(mTestDevice)); String expected = "<AvrcpBipClient" + " device=" + mTestDevice.getAddress() + " psm=" + TEST_PSM + " state=" + client.getStateName() + ">"; assertThat(client.toString()).isEqualTo(expected); } } Loading
android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpBipClient.java +5 −2 Original line number Diff line number Diff line Loading @@ -26,6 +26,7 @@ import android.os.Message; import android.util.Log; import com.android.bluetooth.BluetoothObexTransport; import com.android.internal.annotations.VisibleForTesting; import com.android.obex.ClientSession; import com.android.obex.HeaderSet; import com.android.obex.ResponseCodes; Loading Loading @@ -229,7 +230,8 @@ public class AvrcpBipClient { /** * Update our client's connection state and notify of the new status */ private void setConnectionState(int state) { @VisibleForTesting void setConnectionState(int state) { int oldState = -1; synchronized (this) { oldState = mState; Loading Loading @@ -428,7 +430,8 @@ public class AvrcpBipClient { } } private String getStateName() { @VisibleForTesting String getStateName() { int state = getState(); switch (state) { case BluetoothProfile.STATE_DISCONNECTED: Loading
android/app/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpBipClientTest.java 0 → 100644 +144 −0 Original line number Diff line number Diff line /* * Copyright 2022 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.android.bluetooth.avrcpcontroller; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import androidx.test.filters.SmallTest; import androidx.test.rule.ServiceTestRule; import androidx.test.runner.AndroidJUnit4; import com.android.bluetooth.TestUtils; import com.android.bluetooth.btservice.AdapterService; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @SmallTest @RunWith(AndroidJUnit4.class) public class AvrcpBipClientTest { private static final int TEST_PSM = 1; @Rule public final ServiceTestRule mServiceRule = new ServiceTestRule(); @Mock private AdapterService mAdapterService; private BluetoothAdapter mAdapter; private BluetoothDevice mTestDevice; private AvrcpControllerService mService = null; private AvrcpCoverArtManager mArtManager; private AvrcpBipClient mClient; @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); TestUtils.setAdapterService(mAdapterService); doReturn(true, false).when(mAdapterService).isStartedProfile(anyString()); TestUtils.startService(mServiceRule, AvrcpControllerService.class); mService = AvrcpControllerService.getAvrcpControllerService(); mAdapter = BluetoothAdapter.getDefaultAdapter(); mTestDevice = mAdapter.getRemoteDevice("00:01:02:03:04:05"); AvrcpCoverArtManager.Callback callback = (device, event) -> { }; mArtManager = new AvrcpCoverArtManager(mService, callback); mClient = new AvrcpBipClient(mTestDevice, TEST_PSM, mArtManager.new BipClientCallback(mTestDevice)); } @After public void tearDown() throws Exception { TestUtils.stopService(mServiceRule, AvrcpControllerService.class); mService = AvrcpControllerService.getAvrcpControllerService(); assertThat(mService).isNull(); TestUtils.clearAdapterService(mAdapterService); mArtManager.cleanup(); } @Test public void constructor() { AvrcpBipClient client = new AvrcpBipClient(mTestDevice, TEST_PSM, mArtManager.new BipClientCallback(mTestDevice)); assertThat(client.getL2capPsm()).isEqualTo(TEST_PSM); } @Test public void constructor_withNullDevice() { assertThrows(NullPointerException.class, () -> new AvrcpBipClient(null, TEST_PSM, mArtManager.new BipClientCallback(mTestDevice))); } @Test public void constructor_withNullCallback() { assertThrows(NullPointerException.class, () -> new AvrcpBipClient(mTestDevice, TEST_PSM, null)); } @Test public void setConnectionState() { mClient.setConnectionState(BluetoothProfile.STATE_CONNECTING); assertThat(mClient.getState()).isEqualTo(BluetoothProfile.STATE_CONNECTING); } @Test public void getConnectionState() { mClient.setConnectionState(BluetoothProfile.STATE_DISCONNECTED); assertThat(mClient.getStateName()).isEqualTo("Disconnected"); mClient.setConnectionState(BluetoothProfile.STATE_CONNECTING); assertThat(mClient.getStateName()).isEqualTo("Connecting"); mClient.setConnectionState(BluetoothProfile.STATE_CONNECTED); assertThat(mClient.getStateName()).isEqualTo("Connected"); mClient.setConnectionState(BluetoothProfile.STATE_DISCONNECTING); assertThat(mClient.getStateName()).isEqualTo("Disconnecting"); int invalidState = 4; mClient.setConnectionState(invalidState); assertThat(mClient.getStateName()).isEqualTo("Unknown"); } @Test public void toString_returnsClientInfo() { AvrcpBipClient client = new AvrcpBipClient(mTestDevice, TEST_PSM, mArtManager.new BipClientCallback(mTestDevice)); String expected = "<AvrcpBipClient" + " device=" + mTestDevice.getAddress() + " psm=" + TEST_PSM + " state=" + client.getStateName() + ">"; assertThat(client.toString()).isEqualTo(expected); } }