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

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

Merge "Move notification service tests to be ui services tests"

parents da38ce8e ec4b6778

services/tests/notification/Android.mk→services/tests/uiservicestests/Android.mk

+2 −2
Original line number Diff line number Diff line 
#########################################################################

# Build FrameworksNotificationTests package

# Build FrameworksUiServicesTests package

#########################################################################



LOCAL_PATH:= $(call my-dir)
@@ -30,7 +30,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner 
LOCAL_JACK_FLAGS := --multi-dex native

LOCAL_DX_FLAGS := --multi-dex



LOCAL_PACKAGE_NAME := FrameworksNotificationTests

LOCAL_PACKAGE_NAME := FrameworksUiServicesTests

LOCAL_COMPATIBILITY_SUITE := device-tests



LOCAL_CERTIFICATE := platform

services/tests/notification/AndroidManifest.xml→services/tests/uiservicestests/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.frameworks.tests.notification">

        package="com.android.frameworks.tests.uiservices">



    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
@@ -32,6 +32,6 @@ 


    <instrumentation

        android:name="android.testing.TestableInstrumentation"

        android:targetPackage="com.android.frameworks.tests.notification"

        android:targetPackage="com.android.frameworks.tests.uiservices"

        android:label="Notification Tests" />

</manifest>

services/tests/notification/AndroidTest.xml→services/tests/uiservicestests/AndroidTest.xml

+4 −4
Original line number Diff line number Diff line
@@ -13,16 +13,16 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs Frameworks Notification Tests.">

<configuration description="Runs Frameworks UI Services Tests.">

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

        <option name="test-file-name" value="FrameworksNotificationTests.apk" />

        <option name="test-file-name" value="FrameworksUiServicesTests.apk" />

    </target_preparer>



    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="framework-base-presubmit" />

    <option name="test-tag" value="FrameworksNotificationTests" />

    <option name="test-tag" value="FrameworksUiServicesTests" />

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

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

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

        <option name="runner" value="android.testing.TestableInstrumentation" />

    </test>

</configuration>

services/tests/notification/src/com/android/server/notification/AlertRateLimiterTest.java→services/tests/uiservicestests/src/com/android/server/notification/AlertRateLimiterTest.java

+0 −0

File moved.

View file

services/tests/notification/src/com/android/server/notification/BadgeExtractorTest.java→services/tests/uiservicestests/src/com/android/server/notification/BadgeExtractorTest.java

+0 −0

File moved.

View file