From 9834bc060a2d2fb6ea13c7b7ad9741a664db9cd0 Mon Sep 17 00:00:00 2001 From: Felka Chang Date: Mon, 3 Jan 2022 10:36:53 +0800 Subject: [PATCH] Add FrameworksCoreTests test for PM test plan FrameworksCoreTests has been added in frameworks/base/TEST_MAPPING. The only task for adding PackageManager related tests is to add @Presubmit for the following tests. * android.app.ApplicationPackageManagerTest (ag/16040736) * android.content.ContentProviderTest (ag/15207285) * android.content.ContentResolverTest (ag/15207285) * android.content.ContextTest (ag/15360455) * android.content.ManagedUserContentResolverTest (ag/15207285) * android.content.SecondaryUserContentResolverTest (ag/15207285) * com.android.internal.content.res.OverlayConfigTest (ag/14813127) The number of tests of FrameworksCoreTests in presubmit process increases from 1387 to 1457. Test: atest --collect-tests-only -p frameworks/base Test: presubmit Bug: 180650365 Change-Id: I5b324558213d3df830b9c5e52725f58fb6d9a857 --- .../src/android/app/ApplicationPackageManagerTest.java | 2 ++ .../coretests/src/android/content/ContentProviderTest.java | 2 ++ .../coretests/src/android/content/ContentResolverTest.java | 2 ++ core/tests/coretests/src/android/content/ContextTest.java | 2 ++ .../src/android/content/ManagedUserContentResolverTest.java | 2 ++ .../src/android/content/SecondaryUserContentResolverTest.java | 2 ++ .../src/com/android/internal/content/res/OverlayConfigTest.java | 2 ++ 7 files changed, 14 insertions(+) diff --git a/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java b/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java index 2c3c1ed0c40e6..9bb064c447b86 100644 --- a/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java +++ b/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java @@ -25,6 +25,7 @@ import android.content.pm.IPackageManager; import android.content.pm.PackageInfo; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; +import android.platform.test.annotations.Presubmit; import androidx.annotation.NonNull; import androidx.test.filters.LargeTest; @@ -39,6 +40,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@Presubmit @LargeTest public class ApplicationPackageManagerTest extends TestCase { private static final String sInternalVolPath = "/data"; diff --git a/core/tests/coretests/src/android/content/ContentProviderTest.java b/core/tests/coretests/src/android/content/ContentProviderTest.java index ceebc621f51f9..c9a6d222dcba3 100644 --- a/core/tests/coretests/src/android/content/ContentProviderTest.java +++ b/core/tests/coretests/src/android/content/ContentProviderTest.java @@ -24,6 +24,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.ProviderInfo; import android.net.Uri; import android.os.UserHandle; +import android.platform.test.annotations.Presubmit; import androidx.test.runner.AndroidJUnit4; @@ -32,6 +33,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; +@Presubmit @RunWith(AndroidJUnit4.class) public class ContentProviderTest { diff --git a/core/tests/coretests/src/android/content/ContentResolverTest.java b/core/tests/coretests/src/android/content/ContentResolverTest.java index 01e240a7ff8a4..7b70b412e62b6 100644 --- a/core/tests/coretests/src/android/content/ContentResolverTest.java +++ b/core/tests/coretests/src/android/content/ContentResolverTest.java @@ -35,6 +35,7 @@ import android.net.Uri; import android.os.MemoryFile; import android.os.ParcelFileDescriptor; import android.os.SystemClock; +import android.platform.test.annotations.Presubmit; import android.util.Size; import androidx.test.InstrumentationRegistry; @@ -45,6 +46,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +@Presubmit @RunWith(AndroidJUnit4.class) public class ContentResolverTest { diff --git a/core/tests/coretests/src/android/content/ContextTest.java b/core/tests/coretests/src/android/content/ContextTest.java index 3d7d807ca53d2..e4a9ce59911b0 100644 --- a/core/tests/coretests/src/android/content/ContextTest.java +++ b/core/tests/coretests/src/android/content/ContextTest.java @@ -34,6 +34,7 @@ import android.hardware.display.DisplayManager; import android.hardware.display.VirtualDisplay; import android.media.ImageReader; import android.os.UserHandle; +import android.platform.test.annotations.Presubmit; import android.view.Display; import androidx.test.core.app.ApplicationProvider; @@ -48,6 +49,7 @@ import org.junit.runner.RunWith; * Build/Install/Run: * atest FrameworksCoreTests:ContextTest */ +@Presubmit @SmallTest @RunWith(AndroidJUnit4.class) public class ContextTest { diff --git a/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java b/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java index 1bc46a79f1c08..68d4cd4a97e7b 100644 --- a/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java +++ b/core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java @@ -20,6 +20,7 @@ import android.content.pm.UserInfo; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; +import android.platform.test.annotations.Presubmit; import androidx.test.filters.LargeTest; @@ -36,6 +37,7 @@ import androidx.test.filters.LargeTest; * Run: adb shell am instrument -e class android.content.ManagedUserContentResolverTest -w \ * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner */ +@Presubmit @LargeTest public class ManagedUserContentResolverTest extends AbstractCrossUserContentResolverTest { @Override diff --git a/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java b/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java index dbe027800e3fa..de4c5725c190b 100644 --- a/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java +++ b/core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java @@ -18,6 +18,7 @@ package android.content; import android.content.pm.UserInfo; import android.os.RemoteException; +import android.platform.test.annotations.Presubmit; import androidx.test.filters.LargeTest; @@ -34,6 +35,7 @@ import androidx.test.filters.LargeTest; * Run: adb shell am instrument -e class android.content.SecondaryUserContentResolverTest -w \ * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner */ +@Presubmit @LargeTest public class SecondaryUserContentResolverTest extends AbstractCrossUserContentResolverTest { @Override diff --git a/core/tests/coretests/src/com/android/internal/content/res/OverlayConfigTest.java b/core/tests/coretests/src/com/android/internal/content/res/OverlayConfigTest.java index aea453ea4e573..caec3651210ac 100644 --- a/core/tests/coretests/src/com/android/internal/content/res/OverlayConfigTest.java +++ b/core/tests/coretests/src/com/android/internal/content/res/OverlayConfigTest.java @@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue; import android.os.FileUtils; import android.os.SystemProperties; +import android.platform.test.annotations.Presubmit; import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; @@ -46,6 +47,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; +@Presubmit @RunWith(AndroidJUnit4.class) public class OverlayConfigTest { private static final String TEST_APK_PACKAGE_NAME =