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

Commit 2c403db6 authored by Geoffrey Pitsch's avatar Geoffrey Pitsch
Browse files

Convert SysUI tests to use JUnit4 

Run tests with android.support.test.runner.AndroidJUnitRunner,
modification to runtest target in separate CL.

No longer inherit from TestCase, stripped unneeded code from
SysuiTestCase, which now assigns mContext via
InstrumentationRegistry.getTargetContext().

Can no longer create Handlers with default constructor,
Looper.myLooper() was never able to receive messages in tests
and it is now enforced that you pass the Looper.getMainLooper().

Change-Id: I13f499175a459cef1a554431911f4b21126e126e
parent c148ba90

packages/SystemUI/src/com/android/systemui/statusbar/policy/DataSaverController.java

+2 −1
Original line number Diff line number Diff line
@@ -18,13 +18,14 @@ import android.content.Context; 
import android.net.INetworkPolicyListener;

import android.net.NetworkPolicyManager;

import android.os.Handler;

import android.os.Looper;

import android.os.RemoteException;



import java.util.ArrayList;



public class DataSaverController {



    private final Handler mHandler = new Handler();

    private final Handler mHandler = new Handler(Looper.getMainLooper());

    private final ArrayList<Listener> mListeners = new ArrayList<>();

    private final NetworkPolicyManager mPolicyManager;

packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java

+6 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Intent; 
import android.net.NetworkCapabilities;

import android.net.wifi.WifiManager;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.Messenger;

import android.util.Log;
@@ -49,7 +50,7 @@ public class WifiSignalController extends 
        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);

        mWifiTracker = new WifiStatusTracker(mWifiManager);

        mHasMobileData = hasMobileData;

        Handler handler = new WifiHandler();

        Handler handler = new WifiHandler(Looper.getMainLooper());

        mWifiChannel = new AsyncChannel();

        Messenger wifiMessenger = mWifiManager.getWifiServiceMessenger();

        if (wifiMessenger != null) {
@@ -121,6 +122,10 @@ public class WifiSignalController extends 
     * Handler to receive the data activity on wifi.

     */

    private class WifiHandler extends Handler {

        WifiHandler(Looper looper) {

            super(looper);

        }



        @Override

        public void handleMessage(Message msg) {

            switch (msg.what) {

packages/SystemUI/tests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ 
    android-support-v17-leanback



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    mockito-target \

    SystemUI-proto-tags

packages/SystemUI/tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
            android:process=":killable" />

    </application>



    <instrumentation android:name="android.test.InstrumentationTestRunner"

    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.systemui.tests"

        android:label="Tests for SystemUI">

    </instrumentation>

packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java

+13 −7
Original line number Diff line number Diff line
@@ -15,17 +15,23 @@ 
 */

package com.android.systemui;



import android.content.Context;

import android.support.test.InstrumentationRegistry;

import android.test.AndroidTestCase;

import org.junit.Before;



/**

 * Base class that does System UI specific setup.

 */

public class SysuiTestCase extends AndroidTestCase {

    @Override

    protected void setUp() throws Exception {

        super.setUp();

        // Mockito stuff.

        System.setProperty("dexmaker.dexcache", mContext.getCacheDir().getPath());

        Thread.currentThread().setContextClassLoader(getClass().getClassLoader());

public class SysuiTestCase {

    protected Context mContext;



    @Before

    public void SysuiSetup() throws Exception {

        mContext = InstrumentationRegistry.getTargetContext();

    }



    protected Context getContext() {

        return mContext;

    }

}