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

Remove summary provider

Browse Source 
- use SummaryProvider to provide the summary of UserSettings
- use WifiDisplayPreferenceController to replace the summary loader
in WifiDisplaySettings
- use ConfigureNotificationPreferernceController to replace the
sumary load in ConfigureNotificationSettings

Fixes: 141653158
Test: robolectric
Change-Id: Id5f5ed645707caa0b25ecae5252174cbf017651c
This commit is contained in:
Raff Tsai
2019-10-02 16:43:23 +08:00
parent 9e3a9fd255
commit 6db277ebb7
21 changed files with 399 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
View File

@@ -19,8 +19,6 @@ package com.android.settings.wfd;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.Activity;
@@ -30,9 +28,6 @@ import android.hardware.display.DisplayManager;
import android.media.MediaRouter;
import android.net.wifi.p2p.WifiP2pManager;
import com.android.settings.R;
import com.android.settings.dashboard.SummaryLoader;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -46,45 +41,16 @@ public class WifiDisplaySettingsTest {
@Mock
private Activity mActivity;
@Mock
private SummaryLoader mSummaryLoader;
@Mock
private MediaRouter mMediaRouter;
@Mock
private PackageManager mPackageManager;
private SummaryLoader.SummaryProvider mSummaryProvider;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mActivity.getSystemService(Context.MEDIA_ROUTER_SERVICE)).thenReturn(mMediaRouter);
when(mActivity.getPackageManager()).thenReturn(mPackageManager);
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)).thenReturn(true);
mSummaryProvider = WifiDisplaySettings.SUMMARY_PROVIDER_FACTORY
.createSummaryProvider(mActivity, mSummaryLoader);
}
@Test
public void listenToSummary_disconnected_shouldProvideDisconnectedSummary() {
mSummaryProvider.setListening(true);
verify(mActivity).getString(R.string.disconnected);
verify(mActivity, never()).getString(R.string.wifi_display_status_connected);
}
@Test
public void listenToSummary_connected_shouldProvideConnectedSummary() {
final MediaRouter.RouteInfo route = mock(MediaRouter.RouteInfo.class);
when(mMediaRouter.getRouteCount()).thenReturn(1);
when(mMediaRouter.getRouteAt(0)).thenReturn(route);
when(route.matchesTypes(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY)).thenReturn(true);
when(route.isSelected()).thenReturn(true);
when(route.isConnecting()).thenReturn(false);
mSummaryProvider.setListening(true);
verify(mActivity).getString(R.string.wifi_display_status_connected);
}
@Test