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

Commit e79ebc3d authored by David Duarte's avatar David Duarte
Browse files

BluetoothProfileConnectorTest: Use Mockito.verifyNoMoreInteractions instead of InOrder 

InOrder.verifyNoMoreInteractions only verifies that there we no more interaction in order, see
https://www.javadoc.io/doc/org.mockito/mockito-core/2.6.9/org/mockito/InOrder.html#verifyNoMoreInteractions()

Test: atest BluetoothProfileConnectorTest
Bug: 305741984
Change-Id: I5599ae536a0d58e7609430e14a914f986edd9a19
parent d6a6c6b0

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);

    }

}