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

Commit 0d55dcc9 authored by Matthew Reynolds's avatar Matthew Reynolds Committed by Android (Google) Code Review
Browse files

Merge "More Robolectric mass migration." into main

parents 73849f32 8b5e1e47

packages/SystemUI/tests/src/com/android/keyguard/ActiveUnlockConfigTest.kt→packages/SystemUI/multivalentTests/src/com/android/keyguard/ActiveUnlockConfigTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.provider.Settings.Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT_WHEN_BIOM 
import android.provider.Settings.Secure.ACTIVE_UNLOCK_ON_WAKE

import android.provider.Settings.Secure.ACTIVE_UNLOCK_WAKEUPS_CONSIDERED_UNLOCK_INTENTS

import android.provider.Settings.Secure.ACTIVE_UNLOCK_WAKEUPS_TO_FORCE_DISMISS_KEYGUARD

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

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.dump.DumpManager
@@ -47,6 +48,7 @@ import org.junit.Assert.assertFalse 
import org.junit.Assert.assertTrue

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.ArgumentCaptor

import org.mockito.Captor

import org.mockito.Mock
@@ -55,6 +57,7 @@ import org.mockito.Mockito.`when` 
import org.mockito.MockitoAnnotations



@SmallTest

@RunWith(AndroidJUnit4::class)

class ActiveUnlockConfigTest : SysuiTestCase() {

    private lateinit var secureSettings: FakeSettings

    @Mock private lateinit var contentResolver: ContentResolver

packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockAccessibilityDelegateTest.java→packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardClockAccessibilityDelegateTest.java

+4 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.view.accessibility.AccessibilityEvent; 
import android.view.accessibility.AccessibilityNodeInfo;

import android.widget.TextView;



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

import androidx.test.filters.SmallTest;



import com.android.systemui.SysuiTestCase;
@@ -32,10 +33,12 @@ import com.android.systemui.res.R; 


import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.List;



@SmallTest

@RunWith(AndroidJUnit4.class)

public class KeyguardClockAccessibilityDelegateTest extends SysuiTestCase {



    private TextView mView;

packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/ExpandHelperTest.java

+2 −2
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ import static org.mockito.Mockito.mock; 
import static org.mockito.Mockito.when;



import android.content.Context;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;



import androidx.core.animation.ObjectAnimator;

import androidx.test.annotation.UiThreadTest;

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

import androidx.test.filters.SmallTest;



import com.android.keyguard.KeyguardUpdateMonitor;
@@ -42,7 +42,7 @@ import org.junit.Test; 
import org.junit.runner.RunWith;



@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidJUnit4.class)

@RunWithLooper

public class ExpandHelperTest extends SysuiTestCase {

packages/SystemUI/tests/src/com/android/systemui/InitControllerTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/InitControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -19,16 +19,16 @@ package com.android.systemui; 
import static junit.framework.TestCase.assertFalse;

import static junit.framework.TestCase.assertTrue;



import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;



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

import androidx.test.filters.SmallTest;



import org.junit.Test;

import org.junit.runner.RunWith;



@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidJUnit4.class)

@TestableLooper.RunWithLooper

public class InitControllerTest extends SysuiTestCase {