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

Commit b50d662f authored by Nathalie Le Clair's avatar Nathalie Le Clair
Browse files

Initialize unit tests with empty local devices 

Before: HdmiControlService is initialized with the local devices
specified in HdmiProperties.cec_device_types(). This results in
different behavior for different DUTs.

After: HdmiControlService is initialized with empty local
devices, practically ignoring HdmiProperties.cec_device_types().

Bug: 187909454
Test: atest com.android.server.hdmi on Cuttlefish and ADT3

Change-Id: I72c2ae4d0621c728f80ed8d7755719263428e384
parent 762e7fb9

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

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;



import java.util.ArrayList;

import java.util.Collections;



/** Tests for {@link ActiveSourceAction} */

@SmallTest
@@ -76,7 +77,7 @@ public class ActiveSourceActionTest { 
                mIThermalServiceMock, new Handler(mTestLooper.getLooper())));

        when(mIPowerManagerMock.isInteractive()).thenReturn(true);



        mHdmiControlService = new HdmiControlService(mContextSpy) {

        mHdmiControlService = new HdmiControlService(mContextSpy, Collections.emptyList()) {

            @Override

            AudioManager getAudioManager() {

                return new AudioManager() {

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

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;



import java.util.ArrayList;

import java.util.Collections;



/** Tests for {@link ArcInitiationActionFromAvrTest} */

@SmallTest
@@ -79,7 +80,7 @@ public class ArcInitiationActionFromAvrTest { 
        when(mIPowerManagerMock.isInteractive()).thenReturn(true);



        HdmiControlService hdmiControlService =

                new HdmiControlService(mContextSpy) {

                new HdmiControlService(mContextSpy, Collections.emptyList()) {

                    @Override

                    boolean isPowerStandby() {

                        return false;

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

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;



import java.util.ArrayList;

import java.util.Collections;



/** Tests for {@link ArcTerminationActionFromAvr} */

@SmallTest
@@ -80,7 +81,7 @@ public class ArcTerminationActionFromAvrTest { 
        when(mIPowerManagerMock.isInteractive()).thenReturn(true);



        HdmiControlService hdmiControlService =

                new HdmiControlService(mContextSpy) {

                new HdmiControlService(mContextSpy, Collections.emptyList()) {

                    @Override

                    void wakeUp() {

                    }

services/tests/servicestests/src/com/android/server/hdmi/DetectTvSystemAudioModeSupportActionTest.java

+4 −1
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;



import java.util.Collections;



/** Tests for {@link DetectTvSystemAudioModeSupportAction} class. */

@SmallTest

@Presubmit
@@ -53,7 +55,8 @@ public class DetectTvSystemAudioModeSupportActionTest { 
    public void SetUp() {

        mDeviceInfoForTests = new HdmiDeviceInfo(1001, 1234);

        HdmiControlService hdmiControlService =

                new HdmiControlService(InstrumentationRegistry.getTargetContext()) {

                new HdmiControlService(InstrumentationRegistry.getTargetContext(),

                        Collections.emptyList()) {



                    @Override

                    void sendCecCommand(

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

+5 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;



import java.util.ArrayList;

import java.util.Collections;



/** Tests for {@link DevicePowerStatusAction} */

@SmallTest
@@ -88,7 +89,7 @@ public class DevicePowerStatusActionTest { 
                mIThermalServiceMock, new Handler(mTestLooper.getLooper())));

        when(mIPowerManagerMock.isInteractive()).thenReturn(true);



        mHdmiControlService = new HdmiControlService(mContextSpy) {

        mHdmiControlService = new HdmiControlService(mContextSpy, Collections.emptyList()) {

            @Override

            AudioManager getAudioManager() {

                return new AudioManager() {
@@ -220,6 +221,7 @@ public class DevicePowerStatusActionTest { 
        mHdmiControlService.getHdmiCecConfig().setIntValue(

                HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,

                HdmiControlManager.HDMI_CEC_VERSION_2_0);

        mHdmiControlService.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC);

        mPlaybackDevice.addAndStartAction(mDevicePowerStatusAction);

        mTestLooper.dispatchAll();
@@ -240,6 +242,7 @@ public class DevicePowerStatusActionTest { 
        mHdmiControlService.getHdmiCecConfig().setIntValue(

                HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,

                HdmiControlManager.HDMI_CEC_VERSION_2_0);

        mHdmiControlService.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC);

        HdmiCecMessage reportPhysicalAddress = HdmiCecMessageBuilder

                .buildReportPhysicalAddressCommand(ADDR_TV, 0x0000, HdmiDeviceInfo.DEVICE_TV);

        mNativeWrapper.onCecMessage(reportPhysicalAddress);
@@ -263,6 +266,7 @@ public class DevicePowerStatusActionTest { 
        mHdmiControlService.getHdmiCecConfig().setIntValue(

                HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,

                HdmiControlManager.HDMI_CEC_VERSION_2_0);

        mHdmiControlService.allocateLogicalAddress(mLocalDevices, INITIATED_BY_ENABLE_CEC);

        HdmiCecMessage reportPhysicalAddress = HdmiCecMessageBuilder

                .buildReportPhysicalAddressCommand(ADDR_TV, 0x0000, HdmiDeviceInfo.DEVICE_TV);

        mNativeWrapper.onCecMessage(reportPhysicalAddress);