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

Commit 65436d48 authored by Weilin Xu's avatar Weilin Xu
Browse files

Add unit tests for radio HIDL tuner and module 

Unit tests for radio module and get/set methods in tuner session
of broadcast radio HIDL HAL client are added. Meanwhile, replace
deprecated Matchers package with ArgumentMatchers package.

Bug: 258034192
Test: atest TunerSessionHidlTest RadioTunerHidlTest
Change-Id: I5530c5b42cf3f4763df8d003871196d630ef06cd
parent f4c573cc

core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/IRadioServiceAidlImplTest.java

+2 −2
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; 


import static com.google.common.truth.Truth.assertWithMessage;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/IRadioServiceHidlImplTest.java

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.server.broadcastradio; 


import static com.google.common.truth.Truth.assertWithMessage;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.verify;

core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/aidl/AidlTestUtils.java

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,16 @@ final class AidlTestUtils { 
        throw new UnsupportedOperationException("AidlTestUtils class is noninstantiable");

    }



    static RadioManager.ModuleProperties makeDefaultModuleProperties() {

        return new RadioManager.ModuleProperties(

                /* id= */ 0, /* serviceName= */ "", /* classId= */ 0, /* implementor= */ "",

                /* product= */ "", /* version= */ "", /* serial= */ "", /* numTuners= */ 0,

                /* numAudioSources= */ 0, /* isInitializationRequired= */ false,

                /* isCaptureSupported= */ false, /* bands= */ null,

                /* isBgScanSupported= */ false, new int[] {}, new int[] {},

                /* dabFrequencyTable= */ null, /* vendorInfo= */ null);

    }



    static RadioManager.ProgramInfo makeProgramInfo(ProgramSelector selector, int signalQuality) {

        return new RadioManager.ProgramInfo(selector,

                selector.getPrimaryId(), selector.getPrimaryId(), /* relatedContents= */ null,

core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/aidl/RadioModuleTest.java

+4 −11
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ package com.android.server.broadcastradio.aidl; 
import static com.google.common.truth.Truth.assertWithMessage;



import static org.junit.Assert.assertThrows;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -48,14 +48,7 @@ public final class RadioModuleTest { 


    private static final int TEST_ENABLED_TYPE = Announcement.TYPE_EVENT;

    private static final RadioManager.ModuleProperties TEST_MODULE_PROPERTIES =

            new RadioManager.ModuleProperties(/* id= */ 0, /* serviceName= */ "", /* classId= */ 0,

                    /* implementor= */ "", /* product= */ "", /* version= */ "",

                    /* serial= */ "", /* numTuners= */ 0, /* numAudioSources= */ 0,

                    /* isInitializationRequired= */ false, /* isCaptureSupported= */ false,

                    /* bands= */ null, /* isBgScanSupported= */ false,

                    /* supportedProgramTypes= */ new int[]{},

                    /* supportedIdentifierTypes */ new int[]{},

                    /* dabFrequencyTable= */ null, /* vendorInfo= */ null);

            AidlTestUtils.makeDefaultModuleProperties();



    // Mocks

    @Mock
@@ -108,7 +101,7 @@ public final class RadioModuleTest { 


        Bitmap imageTest = mRadioModule.getImage(imageId);



        assertWithMessage("Image got from radio module").that(imageTest).isNull();

        assertWithMessage("Image from radio module").that(imageTest).isNull();

    }



    @Test

core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/aidl/TunerSessionTest.java

+7 −12
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ package com.android.server.broadcastradio.aidl; 
import static com.google.common.truth.Truth.assertWithMessage;



import static org.junit.Assert.assertThrows;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.timeout;
@@ -93,13 +93,8 @@ public final class TunerSessionTest { 


    @Before

    public void setup() throws Exception {

        mRadioModule = new RadioModule(mBroadcastRadioMock, new RadioManager.ModuleProperties(

                /* id= */ 0, /* serviceName= */ "", /* classId= */ 0, /* implementor= */ "",

                /* product= */ "", /* version= */ "", /* serial= */ "", /* numTuners= */ 0,

                /* numAudioSources= */ 0, /* isInitializationRequired= */ false,

                /* isCaptureSupported= */ false, /* bands= */ null, /* isBgScanSupported= */ false,

                new int[] {}, new int[] {},

                /* dabFrequencyTable= */ null, /* vendorInfo= */ null), mLock);

        mRadioModule = new RadioModule(mBroadcastRadioMock,

                AidlTestUtils.makeDefaultModuleProperties(), mLock);



        doAnswer(invocation -> {

            mHalTunerCallback = (ITunerCallback) invocation.getArguments()[0];
@@ -424,7 +419,7 @@ public final class TunerSessionTest { 
            mTunerSessions[0].getImage(imageId);

        });



        assertWithMessage("Exception for getting image with invalid ID")

        assertWithMessage("Get image exception")

                .that(thrown).hasMessageThat().contains("Image ID is missing");

    }