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

Commit c42ccdd6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add BatteryUsageStatsProtoTests to presubmit" into sc-dev am: 0a9650dc 

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

Change-Id: I7ef969603599e095eb8fff9ae5f39070568ce695
parents 4174b46a 0a9650dc

core/java/android/os/TEST_MAPPING

+20 −2
Original line number Diff line number Diff line
@@ -40,7 +40,12 @@ 
      ]

    },

    {

      "file_patterns": ["BatteryStats.java"],

      "file_patterns": [

        "BatteryStats[^/]*\\.java",

        "BatteryUsageStats[^/]*\\.java",

        "PowerComponents\\.java",

        "[^/]*BatteryConsumer[^/]*\\.java"

      ],

      "name": "FrameworksCoreTests",

      "options": [

        { "include-filter": "com.android.internal.os.BatteryStatsTests" },
@@ -48,13 +53,26 @@ 
      ]

    },

    {

      "file_patterns": ["BatteryStats.java"],

      "file_patterns": [

        "BatteryStats[^/]*\\.java",

        "BatteryUsageStats[^/]*\\.java",

        "PowerComponents\\.java",

        "[^/]*BatteryConsumer[^/]*\\.java"

      ],

      "name": "FrameworksServicesTests",

      "options": [

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

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

        { "include-filter": "com.android.server.am.BatteryExternalStatsWorkerTest" }

      ]

    },

    {

      "file_patterns": [

        "BatteryUsageStats[^/]*\\.java",

        "PowerComponents\\.java",

        "[^/]*BatteryConsumer[^/]*\\.java"

      ],

      "name": "BatteryUsageStatsProtoTests"

    }

  ],

  "postsubmit": [

core/java/com/android/internal/os/TEST_MAPPING

+13 −1
Original line number Diff line number Diff line
@@ -12,6 +12,14 @@ 
        { "exclude-annotation": "com.android.internal.os.SkipPresubmit" }

      ]

    },

    {

      "file_patterns": [

        "Battery[^/]*\\.java",

        "Kernel[^/]*\\.java",

        "[^/]*Power[^/]*\\.java"

      ],

      "name": "BatteryUsageStatsProtoTests"

    },

    {

      "file_patterns": [

        "BinderDeathDispatcher\\.java"
@@ -23,7 +31,11 @@ 
      ]

    },

    {

      "file_patterns": ["Battery[^/]*\\.java"],

      "file_patterns": [

        "Battery[^/]*\\.java",

        "Kernel[^/]*\\.java",

        "[^/]*Power[^/]*\\.java"

      ],

      "name": "FrameworksServicesTests",

      "options": [

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