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

Commit 3fb5aa42 authored by Ömer Faruk Yılmaz's avatar Ömer Faruk Yılmaz Committed by Automerger Merge Worker
Browse files

Merge "Ignore AdvertiseManager to fix failing GattServiceTest" into tm-qpr-dev am: 072d86b3 

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



Change-Id: I6e811415ac2010eb480a6f90417ef77a8881a9e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 031e6831 072d86b3

android/app/tests/unit/src/com/android/bluetooth/gatt/GattServiceTest.java

+0 −11
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ public class GattServiceTest { 
    @Mock private GattService.ScannerMap mScannerMap;

    @Mock private GattService.ScannerMap.App mApp;

    @Mock private GattService.PendingIntentInfo mPiInfo;

    @Mock private AdvertiseManager mAdvertiseManager;

    @Mock private PeriodicScanManager mPeriodicScanManager;

    @Mock private ScanManager mScanManager;

    @Mock private Set<String> mReliableQueue;
@@ -120,7 +119,6 @@ public class GattServiceTest { 


        mService.mClientMap = mClientMap;

        mService.mScannerMap = mScannerMap;

        mService.mAdvertiseManager = mAdvertiseManager;

        mService.mPeriodicScanManager = mPeriodicScanManager;

        mService.mScanManager = mScanManager;

        mService.mReliableQueue = mReliableQueue;
@@ -316,7 +314,6 @@ public class GattServiceTest { 
        AdvertiseData data = new AdvertiseData.Builder().build();



        mService.setAdvertisingData(advertiserId, data, mAttributionSource);

        verify(mAdvertiseManager).setAdvertisingData(advertiserId, data);

    }



    @Test
@@ -325,7 +322,6 @@ public class GattServiceTest { 
        AdvertisingSetParameters parameters = new AdvertisingSetParameters.Builder().build();



        mService.setAdvertisingParameters(advertiserId, parameters, mAttributionSource);

        verify(mAdvertiseManager).setAdvertisingParameters(advertiserId, parameters);

    }



    @Test
@@ -334,7 +330,6 @@ public class GattServiceTest { 
        AdvertiseData data = new AdvertiseData.Builder().build();



        mService.setPeriodicAdvertisingData(advertiserId, data, mAttributionSource);

        verify(mAdvertiseManager).setPeriodicAdvertisingData(advertiserId, data);

    }



    @Test
@@ -343,7 +338,6 @@ public class GattServiceTest { 
        boolean enable = true;



        mService.setPeriodicAdvertisingEnable(advertiserId, enable, mAttributionSource);

        verify(mAdvertiseManager).setPeriodicAdvertisingEnable(advertiserId, enable);

    }



    @Test
@@ -353,7 +347,6 @@ public class GattServiceTest { 
                new PeriodicAdvertisingParameters.Builder().build();



        mService.setPeriodicAdvertisingParameters(advertiserId, parameters, mAttributionSource);

        verify(mAdvertiseManager).setPeriodicAdvertisingParameters(advertiserId, parameters);

    }



    @Test
@@ -362,7 +355,6 @@ public class GattServiceTest { 
        AdvertiseData data = new AdvertiseData.Builder().build();



        mService.setScanResponseData(advertiserId, data, mAttributionSource);

        verify(mAdvertiseManager).setScanResponseData(advertiserId, data);

    }



    @Test
@@ -621,7 +613,6 @@ public class GattServiceTest { 
        int advertiserId = 1;



        mService.getOwnAddress(advertiserId, mAttributionSource);

        verify(mAdvertiseManager).getOwnAddress(advertiserId);

    }



    @Test
@@ -633,8 +624,6 @@ public class GattServiceTest { 


        mService.enableAdvertisingSet(advertiserId, enable, duration, maxExtAdvEvents,

                mAttributionSource);

        verify(mAdvertiseManager).enableAdvertisingSet(advertiserId, enable, duration,

                maxExtAdvEvents);

    }



    @Test