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

Commit 7727acb2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Get the context in test from android instrumentation."

parents a29385e5 8cdd559f

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

+6 −3
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ package com.android.server.hdmi; 
import static com.google.common.truth.Truth.assertThat;



import android.annotation.Nullable;

import android.app.Instrumentation;

import android.hardware.hdmi.HdmiDeviceInfo;

import android.hardware.tv.cec.V1_0.SendMessageResult;

import android.os.Looper;

import android.os.test.TestLooper;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -44,13 +44,16 @@ public class ArcTerminationActionFromAvrTest { 
    private boolean mShouldDispatchReportArcTerminated;

    private boolean mArcEnabled;

    private boolean mSetArcStatusCalled;

    private Instrumentation mInstrumentation;



    @Before

    public void setUp() {

        mDeviceInfoForTests = new HdmiDeviceInfo(1000, 1);



        mInstrumentation = InstrumentationRegistry.getInstrumentation();



        HdmiControlService hdmiControlService =

                new HdmiControlService(null) {

                new HdmiControlService(mInstrumentation.getTargetContext()) {

                    @Override

                    void sendCecCommand(

                            HdmiCecMessage command, @Nullable SendMessageCallback callback) {

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

+2 −3
Original line number Diff line number Diff line
@@ -22,9 +22,8 @@ import android.hardware.hdmi.HdmiDeviceInfo; 
import android.hardware.tv.cec.V1_0.SendMessageResult;

import android.os.Looper;

import android.os.test.TestLooper;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;



import com.android.server.hdmi.HdmiCecLocalDeviceAudioSystem.TvSystemAudioModeSupportedCallback;



import org.junit.Before;
@@ -50,7 +49,7 @@ public class DetectTvSystemAudioModeSupportActionTest { 
    public void SetUp() {

        mDeviceInfoForTests = new HdmiDeviceInfo(1001, 1234);

        HdmiControlService hdmiControlService =

                new HdmiControlService(null) {

                new HdmiControlService(InstrumentationRegistry.getTargetContext()) {



                    @Override

                    void sendCecCommand(

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

+2 −6
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.hdmi; 
import static android.hardware.hdmi.HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM;

import static android.hardware.hdmi.HdmiDeviceInfo.DEVICE_PLAYBACK;

import static android.hardware.hdmi.HdmiDeviceInfo.DEVICE_TV;



import static com.android.server.hdmi.Constants.ADDR_AUDIO_SYSTEM;

import static com.android.server.hdmi.Constants.ADDR_PLAYBACK_1;

import static com.android.server.hdmi.Constants.ADDR_PLAYBACK_2;
@@ -26,18 +25,15 @@ import static com.android.server.hdmi.Constants.ADDR_PLAYBACK_3; 
import static com.android.server.hdmi.Constants.ADDR_SPECIFIC_USE;

import static com.android.server.hdmi.Constants.ADDR_TV;

import static com.android.server.hdmi.Constants.ADDR_UNREGISTERED;



import static junit.framework.Assert.assertEquals;



import android.content.Context;

import android.hardware.tv.cec.V1_0.SendMessageResult;

import android.os.Looper;

import android.os.test.TestLooper;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;



import com.android.server.hdmi.HdmiCecController.AllocateAddressCallback;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -84,7 +80,7 @@ public class HdmiCecControllerTest { 
    public void SetUp() {

        mMyLooper = mTestLooper.getLooper();

        mMyLooper = mTestLooper.getLooper();

        mHdmiControlService = new MyHdmiControlService(null);

        mHdmiControlService = new MyHdmiControlService(InstrumentationRegistry.getTargetContext());

        mNativeWrapper = new FakeNativeWrapper();

        mHdmiCecController =

                HdmiCecController.createWithNativeWrapper(mHdmiControlService, mNativeWrapper);

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

+4 −6
Original line number Diff line number Diff line
@@ -30,14 +30,13 @@ import android.media.AudioManager; 
import android.os.Looper;

import android.os.SystemProperties;

import android.os.test.TestLooper;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;



import com.android.server.hdmi.HdmiCecLocalDevice.ActiveSource;



import org.junit.Before;

import org.junit.Test;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;
@@ -48,7 +47,6 @@ import java.util.ArrayList; 
/** Tests for {@link HdmiCecLocalDeviceAudioSystem} class. */

public class HdmiCecLocalDeviceAudioSystemTest {



    private static final String TAG = "HdmiCecLocalDeviceAudioSystemTest";

    private HdmiControlService mHdmiControlService;

    private HdmiCecController mHdmiCecController;

    private HdmiCecLocalDeviceAudioSystem mHdmiCecLocalDeviceAudioSystem;
@@ -61,9 +59,9 @@ public class HdmiCecLocalDeviceAudioSystemTest { 
    private boolean mMusicMute;



    @Before

    public void SetUp() {

    public void setUp() {

        mHdmiControlService =

                new HdmiControlService(null) {

                new HdmiControlService(InstrumentationRegistry.getTargetContext()) {

                    @Override

                    AudioManager getAudioManager() {

                        return new AudioManager() {

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

+3 −3
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ import static junit.framework.Assert.assertTrue; 


import android.hardware.hdmi.HdmiControlManager;

import android.os.test.TestLooper;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;



import java.util.Arrays;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -95,7 +95,7 @@ public class HdmiCecLocalDeviceTest { 
    @Before

    public void SetUp() {

        mHdmiControlService =

                new HdmiControlService(null) {

                new HdmiControlService(InstrumentationRegistry.getTargetContext()) {

                    @Override

                    boolean isControlEnabled() {

                        return isControlEnabled;