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

Commit 45300425 authored by Fiona Campbell's avatar Fiona Campbell Committed by Android (Google) Code Review
Browse files

Merge "Move display mocking tests to DisplayServiceTests" into udc-qpr-dev

parents a5fa0bed 432b6870

services/tests/displayservicetests/Android.bp

+3 −16
Original line number Diff line number Diff line
@@ -7,19 +7,12 @@ package { 
    default_applicable_licenses: ["frameworks_base_license"],

}



// Include all test java files.

filegroup {

    name: "displayservicetests-sources",

    srcs: [

        "src/**/*.java",

    ],

}



android_test {

    name: "DisplayServiceTests",



    srcs: [

        "src/**/*.java",

        ":extended-mockito-rule-sources",

    ],



    libs: [
@@ -28,14 +21,15 @@ android_test { 


    static_libs: [

        "androidx.test.ext.junit",

        "display-core-libs",

        "frameworks-base-testutils",

        "junit",

        "junit-params",

        "mockingservicestests-utils-mockito",

        "platform-compat-test-rules",

        "platform-test-annotations",

        "services.core",

        "servicestests-utils",

        "testables",

    ],



    defaults: [
@@ -56,10 +50,3 @@ android_test { 
        enabled: false,

    },

}
 


java_library {

    name: "display-core-libs",

    srcs: [

        "src/com/android/server/display/TestUtils.java",

    ],

}

services/tests/displayservicetests/AndroidManifest.xml

+5 −4
Original line number Diff line number Diff line
@@ -17,10 +17,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.frameworks.displayservicetests">



    <!--

    Insert permissions here. eg:

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

    -->

    <!-- Permissions -->

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

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

    <uses-permission android:name="android.permission.DEVICE_POWER" />
@@ -32,6 +29,10 @@ 
    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />

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



    <!-- Permissions needed for DisplayTransformManagerTest -->

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

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



    <application android:debuggable="true"

                 android:testOnly="true">

        <uses-library android:name="android.test.mock" android:required="true" />

services/tests/mockingservicestests/src/com/android/server/display/BrightnessSynchronizerTest.java→services/tests/displayservicetests/src/com/android/server/display/BrightnessSynchronizerTest.java

+0 −0

File moved.

View file

services/tests/mockingservicestests/src/com/android/server/display/DensityMappingTest.java→services/tests/displayservicetests/src/com/android/server/display/DensityMappingTest.java

+0 −0

File moved.

View file

services/tests/mockingservicestests/src/com/android/server/display/DisplayBrightnessStateTest.java→services/tests/displayservicetests/src/com/android/server/display/DisplayBrightnessStateTest.java

+0 −0

File moved.

View file