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

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

Merge "Convert SettingsLib Lifecycle to Flatfoot"

parents e1ead4d3 94a7c7d2

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

+10 −4
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 


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;
@@ -71,6 +74,9 @@ public class AccountHeaderPreferenceControllerTest { 


    private AccountHeaderPreferenceController mController;



    private Lifecycle mLifecycle =

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



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);
@@ -78,32 +84,32 @@ public class AccountHeaderPreferenceControllerTest { 
        mHeaderPreference = new LayoutPreference(

                RuntimeEnvironment.application, R.layout.settings_entity_header);

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

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

    }



    @Test

    public void isAvailable_noArgs_shouldReturnNull() {

        mController = new AccountHeaderPreferenceController(RuntimeEnvironment.application,

                new Lifecycle(), mActivity, mFragment, null /* args */);

                mLifecycle, mActivity, mFragment, null /* args */);



        assertThat(mController.isAvailable()).isFalse();

    }



    @Test

    public void onResume_shouldDisplayAccountInEntityHeader() {

        final Lifecycle lifecycle = new Lifecycle();

        final Account account = new Account("name1@abc.com", "com.abc");

        Bundle args = new Bundle();

        args.putParcelable(AccountDetailDashboardFragment.KEY_ACCOUNT, account);

        args.putParcelable(AccountDetailDashboardFragment.KEY_USER_HANDLE, UserHandle.CURRENT);

        mController = new AccountHeaderPreferenceController(RuntimeEnvironment.application,

                lifecycle, mActivity, mFragment, args);

                mLifecycle, mActivity, mFragment, args);



        assertThat(mController.isAvailable()).isTrue();



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



        mController.displayPreference(mScreen);

        lifecycle.onResume();

        mLifecycle.handleLifecycleEvent(ON_RESUME);



        final CharSequence label =

                ((TextView) mHeaderPreference.findViewById(R.id.entity_header_title)).getText();

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

+5 −2
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 


package com.android.settings.applications.assist;



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



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



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;
@@ -60,7 +63,7 @@ public class AssistContextPreferenceControllerTest { 
    public void setUp() {

        MockitoAnnotations.initMocks(this);

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

        mLifecycle = new Lifecycle();

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

        mContext = RuntimeEnvironment.application;

        mController = new AssistContextPreferenceController(mContext, mLifecycle);

        ReflectionHelpers.setField(mController, "mSettingObserver", mObserver);
@@ -88,7 +91,7 @@ public class AssistContextPreferenceControllerTest { 
        Settings.Secure.putInt(mContext.getContentResolver(),

                Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1);



        mLifecycle.onResume();

        mLifecycle.handleLifecycleEvent(ON_RESUME);

        verify(mObserver).register(any(ContentResolver.class), eq(true));

        verify(mPreference).setChecked(true);

    }

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

+15 −12
Original line number Diff line number Diff line
@@ -16,6 +16,18 @@ 


package com.android.settings.applications.assist;



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



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



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Context;
@@ -23,8 +35,8 @@ import android.provider.Settings; 
import android.support.v7.preference.PreferenceScreen;

import android.support.v7.preference.TwoStatePreference;



import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.TestConfig;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.testutils.shadow.ShadowSecureSettings;

import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -38,15 +50,6 @@ import org.robolectric.RuntimeEnvironment; 
import org.robolectric.annotation.Config;

import org.robolectric.util.ReflectionHelpers;



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

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class AssistFlashScreenPreferenceControllerTest {
@@ -67,7 +70,7 @@ public class AssistFlashScreenPreferenceControllerTest { 
    public void setUp() {

        MockitoAnnotations.initMocks(this);

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

        mLifecycle = new Lifecycle();

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

        mContext = RuntimeEnvironment.application;

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

        mLifecycle.addObserver(mController);
@@ -116,7 +119,7 @@ public class AssistFlashScreenPreferenceControllerTest { 
        Settings.Secure.putInt(mContext.getContentResolver(),

                Settings.Secure.ASSIST_DISCLOSURE_ENABLED, 1);



        mLifecycle.onResume();

        mLifecycle.handleLifecycleEvent(ON_RESUME);



        verify(mObserver).register(any(ContentResolver.class), eq(true));

        verify(mPreference).setChecked(true);

tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ import static com.android.settings.applications.manageapplications.ManageApplica 
        .LIST_TYPE_MAIN;

import static com.android.settings.applications.manageapplications.ManageApplications

        .LIST_TYPE_NOTIFICATION;



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



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.eq;
@@ -52,7 +54,6 @@ import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsSha 
import com.android.settings.testutils.shadow.ShadowEventLogWriter;

import com.android.settings.widget.LoadingViewController;

import com.android.settingslib.applications.ApplicationsState;

import com.android.settingslib.core.lifecycle.Lifecycle;



import org.junit.Before;

import org.junit.Test;
@@ -100,7 +101,6 @@ public class ManageApplicationsTest { 
        when(mState.getBackgroundLooper()).thenReturn(mBgLooper);



        mFragment = new ManageApplications();

        ReflectionHelpers.setField(mFragment, "mLifecycle", new Lifecycle());

    }



    @Test

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

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public class BluetoothDetailsControllerTestBase { 
        when(mFragment.getContext()).thenReturn(mContext);

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

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

        mLifecycle = spy(new Lifecycle());

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

        mBluetoothManager = new BluetoothManager(mContext);

        mBluetoothAdapter = mBluetoothManager.getAdapter();

    }