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

Commit abbc672a authored by Jun's avatar Jun Committed by android-build-merger
Browse files

Merge "adding FlakyTest annotation to flaky tests" 

am: 8123ae73

Change-Id: I96d8b9dd9570b70b8f76eebeee41d9ea81e8db3d
parents 7b78bbcb 8123ae73

android/app/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.support.v4.media.session.MediaControllerCompat; 
import android.support.v4.media.session.PlaybackStateCompat;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.MediumTest;

import androidx.test.rule.ServiceTestRule;

import androidx.test.runner.AndroidJUnit4;
@@ -193,6 +194,7 @@ public class AvrcpControllerStateMachineTest { 
     * Test to confirm that a browsing only device can be established (no control)

     */

    @Test

    @FlakyTest

    public void testBrowsingOnly() {

        Assert.assertEquals(0, mAvrcpControllerService.sBrowseTree.mRootNode.getChildrenCount());

        int numBroadcastsSent = setUpConnectedState(false, true);
@@ -343,6 +345,7 @@ public class AvrcpControllerStateMachineTest { 
     * Test media browser fast forward command

     */

    @Test

    @FlakyTest

    public void testFastForward() throws Exception {

        setUpConnectedState(true, true);

        MediaControllerCompat.TransportControls transportControls =
@@ -451,6 +454,7 @@ public class AvrcpControllerStateMachineTest { 
     * Verify that the contents of a player are fetched upon request

     */

    @Test

    @FlakyTest

    public void testBrowsingCommands() {

        setUpConnectedState(true, true);

        final String rootName = "__ROOT__";

android/app/tests/unit/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachineTest.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.os.Message; 


import androidx.test.InstrumentationRegistry;

import androidx.test.espresso.intent.matcher.IntentMatchers;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.LargeTest;

import androidx.test.filters.MediumTest;

import androidx.test.filters.SmallTest;
@@ -236,6 +237,7 @@ public class HeadsetClientStateMachineTest { 
     */

    @LargeTest

    @Test

    @FlakyTest

    public void testInBandRingtone() {

        // Return true for priority.

        when(mHeadsetClientService.getConnectionPolicy(any(BluetoothDevice.class))).thenReturn(

android/app/tests/unit/src/com/android/bluetooth/mapclient/MapClientTest.java

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.bluetooth.BluetoothProfile; 
import android.content.Context;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.MediumTest;

import androidx.test.rule.ServiceTestRule;

import androidx.test.runner.AndroidJUnit4;
@@ -137,6 +138,7 @@ public class MapClientTest { 
     * Test that a PRIORITY_OFF device is not connected to

     */

    @Test

    @FlakyTest

    public void testConnectPriorityOffDevice() {

        // make sure there is no statemachine already defined for this device

        BluetoothDevice device = makeBluetoothDevice("11:11:11:11:11:11");