Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2287fbb4 authored Sep 28, 2022 by Rupesh Bansal Committed by Android (Google) Code Review Sep 28, 2022

Merge "Updated TEST_MAPPING to run all display tests"

parents 3cf026e7 1a946be2

services/core/java/com/android/server/display/TEST_MAPPING

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7,6 +7,15 @@
	{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},		{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
	{"exclude-annotation": "androidx.test.filters.FlakyTest"}		{"exclude-annotation": "androidx.test.filters.FlakyTest"}
	]		]
			},
			{
			"name": "FrameworksServicesTests",
			"options": [
			{"include-filter": "com.android.server.display"},
			{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
			{"exclude-annotation": "androidx.test.filters.FlakyTest"},
			{"exclude-annotation": "org.junit.Ignore"}
			]
	}		}
	]		]
	}		}
			No newline at end of file

services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,6 @@ import android.hardware.SensorManager;
	import android.hardware.display.DisplayManagerInternal.DisplayPowerRequest;		import android.hardware.display.DisplayManagerInternal.DisplayPowerRequest;
	import android.os.Handler;		import android.os.Handler;
	import android.os.test.TestLooper;		import android.os.test.TestLooper;
	import android.platform.test.annotations.Presubmit;

	import androidx.test.InstrumentationRegistry;		import androidx.test.InstrumentationRegistry;
	import androidx.test.filters.SmallTest;		import androidx.test.filters.SmallTest;
	@@ -56,7 +55,6 @@ import org.mockito.Mockito;
	import org.mockito.MockitoAnnotations;		import org.mockito.MockitoAnnotations;

	@SmallTest		@SmallTest
	@Presubmit
	@RunWith(AndroidJUnit4.class)		@RunWith(AndroidJUnit4.class)
	public class AutomaticBrightnessControllerTest {		public class AutomaticBrightnessControllerTest {
	private static final float BRIGHTNESS_MIN_FLOAT = 0.0f;		private static final float BRIGHTNESS_MIN_FLOAT = 0.0f;

services/tests/servicestests/src/com/android/server/display/BrightnessThrottlerTest.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,6 @@ import android.os.PowerManager;
	import android.os.Temperature;		import android.os.Temperature;
	import android.os.Temperature.ThrottlingStatus;		import android.os.Temperature.ThrottlingStatus;
	import android.os.test.TestLooper;		import android.os.test.TestLooper;
	import android.platform.test.annotations.Presubmit;

	import androidx.test.filters.SmallTest;		import androidx.test.filters.SmallTest;
	import androidx.test.runner.AndroidJUnit4;		import androidx.test.runner.AndroidJUnit4;
	@@ -57,7 +56,6 @@ import java.util.ArrayList;
	import java.util.List;		import java.util.List;

	@SmallTest		@SmallTest
	@Presubmit
	@RunWith(AndroidJUnit4.class)		@RunWith(AndroidJUnit4.class)
	public class BrightnessThrottlerTest {		public class BrightnessThrottlerTest {
	private static final float EPSILON = 0.000001f;		private static final float EPSILON = 0.000001f;

services/tests/servicestests/src/com/android/server/display/ColorFadeTest.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,6 @@ import static org.mockito.Mockito.when;

	import android.content.Context;		import android.content.Context;
	import android.hardware.display.DisplayManagerInternal;		import android.hardware.display.DisplayManagerInternal;
	import android.platform.test.annotations.Presubmit;

	import androidx.test.filters.SmallTest;		import androidx.test.filters.SmallTest;
	import androidx.test.runner.AndroidJUnit4;		import androidx.test.runner.AndroidJUnit4;
	@@ -39,7 +38,6 @@ import org.mockito.Mock;
	import org.mockito.MockitoAnnotations;		import org.mockito.MockitoAnnotations;

	@SmallTest		@SmallTest
	@Presubmit
	@RunWith(AndroidJUnit4.class)		@RunWith(AndroidJUnit4.class)
	public class ColorFadeTest {		public class ColorFadeTest {
	private static final int DISPLAY_ID = 123;		private static final int DISPLAY_ID = 123;

services/tests/servicestests/src/com/android/server/display/DisplayDeviceConfigTest.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,6 @@ import static org.mockito.Mockito.when;
	import android.content.Context;		import android.content.Context;
	import android.content.res.Resources;		import android.content.res.Resources;
	import android.content.res.TypedArray;		import android.content.res.TypedArray;
	import android.platform.test.annotations.Presubmit;

	import androidx.test.filters.SmallTest;		import androidx.test.filters.SmallTest;
	import androidx.test.runner.AndroidJUnit4;		import androidx.test.runner.AndroidJUnit4;
	@@ -44,7 +43,6 @@ import java.nio.file.Files;
	import java.nio.file.Path;		import java.nio.file.Path;

	@SmallTest		@SmallTest
	@Presubmit
	@RunWith(AndroidJUnit4.class)		@RunWith(AndroidJUnit4.class)
	public final class DisplayDeviceConfigTest {		public final class DisplayDeviceConfigTest {
	private DisplayDeviceConfig mDisplayDeviceConfig;		private DisplayDeviceConfig mDisplayDeviceConfig;