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

Commit 102c57d1 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Update TEST_MAPPING files with the new module." into main

parents 84f5fa0b fe6976d9

apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING

+7 −1
Original line number Diff line number Diff line
@@ -4,13 +4,19 @@ 
      "name": "CtsUsageStatsTestCases",

      "options": [

        {"include-filter": "android.app.usage.cts.UsageStatsTest"},

        {"include-filter": "android.app.usage.cts.BroadcastResponseStatsTest"},

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

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

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

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

      ]

    },

    {

      "name": "CtsBRSTestCases",

      "options": [

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

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

      ]

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

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

+3 −16
Original line number Diff line number Diff line
@@ -114,27 +114,14 @@ 
      ]

    },

    {

      "name": "CtsUsageStatsTestCases",

      "name": "CtsBRSTestCases",

      "file_patterns": [

        "ActivityManagerService\\.java",

        "BroadcastQueue\\.java"

      ],

      "options": [

        {

          "include-filter": "android.app.usage.cts.BroadcastResponseStatsTest"

        },

        {

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

        },

        {

          "exclude-annotation": "android.platform.test.annotations.FlakyTest"

        },

        {

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

        },

        {

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

        }

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

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

      ]

    }

  ],

services/usage/java/com/android/server/usage/TEST_MAPPING

+2 −11
Original line number Diff line number Diff line
@@ -20,22 +20,13 @@ 
      ]

    },

    {

      "name": "CtsUsageStatsTestCases",

      "name": "CtsBRSTestCases",

      "options": [

        {

          "include-filter": "android.app.usage.cts.BroadcastResponseStatsTest"

        },

        {

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

        },

        {

          "exclude-annotation": "android.platform.test.annotations.FlakyTest"

        },

        {

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

        },

        {

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

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

        }

      ]

    }