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

Commit 0c3d08d6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Try to work on test flakyness." into oc-dr1-dev

parents 2f87ca16 b05395f5

packages/SystemUI/tests/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
    <uses-permission android:name="android.permission.CONTROL_VPN" />

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.GET_APP_OPS_STATS" />

    <uses-permission android:name="android.permission.BLUETOOTH" />



    <application>

        <uses-library android:name="android.test.runner" />

packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServicesTest.java

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ import android.testing.AndroidTestingRunner; 
import com.android.systemui.SysuiTestCase;

import com.android.systemui.qs.QSTileHost;

import com.android.systemui.statusbar.phone.StatusBarIconController;

import com.android.systemui.statusbar.policy.BluetoothController;



import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;
@@ -52,6 +54,7 @@ public class TileServicesTest extends SysuiTestCase { 


    @Before

    public void setUp() throws Exception {

        mDependency.injectMockDependency(BluetoothController.class);

        mManagers = new ArrayList<>();

        QSTileHost host = new QSTileHost(mContext, null,

                mock(StatusBarIconController.class));

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.os.CancellationSignal; 
import android.os.Handler;

import android.os.Looper;

import android.service.notification.StatusBarNotification;

import android.support.test.InstrumentationRegistry;

import android.support.test.annotation.UiThreadTest;

import android.support.test.filters.FlakyTest;

import android.support.test.filters.SmallTest;
@@ -40,9 +39,9 @@ import android.widget.RemoteViews; 
import com.android.systemui.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.statusbar.ExpandableNotificationRow;

import com.android.systemui.statusbar.InflationTask;

import com.android.systemui.statusbar.NotificationData;

import com.android.systemui.statusbar.NotificationTestHelper;

import com.android.systemui.statusbar.InflationTask;



import org.junit.Assert;

import org.junit.Before;
@@ -150,6 +149,7 @@ public class NotificationInflaterTest extends SysuiTestCase { 
    }



    @Test

    @Ignore

    public void testInflationIsRetriedIfAsyncFails() throws Exception {

        NotificationInflater.InflationProgress result =

                new NotificationInflater.InflationProgress();