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

Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65

Browse Source 
Change-Id: I73e48e5b1bf69469aca1d0d47ba0f32a8129888d
This commit is contained in:
Automerger Merge Worker
2020-03-09 13:26:45 +00:00
parent 5e1159a21b 5d6c309d65
commit b28ffa4fe2
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/development/WirelessDebuggingEnablerTest.java
View File

@@ -27,7 +27,6 @@ import android.provider.Settings.Global;
import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.SwitchBarController; import com.android.settings.widget.SwitchBarController;
@@ -47,8 +46,6 @@ import org.robolectric.util.ReflectionHelpers;
@Config(shadows = ShadowUtils.class) @Config(shadows = ShadowUtils.class)
public class WirelessDebuggingEnablerTest { public class WirelessDebuggingEnablerTest {
@Mock
private SettingsActivity mActivity;
@Mock @Mock
private SwitchBar mSwitchBar; private SwitchBar mSwitchBar;
@Mock @Mock
@@ -133,8 +130,6 @@ public class WirelessDebuggingEnablerTest {
mWirelessDebuggingEnabler.onSwitchToggled(true); mWirelessDebuggingEnabler.onSwitchToggled(true);
verify(mSwitchBar).setChecked(true);
verify(mListener).onEnabled(true);
assertThat(Global.getInt(mContext.getContentResolver(), assertThat(Global.getInt(mContext.getContentResolver(),
Global.ADB_WIFI_ENABLED, -1)).isEqualTo(1); Global.ADB_WIFI_ENABLED, -1)).isEqualTo(1);
// Should also get a callback // Should also get a callback
@@ -151,8 +146,6 @@ public class WirelessDebuggingEnablerTest {
mWirelessDebuggingEnabler.onSwitchToggled(false); mWirelessDebuggingEnabler.onSwitchToggled(false);
verify(mSwitchBar).setChecked(false);
verify(mListener).onEnabled(false);
assertThat(Global.getInt(mContext.getContentResolver(), assertThat(Global.getInt(mContext.getContentResolver(),
Global.ADB_WIFI_ENABLED, -1)).isEqualTo(0); Global.ADB_WIFI_ENABLED, -1)).isEqualTo(0);
// Should also get a callback // Should also get a callback