PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix robotests in settings/panel

Browse Source 
Remove @Ignore for tests in settings/panel after testing.
Also update VolumePanelTest according to the recent changes to
remote volume slice.

Test: atest PanelFragmentTest
Test: atest SettingsPanelActivityTest
Test: VolumePanelTest
Fixes: 130896218
Change-Id: Iaa99e65d959cafd382d7209664f2fdbf660c29e0
This commit is contained in:
lindatseng
2019-04-22 16:14:53 -07:00
parent 022af8ca10
commit f19f7981df
3 changed files with 74 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
tests/robotests/src/com/android/settings/panel/VolumePanelTest.java
View File

@@ -18,32 +18,71 @@ package com.android.settings.panel;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.media.session.ISessionController;
import android.media.session.MediaController;
import android.media.session.MediaSession;
import android.media.session.MediaSessionManager;
import android.net.Uri;
import com.android.settings.notification.RemoteVolumePreferenceController;
import com.android.settings.slices.CustomSliceRegistry;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import java.util.ArrayList;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
public class VolumePanelTest {
@Mock
private MediaSessionManager mMediaSessionManager;
@Mock
private MediaController mMediaController;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ISessionController mStub;
private VolumePanel mPanel;
private Context mContext;
@Before
public void setUp() {
mPanel = VolumePanel.create(RuntimeEnvironment.application);
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getApplicationContext()).thenReturn(mContext);
when(mContext.getSystemService(MediaSessionManager.class)).thenReturn(mMediaSessionManager);
mPanel = VolumePanel.create(mContext);
}
@Test
@Ignore("b/130896218")
public void getSlices_containsNecessarySlices() {
public void getSlices_hasActiveRemoteToken_containsRemoteMediaUri() {
List<MediaController> activeSessions = new ArrayList<>();
MediaSession.Token token = new MediaSession.Token(mStub);
activeSessions.add(mMediaController);
when(mMediaSessionManager.getActiveSessions(null)).thenReturn(
activeSessions);
when(mMediaController.getPlaybackInfo()).thenReturn(new MediaController.PlaybackInfo(
MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE, 0, 10, 5, null));
when(mMediaController.getSessionToken()).thenReturn(new MediaSession.Token(mStub));
when(RemoteVolumePreferenceController.getActiveRemoteToken(mContext)).thenReturn(token);
final List<Uri> uris = mPanel.getSlices();
assertThat(uris).containsExactly(
@@ -55,6 +94,22 @@ public class VolumePanelTest {
CustomSliceRegistry.VOLUME_ALARM_URI);
}
@Test
public void getSlices_doesNotHaveActiveRemoteToken_doesNotcontainRemoteMediaUri() {
final List<Uri> uris = mPanel.getSlices();
when(RemoteVolumePreferenceController.getActiveRemoteToken(mContext))
.thenReturn(null);
assertThat(uris).doesNotContain(CustomSliceRegistry.VOLUME_REMOTE_MEDIA_URI);
assertThat(uris).containsExactly(
CustomSliceRegistry.VOLUME_CALL_URI,
CustomSliceRegistry.VOLUME_MEDIA_URI,
CustomSliceRegistry.MEDIA_OUTPUT_INDICATOR_SLICE_URI,
CustomSliceRegistry.VOLUME_RINGER_URI,
CustomSliceRegistry.VOLUME_ALARM_URI);
}
@Test
public void getSeeMoreIntent_notNull() {
assertThat(mPanel.getSeeMoreIntent()).isNotNull();