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

Merge changes I4719b4dc,I0308cdf4,I38db1bb7 am: e5090f2547 am: 1cbdfb6460

Browse Source 
am: b025492a6b

Change-Id: I5385a3747e039a42e86034f7632edd0f855b2eb1
This commit is contained in:
Hugo Benichi
2017-09-14 18:11:06 +00:00
committed by android-build-merger
parent b5141eb1d4 1cbdfb6460
commit 46510068bc
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tests/net/java/android/net/nsd/NsdManagerTest.java
View File

@@ -60,7 +60,7 @@ public class NsdManagerTest {
NsdManager mManager;
long mTimeoutMs = 100; // non-final so that tests can adjust the value.
long mTimeoutMs = 200; // non-final so that tests can adjust the value.
@Before
public void setUp() throws Exception {
@@ -74,7 +74,7 @@ public class NsdManagerTest {
@After
public void tearDown() throws Exception {
waitForIdleHandler(mServiceHandler, mTimeoutMs);
mServiceHandler.waitForIdle(mTimeoutMs);
mServiceHandler.chan.disconnect();
mServiceHandler.stop();
if (mManager != null) {
@@ -334,9 +334,10 @@ public class NsdManagerTest {
}
int verifyRequest(int expectedMessageType) {
mServiceHandler.waitForIdle(mTimeoutMs);
verify(mServiceHandler, timeout(mTimeoutMs)).handleMessage(any());
reset(mServiceHandler);
Message received = mServiceHandler.lastMessage;
Message received = mServiceHandler.getLastMessage();
assertEquals(NsdManager.nameOf(expectedMessageType), NsdManager.nameOf(received.what));
return received.arg2;
}
@@ -347,31 +348,43 @@ public class NsdManagerTest {
// Implements the server side of AsyncChannel connection protocol
public static class MockServiceHandler extends Handler {
public Context mContext;
public final Context context;
public AsyncChannel chan;
public volatile Message lastMessage;
public Message lastMessage;
MockServiceHandler(Looper looper, Context context) {
super(looper);
mContext = context;
MockServiceHandler(Looper l, Context c) {
super(l);
context = c;
}
synchronized Message getLastMessage() {
return lastMessage;
}
synchronized void setLastMessage(Message msg) {
lastMessage = obtainMessage();
lastMessage.copyFrom(msg);
}
void waitForIdle(long timeoutMs) {
waitForIdleHandler(this, timeoutMs);
}
@Override
public void handleMessage(Message msg) {
lastMessage = obtainMessage();
lastMessage.copyFrom(msg);
setLastMessage(msg);
if (msg.what == AsyncChannel.CMD_CHANNEL_FULL_CONNECTION) {
chan = new AsyncChannel();
chan.connect(mContext, this, msg.replyTo);
chan.connect(context, this, msg.replyTo);
chan.sendMessage(AsyncChannel.CMD_CHANNEL_FULLY_CONNECTED);
}
}
public void stop() {
void stop() {
getLooper().quitSafely();
}
public static MockServiceHandler create(Context context) {
static MockServiceHandler create(Context context) {
HandlerThread t = new HandlerThread("mock-service-handler");
t.start();
return new MockServiceHandler(t.getLooper(), context);