From 00e93e8a7de8c6377e45fe05d4daeb17e38d07ab Mon Sep 17 00:00:00 2001 From: Felka Chang Date: Fri, 3 Sep 2021 12:07:44 +0800 Subject: add FrameworkCoreTest for AndroidResources test plan This patch adds Android Resources related tests plan into presubmit process. * FrameworkCoreTest:android.content.res * FrameworkCoreTest:com.android.internal.content.res http://ab/I37600009999426943 * cuttlefish * 2 minutes and 10.8 seconds * 5 test classes * 22 tests Test: atest --request-upload-result \ -p frameworks/base/core/java/android/content/res Test: CORETESTS="frameworks/base/core/tests/coretests" ; \ atest -p \ ${CORETESTS}/src/android/content/res:postsubmit Test: CORETESTS="frameworks/base/core/tests/coretests" ; \ atest --collect-tests-only -p \ ${CORETESTS}/src/android/content/res:presubmit Test: CORETESTS="frameworks/base/core/tests/coretests" ; \ atest --collect-tests-only -p \ ${CORETESTS}/src/com/android/internal/content/res:presubmit Test: TP="FrameworksCoreTests:android.content.res" ; atest \ ${TP}.ConfigurationBoundResourceCacheTest \ ${TP}.ConfigurationTest \ ${TP}.FontResourcesParserTest \ ${TP}.ResourcesDrawableTest \ ${TP}.ResourcesLocaleTest Test: TP="FrameworksCoreTests:com.android.internal.content.res" ; \ atest \ ${TP}.OverlayConfigTest Bug: 180650365 Change-Id: Iad83abf18d1d0ab438faef3bfab62139baadbb18 --- core/java/android/content/res/TEST_MAPPING | 8 ++++ .../res/ConfigurationBoundResourceCacheTest.java | 2 + .../content/res/FontResourcesParserTest.java | 2 + .../android/content/res/ResourcesDrawableTest.java | 2 + .../android/content/res/ResourcesLocaleTest.java | 2 + .../android/content/res/ResourcesManagerTest.java | 2 + .../coretests/src/android/content/res/TEST_MAPPING | 43 ++++++++++++++++++++++ .../internal/content/res/OverlayConfigTest.java | 2 + .../com/android/internal/content/res/TEST_MAPPING | 21 +++++++++++ 9 files changed, 84 insertions(+) create mode 100644 core/tests/coretests/src/android/content/res/TEST_MAPPING create mode 100644 core/tests/coretests/src/com/android/internal/content/res/TEST_MAPPING diff --git a/core/java/android/content/res/TEST_MAPPING b/core/java/android/content/res/TEST_MAPPING index 535afd361f01..3703f2e2152b 100644 --- a/core/java/android/content/res/TEST_MAPPING +++ b/core/java/android/content/res/TEST_MAPPING @@ -1,4 +1,12 @@ { + "imports": [ + { + "path": "frameworks/base/core/tests/coretests/src/android/content/res" + }, + { + "path": "frameworks/base/core/tests/coretests/src/com/android/internal/content/res" + } + ], "presubmit": [ { "name": "CtsResourcesLoaderTests" diff --git a/core/tests/coretests/src/android/content/res/ConfigurationBoundResourceCacheTest.java b/core/tests/coretests/src/android/content/res/ConfigurationBoundResourceCacheTest.java index 47b14bbaa8fa..4f8b85554f5c 100644 --- a/core/tests/coretests/src/android/content/res/ConfigurationBoundResourceCacheTest.java +++ b/core/tests/coretests/src/android/content/res/ConfigurationBoundResourceCacheTest.java @@ -16,6 +16,7 @@ package android.content.res; +import android.platform.test.annotations.Presubmit; import android.test.ActivityInstrumentationTestCase2; import android.util.TypedValue; @@ -25,6 +26,7 @@ import com.android.frameworks.coretests.R; import java.lang.reflect.InvocationTargetException; +@Presubmit public class ConfigurationBoundResourceCacheTest extends ActivityInstrumentationTestCase2 { diff --git a/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java b/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java index 57f01e988440..9aef2ca104bd 100644 --- a/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java +++ b/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import android.app.Instrumentation; +import android.platform.test.annotations.Presubmit; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; @@ -45,6 +46,7 @@ import java.util.List; /** * Tests for {@link FontResourcesParser}. */ +@Presubmit @SmallTest @RunWith(AndroidJUnit4.class) public class FontResourcesParserTest { diff --git a/core/tests/coretests/src/android/content/res/ResourcesDrawableTest.java b/core/tests/coretests/src/android/content/res/ResourcesDrawableTest.java index c4df88b49935..f7f9569c413e 100644 --- a/core/tests/coretests/src/android/content/res/ResourcesDrawableTest.java +++ b/core/tests/coretests/src/android/content/res/ResourcesDrawableTest.java @@ -24,6 +24,7 @@ import android.content.Context; import android.graphics.drawable.ColorStateListDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; +import android.platform.test.annotations.Presubmit; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; @@ -34,6 +35,7 @@ import com.android.frameworks.coretests.R; import org.junit.Test; import org.junit.runner.RunWith; +@Presubmit @SmallTest @RunWith(AndroidJUnit4.class) public class ResourcesDrawableTest { diff --git a/core/tests/coretests/src/android/content/res/ResourcesLocaleTest.java b/core/tests/coretests/src/android/content/res/ResourcesLocaleTest.java index aa1a5341de57..25c3db5c6910 100644 --- a/core/tests/coretests/src/android/content/res/ResourcesLocaleTest.java +++ b/core/tests/coretests/src/android/content/res/ResourcesLocaleTest.java @@ -18,6 +18,7 @@ package android.content.res; import android.os.FileUtils; import android.os.LocaleList; +import android.platform.test.annotations.Presubmit; import android.test.AndroidTestCase; import android.util.DisplayMetrics; @@ -30,6 +31,7 @@ import java.io.InputStream; import java.util.Arrays; import java.util.Locale; +@Presubmit public class ResourcesLocaleTest extends AndroidTestCase { private String extractApkAndGetPath(int id) throws Exception { diff --git a/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java b/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java index e7ee9dcf7557..34a8bdea5e8a 100644 --- a/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java +++ b/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.app.ResourcesManager; import android.os.Binder; import android.os.LocaleList; +import android.platform.test.annotations.Postsubmit; import android.util.DisplayMetrics; import android.util.TypedValue; import android.view.Display; @@ -32,6 +33,7 @@ import junit.framework.TestCase; import java.util.HashMap; import java.util.Map; +@Postsubmit public class ResourcesManagerTest extends TestCase { private static final int SECONDARY_DISPLAY_ID = 1; private static final String APP_ONE_RES_DIR = "app_one.apk"; diff --git a/core/tests/coretests/src/android/content/res/TEST_MAPPING b/core/tests/coretests/src/android/content/res/TEST_MAPPING new file mode 100644 index 000000000000..4ea6e40a7225 --- /dev/null +++ b/core/tests/coretests/src/android/content/res/TEST_MAPPING @@ -0,0 +1,43 @@ +{ + "presubmit": [ + { + "name": "FrameworksCoreTests", + "options": [ + { + "include-filter": "android.content.res." + }, + { + "include-annotation": "android.platform.test.annotations.Presubmit" + }, + { + "exclude-annotation": "android.platform.test.annotations.Postsubmit" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + } + ] + } + ], + "postsubmit": [ + { + "name": "FrameworksCoreTests", + "options": [ + { + "include-filter": "android.content.res." + }, + { + "include-annotation": "android.platform.test.annotations.Postsubmit" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + } + ] + } + ] +} 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 aea453ea4e57..caec3651210a 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 = diff --git a/core/tests/coretests/src/com/android/internal/content/res/TEST_MAPPING b/core/tests/coretests/src/com/android/internal/content/res/TEST_MAPPING new file mode 100644 index 000000000000..9aed8be4f10f --- /dev/null +++ b/core/tests/coretests/src/com/android/internal/content/res/TEST_MAPPING @@ -0,0 +1,21 @@ +{ + "presubmit": [ + { + "name": "FrameworksCoreTests", + "options": [ + { + "include-filter": "com.android.internal.content." + }, + { + "include-annotation": "android.platform.test.annotations.Presubmit" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + } + ] + } + ] +} -- cgit v1.2.3-59-g8ed1b