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

Commit dd65dcdf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix a test in BluetoothOppLauncherActivityTest"" am: 4e3491bc... 

Merge "Revert "Fix a test in BluetoothOppLauncherActivityTest"" am: 4e3491bc am: 73d04af3 am: 3eaee0f3 am: b1d9dea8

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



Change-Id: I5479c8eb10293cd87967f68166246eb4b07c559d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54e7d1f8 b1d9dea8

android/app/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -422,8 +422,7 @@ public class BluetoothOppLauncherActivity extends Activity { 
            launchDevicePicker();

            finish();

        } catch (IllegalArgumentException exception) {

            String message = exception.getMessage();

            showToast(message != null ? message : "IllegalArgumentException");

            showToast(exception.getMessage());

            finish();

        }

    }

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

+16 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import static androidx.test.espresso.matcher.ViewMatchers.withText; 
import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.doThrow;

import static org.mockito.Mockito.spy;
@@ -188,6 +187,7 @@ public class BluetoothOppLauncherActivityTest { 
        assertThat(file.length()).isGreaterThan(shareContent.length());

    }



    @Ignore("b/263754734")

    @Test

    public void sendFileInfo_finishImmediately() throws Exception {

        doReturn(true).when(mMethodProxy).bluetoothAdapterIsEnabled(any());
@@ -195,7 +195,7 @@ public class BluetoothOppLauncherActivityTest { 
        mIntent.setAction("unsupported-action");

        ActivityScenario<BluetoothOppLauncherActivity> scenario = ActivityScenario.launch(mIntent);

        doThrow(new IllegalArgumentException()).when(mBluetoothOppManager).saveSendingFileInfo(

                any(), any(String.class), anyBoolean(), anyBoolean());

                any(), any(String.class), any(), any());

        scenario.onActivity(activity -> {

            activity.sendFileInfo("text/plain", "content:///abc.txt", false, false);

        });
@@ -208,4 +208,18 @@ public class BluetoothOppLauncherActivityTest { 
        Thread.sleep(2_000);

        assertThat(activityScenario.getState()).isEqualTo(state);

    }





    private void enableActivity(boolean enable) {

        int enabledState = enable ? COMPONENT_ENABLED_STATE_ENABLED

                : COMPONENT_ENABLED_STATE_DEFAULT;



        mTargetContext.getPackageManager().setApplicationEnabledSetting(

                mTargetContext.getPackageName(), enabledState, DONT_KILL_APP);



        ComponentName activityName = new ComponentName(mTargetContext,

                BluetoothOppLauncherActivity.class);

        mTargetContext.getPackageManager().setComponentEnabledSetting(

                activityName, enabledState, DONT_KILL_APP);

    }

}