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

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

Merge "Make a strong reference to LifecycleOwner in tests"

parents 6d42a716 4e08869e

tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java

+8 −8
Original line number Diff line number Diff line
@@ -17,15 +17,14 @@ 
package com.android.settings.accounts;



import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Matchers.anyString;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.when;



import android.accounts.Account;

import android.app.Activity;

import android.arch.lifecycle.LifecycleOwner;

import android.content.Context;

import android.os.Bundle;

import android.os.UserHandle;
@@ -74,8 +73,8 @@ public class AccountHeaderPreferenceControllerTest { 


    private AccountHeaderPreferenceController mController;



    private Lifecycle mLifecycle =

            new Lifecycle(() -> AccountHeaderPreferenceControllerTest.this.mLifecycle);

    private LifecycleOwner mLifecycleOwner;

    private Lifecycle mLifecycle;



    @Before

    public void setUp() {
@@ -84,7 +83,8 @@ public class AccountHeaderPreferenceControllerTest { 
        mHeaderPreference = new LayoutPreference(

                RuntimeEnvironment.application, R.layout.settings_entity_header);

        doReturn(mContext).when(mActivity).getApplicationContext();

        mLifecycle = new Lifecycle(() -> mLifecycle);

        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = new Lifecycle(mLifecycleOwner);

    }



    @Test

tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java

+4 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.Matchers.eq; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.arch.lifecycle.LifecycleOwner;

import android.content.ContentResolver;

import android.content.Context;

import android.provider.Settings;
@@ -57,13 +58,15 @@ public class AssistContextPreferenceControllerTest { 
    private AssistContextPreferenceController.SettingObserver mObserver;

    private Context mContext;

    private AssistContextPreferenceController mController;

    private LifecycleOwner mLifecycleOwner;

    private Lifecycle mLifecycle;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        when(mScreen.findPreference(anyString())).thenReturn(mPreference);

        mLifecycle = new Lifecycle(() -> mLifecycle);

        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = new Lifecycle(mLifecycleOwner);

        mContext = RuntimeEnvironment.application;

        mController = new AssistContextPreferenceController(mContext, mLifecycle);

        ReflectionHelpers.setField(mController, "mSettingObserver", mObserver);

tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java

+4 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.arch.lifecycle.LifecycleOwner;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Context;
@@ -64,13 +65,15 @@ public class AssistFlashScreenPreferenceControllerTest { 
    private AssistFlashScreenPreferenceController.SettingObserver mObserver;

    private Context mContext;

    private AssistFlashScreenPreferenceController mController;

    private LifecycleOwner mLifecycleOwner;

    private Lifecycle mLifecycle;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        when(mScreen.findPreference(anyString())).thenReturn(mPreference);

        mLifecycle = new Lifecycle(() -> mLifecycle);

        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = new Lifecycle(mLifecycleOwner);

        mContext = RuntimeEnvironment.application;

        mController = spy(new AssistFlashScreenPreferenceController(mContext, mLifecycle));

        mLifecycle.addObserver(mController);

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.when;



import android.app.Activity;

import android.arch.lifecycle.LifecycleOwner;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothDevice;
@@ -44,6 +45,7 @@ import org.robolectric.annotation.Config; 
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class BluetoothDetailsControllerTestBase {

    protected Context mContext;

    private LifecycleOwner mLifecycleOwner;

    protected Lifecycle mLifecycle;

    protected DeviceConfig mDeviceConfig;

    protected BluetoothDevice mDevice;
@@ -73,7 +75,8 @@ public class BluetoothDetailsControllerTestBase { 
        when(mFragment.getContext()).thenReturn(mContext);

        when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);

        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);

        mLifecycle = spy(new Lifecycle(() -> mLifecycle));

        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = spy(new Lifecycle(mLifecycleOwner));

        mBluetoothManager = new BluetoothManager(mContext);

        mBluetoothAdapter = mBluetoothManager.getAdapter();

    }

tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java

+4 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.doReturn; 
import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;



import android.arch.lifecycle.LifecycleOwner;

import android.content.Context;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceGroup;
@@ -63,6 +64,7 @@ public class ConnectedDeviceGroupControllerTest { 
    private Context mContext;

    private Preference mPreference;

    private ConnectedDeviceGroupController mConnectedDeviceGroupController;

    private LifecycleOwner mLifecycleOwner;

    private Lifecycle mLifecycle;



    @Before
@@ -72,7 +74,8 @@ public class ConnectedDeviceGroupControllerTest { 
        mContext = RuntimeEnvironment.application;

        mPreference = new Preference(mContext);

        mPreference.setKey(PREFERENCE_KEY_1);

        mLifecycle = new Lifecycle(() -> mLifecycle);

        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = new Lifecycle(mLifecycleOwner);

        mPreferenceGroup = spy(new PreferenceScreen(mContext, null));

        doReturn(mPreferenceManager).when(mPreferenceGroup).getPreferenceManager();

        doReturn(mContext).when(mDashboardFragment).getContext();