Merge "DO NOT MERGE Annotate CarSystemUiTests to be run for AAOS pre-submit." into rvc-qpr-dev (311f8cde) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/TEST_MAPPING

+11 −0

Original line number	Diff line number	Diff line
		@@ -8,5 +8,16 @@
		}
		]
		}
		],

		"carsysui-presubmit": [
		{
		"name": "CarSystemUITests",
		"options" : [
		{
		"include-annotation": "com.android.systemui.car.CarSystemUiTest"
		}
		]
		}
		]
		}

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.car;

		import java.lang.annotation.Documented;
		import java.lang.annotation.ElementType;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.lang.annotation.Target;

		/**
		* Annotates that a test class should be run as part of CarSystemUI presubmit
		*/
		@Retention(RetentionPolicy.RUNTIME)
		@Target(ElementType.TYPE)
		@Documented
		public @interface CarSystemUiTest {
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import androidx.test.internal.runner.ClassPathScanner.ExternalClassNameFilter;

		import com.android.systemui.SysuiBaseFragmentTest;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.car.CarSystemUiTest;

		import org.junit.Test;
		import org.junit.runner.RunWith;
		@@ -55,6 +56,7 @@ import java.util.Collections;
		* test suite causes errors, such as the incorrect settings provider being cached.
		* For an example, see {@link com.android.systemui.DependencyTest}.
		*/
		@CarSystemUiTest
		@RunWith(AndroidTestingRunner.class)
		@SmallTest
		public class AAAPlusPlusVerifySysuiRequiredTestPropertiesTest extends SysuiTestCase {

+2 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import androidx.test.filters.SmallTest;

		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.car.CarServiceProvider;
		import com.android.systemui.car.CarSystemUiTest;

		import org.junit.Before;
		import org.junit.Test;
		@@ -39,6 +40,7 @@ import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;

		@CarSystemUiTest
		@RunWith(AndroidTestingRunner.class)
		@TestableLooper.RunWithLooper
		@SmallTest

+2 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import com.android.keyguard.ViewMediatorCallback;
		import com.android.systemui.R;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.car.CarServiceProvider;
		import com.android.systemui.car.CarSystemUiTest;
		import com.android.systemui.car.navigationbar.CarNavigationBarController;
		import com.android.systemui.car.window.OverlayViewGlobalStateController;
		import com.android.systemui.keyguard.DismissCallbackRegistry;
		@@ -59,6 +60,7 @@ import org.mockito.MockitoAnnotations;

		import dagger.Lazy;

		@CarSystemUiTest
		@RunWith(AndroidTestingRunner.class)
		@TestableLooper.RunWithLooper
		@SmallTest