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

Commit 0351c882 authored by David Duarte's avatar David Duarte
Browse files

Migrate from MockitoAnnotations to MockitoJUnit 

Bug: 324268843
Test: atest BluetoothInstrumentationTests
Flag: Exempt, test only change
Change-Id: I271eacc51c8a494f542f508d60985006645ae5de
parent 93732559

android/app/tests/robotests/src/com/android/bluetooth/opp/OppSendFileInfoTest.java

+5 −7
Original line number Diff line number Diff line
@@ -26,11 +26,12 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.net.Uri;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;



import java.io.FileInputStream;
@@ -43,15 +44,12 @@ public class OppSendFileInfoTest { 
    private static final int TEST_FILE_SIZE = 10;

    private static final int MAXIMUM_FILE_SIZE = 0xFFFFFFFF;



    @Rule public MockitoRule mockitoRule = MockitoJUnit.rule();



    @Mock private Context mContext;

    @Mock private ContentResolver mContentResolver;

    @Mock private FileInputStream mFileInputStream;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

    }



    /**

     * Test a BluetoothOppSendFileInfo generated from a local file (MIME type: text/plain,

     * size: #TEST_FILE_SIZE).

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpCodecConfigTest.java

+5 −3
Original line number Diff line number Diff line
@@ -34,10 +34,12 @@ import com.android.bluetooth.R; 
import org.junit.After;

import org.junit.Assert;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



import java.util.Arrays;
@@ -49,6 +51,8 @@ public class A2dpCodecConfigTest { 
    private BluetoothDevice mTestDevice;

    private A2dpCodecConfig mA2dpCodecConfig;



    @Rule public MockitoRule mockitoRule = MockitoJUnit.rule();



    @Mock private Context mMockContext;

    @Mock private Resources mMockResources;

    @Mock private A2dpNativeInterface mA2dpNativeInterface;
@@ -159,8 +163,6 @@ public class A2dpCodecConfigTest { 


    @Before

    public void setUp() throws Exception {

        // Set up mocks and test assets

        MockitoAnnotations.initMocks(this);

        mTargetContext = InstrumentationRegistry.getTargetContext();



        when(mMockContext.getResources()).thenReturn(mMockResources);

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpServiceBinderTest.java

+4 −2
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ import org.junit.Before; 
import org.junit.Rule;

import org.junit.Test;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



import java.util.List;
@@ -56,6 +57,8 @@ public class A2dpServiceBinderTest { 


    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();



    @Rule public MockitoRule mockitoRule = MockitoJUnit.rule();



    @Mock private A2dpService mA2dpService;

    @Mock private AudioRoutingManager mAudioRoutingManager;

    @Mock private PackageManager mPackageManager;
@@ -64,7 +67,6 @@ public class A2dpServiceBinderTest { 


    @Before

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);

        doReturn(mAudioRoutingManager).when(mA2dpService).getActiveDeviceManager();

        doReturn(mPackageManager).when(mA2dpService).getPackageManager();

        ApplicationInfo appInfo = new ApplicationInfo();

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpServiceTest.java

+5 −3
Original line number Diff line number Diff line
@@ -50,13 +50,15 @@ import org.hamcrest.core.AllOf; 
import org.junit.After;

import org.junit.Assert;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.InOrder;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.hamcrest.MockitoHamcrest;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



import java.time.Duration;

import java.util.Arrays;
@@ -72,6 +74,8 @@ public class A2dpServiceTest { 
    private static final BluetoothDevice sTestDevice =

            sAdapter.getRemoteDevice("00:01:02:03:04:05");



    @Rule public MockitoRule mockitoRule = MockitoJUnit.rule();



    @Mock private A2dpNativeInterface mMockNativeInterface;

    @Mock private ActiveDeviceManager mActiveDeviceManager;

    @Mock private AdapterService mAdapterService;
@@ -84,8 +88,6 @@ public class A2dpServiceTest { 


    @Before

    public void setUp() throws Exception {

        // Set up mocks and test assets

        MockitoAnnotations.initMocks(this);

        mInOrder = inOrder(mAdapterService);



        TestUtils.mockGetSystemService(

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpStateMachineTest.java

+5 −3
Original line number Diff line number Diff line
@@ -42,11 +42,13 @@ import org.hamcrest.core.IsInstanceOf; 
import org.junit.After;

import org.junit.Assert;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



import java.util.Arrays;
@@ -64,6 +66,8 @@ public class A2dpStateMachineTest { 
    private BluetoothCodecConfig mCodecConfigAac;

    private BluetoothCodecConfig mCodecConfigOpus;



    @Rule public MockitoRule mockitoRule = MockitoJUnit.rule();



    @Mock private AdapterService mAdapterService;

    @Mock private ActiveDeviceManager mActiveDeviceManager;

    @Mock private SilenceDeviceManager mSilenceDeviceManager;
@@ -73,8 +77,6 @@ public class A2dpStateMachineTest { 
    @Before

    public void setUp() throws Exception {

        mTargetContext = InstrumentationRegistry.getTargetContext();

        // Set up mocks and test assets

        MockitoAnnotations.initMocks(this);

        doReturn(mActiveDeviceManager).when(mAdapterService).getActiveDeviceManager();

        doReturn(mSilenceDeviceManager).when(mAdapterService).getSilenceDeviceManager();