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

Commit 94eece8e authored by Hieu Dang's avatar Hieu Dang Committed by Automerger Merge Worker
Browse files

Merge "Add BluetoothOppManagerTest" am: 5bd0c44b am: 6508f96b 

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



Change-Id: Iefb7c3aba8accb97aa9d519f71c6e11ec49a7669
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4c6256b4 6508f96b

android/app/src/com/android/bluetooth/BluetoothMethodProxy.java

+8 −0
Original line number Diff line number Diff line
@@ -81,6 +81,14 @@ public class BluetoothMethodProxy { 
        return contentResolver.query(contentUri, projection, selection, selectionArgs, sortOrder);

    }



    /**

     * Proxies {@link ContentResolver#insert(Uri, ContentValues)}.

     */

    public Uri contentResolverInsert(ContentResolver contentResolver, final Uri contentUri,

            final ContentValues contentValues) {

        return contentResolver.insert(contentUri, contentValues);

    }



    /**

     * Proxies {@link ContentResolver#update(Uri, ContentValues, String, String[])}.

     */

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

+20 −10
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import android.util.Pair; 


import com.android.bluetooth.BluetoothMethodProxy;

import com.android.bluetooth.R;

import com.android.internal.annotations.VisibleForTesting;



import java.util.ArrayList;

import java.util.Iterator;
@@ -62,7 +63,8 @@ public class BluetoothOppManager { 
    private static final String TAG = "BluetoothOppManager";

    private static final boolean V = Constants.VERBOSE;



    private static BluetoothOppManager sInstance;

    @VisibleForTesting

    static BluetoothOppManager sInstance;



    /** Used when obtaining a reference to the singleton instance. */

    private static final Object INSTANCE_LOCK = new Object();
@@ -73,17 +75,22 @@ public class BluetoothOppManager { 


    private BluetoothAdapter mAdapter;



    private String mMimeTypeOfSendingFile;

    @VisibleForTesting

    String mMimeTypeOfSendingFile;



    private String mUriOfSendingFile;

    @VisibleForTesting

    String mUriOfSendingFile;



    private String mMimeTypeOfSendingFiles;

    @VisibleForTesting

    String mMimeTypeOfSendingFiles;



    private ArrayList<Uri> mUrisOfSendingFiles;

    @VisibleForTesting

    ArrayList<Uri> mUrisOfSendingFiles;



    private boolean mIsHandoverInitiated;



    private static final String OPP_PREFERENCE_FILE = "OPPMGR";

    @VisibleForTesting

    static final String OPP_PREFERENCE_FILE = "OPPMGR";



    private static final String SENDING_FLAG = "SENDINGFLAG";
@@ -477,8 +484,10 @@ public class BluetoothOppManager { 
                    values.put(BluetoothShare.USER_CONFIRMATION,

                            BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED);

                }

                final Uri contentUri =

                        mContext.getContentResolver().insert(BluetoothShare.CONTENT_URI, values);

                final Uri contentUri = BluetoothMethodProxy.getInstance().contentResolverInsert(

                        mContext.getContentResolver(), BluetoothShare.CONTENT_URI, values

                );



                if (V) {

                    Log.v(TAG, "Insert contentUri: " + contentUri + "  to device: " + getDeviceName(

                            mRemoteDevice));
@@ -498,8 +507,9 @@ public class BluetoothOppManager { 
                values.put(BluetoothShare.USER_CONFIRMATION,

                        BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED);

            }

            final Uri contentUri =

                    mContext.getContentResolver().insert(BluetoothShare.CONTENT_URI, values);

            final Uri contentUri = BluetoothMethodProxy.getInstance().contentResolverInsert(

                    mContext.getContentResolver(), BluetoothShare.CONTENT_URI, values

            );

            if (V) {

                Log.v(TAG, "Insert contentUri: " + contentUri + "  to device: " + getDeviceName(

                        mRemoteDevice));

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

+3 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import android.util.Log; 


import com.android.bluetooth.BluetoothMethodProxy;

import com.android.bluetooth.R;

import com.android.internal.annotations.VisibleForTesting;



import java.io.File;

import java.io.IOException;
@@ -77,7 +78,8 @@ public class BluetoothOppUtility { 
    /** Whether the device has the "nosdcard" characteristic, or null if not-yet-known. */

    private static Boolean sNoSdCard = null;



    private static final ConcurrentHashMap<Uri, BluetoothOppSendFileInfo> sSendFileMap =

    @VisibleForTesting

    static final ConcurrentHashMap<Uri, BluetoothOppSendFileInfo> sSendFileMap =

            new ConcurrentHashMap<Uri, BluetoothOppSendFileInfo>();



    public static boolean isBluetoothShareUri(Uri uri) {

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

0 → 100644
+192 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.bluetooth.opp;



import static com.android.bluetooth.opp.BluetoothOppManager.OPP_PREFERENCE_FILE;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.any;

import static org.mockito.Mockito.nullable;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.verify;



import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothManager;

import android.content.ContentValues;

import android.content.Context;

import android.content.ContextWrapper;

import android.net.Uri;



import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import com.android.bluetooth.BluetoothMethodProxy;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.MockitoAnnotations;

import org.mockito.Spy;



import java.util.ArrayList;

import java.util.List;



@RunWith(AndroidJUnit4.class)

public class BluetoothOppManagerTest {

    Context mContext;

    @Spy

    BluetoothMethodProxy mCallProxy = BluetoothMethodProxy.getInstance();



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = spy(new ContextWrapper(

                InstrumentationRegistry.getInstrumentation().getTargetContext()));



        BluetoothMethodProxy.setInstanceForTesting(mCallProxy);

    }



    @After

    public void tearDown() {

        BluetoothMethodProxy.setInstanceForTesting(null);

        BluetoothOppUtility.sSendFileMap.clear();

        mContext.getSharedPreferences(OPP_PREFERENCE_FILE, 0).edit().clear().apply();

        BluetoothOppManager.sInstance = null;

    }



    @Test

    public void

    restoreApplicationData_afterSavingSingleSendingFileInfo_containsSendingFileInfoSaved() {

        BluetoothOppManager bluetoothOppManager = BluetoothOppManager.getInstance(mContext);

        bluetoothOppManager.mSendingFlag = true;

        bluetoothOppManager.saveSendingFileInfo("text/plain", "content:///abc/xyz.txt", false,

                true);



        BluetoothOppManager.sInstance = null;

        BluetoothOppManager restartedBluetoothOppManager = BluetoothOppManager.getInstance(

                mContext);

        assertThat(bluetoothOppManager.mSendingFlag).isEqualTo(

                restartedBluetoothOppManager.mSendingFlag);

        assertThat(bluetoothOppManager.mMultipleFlag).isEqualTo(

                restartedBluetoothOppManager.mMultipleFlag);

        assertThat(bluetoothOppManager.mUriOfSendingFile).isEqualTo(

                restartedBluetoothOppManager.mUriOfSendingFile);

        assertThat(bluetoothOppManager.mUrisOfSendingFiles).isEqualTo(

                restartedBluetoothOppManager.mUrisOfSendingFiles);

        assertThat(bluetoothOppManager.mMimeTypeOfSendingFile).isEqualTo(

                restartedBluetoothOppManager.mMimeTypeOfSendingFile);

        assertThat(bluetoothOppManager.mMimeTypeOfSendingFiles).isEqualTo(

                restartedBluetoothOppManager.mMimeTypeOfSendingFiles);

    }



    @Test

    public void

    restoreApplicationData_afterSavingMultipleSendingFileInfo_containsSendingFileInfoSaved() {

        BluetoothOppManager bluetoothOppManager = BluetoothOppManager.getInstance(mContext);

        bluetoothOppManager.mSendingFlag = true;

        bluetoothOppManager.saveSendingFileInfo("text/plain", new ArrayList<Uri>(

                        List.of(Uri.parse("content:///abc/xyz.txt"), Uri.parse("content:///123"

                                + "/456.txt"))),

                false, true);



        BluetoothOppManager.sInstance = null;

        BluetoothOppManager restartedBluetoothOppManager = BluetoothOppManager.getInstance(

                mContext);

        assertThat(bluetoothOppManager.mSendingFlag).isEqualTo(

                restartedBluetoothOppManager.mSendingFlag);

        assertThat(bluetoothOppManager.mMultipleFlag).isEqualTo(

                restartedBluetoothOppManager.mMultipleFlag);

        assertThat(bluetoothOppManager.mUriOfSendingFile).isEqualTo(

                restartedBluetoothOppManager.mUriOfSendingFile);

        assertThat(bluetoothOppManager.mUrisOfSendingFiles).isEqualTo(

                restartedBluetoothOppManager.mUrisOfSendingFiles);

        assertThat(bluetoothOppManager.mMimeTypeOfSendingFile).isEqualTo(

                restartedBluetoothOppManager.mMimeTypeOfSendingFile);

        assertThat(bluetoothOppManager.mMimeTypeOfSendingFiles).isEqualTo(

                restartedBluetoothOppManager.mMimeTypeOfSendingFiles);

    }



    @Test

    public void isAcceptedList_inAcceptList_returnsTrue() {

        BluetoothOppManager bluetoothOppManager = BluetoothOppManager.getInstance(mContext);

        String address1 = "AA:BB:CC:DD:EE:FF";

        String address2 = "00:11:22:33:44:55";



        bluetoothOppManager.addToAcceptlist(address1);

        bluetoothOppManager.addToAcceptlist(address2);

        assertThat(bluetoothOppManager.isAcceptlisted(address1)).isTrue();

        assertThat(bluetoothOppManager.isAcceptlisted(address2)).isTrue();

    }



    @Test

    public void isAcceptedList_notInAcceptList_returnsFalse() {

        BluetoothOppManager bluetoothOppManager = BluetoothOppManager.getInstance(mContext);

        String address = "01:23:45:67:89:AB";



        assertThat(bluetoothOppManager.isAcceptlisted(address)).isFalse();



        bluetoothOppManager.addToAcceptlist(address);

        assertThat(bluetoothOppManager.isAcceptlisted(address)).isTrue();

    }



    @Test

    public void startTransfer_withMultipleUris_contentResolverInsertMultipleTimes() {

        BluetoothOppManager bluetoothOppManager = BluetoothOppManager.getInstance(mContext);

        String address = "AA:BB:CC:DD:EE:FF";

        bluetoothOppManager.saveSendingFileInfo("text/plain", new ArrayList<Uri>(

                List.of(Uri.parse("content:///abc/xyz.txt"),

                        Uri.parse("content:///a/b/c/d/x/y/z.docs"),

                        Uri.parse("content:///123/456.txt"))), false, true);

        BluetoothDevice device = (mContext.getSystemService(BluetoothManager.class))

                .getAdapter().getRemoteDevice(address);

        bluetoothOppManager.startTransfer(device);

        // add 2 files

        verify(mCallProxy, timeout(5_000)

                .times(3)).contentResolverInsert(any(), nullable(Uri.class),

                nullable(ContentValues.class));

    }



    @Test

    public void startTransfer_withOneUri_contentResolverInsertOnce() {

        BluetoothOppManager bluetoothOppManager = BluetoothOppManager.getInstance(mContext);

        String address = "AA:BB:CC:DD:EE:FF";

        bluetoothOppManager.saveSendingFileInfo("text/plain", "content:///abc/xyz.txt",

                false, true);

        BluetoothDevice device = (mContext.getSystemService(BluetoothManager.class))

                .getAdapter().getRemoteDevice(address);

        bluetoothOppManager.startTransfer(device);

        // add 2 files

        verify(mCallProxy, timeout(5_000).times(1)).contentResolverInsert(any(),

                nullable(Uri.class), nullable(ContentValues.class));

    }



    @Test

    public void cleanUpSendingFileInfo_fileInfoCleaned() {

        BluetoothOppUtility.sSendFileMap.clear();

        Uri uri = Uri.parse("content:///a/new/folder/abc/xyz.txt");

        assertThat(BluetoothOppUtility.sSendFileMap.size()).isEqualTo(0);

        BluetoothOppManager.getInstance(mContext).saveSendingFileInfo("text/plain",

                uri.toString(), false, true);

        assertThat(BluetoothOppUtility.sSendFileMap.size()).isEqualTo(1);



        BluetoothOppManager.getInstance(mContext).cleanUpSendingFileInfo();

        assertThat(BluetoothOppUtility.sSendFileMap.size()).isEqualTo(0);

    }

}