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

Commit 1f63b194 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "BluetoothProfileConnectorTest: Use Mockito.verifyNoMoreInteractions... 

Merge "BluetoothProfileConnectorTest: Use Mockito.verifyNoMoreInteractions instead of InOrder" into main
parents 54f7e54c e79ebc3d

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

+5 −4
Original line number Original line 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.inOrder;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.verifyZeroInteractions;

import static org.mockito.Mockito.verifyZeroInteractions;





import android.content.ComponentName;

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

        InOrder order = inOrder(listener);

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

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

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

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

        order.verifyNoMoreInteractions();

        verifyNoMoreInteractions(listener);

    }

    }





    @Test

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

        InOrder order = inOrder(listener);

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

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

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

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

        order.verifyNoMoreInteractions();

        verifyNoMoreInteractions(listener);

    }

    }





    @Test

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

        InOrder order = inOrder(listener);

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

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

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

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

        order.verifyNoMoreInteractions();

        verifyNoMoreInteractions(listener);

    }

    }





    @Test

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

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

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

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

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

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

        order.verifyNoMoreInteractions();

        verifyNoMoreInteractions(listener);

    }

    }

}
 
}