Merge "Prevent leaked receivers from MediaOutputDialogTest" into udc-dev (e1e138fe) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java

+33 −24

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import android.testing.TestableLooper;
		import android.util.FeatureFlagUtils;
		import android.view.View;

		import androidx.annotation.NonNull;
		import androidx.test.filters.MediumTest;

		import com.android.internal.logging.UiEventLogger;
		@@ -64,6 +65,7 @@ import org.junit.runner.RunWith;
		import java.util.ArrayList;
		import java.util.List;
		import java.util.Optional;
		import java.util.function.Consumer;

		@MediumTest
		@RunWith(AndroidTestingRunner.class)
		@@ -102,6 +104,11 @@ public class MediaOutputDialogTest extends SysuiTestCase {
		private MediaOutputController mMediaOutputController;
		private final List<String> mFeatures = new ArrayList<>();

		@Override
		protected boolean shouldFailOnLeakedReceiver() {
		return true;
		}

		@Before
		public void setUp() {
		when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);
		@@ -120,8 +127,7 @@ public class MediaOutputDialogTest extends SysuiTestCase {
		Optional.of(mNearbyMediaDevicesManager), mAudioManager, mPowerExemptionManager,
		mKeyguardManager, mFlags);
		mMediaOutputController.mLocalMediaManager = mLocalMediaManager;
		mMediaOutputDialog = new MediaOutputDialog(mContext, false, mBroadcastSender,
		mMediaOutputController, mUiEventLogger);
		mMediaOutputDialog = makeTestDialog(mMediaOutputController);
		mMediaOutputDialog.show();

		when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(mMediaDevice);
		@@ -130,7 +136,7 @@ public class MediaOutputDialogTest extends SysuiTestCase {

		@After
		public void tearDown() {
		mMediaOutputDialog.dismissDialog();
		mMediaOutputDialog.dismiss();
		}

		@Test
		@@ -311,11 +317,9 @@ public class MediaOutputDialogTest extends SysuiTestCase {
		MediaOutputController mockMediaOutputController = mock(MediaOutputController.class);
		when(mockMediaOutputController.isBroadcastSupported()).thenReturn(false);

		MediaOutputDialog testDialog = new MediaOutputDialog(mContext, false, mBroadcastSender,
		mockMediaOutputController, mUiEventLogger);
		testDialog.show();

		withTestDialog(mockMediaOutputController, testDialog -> {
		assertThat(testDialog.getStopButtonText().toString()).isEqualTo(stopText);
		});
		}

		@Test
		@@ -328,11 +332,9 @@ public class MediaOutputDialogTest extends SysuiTestCase {
		when(mockMediaOutputController.isBluetoothLeDevice(any())).thenReturn(true);
		when(mockMediaOutputController.isPlaying()).thenReturn(true);
		when(mockMediaOutputController.isBluetoothLeBroadcastEnabled()).thenReturn(false);
		MediaOutputDialog testDialog = new MediaOutputDialog(mContext, false, mBroadcastSender,
		mockMediaOutputController, mUiEventLogger);
		testDialog.show();

		withTestDialog(mockMediaOutputController, testDialog -> {
		assertThat(testDialog.getStopButtonText().toString()).isEqualTo(stopText);
		});
		}

		@Test
		@@ -341,11 +343,9 @@ public class MediaOutputDialogTest extends SysuiTestCase {
		when(mockMediaOutputController.isBroadcastSupported()).thenReturn(false);
		when(mockMediaOutputController.getCurrentConnectedMediaDevice()).thenReturn(null);
		when(mockMediaOutputController.isPlaying()).thenReturn(false);
		MediaOutputDialog testDialog = new MediaOutputDialog(mContext, false, mBroadcastSender,
		mockMediaOutputController, mUiEventLogger);
		testDialog.show();

		withTestDialog(mockMediaOutputController, testDialog -> {
		testDialog.onStopButtonClick();
		});

		verify(mockMediaOutputController).releaseSession();
		}
		@@ -354,13 +354,22 @@ public class MediaOutputDialogTest extends SysuiTestCase {
		// Check the visibility metric logging by creating a new MediaOutput dialog,
		// and verify if the calling times increases.
		public void onCreate_ShouldLogVisibility() {
		MediaOutputDialog testDialog = new MediaOutputDialog(mContext, false, mBroadcastSender,
		mMediaOutputController, mUiEventLogger);
		testDialog.show();

		testDialog.dismissDialog();
		withTestDialog(mMediaOutputController, testDialog -> {});

		verify(mUiEventLogger, times(2))
		.log(MediaOutputDialog.MediaOutputEvent.MEDIA_OUTPUT_DIALOG_SHOW);
		}

		@NonNull
		private MediaOutputDialog makeTestDialog(MediaOutputController controller) {
		return new MediaOutputDialog(mContext, false, mBroadcastSender,
		controller, mUiEventLogger);
		}

		private void withTestDialog(MediaOutputController controller, Consumer<MediaOutputDialog> c) {
		MediaOutputDialog testDialog = makeTestDialog(controller);
		testDialog.show();
		c.accept(testDialog);
		testDialog.dismiss();
		}
		}

packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -102,7 +102,8 @@ public abstract class SysuiTestCase {
		mock(Executor.class),
		mock(DumpManager.class),
		mock(BroadcastDispatcherLogger.class),
		mock(UserTracker.class));
		mock(UserTracker.class),
		shouldFailOnLeakedReceiver());

		mRealInstrumentation = InstrumentationRegistry.getInstrumentation();
		Instrumentation inst = spy(mRealInstrumentation);
		@@ -141,6 +142,10 @@ public abstract class SysuiTestCase {
		mDependency.injectTestDependency(DialogLaunchAnimator.class, fakeDialogLaunchAnimator());
		}

		protected boolean shouldFailOnLeakedReceiver() {
		return false;
		}

		@After
		public void SysuiTeardown() {
		if (mRealInstrumentation != null) {

packages/SystemUI/tests/utils/src/com/android/systemui/broadcast/FakeBroadcastDispatcher.kt

+6 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import com.android.systemui.SysuiTestableContext
		import com.android.systemui.broadcast.logging.BroadcastDispatcherLogger
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.settings.UserTracker
		import java.lang.IllegalStateException
		import java.util.concurrent.ConcurrentHashMap
		import java.util.concurrent.Executor

		@@ -37,7 +38,8 @@ class FakeBroadcastDispatcher(
		broadcastRunningExecutor: Executor,
		dumpManager: DumpManager,
		logger: BroadcastDispatcherLogger,
		userTracker: UserTracker
		userTracker: UserTracker,
		private val shouldFailOnLeakedReceiver: Boolean
		) :
		BroadcastDispatcher(
		context,
		@@ -85,6 +87,9 @@ class FakeBroadcastDispatcher(
		fun cleanUpReceivers(testName: String) {
		registeredReceivers.forEach {
		Log.i(testName, "Receiver not unregistered from dispatcher: $it")
		if (shouldFailOnLeakedReceiver) {
		throw IllegalStateException("Receiver not unregistered from dispatcher: $it")
		}
		}
		registeredReceivers.clear()
		}