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

Commit 6a2327f7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Fix roboletric test fail and add new test case." into... 

Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227 am: c14daa81 am: c88e678a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723



Change-Id: I5a33631c2e7ea1030061e997df4eba1af9e8ecbd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89639372 c88e678a

tests/robotests/src/com/android/settings/slices/SlicePreferenceControllerTest.java

+11 −14
Original line number Original line Diff line number Diff line
@@ -18,15 +18,15 @@ package com.android.settings.slices; 




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

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





import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;





import android.annotation.NonNull;

import android.content.Context;

import android.content.Context;

import android.net.Uri;

import android.net.Uri;





import androidx.lifecycle.LiveData;

import androidx.lifecycle.LiveData;

import androidx.lifecycle.Observer;

import androidx.slice.Slice;

import androidx.slice.Slice;





import org.junit.Before;

import org.junit.Before;
@@ -80,7 +80,6 @@ public class SlicePreferenceControllerTest { 




    @Test

    @Test

    public void onStop_unregisterObserver() {

    public void onStop_unregisterObserver() {

        when(mLiveData.hasActiveObservers()).thenReturn(true);

        mController.onStart();

        mController.onStart();





        mController.onStop();

        mController.onStop();
@@ -88,20 +87,18 @@ public class SlicePreferenceControllerTest { 
    }

    }





    @Test

    @Test

    public void onStop_noActiveObservers_notUnregisterObserver() {

    public void onStop_unregisterObserverAndHasSecurityException_noCrash() {

        when(mLiveData.hasActiveObservers()).thenReturn(false);

        LiveData<Slice> liveData = new LiveData<Slice>() {

        mController.onStart();

            @Override



            public void removeObserver(@NonNull Observer<? super Slice> observer) {

        mController.onStop();

                super.removeObserver(observer);

        verify(mLiveData, never()).removeObserver(mController);

                throw new SecurityException("SecurityException Test");

            }

            }



        };

    @Test

        mController.mLiveData = liveData;

    public void onStop_notRegisterObserver_notUnregisterObserver() {

        mController.onStart();

        when(mLiveData.hasActiveObservers()).thenReturn(true);





        mController.onStop();

        mController.onStop();

        verify(mLiveData, never()).removeObserver(mController);

    }

    }





    @Test

    @Test