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

Commit f2918025 authored by Hyundo Moon's avatar Hyundo Moon Committed by Automerger Merge Worker
Browse files

Merge "Fix flaky BluetoothOppBtEnablingActivityTest#onKeyDown_cancelProgress"... 

Merge "Fix flaky BluetoothOppBtEnablingActivityTest#onKeyDown_cancelProgress" into main am: d4a273aa

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2836298



Change-Id: Id4402fe227492175dfafce8742bab82c6c477d79
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b06e96b3 d4a273aa

android/app/tests/unit/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivityTest.java

+26 −14
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import org.mockito.Mockito; 
import org.mockito.MockitoAnnotations;

import org.mockito.Spy;



import java.util.concurrent.atomic.AtomicBoolean;



@RunWith(AndroidJUnit4.class)

public class BluetoothOppBtEnablingActivityTest {
@@ -117,14 +118,20 @@ public class BluetoothOppBtEnablingActivityTest { 
        ActivityScenario<BluetoothOppBtEnablingActivity> activityScenario = ActivityScenario.launch(

                mIntent);



        activityScenario.onActivity(activity -> {

            activity.onKeyDown(KeyEvent.KEYCODE_BACK,

        AtomicBoolean finishCalled = new AtomicBoolean(false);



        activityScenario.onActivity(

                activity -> {

                    activity.onKeyDown(

                            KeyEvent.KEYCODE_BACK,

                            new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK));

                    // Should be cancelled immediately

                    BluetoothOppManager mOppManager = BluetoothOppManager.getInstance(activity);

                    assertThat(mOppManager.mSendingFlag).isEqualTo(false);



                    finishCalled.set(activity.isFinishing());

                });

        assertActivityState(activityScenario, DESTROYED);

        assertThat(finishCalled.get()).isTrue();

    }



    @Test
@@ -140,12 +147,17 @@ public class BluetoothOppBtEnablingActivityTest { 
        doReturn(false).when(mBluetoothMethodProxy).bluetoothAdapterIsEnabled(any());

        ActivityScenario<BluetoothOppBtEnablingActivity> activityScenario = ActivityScenario.launch(

                mIntent);

        activityScenario.onActivity(activity -> {



        AtomicBoolean finishCalled = new AtomicBoolean(false);

        activityScenario.onActivity(

                activity -> {

                    Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);

                    intent.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_ON);

                    activity.mBluetoothReceiver.onReceive(mTargetContext, intent);



                    finishCalled.set(activity.isFinishing());

                });

        assertActivityState(activityScenario, DESTROYED);

        assertThat(finishCalled.get()).isTrue();

    }



    private void assertActivityState(ActivityScenario activityScenario, Lifecycle.State state)