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

Commit b9cd92c4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I270939ab,Ie6958d9b into tm-qpr-dev am: e06ec351 

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



Change-Id: I8ea9d0c61b5ba6bc0b935dcfa4cdddf7c2403ac2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6038abfa e06ec351

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

+3 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.bluetooth.R; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;
@@ -65,7 +66,6 @@ import org.mockito.MockitoAnnotations; 


import java.io.File;





@MediumTest

@RunWith(AndroidJUnit4.class)

public class BluetoothOppLauncherActivityTest {
@@ -151,6 +151,7 @@ public class BluetoothOppLauncherActivityTest { 
        intended(hasComponent(BluetoothOppBtEnableActivity.class.getName()));

    }



    @Ignore("b/263724420")

    @Test

    public void launchDevicePicker_bluetoothEnabled_launchActivity() throws Exception {

        doReturn(true).when(mMethodProxy).bluetoothAdapterIsEnabled(any());
@@ -185,6 +186,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());