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

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

Merge "BluetoothProfileConnectorTest: Use Mockito.verifyNoMoreInteractions... 

Merge "BluetoothProfileConnectorTest: Use Mockito.verifyNoMoreInteractions instead of InOrder" into main am: 1f63b194

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



Change-Id: I37bf1cf26c3e8c18a70a2ed6279b599f5b83e247
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 879f47bb 1f63b194

framework/tests/unit/src/android/bluetooth/BluetoothProfileConnectorTest.java

+5 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static org.mockito.Mockito.anyInt; 
import static org.mockito.Mockito.inOrder;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.verifyZeroInteractions;



import android.content.ComponentName;
@@ -140,7 +141,7 @@ public class BluetoothProfileConnectorTest { 
        InOrder order = inOrder(listener);

        order.verify(listener).onServiceConnected(anyInt(), any());

        order.verify(listener).onServiceDisconnected(anyInt());

        order.verifyNoMoreInteractions();

        verifyNoMoreInteractions(listener);

    }



    @Test
@@ -175,7 +176,7 @@ public class BluetoothProfileConnectorTest { 
        InOrder order = inOrder(listener);

        // TODO(b/309635805): This should not be here

        order.verify(listener).onServiceDisconnected(anyInt());

        order.verifyNoMoreInteractions();

        verifyNoMoreInteractions(listener);

    }



    @Test
@@ -195,7 +196,7 @@ public class BluetoothProfileConnectorTest { 
        InOrder order = inOrder(listener);

        // TODO(b/309635805): This should not be here

        order.verify(listener).onServiceDisconnected(anyInt());

        order.verifyNoMoreInteractions();

        verifyNoMoreInteractions(listener);

    }



    @Test
@@ -221,6 +222,6 @@ public class BluetoothProfileConnectorTest { 
        order.verify(listener).onServiceConnected(anyInt(), any());

        // TODO(b/309635805): Should be only one

        order.verify(listener, times(2)).onServiceDisconnected(anyInt());

        order.verifyNoMoreInteractions();

        verifyNoMoreInteractions(listener);

    }

}