From 5511befd305980e60c20c857f1c4b39863975f33 Mon Sep 17 00:00:00 2001
From: Darrell Shi <darrellshi@google.com>
Date: Fri, 3 Dec 2021 06:35:05 +0000
Subject: [PATCH] Fix CommunalManagerUpdaterTest.

Test: atest CommunalManagerUpdaterTest
Fix: 208854945
Fix: 208757016
Change-Id: I88abb02b0783cc1603ecc41fc6921582a90dfd28
---
 .../communal/CommunalManagerUpdaterTest.java         | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalManagerUpdaterTest.java b/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalManagerUpdaterTest.java
index fb8efa97a7cba..abc20994749ac 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalManagerUpdaterTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalManagerUpdaterTest.java
@@ -16,12 +16,14 @@
 
 package com.android.systemui.communal;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.clearInvocations;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
 import android.app.communal.CommunalManager;
 import android.testing.AndroidTestingRunner;
-import android.testing.TestableLooper;
 
 import androidx.test.filters.SmallTest;
 
@@ -36,7 +38,6 @@ import org.mockito.MockitoAnnotations;
 
 @SmallTest
 @RunWith(AndroidTestingRunner.class)
-@TestableLooper.RunWithLooper
 public class CommunalManagerUpdaterTest extends SysuiTestCase {
     private CommunalSourceMonitor mMonitor;
     @Mock
@@ -49,9 +50,16 @@ public class CommunalManagerUpdaterTest extends SysuiTestCase {
         MockitoAnnotations.initMocks(this);
         mContext.addMockSystemService(CommunalManager.class, mCommunalManager);
 
+        doAnswer(invocation -> {
+            final CommunalConditionsMonitor.Callback callback = invocation.getArgument(0);
+            callback.onConditionsChanged(true);
+            return null;
+        }).when(mCommunalConditionsMonitor).addCallback(any());
+
         mMonitor = new CommunalSourceMonitor(mCommunalConditionsMonitor);
         final CommunalManagerUpdater updater = new CommunalManagerUpdater(mContext, mMonitor);
         updater.start();
+        clearInvocations(mCommunalManager);
     }
 
     @Test