Merge "Update test owner (3/n)" into main (bde82042) · Commits · e / os / android_frameworks_base

libs/WindowManager/Jetpack/src/TEST_MAPPING

+28 −2

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "WMJetpackUnitTests_Presubmit"
		"name": "WMJetpackUnitTests_Area"
		},
		{
		"name": "CtsWindowManagerJetpackTestCases_Presubmit"
		"name": "WMJetpackUnitTests_ActivityEmbedding"
		},
		{
		"name": "WMJetpackUnitTests_Layout"
		},
		{
		"name": "WMJetpackUnitTests_Other"
		},
		{
		"name": "CtsWindowManagerJetpackTestCases_Area"
		},
		{
		"name": "CtsWindowManagerJetpackTestCases_ActivityEmbedding"
		},
		{
		"name": "CtsWindowManagerJetpackTestCases_Layout"
		},
		{
		"name": "CtsWindowManagerJetpackTestCases_Other"
		}
		],
		"postsubmit": [
		{
		"name": "WMJetpackUnitTests_Postsubmit"
		},
		{
		"name": "CtsWindowManagerJetpackTestCases_Postsubmit"
		}
		],
		"imports": [

libs/WindowManager/Jetpack/tests/OWNERS

+1 −2

Original line number	Diff line number	Diff line
		# Bug component: 1157642
		# includes OWNERS from parent directories
		charlesccchen@google.com
		diegovela@google.com
		kennethford@google.com

libs/WindowManager/Jetpack/tests/unittest/Android.bp

+43 −2

Original line number	Diff line number	Diff line
		@@ -19,11 +19,11 @@ package {
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["frameworks_base_license"],
		default_team: "trendy_team_wm_jetpack",
		}

		android_test {
		name: "WMJetpackUnitTests",
		team: "trendy_team_windowing_sdk",
		// To make the test run via TEST_MAPPING
		test_suites: ["device-tests"],

		@@ -65,9 +65,50 @@ android_test {
		},
		}

		////////////////////////////////////////////////////////////////////////////////
		// Begin breakdowns for WMJetpackUnitTests module

		test_module_config {
		name: "WMJetpackUnitTests_Area",
		base: "WMJetpackUnitTests",
		team: "trendy_team_rear_display",
		test_suites: ["device-tests"],
		include_filters: ["androidx.window.extensions.area"],
		include_annotations: ["android.platform.test.annotations.Presubmit"],
		}

		test_module_config {
		name: "WMJetpackUnitTests_ActivityEmbedding",
		base: "WMJetpackUnitTests",
		team: "trendy_team_activity_embedding",
		test_suites: ["device-tests"],
		include_filters: ["androidx.window.extensions.embedding"],
		include_annotations: ["android.platform.test.annotations.Presubmit"],
		}

		test_module_config {
		name: "WMJetpackUnitTests_Presubmit",
		name: "WMJetpackUnitTests_Layout",
		base: "WMJetpackUnitTests",
		test_suites: ["device-tests"],
		include_filters: ["androidx.window.extensions.layout"],
		include_annotations: ["android.platform.test.annotations.Presubmit"],
		}

		test_module_config {
		name: "WMJetpackUnitTests_Other",
		base: "WMJetpackUnitTests",
		test_suites: ["device-tests"],
		exclude_filters: [
		"androidx.window.extensions.area",
		"androidx.window.extensions.embedding",
		"androidx.window.extensions.layout",
		],
		include_annotations: ["android.platform.test.annotations.Presubmit"],
		}

		test_module_config {
		name: "WMJetpackUnitTests_Postsubmit",
		base: "WMJetpackUnitTests",
		test_suites: ["device-tests"],
		exclude_annotations: ["android.platform.test.annotations.Presubmit"],
		}

libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/common/DeviceStateManagerFoldingFeatureProducerTest.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.content.Context
		import android.content.res.Resources
		import android.hardware.devicestate.DeviceState
		import android.hardware.devicestate.DeviceStateManager
		import android.platform.test.annotations.Presubmit
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.platform.app.InstrumentationRegistry
		import androidx.window.common.layout.CommonFoldingFeature
		@@ -53,6 +54,7 @@ import org.mockito.kotlin.verify
		* Build/Install/Run:
		* atest WMJetpackUnitTests:DeviceStateManagerFoldingFeatureProducerTest
		*/
		@Presubmit
		@RunWith(AndroidJUnit4::class)
		class DeviceStateManagerFoldingFeatureProducerTest {
		private val mMockDeviceStateManager = mock<DeviceStateManager>()

libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/common/collections/ListUtilTest.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ package androidx.window.common.collections;

		import static com.google.common.truth.Truth.assertThat;

		import android.platform.test.annotations.Presubmit;

		import org.junit.Test;

		import java.util.ArrayList;
		@@ -27,8 +29,9 @@ import java.util.List;
		* Test class for {@link ListUtil}.
		*
		* Build/Install/Run:
		* atest WMJetpackUnitTests:ListUtil
		* atest WMJetpackUnitTests:ListUtilTest
		*/
		@Presubmit
		public class ListUtilTest {

		@Test