Merge "Network Service Discovery test: properly release resources" (80e0daa8) · Commits · e / os / android_frameworks_base

core/java/android/net/nsd/NsdManager.java

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -21,25 +21,24 @@ import static com.android.internal.util.Preconditions.checkNotNull;
	import static com.android.internal.util.Preconditions.checkStringNotEmpty;		import static com.android.internal.util.Preconditions.checkStringNotEmpty;

	import android.annotation.SdkConstant;		import android.annotation.SdkConstant;
	import android.annotation.SystemService;
	import android.annotation.SdkConstant.SdkConstantType;		import android.annotation.SdkConstant.SdkConstantType;
			import android.annotation.SystemService;
	import android.content.Context;		import android.content.Context;
	import android.os.Handler;		import android.os.Handler;
	import android.os.HandlerThread;		import android.os.HandlerThread;
	import android.os.Looper;		import android.os.Looper;
	import android.os.Message;		import android.os.Message;
	import android.os.RemoteException;
	import android.os.Messenger;		import android.os.Messenger;
	import android.text.TextUtils;		import android.os.RemoteException;
	import android.util.Log;		import android.util.Log;
	import android.util.SparseArray;		import android.util.SparseArray;

	import java.util.concurrent.CountDownLatch;

	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;
	import com.android.internal.util.AsyncChannel;		import com.android.internal.util.AsyncChannel;
	import com.android.internal.util.Protocol;		import com.android.internal.util.Protocol;

			import java.util.concurrent.CountDownLatch;

	/**		/**
	* The Network Service Discovery Manager class provides the API to discover services		* The Network Service Discovery Manager class provides the API to discover services
	* on a network. As an example, if device A and device B are connected over a Wi-Fi		* on a network. As an example, if device A and device B are connected over a Wi-Fi
	@@ -244,7 +243,7 @@ public final class NsdManager {
	return name;		return name;
	}		}

	private static int FIRST_LISTENER_KEY = 1;		private static final int FIRST_LISTENER_KEY = 1;

	private final INsdManager mService;		private final INsdManager mService;
	private final Context mContext;		private final Context mContext;
	@@ -278,6 +277,7 @@ public final class NsdManager {
	@VisibleForTesting		@VisibleForTesting
	public void disconnect() {		public void disconnect() {
	mAsyncChannel.disconnect();		mAsyncChannel.disconnect();
			mHandler.getLooper().quitSafely();
	}		}

	/**		/**

tests/net/java/android/net/nsd/NsdManagerTest.java

+25 −5

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ import static org.mockito.Mockito.timeout;
	import static org.mockito.Mockito.times;		import static org.mockito.Mockito.times;
	import static org.mockito.Mockito.verify;		import static org.mockito.Mockito.verify;
	import static org.mockito.Mockito.when;		import static org.mockito.Mockito.when;
			import static com.android.internal.util.TestUtils.waitForIdleHandler;

	import android.os.HandlerThread;		import android.os.HandlerThread;
	import android.os.Handler;		import android.os.Handler;
	@@ -38,6 +39,7 @@ import android.support.test.runner.AndroidJUnit4;
	import android.os.Message;		import android.os.Message;
	import android.os.Messenger;		import android.os.Messenger;
	import com.android.internal.util.AsyncChannel;		import com.android.internal.util.AsyncChannel;
			import org.junit.After;
	import org.junit.Before;		import org.junit.Before;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.runner.RunWith;		import org.junit.runner.RunWith;
	@@ -56,6 +58,8 @@ public class NsdManagerTest {
	@Mock INsdManager mService;		@Mock INsdManager mService;
	MockServiceHandler mServiceHandler;		MockServiceHandler mServiceHandler;

			NsdManager mManager;

	long mTimeoutMs = 100; // non-final so that tests can adjust the value.		long mTimeoutMs = 100; // non-final so that tests can adjust the value.

	@Before		@Before
	@@ -64,11 +68,23 @@ public class NsdManagerTest {

	mServiceHandler = spy(MockServiceHandler.create(mContext));		mServiceHandler = spy(MockServiceHandler.create(mContext));
	when(mService.getMessenger()).thenReturn(new Messenger(mServiceHandler));		when(mService.getMessenger()).thenReturn(new Messenger(mServiceHandler));

			mManager = makeManager();
			}

			@After
			public void tearDown() throws Exception {
			waitForIdleHandler(mServiceHandler, mTimeoutMs);
			mServiceHandler.chan.disconnect();
			mServiceHandler.stop();
			if (mManager != null) {
			mManager.disconnect();
			}
	}		}

	@Test		@Test
	public void testResolveService() {		public void testResolveService() {
	NsdManager manager = makeManager();		NsdManager manager = mManager;

	NsdServiceInfo request = new NsdServiceInfo("a_name", "a_type");		NsdServiceInfo request = new NsdServiceInfo("a_name", "a_type");
	NsdServiceInfo reply = new NsdServiceInfo("resolved_name", "resolved_type");		NsdServiceInfo reply = new NsdServiceInfo("resolved_name", "resolved_type");
	@@ -88,7 +104,7 @@ public class NsdManagerTest {

	@Test		@Test
	public void testParallelResolveService() {		public void testParallelResolveService() {
	NsdManager manager = makeManager();		NsdManager manager = mManager;

	NsdServiceInfo request = new NsdServiceInfo("a_name", "a_type");		NsdServiceInfo request = new NsdServiceInfo("a_name", "a_type");
	NsdServiceInfo reply = new NsdServiceInfo("resolved_name", "resolved_type");		NsdServiceInfo reply = new NsdServiceInfo("resolved_name", "resolved_type");
	@@ -111,7 +127,7 @@ public class NsdManagerTest {

	@Test		@Test
	public void testRegisterService() {		public void testRegisterService() {
	NsdManager manager = makeManager();		NsdManager manager = mManager;

	NsdServiceInfo request1 = new NsdServiceInfo("a_name", "a_type");		NsdServiceInfo request1 = new NsdServiceInfo("a_name", "a_type");
	NsdServiceInfo request2 = new NsdServiceInfo("another_name", "another_type");		NsdServiceInfo request2 = new NsdServiceInfo("another_name", "another_type");
	@@ -170,7 +186,7 @@ public class NsdManagerTest {

	@Test		@Test
	public void testDiscoverService() {		public void testDiscoverService() {
	NsdManager manager = makeManager();		NsdManager manager = mManager;

	NsdServiceInfo reply1 = new NsdServiceInfo("a_name", "a_type");		NsdServiceInfo reply1 = new NsdServiceInfo("a_name", "a_type");
	NsdServiceInfo reply2 = new NsdServiceInfo("another_name", "a_type");		NsdServiceInfo reply2 = new NsdServiceInfo("another_name", "a_type");
	@@ -248,7 +264,7 @@ public class NsdManagerTest {

	@Test		@Test
	public void testInvalidCalls() {		public void testInvalidCalls() {
	NsdManager manager = new NsdManager(mContext, mService);		NsdManager manager = mManager;

	NsdManager.RegistrationListener listener1 = mock(NsdManager.RegistrationListener.class);		NsdManager.RegistrationListener listener1 = mock(NsdManager.RegistrationListener.class);
	NsdManager.DiscoveryListener listener2 = mock(NsdManager.DiscoveryListener.class);		NsdManager.DiscoveryListener listener2 = mock(NsdManager.DiscoveryListener.class);
	@@ -351,6 +367,10 @@ public class NsdManagerTest {
	}		}
	}		}

			public void stop() {
			getLooper().quitSafely();
			}

	public static MockServiceHandler create(Context context) {		public static MockServiceHandler create(Context context) {
	HandlerThread t = new HandlerThread("mock-service-handler");		HandlerThread t = new HandlerThread("mock-service-handler");
	t.start();		t.start();

tests/net/java/com/android/server/NsdServiceTest.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -95,6 +95,9 @@ public class NsdServiceTest {
	client2.disconnect();		client2.disconnect();

	verify(mDaemon, timeout(mTimeoutMs).times(1)).stop();		verify(mDaemon, timeout(mTimeoutMs).times(1)).stop();

			client1.disconnect();
			client2.disconnect();
	}		}

	@Test		@Test
	@@ -131,6 +134,8 @@ public class NsdServiceTest {

	// checks that request are cleaned		// checks that request are cleaned
	verifyDaemonCommands("stop-register 2", "stop-discover 3", "stop-resolve 4");		verifyDaemonCommands("stop-register 2", "stop-discover 3", "stop-resolve 4");

			client.disconnect();
	}		}

	NsdService makeService() {		NsdService makeService() {