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

Merge "Fix WifiSummaryUpdaterTest issues for registerReceiver security design"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-01-24 09:46:33 +00:00
committed by Android (Google) Code Review
parent d329f3d79c 481f696a88
commit 544397015b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
View File

@@ -19,7 +19,11 @@ package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -34,7 +38,6 @@ import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
import com.android.settingslib.wifi.WifiStatusTracker; import com.android.settingslib.wifi.WifiStatusTracker;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -54,15 +57,18 @@ public class WifiSummaryUpdaterTest {
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application.getApplicationContext()); mContext = spy(RuntimeEnvironment.application.getApplicationContext());
doReturn(mock(Intent.class)).when(mContext).registerReceiver(any(), any(), anyInt());
doNothing().when(mContext).unregisterReceiver(any(BroadcastReceiver.class));
mSummaryUpdater = new WifiSummaryUpdater(mContext, mListener, mWifiTracker); mSummaryUpdater = new WifiSummaryUpdater(mContext, mListener, mWifiTracker);
} }
@Test @Test
@Ignore
public void register_true_shouldRegisterListenerAndTracker() { public void register_true_shouldRegisterListenerAndTracker() {
mSummaryUpdater.register(true); mSummaryUpdater.register(true);
verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class)); verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class),
anyInt());
verify(mWifiTracker).setListening(true); verify(mWifiTracker).setListening(true);
} }
@@ -75,7 +81,6 @@ public class WifiSummaryUpdaterTest {
} }
@Test @Test
@Ignore
public void register_false_shouldUnregisterListenerAndTracker() { public void register_false_shouldUnregisterListenerAndTracker() {
mSummaryUpdater.register(true); mSummaryUpdater.register(true);
mSummaryUpdater.register(false); mSummaryUpdater.register(false);