Loading android/app/src/com/android/bluetooth/opp/BluetoothOppPreference.java +8 −0 Original line number Original line Diff line number Diff line Loading @@ -166,6 +166,14 @@ public class BluetoothOppPreference { mChannels.remove(key); mChannels.remove(key); } } public void removeName(BluetoothDevice remoteDevice) { Editor ed = mNamePreference.edit(); String key = remoteDevice.getIdentityAddress(); ed.remove(key); ed.apply(); mNames.remove(key); } public void dump() { public void dump() { Log.d(TAG, "Dumping Names: "); Log.d(TAG, "Dumping Names: "); Log.d(TAG, mNames.toString()); Log.d(TAG, mNames.toString()); Loading android/app/tests/unit/src/com/android/bluetooth/opp/BluetoothOppPreferenceTest.java 0 → 100644 +108 −0 Original line number Original line Diff line number Diff line /* * Copyright 2023 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.opp; import static com.android.bluetooth.opp.BluetoothOppManager.OPP_PREFERENCE_FILE; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; import android.content.ContextWrapper; import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; import com.android.bluetooth.BluetoothMethodProxy; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) public class BluetoothOppPreferenceTest { Context mContext; BluetoothMethodProxy mCallProxy; @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = spy(new ContextWrapper( InstrumentationRegistry.getInstrumentation().getTargetContext())); mCallProxy = spy(BluetoothMethodProxy.getInstance()); BluetoothMethodProxy.setInstanceForTesting(mCallProxy); doReturn(null).when(mCallProxy).contentResolverInsert( any(), eq(BluetoothShare.CONTENT_URI), any()); } @After public void tearDown() { BluetoothMethodProxy.setInstanceForTesting(null); BluetoothOppUtility.sSendFileMap.clear(); mContext.getSharedPreferences(OPP_PREFERENCE_FILE, 0).edit().clear().apply(); BluetoothOppManager.sInstance = null; } @Test public void dump_shouldNotThrow() { BluetoothOppPreference.getInstance(mContext).dump(); } @Test public void setNameAndGetNameAndRemoveName_setsAndGetsAndRemovesNameCorrectly() { String address = "AA:BB:CC:DD:EE:FF"; String name = "randomName"; BluetoothDevice device = (mContext.getSystemService(BluetoothManager.class)) .getAdapter().getRemoteDevice(address); BluetoothOppPreference.getInstance(mContext).setName(device, name); assertThat(BluetoothOppPreference.getInstance(mContext).getName(device)).isEqualTo(name); // Undo the change so this will not be saved on share preference BluetoothOppPreference.getInstance(mContext).removeName(device); assertThat(BluetoothOppPreference.getInstance(mContext).getName(device)).isNull(); } @Test public void setChannelAndGetAndRemoveChannel_setsAndGetsAndRemovesChannelCorrectly() { String address = "AA:BB:CC:DD:EE:FF"; int uuid = 1234; int channel = 78910; BluetoothDevice device = (mContext.getSystemService(BluetoothManager.class)) .getAdapter().getRemoteDevice(address); BluetoothOppPreference.getInstance(mContext).setChannel(device, uuid, channel); assertThat(BluetoothOppPreference.getInstance(mContext).getChannel(device, uuid)).isEqualTo( channel); // Undo the change so this will not be saved on share preference BluetoothOppPreference.getInstance(mContext).removeChannel(device, uuid); assertThat(BluetoothOppPreference.getInstance(mContext).getChannel(device, uuid)).isEqualTo( -1); } } Loading
android/app/src/com/android/bluetooth/opp/BluetoothOppPreference.java +8 −0 Original line number Original line Diff line number Diff line Loading @@ -166,6 +166,14 @@ public class BluetoothOppPreference { mChannels.remove(key); mChannels.remove(key); } } public void removeName(BluetoothDevice remoteDevice) { Editor ed = mNamePreference.edit(); String key = remoteDevice.getIdentityAddress(); ed.remove(key); ed.apply(); mNames.remove(key); } public void dump() { public void dump() { Log.d(TAG, "Dumping Names: "); Log.d(TAG, "Dumping Names: "); Log.d(TAG, mNames.toString()); Log.d(TAG, mNames.toString()); Loading
android/app/tests/unit/src/com/android/bluetooth/opp/BluetoothOppPreferenceTest.java 0 → 100644 +108 −0 Original line number Original line Diff line number Diff line /* * Copyright 2023 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.opp; import static com.android.bluetooth.opp.BluetoothOppManager.OPP_PREFERENCE_FILE; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; import android.content.ContextWrapper; import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; import com.android.bluetooth.BluetoothMethodProxy; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) public class BluetoothOppPreferenceTest { Context mContext; BluetoothMethodProxy mCallProxy; @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = spy(new ContextWrapper( InstrumentationRegistry.getInstrumentation().getTargetContext())); mCallProxy = spy(BluetoothMethodProxy.getInstance()); BluetoothMethodProxy.setInstanceForTesting(mCallProxy); doReturn(null).when(mCallProxy).contentResolverInsert( any(), eq(BluetoothShare.CONTENT_URI), any()); } @After public void tearDown() { BluetoothMethodProxy.setInstanceForTesting(null); BluetoothOppUtility.sSendFileMap.clear(); mContext.getSharedPreferences(OPP_PREFERENCE_FILE, 0).edit().clear().apply(); BluetoothOppManager.sInstance = null; } @Test public void dump_shouldNotThrow() { BluetoothOppPreference.getInstance(mContext).dump(); } @Test public void setNameAndGetNameAndRemoveName_setsAndGetsAndRemovesNameCorrectly() { String address = "AA:BB:CC:DD:EE:FF"; String name = "randomName"; BluetoothDevice device = (mContext.getSystemService(BluetoothManager.class)) .getAdapter().getRemoteDevice(address); BluetoothOppPreference.getInstance(mContext).setName(device, name); assertThat(BluetoothOppPreference.getInstance(mContext).getName(device)).isEqualTo(name); // Undo the change so this will not be saved on share preference BluetoothOppPreference.getInstance(mContext).removeName(device); assertThat(BluetoothOppPreference.getInstance(mContext).getName(device)).isNull(); } @Test public void setChannelAndGetAndRemoveChannel_setsAndGetsAndRemovesChannelCorrectly() { String address = "AA:BB:CC:DD:EE:FF"; int uuid = 1234; int channel = 78910; BluetoothDevice device = (mContext.getSystemService(BluetoothManager.class)) .getAdapter().getRemoteDevice(address); BluetoothOppPreference.getInstance(mContext).setChannel(device, uuid, channel); assertThat(BluetoothOppPreference.getInstance(mContext).getChannel(device, uuid)).isEqualTo( channel); // Undo the change so this will not be saved on share preference BluetoothOppPreference.getInstance(mContext).removeChannel(device, uuid); assertThat(BluetoothOppPreference.getInstance(mContext).getChannel(device, uuid)).isEqualTo( -1); } }