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

Commit 78ca25fb authored by Hyundo Moon's avatar Hyundo Moon Committed by Cherrypicker Worker
Browse files

Fix MapClientTest#testConnect 

The variable 'mMapInstanceMap' was not cleared
when service is stopped, which resulted testConnect fail
if a previous test added any key.

Bug: 264224883
Test: atest MapClientServiceTest#broadcastReceiver_withActionAclDisconnected_whenConnected_callsDisconnect \
             MapClientTest#testConnect
Change-Id: Ib9da20e0b00c23345b892f6eec680d2b44972349
(cherry picked from commit 6fde1b21)
Merged-In: Ib9da20e0b00c23345b892f6eec680d2b44972349
parent 04ca17d1

android/app/src/com/android/bluetooth/mapclient/MapClientService.java

+1 −7
Original line number Diff line number Diff line
@@ -166,9 +166,6 @@ public class MapClientService extends ProfileService { 
    }



    private synchronized void addDeviceToMapAndConnect(BluetoothDevice device) {

        if (Utils.isInstrumentationTestMode()) {

            Log.d(TAG, "addDeviceToMapAndConnect: device=" + device, new Exception());

        }

        // When creating a new statemachine, its state is set to CONNECTING - which will trigger

        // connect.

        MceStateMachine mapStateMachine = new MceStateMachine(this, device);
@@ -358,6 +355,7 @@ public class MapClientService extends ProfileService { 
            }

            stateMachine.doQuit();

        }

        mMapInstanceMap.clear();

        return true;

    }
@@ -367,10 +365,6 @@ public class MapClientService extends ProfileService { 
            Log.d(TAG, "in Cleanup");

        }

        removeUncleanAccounts();

        mMapInstanceMap.clear();

        if (Utils.isInstrumentationTestMode()) {

            Log.d(TAG, "cleanup() called.", new Exception());

        }

        // TODO(b/72948646): should be moved to stop()

        setMapClientService(null);

    }

android/app/tests/unit/src/com/android/bluetooth/mapclient/MapClientTest.java

+0 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.bluetooth.BluetoothProfile; 
import android.bluetooth.IBluetoothMapClient;

import android.content.Context;

import android.os.UserHandle;

import android.util.Log;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.MediumTest;
@@ -123,7 +122,6 @@ public class MapClientTest { 


        // is the statemachine created

        Map<BluetoothDevice, MceStateMachine> map = mService.getInstanceMap();

        Log.d("MapClientTest", "map=" + map);



        Assert.assertEquals(1, map.size());

        Assert.assertNotNull(map.get(device));