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

Rename DnsEventListenerServiceTest to NetdEventListenerServiceTest

Browse Source 
Change-Id: I67e645306444938a4675e91a9db5d716c0bd4881
This commit is contained in:
Michal Karpinski
2016-09-21 18:45:59 +09:00
parent 18a2ad067e
commit 66d4a5baf2
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/tests/servicestests/src/com/android/server/connectivity/DnsEventListenerServiceTest.java → services/tests/servicestests/src/com/android/server/connectivity/NetdEventListenerServiceTest.java
View File

@@ -20,7 +20,7 @@ import android.net.ConnectivityManager.NetworkCallback;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.Network; import android.net.Network;
import android.net.metrics.DnsEvent; import android.net.metrics.DnsEvent;
import android.net.metrics.IDnsEventListener; import android.net.metrics.INetdEventListener;
import android.net.metrics.IpConnectivityLog; import android.net.metrics.IpConnectivityLog;
import junit.framework.TestCase; import junit.framework.TestCase;
@@ -47,12 +47,12 @@ import java.util.List;
import java.util.OptionalInt; import java.util.OptionalInt;
import java.util.stream.IntStream; import java.util.stream.IntStream;
public class DnsEventListenerServiceTest extends TestCase { public class NetdEventListenerServiceTest extends TestCase {
// TODO: read from DnsEventListenerService after this constant is read from system property // TODO: read from NetdEventListenerService after this constant is read from system property
static final int BATCH_SIZE = 100; static final int BATCH_SIZE = 100;
static final int EVENT_TYPE = IDnsEventListener.EVENT_GETADDRINFO; static final int EVENT_TYPE = INetdEventListener.EVENT_GETADDRINFO;
// TODO: read from IDnsEventListener // TODO: read from INetdEventListener
static final int RETURN_CODE = 1; static final int RETURN_CODE = 1;
static final byte[] EVENT_TYPES = new byte[BATCH_SIZE]; static final byte[] EVENT_TYPES = new byte[BATCH_SIZE];
@@ -66,7 +66,7 @@ public class DnsEventListenerServiceTest extends TestCase {
} }
} }
DnsEventListenerService mDnsService; NetdEventListenerService mNetdService;
@Mock ConnectivityManager mCm; @Mock ConnectivityManager mCm;
@Mock IpConnectivityLog mLog; @Mock IpConnectivityLog mLog;
@@ -77,7 +77,7 @@ public class DnsEventListenerServiceTest extends TestCase {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mCallbackCaptor = ArgumentCaptor.forClass(NetworkCallback.class); mCallbackCaptor = ArgumentCaptor.forClass(NetworkCallback.class);
mEvCaptor = ArgumentCaptor.forClass(DnsEvent.class); mEvCaptor = ArgumentCaptor.forClass(DnsEvent.class);
mDnsService = new DnsEventListenerService(mCm, mLog); mNetdService = new NetdEventListenerService(mCm, mLog);
verify(mCm, times(1)).registerNetworkCallback(any(), mCallbackCaptor.capture()); verify(mCm, times(1)).registerNetworkCallback(any(), mCallbackCaptor.capture());
} }
@@ -131,7 +131,7 @@ public class DnsEventListenerServiceTest extends TestCase {
new Thread() { new Thread() {
public void run() { public void run() {
while (System.currentTimeMillis() < stop) { while (System.currentTimeMillis() < stop) {
mDnsService.dump(pw); mNetdService.dump(pw);
} }
} }
}.start(); }.start();
@@ -158,7 +158,7 @@ public class DnsEventListenerServiceTest extends TestCase {
void log(int netId, int[] latencies) { void log(int netId, int[] latencies) {
for (int l : latencies) { for (int l : latencies) {
mDnsService.onDnsEvent(netId, EVENT_TYPE, RETURN_CODE, l); mNetdService.onDnsEvent(netId, EVENT_TYPE, RETURN_CODE, l);
} }
} }