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

Commit c5059b79 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Rename powerstatstests to batterystatstests 

Bug: 170134969
Test: mp :BatteryStatsViewer && adb shell am start -n com.android.frameworks.core.batterystatsviewer/.BatteryStatsViewerActivity
Test: atest BatteryStatsLoadTests
Change-Id: I7bcd24fd89542b854f8b037bb7d8fc184bea9853
parent 4ed8d163

core/tests/powertests/PowerStatsLoadTests/Android.bp→core/tests/batterystatstests/BatteryStatsLoadTests/Android.bp

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

    name: "PowerStatsLoadTests",

    name: "BatteryStatsLoadTests",

    srcs: ["src/**/*.java"],

    static_libs: [

        "androidx.test.rules",

core/tests/powertests/PowerStatsLoadTests/AndroidManifest.xml→core/tests/batterystatstests/BatteryStatsLoadTests/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.frameworks.core.powerstatsloadtests">

          package="com.android.frameworks.core.batterystatsloadtests">



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

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -27,7 +27,7 @@ 


    <instrumentation

        android:name="androidx.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.frameworks.core.powerstatsloadtests"

        android:targetPackage="com.android.frameworks.core.batterystatsloadtests"

        android:label="Power Stats Load Tests" />



    <queries>

core/tests/powertests/PowerStatsLoadTests/src/com/android/frameworks/core/powerstatsloadtests/ConnectivitySetupRule.java→core/tests/batterystatstests/BatteryStatsLoadTests/src/com/android/frameworks/core/batterystatsloadtests/ConnectivitySetupRule.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.frameworks.core.powerstatsloadtests;

package com.android.frameworks.core.batterystatsloadtests;



import static org.junit.Assert.assertEquals;

core/tests/powertests/PowerStatsLoadTests/src/com/android/frameworks/core/powerstatsloadtests/PowerMetrics.java→core/tests/batterystatstests/BatteryStatsLoadTests/src/com/android/frameworks/core/batterystatsloadtests/PowerMetrics.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.frameworks.core.powerstatsloadtests;

package com.android.frameworks.core.batterystatsloadtests;



import android.os.Process;

core/tests/powertests/PowerStatsLoadTests/src/com/android/frameworks/core/powerstatsloadtests/PowerMetricsCollector.java→core/tests/batterystatstests/BatteryStatsLoadTests/src/com/android/frameworks/core/batterystatsloadtests/PowerMetricsCollector.java

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.frameworks.core.powerstatsloadtests;

package com.android.frameworks.core.batterystatsloadtests;



import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;
@@ -106,6 +106,7 @@ public class PowerMetricsCollector implements TestRule { 
        mContext = instrumentation.getContext();

        mUid = Process.myUid();

        mUserManager = mContext.getSystemService(UserManager.class);

        // TODO(b/175324611): Use BatteryUsageStats instead

        mStatsHelper = new BatteryStatsHelper(mContext, false /* collectBatteryBroadcast */);

        mStatsHelper.create((Bundle) null);

    }