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

Commit e16f54e2 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge "Fix AnimationLib Test not running in presubmit" into tm-qpr-dev am: 18b4a499 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20609552



Change-Id: I4915b238918298ab26730e72dc3eaff34533489e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e8339fbc 18b4a499

packages/SystemUI/animation/Android.bp

+0 −20
Original line number Diff line number Diff line
@@ -44,23 +44,3 @@ android_library { 
    manifest: "AndroidManifest.xml",

    kotlincflags: ["-Xjvm-default=all"],

}
 


android_test {

    name: "SystemUIAnimationLibTests",



    static_libs: [

        "SystemUIAnimationLib",

        "androidx.test.ext.junit",

        "androidx.test.rules",

        "testables",

    ],

    libs: [

        "android.test.base",

    ],

    srcs: [

        "**/*.java",

        "**/*.kt",

    ],

    kotlincflags: ["-Xjvm-default=all"],

    test_suites: ["general-tests"],

}

packages/SystemUI/animation/TEST_MAPPING

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "SystemUIAnimationLibTests"

    }

  ]

}

packages/SystemUI/animation/tests/com/android/systemui/animation/InterpolatorsAndroidXTest.kt→packages/SystemUI/tests/src/com/android/systemui/animation/InterpolatorsAndroidXTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.animation



import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import java.lang.reflect.Modifier

import junit.framework.Assert.assertEquals

import org.junit.Test
@@ -25,7 +26,7 @@ import org.junit.runners.JUnit4 


@SmallTest

@RunWith(JUnit4::class)

class InterpolatorsAndroidXTest {

class InterpolatorsAndroidXTest : SysuiTestCase() {



    @Test

    fun testInterpolatorsAndInterpolatorsAndroidXPublicMethodsAreEqual() {