Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I9dbbf904,Iebc174ed

Browse Source 
* changes:
  Move NetworkStackTests to presubmit
  Remove NetworkStack test dependency on testutils
This commit is contained in:
Remi NGUYEN VAN
2019-03-11 02:06:27 +00:00
committed by Gerrit Code Review
parent c06c54662b d9c313d450
commit 06d8067975
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/NetworkStack/TEST_MAPPING
View File

@@ -1,5 +1,5 @@
{ {
"postsubmit": [ "presubmit": [
{ {
"name": "NetworkStackTests" "name": "NetworkStackTests"
} }

1
packages/NetworkStack/tests/Android.bp
View File

@@ -22,7 +22,6 @@ android_test {
resource_dirs: ["res"], resource_dirs: ["res"],
static_libs: [ static_libs: [
"androidx.test.rules", "androidx.test.rules",
"frameworks-base-testutils",
"mockito-target-extended-minus-junit4", "mockito-target-extended-minus-junit4",
"NetworkStackLib", "NetworkStackLib",
"testables", "testables",

9
packages/NetworkStack/tests/src/android/net/ip/IpClientTest.java
View File

@@ -34,6 +34,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.app.AlarmManager; import android.app.AlarmManager;
import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
@@ -46,14 +47,11 @@ import android.net.RouteInfo;
import android.net.shared.InitialConfiguration; import android.net.shared.InitialConfiguration;
import android.net.shared.ProvisioningConfiguration; import android.net.shared.ProvisioningConfiguration;
import android.net.util.InterfaceParams; import android.net.util.InterfaceParams;
import android.provider.Settings;
import android.test.mock.MockContentResolver;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.internal.R; import com.android.internal.R;
import com.android.internal.util.test.FakeSettingsProvider;
import com.android.server.NetworkObserver; import com.android.server.NetworkObserver;
import com.android.server.NetworkObserverRegistry; import com.android.server.NetworkObserverRegistry;
@@ -94,7 +92,7 @@ public class IpClientTest {
@Mock private IIpClientCallbacks mCb; @Mock private IIpClientCallbacks mCb;
@Mock private AlarmManager mAlarm; @Mock private AlarmManager mAlarm;
@Mock private IpClient.Dependencies mDependencies; @Mock private IpClient.Dependencies mDependencies;
private MockContentResolver mContentResolver; @Mock private ContentResolver mContentResolver;
private NetworkObserver mObserver; private NetworkObserver mObserver;
private InterfaceParams mIfParams; private InterfaceParams mIfParams;
@@ -109,9 +107,6 @@ public class IpClientTest {
when(mDependencies.getNetd(any())).thenReturn(mNetd); when(mDependencies.getNetd(any())).thenReturn(mNetd);
when(mResources.getInteger(R.integer.config_networkAvoidBadWifi)) when(mResources.getInteger(R.integer.config_networkAvoidBadWifi))
.thenReturn(DEFAULT_AVOIDBADWIFI_CONFIG_VALUE); .thenReturn(DEFAULT_AVOIDBADWIFI_CONFIG_VALUE);
mContentResolver = new MockContentResolver();
mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());
when(mContext.getContentResolver()).thenReturn(mContentResolver); when(mContext.getContentResolver()).thenReturn(mContentResolver);
mIfParams = null; mIfParams = null;