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

Commit 9d2ee3f3 authored by Ronald Braunstein's avatar Ronald Braunstein Committed by Automerger Merge Worker
Browse files

Merge "Migrate test options -> Android.bp for FrameworksMockingServicesTests"... 

Merge "Migrate test options -> Android.bp for FrameworksMockingServicesTests" into main am: bdc01a06 am: d981a430

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3219937



Change-Id: I6c2da15c1f3c08b8a9f32b237da4848448416a55
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8642a8db d981a430

apex/blobstore/TEST_MAPPING

+1 −6
Original line number Diff line number Diff line
@@ -7,12 +7,7 @@ 
      "name": "CtsBlobStoreHostTestCases"

    },

    {

      "name": "FrameworksMockingServicesTests",

      "options": [

        {

          "include-filter": "com.android.server.blob"

        }

      ]

      "name": "FrameworksMockingServicesTests_blob"

    }

  ]

}

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

+4 −15
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "FrameworksMockingServicesTests",

      "file_patterns": [

        "DeviceIdleController\\.java"

      ],

      "options": [

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

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

      ]

      "name": "FrameworksMockingServicesTests_IdleController",

      "file_patterns": ["DeviceIdleController\\.java"]

    },

    {

      "name": "FrameworksMockingServicesTests",

      "file_patterns": ["AppStateTrackerImpl\\.java"],

      "options": [

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

        {"include-annotation": "android.platform.test.annotations.Presubmit"},

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

      ]

      "name": "FrameworksMockingServicesTests_AppStateTracker",

      "file_patterns": ["AppStateTrackerImpl\\.java"]

    }

  ],

  "postsubmit": [

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

+1 −12
Original line number Diff line number Diff line 
{

    "presubmit": [

        {

            "name": "FrameworksMockingServicesTests",

            "options": [

                {

                  "include-filter": "com.android.server.alarm"

                },

                {

                  "include-annotation": "android.platform.test.annotations.Presubmit"

                },

                {

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

                }

            ]

            "name": "FrameworksMockingServicesTests_com_android_server_alarm"

        }

    ],

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

+1 −5
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "FrameworksMockingServicesTests",

      "options": [

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

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

      ]

      "name": "FrameworksMockingServicesTests_IdleController"

    }

  ],

  "postsubmit": [

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

+1 −6
Original line number Diff line number Diff line
@@ -8,12 +8,7 @@ 
            ]

        },

        {

            "name": "FrameworksMockingServicesTests",

            "options": [

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

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

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

            ]

            "name": "FrameworksMockingServicesTests_com_android_server_job_Presubmit"

        },

        {

            "name": "FrameworksServicesTests_com_android_server_job_Presubmit"