diff options
3 files changed, 36 insertions, 6 deletions
diff --git a/services/tests/powerstatstests/Android.bp b/services/tests/powerstatstests/Android.bp index 18a4f0068909..f02e5a5ece24 100644 --- a/services/tests/powerstatstests/Android.bp +++ b/services/tests/powerstatstests/Android.bp @@ -11,6 +11,10 @@ android_test { "src/**/*.java", ], + exclude_srcs: [ + "src/com/android/server/power/stats/PowerStatsStoreTest.java", + ], + static_libs: [ "services.core", "coretests-aidl", @@ -52,3 +56,19 @@ android_test { enabled: false, }, } + +android_ravenwood_test { + name: "PowerStatsTestsRavenwood", + static_libs: [ + "services.core", + "modules-utils-binary-xml", + + "androidx.annotation_annotation", + "androidx.test.rules", + ], + srcs: [ + "src/com/android/server/power/stats/PowerStatsStoreTest.java", + ], + sdk_version: "test_current", + auto_gen_config: true, +} diff --git a/services/tests/powerstatstests/TEST_MAPPING b/services/tests/powerstatstests/TEST_MAPPING index eee68a48fc63..6d3db1cb6c23 100644 --- a/services/tests/powerstatstests/TEST_MAPPING +++ b/services/tests/powerstatstests/TEST_MAPPING @@ -9,6 +9,12 @@ ] } ], + "ravenwood-presubmit": [ + { + "name": "PowerStatsTestsRavenwood", + "host": true + } + ], "postsubmit": [ { "name": "PowerStatsTests", diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/PowerStatsStoreTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/PowerStatsStoreTest.java index d3628b5888c8..36d7af500ac3 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/PowerStatsStoreTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/PowerStatsStoreTest.java @@ -18,18 +18,18 @@ package com.android.server.power.stats; import static com.google.common.truth.Truth.assertThat; -import android.content.Context; import android.os.Handler; import android.os.Looper; import android.os.Message; +import android.platform.test.ravenwood.RavenwoodRule; -import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; import com.android.modules.utils.TypedXmlPullParser; import com.android.modules.utils.TypedXmlSerializer; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.xmlpull.v1.XmlPullParser; @@ -37,6 +37,7 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.List; @RunWith(AndroidJUnit4.class) @@ -44,14 +45,17 @@ import java.util.List; public class PowerStatsStoreTest { private static final long MAX_BATTERY_STATS_SNAPSHOT_STORAGE_BYTES = 2 * 1024; + @Rule + public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder() + .setProvideMainThread(true) + .build(); + private PowerStatsStore mPowerStatsStore; private File mStoreDirectory; @Before - public void setup() { - Context context = InstrumentationRegistry.getContext(); - - mStoreDirectory = new File(context.getCacheDir(), "PowerStatsStoreTest"); + public void setup() throws IOException { + mStoreDirectory = Files.createTempDirectory("PowerStatsStoreTest").toFile(); clearDirectory(mStoreDirectory); mPowerStatsStore = new PowerStatsStore(mStoreDirectory, |