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

Commit 873711af authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Fix tests and tag them for continuous testage" into nyc-dev am: 1ed1bb0f 

am: 41eb41b0

* commit '41eb41b0':
  Fix tests and tag them for continuous testage

Change-Id: If24f618626ba2c4a8b318d08d44818e8cac7561e
parents 781793da 41eb41b0

packages/SystemUI/tests/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />

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

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

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

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



    <application>

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

packages/SystemUI/tests/src/com/android/systemui/qs/TouchAnimatorTests.java

+2 −0
Original line number Diff line number Diff line
@@ -14,11 +14,13 @@ 


package com.android.systemui.qs;



import android.test.suitebuilder.annotation.SmallTest;

import android.view.View;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.qs.TouchAnimator.Listener;

import org.mockito.Mockito;



@SmallTest

public class TouchAnimatorTests extends SysuiTestCase {



    private Listener mTouchListener;

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

+2 −0
Original line number Diff line number Diff line
@@ -32,9 +32,11 @@ import android.service.quicksettings.IQSService; 
import android.service.quicksettings.IQSTileService;

import android.service.quicksettings.Tile;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.ArraySet;

import android.util.Log;



@SmallTest

public class TileLifecycleManagerTests extends AndroidTestCase {

    public static final String TILE_UPDATE_BROADCAST = "com.android.systemui.tests.TILE_UPDATE";

    public static final String EXTRA_CALLBACK = "callback";

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

+2 −0
Original line number Diff line number Diff line
@@ -19,10 +19,12 @@ import android.content.ComponentName; 
import android.os.Handler;

import android.os.HandlerThread;

import android.service.quicksettings.TileService;

import android.test.suitebuilder.annotation.SmallTest;

import com.android.systemui.SysuiTestCase;

import org.mockito.ArgumentCaptor;

import org.mockito.Mockito;



@SmallTest

public class TileServiceManagerTests extends SysuiTestCase {



    private TileServices mTileServices;

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

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.systemui.qs.external; 


import android.content.ComponentName;

import android.os.Looper;

import android.test.suitebuilder.annotation.SmallTest;

import com.android.systemui.SysuiTestCase;

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

import com.android.systemui.statusbar.policy.DataSaverController;
@@ -27,6 +28,7 @@ import org.mockito.Mockito; 


import java.util.ArrayList;



@SmallTest

public class TileServicesTests extends SysuiTestCase {

    private static int NUM_FAKES = TileServices.DEFAULT_MAX_BOUND * 2;