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

Commit ea8c9ff2 authored May 20, 2022 by Jakub Tyszkowski Committed by Grzegorz Kolodziejczyk Jun 30, 2022

tests: Fix handling exceptions during the setup phase

Some tests can assert in the setup phase, but
the teardown phase is performed anyway.
The interrupted setup may result in some variables
being undefined. This results with NullPointerException
being thrown at teardown when these are accessed.
This often shadows the original problem making it harder
to troubleshoot.

Bug: 150670922
Bug: 237642745
Tag: #feature
Sponsor: jpawlowski@
Test: atest BluetoothInstrumentationTests
Change-Id: I70e01a0f977e2d99fa57c4f4b95d29a3880bd0c3

parent bf99d7bc

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
		@@ -215,6 +215,10 @@ public class LeAudioServiceTest {

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

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