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

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

Merge "Fix Notifications SettingsRoboTests" into main

parents dc10483d 92f268ae

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

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static org.mockito.ArgumentMatchers.any; 
import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;
@@ -235,7 +236,7 @@ public class NotificationAssistantPreferenceControllerTest { 
        mPreferenceController.getDefaultNASIntent();

        mPreferenceController.updateState(mPreference);



        verify(mPreference).setSwitchEnabled(eq(false));

        verify(mPreference, atLeastOnce()).setSwitchEnabled(eq(false));

        assertFalse(mPreference.isEnabled());

    }

}

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

+5 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ public class VolumeSeekBarPreferenceTest { 
        when(mPreference.isEnabled()).thenReturn(true);

        doCallRealMethod().when(mPreference).init();



        mPreference.setStream(STREAM);

        mPreference.init();



        verify(mPreference, never()).updateContentDescription(CONTENT_DESCRIPTION);
@@ -136,6 +137,7 @@ public class VolumeSeekBarPreferenceTest { 
    @Test

    public void init_changeProgress_overrideStateDescriptionCalled() {

        final int progress = 4;

        when(mPreference.isEnabled()).thenReturn(true);

        when(mPreference.formatStateDescription(progress)).thenReturn(CONTENT_DESCRIPTION);

        doCallRealMethod().when(mPreference).init();
@@ -157,6 +159,7 @@ public class VolumeSeekBarPreferenceTest { 
        when(mAudioManager.getStreamMaxVolume(STREAM)).thenReturn(max);

        when(mAudioManager.getStreamMinVolumeInt(STREAM)).thenReturn(min);

        when(mAudioManager.getStreamVolume(STREAM)).thenReturn(progress);

        when(mPreference.isEnabled()).thenReturn(true);

        when(mPreference.getMin()).thenReturn(min);

        when(mPreference.getMax()).thenReturn(max);

        when(mPreference.getContext()).thenReturn(mContext);
@@ -168,6 +171,8 @@ public class VolumeSeekBarPreferenceTest { 
        mPreference.setStream(STREAM);

        mPreference.init();



        verify(mSeekBarVolumizerFactory).create(eq(STREAM), eq(null), mSbvc.capture());



        // On progress change, Round down the percent to match it with what the talkback says.

        // (b/285458191)

        // when progress is 4, the percent is 0.187. The state description should be set to 18%.

tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceTest.java

+3 −4
Original line number Diff line number Diff line
@@ -21,17 +21,15 @@ import static android.app.NotificationManager.IMPORTANCE_LOW; 


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



import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



import android.content.Context;

import android.graphics.drawable.Drawable;

import android.util.Pair;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.TextView;



import androidx.preference.PreferenceViewHolder;
@@ -50,7 +48,8 @@ public class ConversationPriorityPreferenceTest { 


    @Before

    public void setUp() {

        mContext = RuntimeEnvironment.application;

        Context context = spy(RuntimeEnvironment.application.getApplicationContext());

        mContext = new ContextThemeWrapper(context, R.style.Theme_Settings);

    }



    @Test

tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceTest.java

+5 −4
Original line number Diff line number Diff line
@@ -28,13 +28,15 @@ import static org.mockito.Mockito.verify; 


import android.content.Context;

import android.graphics.drawable.Drawable;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.TextView;



import androidx.preference.PreferenceViewHolder;



import com.android.settings.R;

import com.android.settings.notification.app.ImportancePreference;



import org.junit.Before;

import org.junit.Test;
@@ -42,8 +44,6 @@ import org.junit.runner.RunWith; 
import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



import androidx.preference.PreferenceViewHolder;



@RunWith(RobolectricTestRunner.class)

public class ImportancePreferenceTest {
@@ -51,7 +51,8 @@ public class ImportancePreferenceTest { 


    @Before

    public void setUp() {

        mContext = RuntimeEnvironment.application;

        Context context = spy(RuntimeEnvironment.application.getApplicationContext());

        mContext = new ContextThemeWrapper(context, R.style.Theme_Settings);

    }



    @Test