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

Commit 9d1e5cd2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate frameworks/base/services/tests/servicestests to androidx.test"

parents bb287445 a26eda94

services/core/java/com/android/server/am/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

          "exclude-annotation": "android.support.test.filters.FlakyTest"

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    }

services/tests/servicestests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    services.net \

    services.usage \

    guava \

    android-support-test \

    androidx-test \

    mockito-target-minus-junit4 \

    platform-test-annotations \

    ShortcutManagerTestUtils \

services/tests/servicestests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ 
    </application>



    <instrumentation

        android:name="android.support.test.runner.AndroidJUnitRunner"

        android:name="androidx.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.frameworks.servicestests"

        android:label="Frameworks Services Tests" />

</manifest>

services/tests/servicestests/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
    <option name="test-tag" value="FrameworksServicesTests" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.frameworks.servicestests" />

        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>

</configuration>

services/tests/servicestests/src/com/android/server/AlarmManagerServiceTest.java

+3 −2
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ import static android.app.AlarmManager.RTC_WAKEUP; 


import static org.junit.Assert.assertEquals;



import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.util.SparseArray;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.util.ObjectUtils;

import com.android.server.AlarmManagerService.Alarm;