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

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

Merge "Skip some OppTransferHistory tests in watch devices" into main am: 2f9c2808 

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



Change-Id: If6f50658459a5996e934638c206617cb9cdb2cf0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6cf59ad8 2f9c2808

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

+15 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import static org.mockito.Mockito.verify; 


import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.database.Cursor;

import android.net.Uri;

import android.view.MenuItem;
@@ -47,6 +48,7 @@ import com.android.bluetooth.TestUtils; 
import com.google.common.base.Objects;



import org.junit.After;

import org.junit.Assume;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;
@@ -135,7 +137,11 @@ public class BluetoothOppTransferHistoryTest { 
    }



    @Test

    public void onCreate_withDirectionInbound_withExtraShowAllFileIsTrue_displayLiveFolder() {

    public void onCreate_withDirectionInbound_withExtraShowAllFileIsTrue_displayLiveFolder()

            throws Exception {

        Assume.assumeFalse(

                mTargetContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH));



        BluetoothOppTestUtils.setUpMockCursor(mCursor, mCursorMockDataList);

        mIntent.putExtra(Constants.EXTRA_SHOW_ALL_FILES, true);

        mIntent.putExtra("direction", BluetoothShare.DIRECTION_INBOUND);
@@ -148,6 +154,9 @@ public class BluetoothOppTransferHistoryTest { 


    @Test

    public void onCreate_withDirectionInbound_withExtraShowAllFileIsFalse_displayInboundHistory() {

        Assume.assumeFalse(

                mTargetContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH));



        BluetoothOppTestUtils.setUpMockCursor(mCursor, mCursorMockDataList);

        mIntent.putExtra(Constants.EXTRA_SHOW_ALL_FILES, false);

        mIntent.putExtra("direction", BluetoothShare.DIRECTION_INBOUND);
@@ -161,6 +170,9 @@ public class BluetoothOppTransferHistoryTest { 


    @Test

    public void onCreate_withDirectionOutbound_displayOutboundHistory() {

        Assume.assumeFalse(

                mTargetContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH));



        BluetoothOppTestUtils.setUpMockCursor(mCursor, mCursorMockDataList);

        mCursorMockDataList.set(1,

                new BluetoothOppTestUtils.CursorMockData(BluetoothShare.DIRECTION, 2,
@@ -175,6 +187,7 @@ public class BluetoothOppTransferHistoryTest { 
                matches(isDisplayed()));

    }



    // TODO: Check whether watch devices can pass this test

    @Ignore("b/268424815")

    @Test

    public void onOptionsItemSelected_clearAllSelected_promptWarning() {