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

Commit 232147e2 authored by Lyn's avatar Lyn
Browse files

Set up deviceless testing for HeadsUpManagerPhoneTest 

Fixes: 326986767
Test: atest SystemUiRoboTests:HeadsUpManagerPhoneTest
Test: atest SystemUITests:HeadsUpManagerPhoneTest
Change-Id: I35b055293f4293dfa943c6e455ef45c5585a8964
parent 3e856627

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhoneTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/HeadsUpManagerPhoneTest.java

+6 −8
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.statusbar.phone;

package com.android.systemui.statusbar.policy;



import static com.android.systemui.log.LogBufferHelperKt.logcatLogBuffer;

import static com.android.systemui.util.concurrency.MockExecutorHandlerKt.mockExecutorHandler;
@@ -26,10 +26,10 @@ import static org.mockito.ArgumentMatchers.anyInt; 
import static org.mockito.Mockito.when;



import android.content.Context;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;



import androidx.test.filters.SmallTest;

import androidx.test.ext.junit.runners.AndroidJUnit4;



import com.android.internal.logging.UiEventLogger;

import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -39,11 +39,9 @@ import com.android.systemui.statusbar.NotificationShadeWindowController; 
import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider;

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;

import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;

import com.android.systemui.statusbar.policy.BaseHeadsUpManagerTest;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.HeadsUpManager;

import com.android.systemui.statusbar.policy.HeadsUpManagerLogger;

import com.android.systemui.statusbar.phone.ConfigurationControllerImpl;

import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.kotlin.JavaAdapter;

import com.android.systemui.util.settings.GlobalSettings;
@@ -61,7 +59,7 @@ import org.mockito.junit.MockitoRule; 
import kotlinx.coroutines.flow.StateFlowKt;



@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidJUnit4.class)

@TestableLooper.RunWithLooper

public class HeadsUpManagerPhoneTest extends BaseHeadsUpManagerTest {

    @Rule public MockitoRule rule = MockitoJUnit.rule();

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements OnHeadsUp 
    private static final String TAG = "HeadsUpManagerPhone";



    @VisibleForTesting

    final int mExtensionTime;

    public final int mExtensionTime;

    private final KeyguardBypassController mBypassController;

    private final GroupMembershipManager mGroupMembershipManager;

    private final List<OnHeadsUpPhoneListenerChange> mHeadsUpPhoneListeners = new ArrayList<>();