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

Commit 3e8dd0e6 authored by Fiona Campbell's avatar Fiona Campbell
Browse files

Add presubmit test mappings to display and power 

- Run DisplayServiceTests when display tests are changed, or
services/core/../display is changed.
- Run PowerServiceTests when power tests are changed, or
services/core/../power is changed.

Bug: 290761553
Bug: 290764236
Test: atest --test-mapping services/core/java/com/android/server/power:presubmit
Test: atest --test-mapping services/core/java/com/android/server/display:presubmit

Change-Id: I55bb88ea2ab656d5fbdd3a23fdc2a6371384aec9
parent a7f5bfcd

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

+8 −7
Original line number Diff line number Diff line 
{

    "presubmit": [

        {

            "name": "FrameworksMockingServicesTests",

            "name": "DisplayServiceTests",

            "options": [

                {"include-filter": "com.android.server.display"},

                {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

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

                {"exclude-annotation": "androidx.test.filters.FlakyTest"},

                {"exclude-annotation": "org.junit.Ignore"}

            ]

        },

        }

    ],

    "postsubmit": [

        {

            "name": "FrameworksServicesTests",

            "name": "DisplayServiceTests",

            "options": [

                {"include-filter": "com.android.server.display"},

                {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

                {"exclude-annotation": "androidx.test.filters.FlakyTest"},

                {"exclude-annotation": "org.junit.Ignore"}

            ]

        }

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

+17 −0
Original line number Diff line number Diff line
@@ -24,6 +24,15 @@ 
        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

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

      ]

    },

    {

      "name": "PowerServiceTests",

      "options": [

        {"include-filter": "com.android.server.power"},

        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

        {"exclude-annotation": "androidx.test.filters.FlakyTest"},

        {"exclude-annotation": "org.junit.Ignore"}

      ]

    }

  ],

  "postsubmit": [
@@ -42,6 +51,14 @@ 
        {"include-filter": "com.android.server.power"},

        {"exclude-filter": "com.android.server.power.BatteryStatsTests"}

      ]

    },

    {

      "name": "PowerServiceTests",

      "options": [

        {"include-filter": "com.android.server.power"},

        {"exclude-filter": "com.android.server.power.BatteryStatsTests"},

        {"exclude-annotation": "org.junit.Ignore"}

      ]

    }

  ]

}

services/tests/displayservicetests/TEST_MAPPING

+2 −8
Original line number Diff line number Diff line 
{

  "presubmit": [

  "imports": [

    {

      "name": "DisplayServiceTests",

      "options": [

        {"include-filter": "com.android.server.display"},

        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

        {"exclude-annotation": "androidx.test.filters.FlakyTest"},

        {"exclude-annotation": "org.junit.Ignore"}

      ]

      "path": "frameworks/base/services/core/java/com/android/server/display"

    }

  ]

}

services/tests/powerservicetests/TEST_MAPPING

0 → 100644
+8 −0
Original line number Diff line number Diff line 
{

  "imports": [

    {

      "path": "frameworks/base/services/core/java/com/android/server/power"

    }

  ]

}