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

Commit 4e7a5ea6 authored by Julia Tuttle's avatar Julia Tuttle
Browse files

Use MockitoRule instead of initMocks 

Bug: 315192399
Test: atest AlertingNotificationManagerTest
Test: atest HeadsUpManagerTest
Test: atest HeadsUpManagerPhoneTest
Flag: NA
Change-Id: I8dc2e8d269ce2909966100b92b779d9c07cdb098
parent 9a782e21

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BaseHeadsUpManagerTest.java

+6 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.mockito.MockitoAnnotations.initMocks;



import android.app.Notification;

import android.app.PendingIntent;
@@ -60,14 +59,20 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntryB 


import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



@SmallTest

@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper

public class BaseHeadsUpManagerTest extends AlertingNotificationManagerTest {

    @Rule

    public MockitoRule rule = MockitoJUnit.rule();



    private static final int TEST_TOUCH_ACCEPTANCE_TIME = 200;

    private static final int TEST_A11Y_AUTO_DISMISS_TIME = 1_000;

    private static final int TEST_A11Y_TIMEOUT_TIME = 3_000;
@@ -227,7 +232,6 @@ public class BaseHeadsUpManagerTest extends AlertingNotificationManagerTest { 
    @Before

    @Override

    public void setUp() {

        initMocks(this);

        super.setUp();

    }