LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IpConnectivityMetrics: no metrics upload in tests

Browse Source 
Similarly to ApfTest, this patch changes ConnectivityServiceTest to use
a mock object instead of IpConnectivityLog so that running
ConnectivityServiceTest does not generate android.net.metrics events.

Bug: 30450301
Change-Id: Ibc0479f381f26e60baefbae15407c62aecbf6666
This commit is contained in:
Hugo Benichi
2016-07-28 17:53:06 +09:00
parent bd0cc763ae
commit 208c01039f
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -479,7 +479,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
private final IpConnectivityLog mMetricsLog = new IpConnectivityLog(); private final IpConnectivityLog mMetricsLog;
/** /**
* Implements support for the legacy "one network per network type" model. * Implements support for the legacy "one network per network type" model.
@@ -677,8 +677,16 @@ public class ConnectivityService extends IConnectivityManager.Stub
public ConnectivityService(Context context, INetworkManagementService netManager, public ConnectivityService(Context context, INetworkManagementService netManager,
INetworkStatsService statsService, INetworkPolicyManager policyManager) { INetworkStatsService statsService, INetworkPolicyManager policyManager) {
this(context, netManager, statsService, policyManager, new IpConnectivityLog());
}
@VisibleForTesting
protected ConnectivityService(Context context, INetworkManagementService netManager,
INetworkStatsService statsService, INetworkPolicyManager policyManager,
IpConnectivityLog logger) {
if (DBG) log("ConnectivityService starting up"); if (DBG) log("ConnectivityService starting up");
mMetricsLog = logger;
mDefaultRequest = createInternetRequestForTransport(-1); mDefaultRequest = createInternetRequestForTransport(-1);
NetworkRequestInfo defaultNRI = new NetworkRequestInfo(null, mDefaultRequest, new Binder()); NetworkRequestInfo defaultNRI = new NetworkRequestInfo(null, mDefaultRequest, new Binder());
mNetworkRequests.put(mDefaultRequest, defaultNRI); mNetworkRequests.put(mDefaultRequest, defaultNRI);

18
services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
View File

@@ -51,6 +51,7 @@ import android.net.NetworkInfo.DetailedState;
import android.net.NetworkMisc; import android.net.NetworkMisc;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.net.metrics.IpConnectivityLog;
import android.os.ConditionVariable; import android.os.ConditionVariable;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
@@ -585,8 +586,9 @@ public class ConnectivityServiceTest extends AndroidTestCase {
public String gen204ProbeRedirectUrl = null; public String gen204ProbeRedirectUrl = null;
public WrappedNetworkMonitor(Context context, Handler handler, public WrappedNetworkMonitor(Context context, Handler handler,
NetworkAgentInfo networkAgentInfo, NetworkRequest defaultRequest) { NetworkAgentInfo networkAgentInfo, NetworkRequest defaultRequest,
super(context, handler, networkAgentInfo, defaultRequest); IpConnectivityLog log) {
super(context, handler, networkAgentInfo, defaultRequest, log);
} }
@Override @Override
@@ -599,8 +601,9 @@ public class ConnectivityServiceTest extends AndroidTestCase {
private WrappedNetworkMonitor mLastCreatedNetworkMonitor; private WrappedNetworkMonitor mLastCreatedNetworkMonitor;
public WrappedConnectivityService(Context context, INetworkManagementService netManager, public WrappedConnectivityService(Context context, INetworkManagementService netManager,
INetworkStatsService statsService, INetworkPolicyManager policyManager) { INetworkStatsService statsService, INetworkPolicyManager policyManager,
super(context, netManager, statsService, policyManager); IpConnectivityLog log) {
super(context, netManager, statsService, policyManager, log);
mLingerDelayMs = TEST_LINGER_DELAY_MS; mLingerDelayMs = TEST_LINGER_DELAY_MS;
} }
@@ -639,8 +642,8 @@ public class ConnectivityServiceTest extends AndroidTestCase {
@Override @Override
public NetworkMonitor createNetworkMonitor(Context context, Handler handler, public NetworkMonitor createNetworkMonitor(Context context, Handler handler,
NetworkAgentInfo nai, NetworkRequest defaultRequest) { NetworkAgentInfo nai, NetworkRequest defaultRequest) {
final WrappedNetworkMonitor monitor = new WrappedNetworkMonitor(context, handler, nai, final WrappedNetworkMonitor monitor = new WrappedNetworkMonitor(
defaultRequest); context, handler, nai, defaultRequest, mock(IpConnectivityLog.class));
mLastCreatedNetworkMonitor = monitor; mLastCreatedNetworkMonitor = monitor;
return monitor; return monitor;
} }
@@ -705,7 +708,8 @@ public class ConnectivityServiceTest extends AndroidTestCase {
mService = new WrappedConnectivityService(mServiceContext, mService = new WrappedConnectivityService(mServiceContext,
mock(INetworkManagementService.class), mock(INetworkManagementService.class),
mock(INetworkStatsService.class), mock(INetworkStatsService.class),
mock(INetworkPolicyManager.class)); mock(INetworkPolicyManager.class),
mock(IpConnectivityLog.class));
mService.systemReady(); mService.systemReady();
mCm = new WrappedConnectivityManager(getContext(), mService); mCm = new WrappedConnectivityManager(getContext(), mService);