Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I9374cadd,Ie8a1707b into sc-dev

Browse Source 
* changes:
  Reinitialize PowerManager in unit tests
  Set config values explicitely in unit tests
This commit is contained in:
Nathalie Le Clair
2021-05-12 11:29:41 +00:00
committed by Android (Google) Code Review
parent 137a248c1f ac0134bc53
commit 9172401c76
14 changed files with 83 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/tests/servicestests/src/com/android/server/hdmi/ActiveSourceActionTest.java
View File

@@ -68,10 +68,12 @@ public class ActiveSourceActionTest {
mContextSpy = spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));
PowerManager powerManager = new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper()));
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenReturn(powerManager);
when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper())));
when(mContextSpy.getSystemService(PowerManager.class)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper())));
when(mIPowerManagerMock.isInteractive()).thenReturn(true);
mHdmiControlService = new HdmiControlService(mContextSpy) {
@@ -97,7 +99,8 @@ public class ActiveSourceActionTest {
@Override
protected PowerManager getPowerManager() {
return powerManager;
return new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper()));
}
@Override

13
services/tests/servicestests/src/com/android/server/hdmi/ArcInitiationActionFromAvrTest.java
View File

@@ -70,10 +70,12 @@ public class ArcInitiationActionFromAvrTest {
mContextSpy = spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));
PowerManager powerManager = new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper()));
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenReturn(powerManager);
when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper())));
when(mContextSpy.getSystemService(PowerManager.class)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper())));
when(mIPowerManagerMock.isInteractive()).thenReturn(true);
HdmiControlService hdmiControlService =
@@ -89,7 +91,8 @@ public class ArcInitiationActionFromAvrTest {
@Override
protected PowerManager getPowerManager() {
return powerManager;
return new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper()));
}
@Override

13
services/tests/servicestests/src/com/android/server/hdmi/ArcTerminationActionFromAvrTest.java
View File

@@ -71,10 +71,12 @@ public class ArcTerminationActionFromAvrTest {
mContextSpy = spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));
PowerManager powerManager = new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper()));
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenReturn(powerManager);
when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper())));
when(mContextSpy.getSystemService(PowerManager.class)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper())));
when(mIPowerManagerMock.isInteractive()).thenReturn(true);
HdmiControlService hdmiControlService =
@@ -85,7 +87,8 @@ public class ArcTerminationActionFromAvrTest {
@Override
protected PowerManager getPowerManager() {
return powerManager;
return new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper()));
}
@Override

13
services/tests/servicestests/src/com/android/server/hdmi/DevicePowerStatusActionTest.java
View File

@@ -80,10 +80,12 @@ public class DevicePowerStatusActionTest {
mContextSpy = spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));
PowerManager powerManager = new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper()));
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenReturn(powerManager);
when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper())));
when(mContextSpy.getSystemService(PowerManager.class)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper())));
when(mIPowerManagerMock.isInteractive()).thenReturn(true);
mHdmiControlService = new HdmiControlService(mContextSpy) {
@@ -109,7 +111,8 @@ public class DevicePowerStatusActionTest {
@Override
protected PowerManager getPowerManager() {
return powerManager;
return new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper()));
}
@Override

5
services/tests/servicestests/src/com/android/server/hdmi/DeviceSelectActionTest.java
View File

@@ -103,8 +103,6 @@ public class DeviceSelectActionTest {
Context context = InstrumentationRegistry.getTargetContext();
mMyLooper = mTestLooper.getLooper();
PowerManager powerManager = new PowerManager(context, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mMyLooper));
mHdmiControlService =
new HdmiControlService(InstrumentationRegistry.getTargetContext()) {
@@ -129,7 +127,8 @@ public class DeviceSelectActionTest {
@Override
protected PowerManager getPowerManager() {
return powerManager;
return new PowerManager(context, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mMyLooper));
}
};

8
services/tests/servicestests/src/com/android/server/hdmi/HdmiCecAtomLoggingTest.java
View File

@@ -30,6 +30,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.ContextWrapper;
@@ -96,9 +97,10 @@ public class HdmiCecAtomLoggingTest {
mContextSpy = spy(new ContextWrapper(
InstrumentationRegistry.getInstrumentation().getTargetContext()));
PowerManager powerManager = new PowerManager(
mContextSpy, mIPowerManagerMock, mIThermalServiceMock, new Handler(mLooper));
doReturn(powerManager).when(mContextSpy).getSystemService(Context.POWER_SERVICE);
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mLooper)));
doReturn(true).when(mIPowerManagerMock).isInteractive();
mHdmiControlServiceSpy = spy(new HdmiControlService(mContextSpy));

5
services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystemTest.java
View File

@@ -94,8 +94,6 @@ public class HdmiCecLocalDeviceAudioSystemTest {
Context context = InstrumentationRegistry.getTargetContext();
mMyLooper = mTestLooper.getLooper();
PowerManager powerManager = new PowerManager(context, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mMyLooper));
mHdmiControlService =
new HdmiControlService(InstrumentationRegistry.getTargetContext()) {
@@ -183,7 +181,8 @@ public class HdmiCecLocalDeviceAudioSystemTest {
@Override
protected PowerManager getPowerManager() {
return powerManager;
return new PowerManager(context, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mMyLooper));
}
};

7
services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java
View File

@@ -92,8 +92,6 @@ public class HdmiCecLocalDevicePlaybackTest {
Context context = InstrumentationRegistry.getTargetContext();
mMyLooper = mTestLooper.getLooper();
PowerManager powerManager = new PowerManager(context, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mMyLooper));
mHdmiControlService =
new HdmiControlService(InstrumentationRegistry.getTargetContext()) {
@@ -140,7 +138,8 @@ public class HdmiCecLocalDevicePlaybackTest {
@Override
protected PowerManager getPowerManager() {
return powerManager;
return new PowerManager(context, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mMyLooper));
}
};
@@ -168,6 +167,8 @@ public class HdmiCecLocalDevicePlaybackTest {
mPlaybackLogicalAddress = mHdmiCecLocalDevicePlayback.getDeviceInfo().getLogicalAddress();
mHdmiControlService.getHdmiCecNetwork().addCecDevice(INFO_TV);
mNativeWrapper.clearResultMessages();
mHdmiCecLocalDevicePlayback.mPlaybackDeviceActionOnRoutingControl =
HdmiProperties.playback_device_action_on_routing_control_values.NONE;
}
@Test

5
services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java
View File

@@ -86,8 +86,6 @@ public class HdmiCecLocalDeviceTvTest {
Context context = InstrumentationRegistry.getTargetContext();
mMyLooper = mTestLooper.getLooper();
PowerManager powerManager = new PowerManager(context, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mMyLooper));
mHdmiControlService =
new HdmiControlService(InstrumentationRegistry.getTargetContext()) {
@@ -118,7 +116,8 @@ public class HdmiCecLocalDeviceTvTest {
@Override
protected PowerManager getPowerManager() {
return powerManager;
return new PowerManager(context, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mMyLooper));
}
@Override

10
services/tests/servicestests/src/com/android/server/hdmi/HdmiCecPowerStatusControllerTest.java
View File

@@ -75,10 +75,12 @@ public class HdmiCecPowerStatusControllerTest {
Context contextSpy = spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));
Looper myLooper = mTestLooper.getLooper();
PowerManager powerManager = new PowerManager(contextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(myLooper));
when(contextSpy.getSystemService(Context.POWER_SERVICE)).thenReturn(powerManager);
when(contextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);
when(contextSpy.getSystemService(Context.POWER_SERVICE)).thenAnswer(i ->
new PowerManager(contextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(myLooper)));
when(contextSpy.getSystemService(PowerManager.class)).thenAnswer(i ->
new PowerManager(contextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(myLooper)));
when(mIPowerManagerMock.isInteractive()).thenReturn(true);
mHdmiControlService = new HdmiControlService(contextSpy) {

10
services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java
View File

@@ -192,10 +192,12 @@ public class HdmiControlServiceTest {
mContextSpy = spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));
PowerManager powerManager = new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, null);
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenReturn(powerManager);
when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, null));
when(mContextSpy.getSystemService(PowerManager.class)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, null));
when(mIPowerManagerMock.isInteractive()).thenReturn(true);
HdmiCecConfig hdmiCecConfig = new FakeHdmiCecConfig(mContextSpy);

13
services/tests/servicestests/src/com/android/server/hdmi/OneTouchPlayActionTest.java
View File

@@ -91,10 +91,12 @@ public class OneTouchPlayActionTest {
setHdmiControlEnabled(hdmiControlEnabled);
PowerManager powerManager = new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper()));
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenReturn(powerManager);
when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper())));
when(mContextSpy.getSystemService(PowerManager.class)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper())));
when(mIPowerManagerMock.isInteractive()).thenReturn(true);
mHdmiControlService = new HdmiControlService(mContextSpy) {
@@ -120,7 +122,8 @@ public class OneTouchPlayActionTest {
@Override
protected PowerManager getPowerManager() {
return powerManager;
return new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper()));
}
@Override

13
services/tests/servicestests/src/com/android/server/hdmi/PowerStatusMonitorActionTest.java
View File

@@ -78,10 +78,12 @@ public class PowerStatusMonitorActionTest {
mContextSpy = spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));
PowerManager powerManager = new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper()));
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenReturn(powerManager);
when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper())));
when(mContextSpy.getSystemService(PowerManager.class)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper())));
when(mIPowerManagerMock.isInteractive()).thenReturn(true);
mHdmiControlService = new HdmiControlService(mContextSpy,
@@ -108,7 +110,8 @@ public class PowerStatusMonitorActionTest {
@Override
protected PowerManager getPowerManager() {
return powerManager;
return new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(mTestLooper.getLooper()));
}
@Override

13
services/tests/servicestests/src/com/android/server/hdmi/SystemAudioAutoInitiationActionTest.java
View File

@@ -78,10 +78,12 @@ public class SystemAudioAutoInitiationActionTest {
mContextSpy = spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));
Looper myLooper = mTestLooper.getLooper();
PowerManager powerManager = new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(myLooper));
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenReturn(powerManager);
when(mContextSpy.getSystemService(PowerManager.class)).thenReturn(powerManager);
when(mContextSpy.getSystemService(Context.POWER_SERVICE)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(myLooper)));
when(mContextSpy.getSystemService(PowerManager.class)).thenAnswer(i ->
new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(myLooper)));
when(mIPowerManagerMock.isInteractive()).thenReturn(true);
mHdmiControlService = new HdmiControlService(mContextSpy) {
@@ -107,7 +109,8 @@ public class SystemAudioAutoInitiationActionTest {
@Override
protected PowerManager getPowerManager() {
return powerManager;
return new PowerManager(mContextSpy, mIPowerManagerMock,
mIThermalServiceMock, new Handler(myLooper));
}
@Override