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

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

Merge "Fix flaky tests caused by WeakReference"

parents 004e782e 0cc61640

packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java

+4 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
package com.android.settingslib.core.lifecycle;



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



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



import android.arch.lifecycle.LifecycleOwner;

import android.content.Context;

import android.view.Menu;

import android.view.MenuInflater;
@@ -48,6 +48,7 @@ import org.robolectric.annotation.Config; 
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class LifecycleTest {



    private LifecycleOwner mLifecycleOwner;

    private Lifecycle mLifecycle;



    public static class TestDialogFragment extends ObservableDialogFragment {
@@ -146,7 +147,8 @@ public class LifecycleTest { 


    @Before

    public void setUp() {

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

        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = new Lifecycle(mLifecycleOwner);

    }



    @Test

packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java

+4 −2
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 
package com.android.settingslib.development;



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



import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.verify;



import android.arch.lifecycle.LifecycleOwner;

import android.os.SystemProperties;

import android.support.v7.preference.ListPreference;

import android.support.v7.preference.Preference;
@@ -44,6 +44,7 @@ import org.robolectric.annotation.Config; 
        shadows = SystemPropertiesTestImpl.class)

public class LogpersistPreferenceControllerTest {



    private LifecycleOwner mLifecycleOwner;

    private Lifecycle mLifecycle;



    @Mock
@@ -57,7 +58,8 @@ public class LogpersistPreferenceControllerTest { 
    public void setUp() {

        MockitoAnnotations.initMocks(this);

        SystemProperties.set("ro.debuggable", "1");

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

        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = new Lifecycle(mLifecycleOwner);

        mController = new AbstractLogpersistPreferenceController(RuntimeEnvironment.application,

                mLifecycle) {

            @Override

packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java

+4 −2
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
package com.android.settingslib.widget;



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



import static org.mockito.Matchers.any;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.arch.lifecycle.LifecycleOwner;

import android.support.v14.preference.PreferenceFragment;

import android.support.v7.preference.PreferenceManager;

import android.support.v7.preference.PreferenceScreen;
@@ -49,13 +49,15 @@ public class FooterPreferenceMixinTest { 
    @Mock

    private PreferenceScreen mScreen;



    private LifecycleOwner mLifecycleOwner;

    private Lifecycle mLifecycle;

    private FooterPreferenceMixin mMixin;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

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

        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = new Lifecycle(mLifecycleOwner);

        when(mFragment.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));

        when(mFragment.getPreferenceManager().getContext())

                .thenReturn(ShadowApplication.getInstance().getApplicationContext());