From 259ce71793c72cdf412bf19c9c399866f0e17cd6 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Tue, 27 Oct 2020 11:03:27 +0900 Subject: [PATCH] Check feature availability before running tests On some devices, some of features such as, night display, display white balance, screen color gamut, and color mode may not been supported. The test should check the feature before running. Bug: 171285172 Bug: 171285174 Bug: 171285134 Bug: 171284822 Test: atest FrameworksServicesTests:ColorDisplayServiceTest Change-Id: Iaf2eb0d2bc99525f874a969274243361cdb92143 --- .../color/ColorDisplayServiceTest.java | 202 ++++++++++++++++-- 1 file changed, 186 insertions(+), 16 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/display/color/ColorDisplayServiceTest.java b/services/tests/servicestests/src/com/android/server/display/color/ColorDisplayServiceTest.java index a19b3872949ed..f832e4a90e98c 100644 --- a/services/tests/servicestests/src/com/android/server/display/color/ColorDisplayServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/display/color/ColorDisplayServiceTest.java @@ -18,6 +18,7 @@ package com.android.server.display.color; import static com.google.common.truth.Truth.assertWithMessage; +import static org.junit.Assume.assumeTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; @@ -74,6 +75,10 @@ public class ColorDisplayServiceTest { private Context mContext; private int mUserId; + private boolean mNightDisplayAvailable; + private boolean mDisplayWhiteBalanceAvailable; + private boolean mScreenWideColorGamutAvailable; + private boolean mColorModeAvailable; private MockTwilightManager mTwilightManager; @@ -90,7 +95,18 @@ public class ColorDisplayServiceTest { @Before public void setUp() { - mContext = Mockito.spy(new ContextWrapper(InstrumentationRegistry.getTargetContext())); + final Context targetContext = InstrumentationRegistry.getTargetContext(); + mNightDisplayAvailable = + ColorDisplayManager.isNightDisplayAvailable(targetContext); + mDisplayWhiteBalanceAvailable = + ColorDisplayManager.isDisplayWhiteBalanceAvailable(targetContext); + mScreenWideColorGamutAvailable = + targetContext.getResources().getConfiguration().isScreenWideColorGamut(); + final int[] availableColorModes = targetContext.getResources().getIntArray( + R.array.config_availableColorModes); + mColorModeAvailable = availableColorModes != null && availableColorModes.length > 0; + + mContext = Mockito.spy(new ContextWrapper(targetContext)); doReturn(mContext).when(mContext).getApplicationContext(); mResourcesSpy = Mockito.spy(mContext.getResources()); @@ -137,6 +153,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedAfterNight_ifOffAfterNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-120 /* startTimeOffset */, -60 /* endTimeOffset */); setNightDisplayActivated(false /* activated */, -30 /* lastActivatedTimeOffset */); @@ -146,6 +164,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedAfterNight_ifOffBeforeNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-120 /* startTimeOffset */, -60 /* endTimeOffset */); setNightDisplayActivated(false /* activated */, -180 /* lastActivatedTimeOffset */); @@ -155,6 +175,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedAfterNight_ifOffDuringNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-120 /* startTimeOffset */, -60 /* endTimeOffset */); setNightDisplayActivated(false /* activated */, -90 /* lastActivatedTimeOffset */); @@ -164,6 +186,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedAfterNight_ifOffInFuture_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-120 /* startTimeOffset */, -60 /* endTimeOffset */); setNightDisplayActivated(false /* activated */, 30 /* lastActivatedTimeOffset */); @@ -173,6 +197,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedAfterNight_ifOnAfterNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-120 /* startTimeOffset */, -60 /* endTimeOffset */); setNightDisplayActivated(true /* activated */, -30 /* lastActivatedTimeOffset */); @@ -182,6 +208,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedAfterNight_ifOnBeforeNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-120 /* startTimeOffset */, -60 /* endTimeOffset */); setNightDisplayActivated(true /* activated */, -180 /* lastActivatedTimeOffset */); @@ -191,6 +219,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedAfterNight_ifOnDuringNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-120 /* startTimeOffset */, -60 /* endTimeOffset */); setNightDisplayActivated(true /* activated */, -90 /* lastActivatedTimeOffset */); @@ -200,6 +230,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedAfterNight_ifOnInFuture_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-120 /* startTimeOffset */, -60 /* endTimeOffset */); setNightDisplayActivated(true /* activated */, 30 /* lastActivatedTimeOffset */); @@ -209,6 +241,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedBeforeNight_ifOffAfterNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(60 /* startTimeOffset */, 120 /* endTimeOffset */); setNightDisplayActivated(false /* activated */, 180 /* lastActivatedTimeOffset */); @@ -218,6 +252,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedBeforeNight_ifOffBeforeNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(60 /* startTimeOffset */, 120 /* endTimeOffset */); setNightDisplayActivated(false /* activated */, 30 /* lastActivatedTimeOffset */); @@ -227,6 +263,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedBeforeNight_ifOffDuringNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(60 /* startTimeOffset */, 120 /* endTimeOffset */); setNightDisplayActivated(false /* activated */, 90 /* lastActivatedTimeOffset */); @@ -236,6 +274,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedBeforeNight_ifOffInPast_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(60 /* startTimeOffset */, 120 /* endTimeOffset */); setNightDisplayActivated(false /* activated */, -30 /* lastActivatedTimeOffset */); @@ -245,6 +285,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedBeforeNight_ifOnAfterNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(60 /* startTimeOffset */, 120 /* endTimeOffset */); setNightDisplayActivated(true /* activated */, 180 /* lastActivatedTimeOffset */); @@ -254,6 +296,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedBeforeNight_ifOnBeforeNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(60 /* startTimeOffset */, 120 /* endTimeOffset */); setNightDisplayActivated(true /* activated */, 30 /* lastActivatedTimeOffset */); @@ -263,6 +307,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedBeforeNight_ifOnDuringNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(60 /* startTimeOffset */, 120 /* endTimeOffset */); setNightDisplayActivated(true /* activated */, 90 /* lastActivatedTimeOffset */); @@ -272,6 +318,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedBeforeNight_ifOnInPast_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(60 /* startTimeOffset */, 120 /* endTimeOffset */); setNightDisplayActivated(true /* activated */, -30 /* lastActivatedTimeOffset */); @@ -281,6 +329,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedDuringNight_ifOffAfterNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-60 /* startTimeOffset */, 60 /* endTimeOffset */); setNightDisplayActivated(false /* activated */, 90 /* lastActivatedTimeOffset */); @@ -290,6 +340,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedDuringNight_ifOffBeforeNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-60 /* startTimeOffset */, 60 /* endTimeOffset */); setNightDisplayActivated(false /* activated */, -90 /* lastActivatedTimeOffset */); @@ -299,6 +351,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedDuringNight_ifOffDuringNightInFuture_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-60 /* startTimeOffset */, 60 /* endTimeOffset */); setNightDisplayActivated(false /* activated */, 30 /* lastActivatedTimeOffset */); @@ -308,6 +362,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedDuringNight_ifOffDuringNightInPast_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-60 /* startTimeOffset */, 60 /* endTimeOffset */); setNightDisplayActivated(false /* activated */, -30 /* lastActivatedTimeOffset */); @@ -317,6 +373,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedDuringNight_ifOnAfterNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-60 /* startTimeOffset */, 60 /* endTimeOffset */); setNightDisplayActivated(true /* activated */, 90 /* lastActivatedTimeOffset */); @@ -326,6 +384,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedDuringNight_ifOnBeforeNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-60 /* startTimeOffset */, 60 /* endTimeOffset */); setNightDisplayActivated(true /* activated */, -90 /* lastActivatedTimeOffset */); @@ -335,6 +395,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedDuringNight_ifOnDuringNightInFuture_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-60 /* startTimeOffset */, 60 /* endTimeOffset */); setNightDisplayActivated(true /* activated */, 30 /* lastActivatedTimeOffset */); @@ -344,6 +406,8 @@ public class ColorDisplayServiceTest { @Test public void customSchedule_whenStartedDuringNight_ifOnDuringNightInPast_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeCustom(-60 /* startTimeOffset */, 60 /* endTimeOffset */); setNightDisplayActivated(true /* activated */, -30 /* lastActivatedTimeOffset */); @@ -353,6 +417,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedAfterNight_ifOffAfterNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, -30 /* lastActivatedTimeOffset */); @@ -362,6 +428,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedAfterNight_ifOffBeforeNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, -180 /* lastActivatedTimeOffset */); @@ -371,6 +439,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedAfterNight_ifOffDuringNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, -90 /* lastActivatedTimeOffset */); @@ -380,6 +450,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedAfterNight_ifOffInFuture_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, 30 /* lastActivatedTimeOffset */); @@ -389,6 +461,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedAfterNight_ifOnAfterNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, -30 /* lastActivatedTimeOffset */); @@ -398,6 +472,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedAfterNight_ifOnBeforeNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, -180 /* lastActivatedTimeOffset */); @@ -407,6 +483,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedAfterNight_ifOnDuringNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, -90 /* lastActivatedTimeOffset */); @@ -416,6 +494,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedAfterNight_ifOnInFuture_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, 30 /* lastActivatedTimeOffset */); @@ -425,6 +505,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedBeforeNight_ifOffAfterNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, 180 /* lastActivatedTimeOffset */); @@ -434,6 +516,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedBeforeNight_ifOffBeforeNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, 30 /* lastActivatedTimeOffset */); @@ -443,6 +527,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedBeforeNight_ifOffDuringNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, 90 /* lastActivatedTimeOffset */); @@ -452,6 +538,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedBeforeNight_ifOffInPast_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, -30 /* lastActivatedTimeOffset */); @@ -461,6 +549,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedBeforeNight_ifOnAfterNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, 180 /* lastActivatedTimeOffset */); @@ -470,6 +560,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedBeforeNight_ifOnBeforeNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, 30 /* lastActivatedTimeOffset */); @@ -479,6 +571,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedBeforeNight_ifOnDuringNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, 90 /* lastActivatedTimeOffset */); @@ -488,6 +582,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedBeforeNight_ifOnInPast_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, -30 /* lastActivatedTimeOffset */); @@ -497,6 +593,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedDuringNight_ifOffAfterNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, 90 /* lastActivatedTimeOffset */); @@ -506,6 +604,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedDuringNight_ifOffBeforeNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, -90 /* lastActivatedTimeOffset */); @@ -515,6 +615,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedDuringNight_ifOffDuringNightInFuture_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, 30 /* lastActivatedTimeOffset */); @@ -524,6 +626,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedDuringNight_ifOffDuringNightInPast_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, -30 /* lastActivatedTimeOffset */); @@ -533,6 +637,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedDuringNight_ifOnAfterNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, 90 /* lastActivatedTimeOffset */); @@ -542,6 +648,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedDuringNight_ifOnBeforeNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, -90 /* lastActivatedTimeOffset */); @@ -551,6 +659,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedDuringNight_ifOnDuringNightInFuture_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, 30 /* lastActivatedTimeOffset */); @@ -560,6 +670,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenStartedDuringNight_ifOnDuringNightInPast_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, -30 /* lastActivatedTimeOffset */); @@ -569,6 +681,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedAfterNight_ifOffAfterNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, -30 /* lastActivatedTimeOffset */); @@ -584,6 +698,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedAfterNight_ifOffBeforeNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, -180 /* lastActivatedTimeOffset */); @@ -599,6 +715,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedAfterNight_ifOffDuringNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, -90 /* lastActivatedTimeOffset */); @@ -614,6 +732,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedAfterNight_ifOffInFuture_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, 30 /* lastActivatedTimeOffset */); @@ -629,6 +749,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedAfterNight_ifOnAfterNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, -30 /* lastActivatedTimeOffset */); @@ -644,6 +766,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedAfterNight_ifOnBeforeNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, -180 /* lastActivatedTimeOffset */); @@ -659,6 +783,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedAfterNight_ifOnDuringNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, -90 /* lastActivatedTimeOffset */); @@ -674,6 +800,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedAfterNight_ifOnInFuture_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-120 /* sunsetOffset */, -60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, 30 /* lastActivatedTimeOffset */); @@ -689,6 +817,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedBeforeNight_ifOffAfterNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, 180 /* lastActivatedTimeOffset */); @@ -704,6 +834,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedBeforeNight_ifOffBeforeNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, 30 /* lastActivatedTimeOffset */); @@ -719,6 +851,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedBeforeNight_ifOffDuringNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, 90 /* lastActivatedTimeOffset */); @@ -734,6 +868,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedBeforeNight_ifOffInPast_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, -30 /* lastActivatedTimeOffset */); @@ -749,6 +885,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedBeforeNight_ifOnAfterNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, 180 /* lastActivatedTimeOffset */); @@ -764,6 +902,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedBeforeNight_ifOnBeforeNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, 30 /* lastActivatedTimeOffset */); @@ -779,6 +919,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedBeforeNight_ifOnDuringNight_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, 90 /* lastActivatedTimeOffset */); @@ -794,6 +936,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedBeforeNight_ifOnInPast_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(60 /* sunsetOffset */, 120 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, -30 /* lastActivatedTimeOffset */); @@ -809,6 +953,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedDuringNight_ifOffAfterNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, 90 /* lastActivatedTimeOffset */); @@ -824,6 +970,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedDuringNight_ifOffBeforeNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, -90 /* lastActivatedTimeOffset */); @@ -839,6 +987,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedDuringNight_ifOffDuringNightInFuture_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, 30 /* lastActivatedTimeOffset */); @@ -854,6 +1004,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedDuringNight_ifOffDuringNightInPast_turnsOff() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(false /* activated */, -30 /* lastActivatedTimeOffset */); @@ -869,6 +1021,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedDuringNight_ifOnAfterNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, 90 /* lastActivatedTimeOffset */); @@ -884,6 +1038,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedDuringNight_ifOnBeforeNight_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, -90 /* lastActivatedTimeOffset */); @@ -899,6 +1055,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedDuringNight_ifOnDuringNightInFuture_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, 30 /* lastActivatedTimeOffset */); @@ -914,6 +1072,8 @@ public class ColorDisplayServiceTest { @Test public void twilightSchedule_whenRebootedDuringNight_ifOnDuringNightInPast_turnsOn() { + assumeTrue(mNightDisplayAvailable); + setAutoModeTwilight(-60 /* sunsetOffset */, 60 /* sunriseOffset */); setNightDisplayActivated(true /* activated */, -30 /* lastActivatedTimeOffset */); @@ -929,9 +1089,7 @@ public class ColorDisplayServiceTest { @Test public void accessibility_colorInversion_transformActivated() { - if (!mContext.getResources().getConfiguration().isScreenWideColorGamut()) { - return; - } + assumeTrue(mScreenWideColorGamutAvailable); setAccessibilityColorInversion(true); setColorMode(ColorDisplayManager.COLOR_MODE_NATURAL); @@ -944,9 +1102,7 @@ public class ColorDisplayServiceTest { @Test public void accessibility_colorCorrection_transformActivated() { - if (!mContext.getResources().getConfiguration().isScreenWideColorGamut()) { - return; - } + assumeTrue(mScreenWideColorGamutAvailable); setAccessibilityColorCorrection(true); setColorMode(ColorDisplayManager.COLOR_MODE_NATURAL); @@ -959,9 +1115,7 @@ public class ColorDisplayServiceTest { @Test public void accessibility_all_transformActivated() { - if (!mContext.getResources().getConfiguration().isScreenWideColorGamut()) { - return; - } + assumeTrue(mScreenWideColorGamutAvailable); setAccessibilityColorCorrection(true); setAccessibilityColorInversion(true); @@ -975,9 +1129,7 @@ public class ColorDisplayServiceTest { @Test public void accessibility_none_transformActivated() { - if (!mContext.getResources().getConfiguration().isScreenWideColorGamut()) { - return; - } + assumeTrue(mScreenWideColorGamutAvailable); setAccessibilityColorCorrection(false); setAccessibilityColorInversion(false); @@ -990,6 +1142,8 @@ public class ColorDisplayServiceTest { @Test public void displayWhiteBalance_enabled() { + assumeTrue(mDisplayWhiteBalanceAvailable); + setDisplayWhiteBalanceEnabled(true); setNightDisplayActivated(false /* activated */, -30 /* lastActivatedTimeOffset */); mBinderService.setColorMode(ColorDisplayManager.COLOR_MODE_NATURAL); @@ -999,6 +1153,8 @@ public class ColorDisplayServiceTest { @Test public void displayWhiteBalance_disabledAfterNightDisplayEnabled() { + assumeTrue(mDisplayWhiteBalanceAvailable); + setDisplayWhiteBalanceEnabled(true); startService(); setNightDisplayActivated(true /* activated */, -30 /* lastActivatedTimeOffset */); @@ -1011,6 +1167,8 @@ public class ColorDisplayServiceTest { @Test public void displayWhiteBalance_enabledAfterNightDisplayDisabled() { + assumeTrue(mDisplayWhiteBalanceAvailable); + setDisplayWhiteBalanceEnabled(true); startService(); setNightDisplayActivated(true /* activated */, -30 /* lastActivatedTimeOffset */); @@ -1025,9 +1183,9 @@ public class ColorDisplayServiceTest { @Test public void displayWhiteBalance_enabledAfterLinearColorModeSelected() { - if (!isColorModeValid(ColorDisplayManager.COLOR_MODE_SATURATED)) { - return; - } + assumeTrue(mDisplayWhiteBalanceAvailable); + assumeTrue(isColorModeValid(ColorDisplayManager.COLOR_MODE_SATURATED)); + setDisplayWhiteBalanceEnabled(true); mBinderService.setColorMode(ColorDisplayManager.COLOR_MODE_SATURATED); startService(); @@ -1040,6 +1198,8 @@ public class ColorDisplayServiceTest { @Test public void displayWhiteBalance_disabledWhileAccessibilityColorCorrectionEnabled() { + assumeTrue(mDisplayWhiteBalanceAvailable); + setDisplayWhiteBalanceEnabled(true); setAccessibilityColorCorrection(true); startService(); @@ -1052,6 +1212,8 @@ public class ColorDisplayServiceTest { @Test public void displayWhiteBalance_disabledWhileAccessibilityColorInversionEnabled() { + assumeTrue(mDisplayWhiteBalanceAvailable); + setDisplayWhiteBalanceEnabled(true); setAccessibilityColorInversion(true); startService(); @@ -1064,6 +1226,8 @@ public class ColorDisplayServiceTest { @Test public void compositionColorSpaces_noResources() { + assumeTrue(mColorModeAvailable); + final DisplayTransformManager dtm = LocalServices.getService(DisplayTransformManager.class); reset(dtm); @@ -1079,6 +1243,8 @@ public class ColorDisplayServiceTest { @Test public void compositionColorSpaces_invalidResources() { + assumeTrue(mColorModeAvailable); + final DisplayTransformManager dtm = LocalServices.getService(DisplayTransformManager.class); reset(dtm); @@ -1100,6 +1266,8 @@ public class ColorDisplayServiceTest { @Test public void compositionColorSpaces_validResources_validColorMode() { + assumeTrue(mColorModeAvailable); + final DisplayTransformManager dtm = LocalServices.getService(DisplayTransformManager.class); reset(dtm); @@ -1119,6 +1287,8 @@ public class ColorDisplayServiceTest { @Test public void compositionColorSpaces_validResources_invalidColorMode() { + assumeTrue(mColorModeAvailable); + final DisplayTransformManager dtm = LocalServices.getService(DisplayTransformManager.class); reset(dtm);