Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f00ecb20 authored Jul 15, 2022 by Treehugger Robot Committed by Automerger Merge Worker Jul 15, 2022

Merge "tests: Fix handling exceptions during the setup phase" am: e867c5af...

Merge "tests: Fix handling exceptions during the setup phase" am: e867c5af am: 65960530 am: b97892b9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2101707

Change-Id: Ieff363a3ff15dce6394fdf2a58f06b0e7da3fae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6dec659e b97892b9

android/app/tests/unit/src/com/android/bluetooth/bass_client/BassClientServiceTest.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,10 @@ public class BassClientServiceTest {

		@After
		public void tearDown() throws Exception {
		if (mBassClientService == null) {
		return;
		}

		TestUtils.stopService(mServiceRule, BassClientService.class);
		mBassClientService = BassClientService.getBassClientService();
		assertThat(mBassClientService).isNull();

android/app/tests/unit/src/com/android/bluetooth/csip/CsipSetCoordinatorServiceTest.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,14 @@ public class CsipSetCoordinatorServiceTest {

		@After
		public void tearDown() throws Exception {
		if (mService == null) {
		return;
		}

		if (Looper.myLooper() == null) {
		return;
		}

		stopService();
		mTargetContext.unregisterReceiver(mCsipSetCoordinatorIntentReceiver);
		TestUtils.clearAdapterService(mAdapterService);

android/app/tests/unit/src/com/android/bluetooth/hap/HapClientTest.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,10 @@ public class HapClientTest {

		@After
		public void tearDown() throws Exception {
		if (mService == null) {
		return;
		}

		mService.mCallbacks.unregister(mCallback);

		stopService();

android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioBroadcastServiceTest.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -193,6 +193,10 @@ public class LeAudioBroadcastServiceTest {

		@After
		public void tearDown() throws Exception {
		if (mService == null) {
		return;
		}

		stopService();
		mTargetContext.unregisterReceiver(mLeAudioIntentReceiver);
		TestUtils.clearAdapterService(mAdapterService);

android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -221,6 +221,10 @@ public class LeAudioServiceTest {

		@After
		public void tearDown() throws Exception {
		if ((mService == null) \|\| (mAdapter == null)) {
		return;
		}

		mBondedDevices.clear();
		mGroupIntentQueue.clear();
		stopService();