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

Commit a415d0e9 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Add new SystemUI AnimatorTestRule that wraps both platform and androidx versions of the same 

Bug: 291645410
Test: atest SystemUITests
Change-Id: I71731f6674fc5d09c5977124e8214da639935f0f
parent 70583899

packages/SystemUI/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ android_library { 
    static_libs: [

        "SystemUI-tests-base",

        "androidx.test.uiautomator_uiautomator",

        "androidx.core_core-animation-testing",

        "mockito-target-extended-minus-junit4",

        "androidx.test.ext.junit",

        "androidx.test.ext.truth",
@@ -474,6 +475,7 @@ android_robolectric_test { 
    ],

    static_libs: [

        "androidx.test.uiautomator_uiautomator",

        "androidx.core_core-animation-testing",

        "androidx.test.ext.junit",

        "inline-mockito-robolectric-prebuilt",

    ],

packages/SystemUI/tests/src/android/animation/AnimatorTestRuleIsolationTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import org.junit.runner.RunWith 
 */

@RunWith(AndroidTestingRunner::class)

@SmallTest

@RunWithLooper(setAsMainLooper = true)

@RunWithLooper

class AnimatorTestRuleIsolationTest : SysuiTestCase() {



    @get:Rule val animatorTestRule = AnimatorTestRule()

packages/SystemUI/tests/src/android/animation/AnimatorTestRulePrecisionTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith 


@RunWith(AndroidTestingRunner::class)

@SmallTest

@RunWithLooper(setAsMainLooper = true)

@RunWithLooper

class AnimatorTestRulePrecisionTest : SysuiTestCase() {



    @get:Rule val animatorTestRule = AnimatorTestRule()

packages/SystemUI/tests/src/androidx/core/animation/AnimatorTestRuleIsolationTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import org.junit.runner.RunWith 
 */

@RunWith(AndroidTestingRunner::class)

@SmallTest

@RunWithLooper(setAsMainLooper = true)

@RunWithLooper

class AnimatorTestRuleIsolationTest : SysuiTestCase() {



    @get:Rule val animatorTestRule = AnimatorTestRule()

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

+1 −1
Original line number Diff line number Diff line
@@ -25,12 +25,12 @@ import android.testing.AndroidTestingRunner; 
import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;



import androidx.core.animation.AnimatorTestRule;

import androidx.core.animation.ObjectAnimator;

import androidx.test.annotation.UiThreadTest;

import androidx.test.filters.SmallTest;



import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.animation.AnimatorTestRule;

import com.android.systemui.flags.FakeFeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.statusbar.NotificationMediaManager;