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

Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: e35a89ef62 am: 211a604243

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

Change-Id: I8ca3430f4bf89107b8a5b4a92f1bbd96023bf78d
This commit is contained in:
Mark Chien
2020-06-19 06:46:58 +00:00
committed by Automerger Merge Worker
parent cdf13b6a0a 211a604243
commit cf18d506fe
1 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
View File

@@ -50,7 +50,6 @@ import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.net.TetheringManager; import android.net.TetheringManager;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Bundle; import android.os.Bundle;
@@ -78,13 +77,11 @@ public class TetherServiceTest extends ServiceTestCase<TetherService> {
private static final String TEST_RESPONSE_ACTION = "testProvisioningResponseAction"; private static final String TEST_RESPONSE_ACTION = "testProvisioningResponseAction";
private static final String TEST_NO_UI_ACTION = "testNoUiProvisioningRequestAction"; private static final String TEST_NO_UI_ACTION = "testNoUiProvisioningRequestAction";
private static final int BOGUS_RECEIVER_RESULT = -5; private static final int BOGUS_RECEIVER_RESULT = -5;
private static final int TEST_CHECK_PERIOD = 100;
private static final int MS_PER_HOUR = 60 * 60 * 1000; private static final int MS_PER_HOUR = 60 * 60 * 1000;
private static final int SHORT_TIMEOUT = 100; private static final int SHORT_TIMEOUT = 100;
private static final int PROVISION_TIMEOUT = 1000; private static final int PROVISION_TIMEOUT = 1000;
private TetherService mService; private TetherService mService;
private MockResources mResources;
private MockTetherServiceWrapper mWrapper; private MockTetherServiceWrapper mWrapper;
int mLastReceiverResultCode = BOGUS_RECEIVER_RESULT; int mLastReceiverResultCode = BOGUS_RECEIVER_RESULT;
private int mLastTetherRequestType = TETHERING_INVALID; private int mLastTetherRequestType = TETHERING_INVALID;
@@ -109,7 +106,6 @@ public class TetherServiceTest extends ServiceTestCase<TetherService> {
super.setUp(); super.setUp();
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mResources = new MockResources();
mContext = new TestContextWrapper(getContext()); mContext = new TestContextWrapper(getContext());
setContext(mContext); setContext(mContext);
@@ -302,41 +298,12 @@ public class TetherServiceTest extends ServiceTestCase<TetherService> {
} }
} }
private static class MockResources extends android.test.mock.MockResources {
@Override
public int getInteger(int id) {
switch(id) {
case com.android.internal.R.integer.config_mobile_hotspot_provision_check_period:
return TEST_CHECK_PERIOD;
default:
return 0;
}
}
@Override
public String getString(int id) {
switch(id) {
case com.android.internal.R.string.config_mobile_hotspot_provision_response:
return TEST_RESPONSE_ACTION;
case com.android.internal.R.string.config_mobile_hotspot_provision_app_no_ui:
return TEST_NO_UI_ACTION;
default:
return null;
}
}
}
private class TestContextWrapper extends ContextWrapper { private class TestContextWrapper extends ContextWrapper {
public TestContextWrapper(Context base) { public TestContextWrapper(Context base) {
super(base); super(base);
} }
@Override
public Resources getResources() {
return mResources;
}
@Override @Override
public SharedPreferences getSharedPreferences(String name, int mode) { public SharedPreferences getSharedPreferences(String name, int mode) {
// Stub out prefs to control the persisted tether type list. // Stub out prefs to control the persisted tether type list.