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

Commit b0bb2f36 authored by Raff Tsai's avatar Raff Tsai Committed by Android (Google) Code Review
Browse files

Merge "Fix broken settings tests"

parents 41562c66 4dbcdd63

tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ public class AppButtonsPreferenceControllerTest { 


        final boolean controllable = mController.handleDisableable();



        verify(mButtonPrefs).setButton2Text(R.string.uninstall_text);

        verify(mButtonPrefs).setButton2Text(R.string.disable_text);

        assertThat(controllable).isFalse();

    }
@@ -336,7 +336,7 @@ public class AppButtonsPreferenceControllerTest { 


        final boolean controllable = mController.handleDisableable();



        verify(mButtonPrefs).setButton2Text(R.string.uninstall_text);

        verify(mButtonPrefs).setButton2Text(R.string.disable_text);

        assertThat(controllable).isTrue();

    }
@@ -348,7 +348,7 @@ public class AppButtonsPreferenceControllerTest { 


        final boolean controllable = mController.handleDisableable();



        verify(mButtonPrefs).setButton2Text(R.string.install_text);

        verify(mButtonPrefs).setButton2Text(R.string.enable_text);

        assertThat(controllable).isTrue();

    }

tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java

+0 −36
Original line number Diff line number Diff line
@@ -16,43 +16,26 @@ 


package com.android.settings.applications.appinfo;



import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import static org.junit.Assert.assertEquals;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.settings.SettingsEnums;

import android.view.Window;

import android.view.WindowManager.LayoutParams;



import androidx.fragment.app.FragmentActivity;



import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.testutils.FakeFeatureFactory;

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



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.Spy;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



@RunWith(RobolectricTestRunner.class)

public class DrawOverlayDetailsTest {



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private FragmentActivity mActivity;



    @Mock

    private Window mWindow;



    private LayoutParams layoutParams;



    private FakeFeatureFactory mFeatureFactory;
@@ -82,23 +65,4 @@ public class DrawOverlayDetailsTest { 
                MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_DENY,

                mFragment.getMetricsCategory(), "app", 0);

    }



    @Test

    @Config(shadows = {ShadowAppInfoBase.class})

    public void hideNonSystemOverlaysWhenResumed() {

        when(mFragment.getActivity()).thenReturn(mActivity);

        when(mActivity.getWindow()).thenReturn(mWindow);

        when(mWindow.getAttributes()).thenReturn(layoutParams);



        mFragment.onResume();

        verify(mWindow).addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        mFragment.onPause();



        // There's no Window.clearPrivateFlags() method, so the Window.attributes are updated.

        ArgumentCaptor<LayoutParams> paramCaptor = ArgumentCaptor.forClass(LayoutParams.class);

        verify(mWindow).setAttributes(paramCaptor.capture());

        assertEquals(0,

                paramCaptor.getValue().privateFlags & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

    }

}

tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.settingslib.media.MediaDevice; 
import com.android.settingslib.media.MediaOutputSliceConstants;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -59,6 +60,7 @@ import java.util.List; 


@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowBluetoothAdapter.class})

@Ignore("b/129292771")

public class MediaOutputIndicatorSliceTest {



    private static final String TEST_DEVICE_NAME = "test_device_name";

tests/robotests/src/com/android/settings/notification/AppNotificationSettingsTest.java

deleted100644 → 0
+0 −93
Original line number Diff line number Diff line 
package com.android.settings.notification;



import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import static org.junit.Assert.assertEquals;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.view.Window;

import android.view.WindowManager;



import androidx.fragment.app.FragmentActivity;

import androidx.fragment.app.FragmentManager;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.Config;

import org.robolectric.annotation.Implementation;

import org.robolectric.annotation.Implements;



@RunWith(RobolectricTestRunner.class)

public class AppNotificationSettingsTest {



    private WindowManager.LayoutParams mLayoutParams;

    private AppNotificationSettings mFragment;

    private FragmentActivity mActivity;

    @Mock

    private Window mWindow;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mLayoutParams = new WindowManager.LayoutParams();

        mActivity = spy(Robolectric.setupActivity(FragmentActivity.class));

        mFragment = spy(new AppNotificationSettings());

        when(mFragment.getActivity()).thenReturn(mActivity);

        when(mFragment.getFragmentManager()).thenReturn(mock(FragmentManager.class));

        when(mActivity.getWindow()).thenReturn(mWindow);

        when(mWindow.getAttributes()).thenReturn(mLayoutParams);

    }



    @Test

    @Config(shadows = {ShadowNotificationSettingsBase.class})

    public void onResume_shouldHideSystemOverlay() {

        mFragment.onResume();



        verify(mWindow).addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

    }



    @Test

    @Config(shadows = {ShadowNotificationSettingsBase.class})

    public void onPause_shouldRemoveHideSystemOverlay() {

        mFragment.onResume();



        verify(mWindow).addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        mFragment.onPause();



        // There's no Window.clearPrivateFlags() method, so the Window.attributes are updated.

        ArgumentCaptor<WindowManager.LayoutParams> paramCaptor = ArgumentCaptor.forClass(

                WindowManager.LayoutParams.class);

        verify(mWindow).setAttributes(paramCaptor.capture());

        assertEquals(0,

                paramCaptor.getValue().privateFlags

                        & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

    }



    @Implements(NotificationSettingsBase.class)

    public static class ShadowNotificationSettingsBase {



        protected void __constructor__() {

            // Do nothing

        }



        @Implementation

        protected void onResume() {

            // No-op.

        }



        @Implementation

        protected void onPause() {

            // No-op.

        }

    }

}

tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java

+3 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.view.View.OnClickListener; 
import android.view.ViewGroup;

import android.widget.Button;



import androidx.fragment.app.FragmentActivity;

import androidx.recyclerview.widget.RecyclerView;

import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
@@ -60,7 +61,7 @@ import org.robolectric.RobolectricTestRunner; 
public class WifiCallingDisclaimerFragmentTest {



    @Mock

    private Activity mActivity;

    private FragmentActivity mActivity;

    @Mock

    private DisclaimerItem mDisclaimerItem;

    @Mock
@@ -89,7 +90,7 @@ public class WifiCallingDisclaimerFragmentTest { 
    public void setUp() {

        MockitoAnnotations.initMocks(this);



        mActivity = Robolectric.setupActivity(Activity.class);

        mActivity = Robolectric.setupActivity(FragmentActivity.class);

        mFragment = spy(new WifiCallingDisclaimerFragment());



        doReturn(mActivity).when(mFragment).getActivity();