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

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

Merge "Ignore failing tests in android.bluetooth.opp" am: b1c78254 

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



Change-Id: Ie111ead424a3f4bef6c312c25267913fc8127c4c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d935477 b1c78254

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

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.bluetooth.BluetoothMethodProxy; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mockito;
@@ -80,6 +81,7 @@ public class BluetoothOppBtEnablingActivityTest { 
        BluetoothOppTestUtils.enableOppActivities(false, mTargetContext);

    }



    @Ignore("b/277594572")

    @Test

    public void onCreate_bluetoothEnableTimeout_finishAfterTimeout() throws Exception {

        int spedUpTimeoutValue = 1000;

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

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.google.common.base.Objects; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -177,6 +178,7 @@ public class IncomingFileConfirmActivityTest { 
        ), nullable(String.class), nullable(String[].class));

    }



    @Ignore("b/277593460")

    @Test

    public void onTimeout_sendIntentWithUSER_CONFIRMATION_TIMEOUT_ACTION_finish() throws Exception {

        BluetoothOppTestUtils.setUpMockCursor(mCursor, mCursorMockDataList);