Merge "Address a few unittest comments." am: 9c3a298748 am: d4d464ae2c (d870ed9e) · Commits · e / os / android_frameworks_base

tests/net/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitorTest.java

+17 −13

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN;
	import static org.junit.Assert.assertEquals;		import static org.junit.Assert.assertEquals;
	import static org.junit.Assert.assertFalse;		import static org.junit.Assert.assertFalse;
	import static org.junit.Assert.assertTrue;		import static org.junit.Assert.assertTrue;
			import static org.junit.Assert.fail;
	import static org.mockito.Mockito.reset;		import static org.mockito.Mockito.reset;

	import android.content.Context;		import android.content.Context;
	@@ -69,12 +70,13 @@ public class UpstreamNetworkMonitorTest {

	@Test		@Test
	public void testDoesNothingBeforeStarted() {		public void testDoesNothingBeforeStarted() {
	UpstreamNetworkMonitor unm = new UpstreamNetworkMonitor(null, null, EVENT_UNM_UPDATE);		assertTrue(mCM.hasNoCallbacks());
	assertFalse(unm.mobileNetworkRequested());		assertFalse(mUNM.mobileNetworkRequested());
	// Given a null Context, and therefore a null ConnectivityManager,
	// these would cause an exception, if they actually attempted anything.		mUNM.updateMobileRequiresDun(true);
	unm.updateMobileRequiresDun(true);		assertTrue(mCM.hasNoCallbacks());
	unm.updateMobileRequiresDun(false);		mUNM.updateMobileRequiresDun(false);
			assertTrue(mCM.hasNoCallbacks());
	}		}

	@Test		@Test
	@@ -85,7 +87,7 @@ public class UpstreamNetworkMonitorTest {
	assertEquals(1, mCM.trackingDefault.size());		assertEquals(1, mCM.trackingDefault.size());

	mUNM.stop();		mUNM.stop();
	assertTrue(mCM.isEmpty());		assertTrue(mCM.hasNoCallbacks());
	}		}

	@Test		@Test
	@@ -97,11 +99,11 @@ public class UpstreamNetworkMonitorTest {
	assertTrue(mCM.isListeningForDun());		assertTrue(mCM.isListeningForDun());

	mUNM.stop();		mUNM.stop();
	assertTrue(mCM.isEmpty());		assertTrue(mCM.hasNoCallbacks());
	}		}

	@Test		@Test
	public void testCanRequestMobileNetwork() throws Exception {		public void testRequestsMobileNetwork() throws Exception {
	assertFalse(mUNM.mobileNetworkRequested());		assertFalse(mUNM.mobileNetworkRequested());
	assertEquals(0, mCM.requested.size());		assertEquals(0, mCM.requested.size());

	@@ -123,11 +125,11 @@ public class UpstreamNetworkMonitorTest {

	mUNM.stop();		mUNM.stop();
	assertFalse(mUNM.mobileNetworkRequested());		assertFalse(mUNM.mobileNetworkRequested());
	assertTrue(mCM.isEmpty());		assertTrue(mCM.hasNoCallbacks());
	}		}

	@Test		@Test
	public void testCanRequestDunNetwork() throws Exception {		public void testRequestsDunNetwork() throws Exception {
	assertFalse(mUNM.mobileNetworkRequested());		assertFalse(mUNM.mobileNetworkRequested());
	assertEquals(0, mCM.requested.size());		assertEquals(0, mCM.requested.size());

	@@ -149,7 +151,7 @@ public class UpstreamNetworkMonitorTest {

	mUNM.stop();		mUNM.stop();
	assertFalse(mUNM.mobileNetworkRequested());		assertFalse(mUNM.mobileNetworkRequested());
	assertTrue(mCM.isEmpty());		assertTrue(mCM.hasNoCallbacks());
	}		}

	private static class TestConnectivityManager extends ConnectivityManager {		private static class TestConnectivityManager extends ConnectivityManager {
	@@ -162,7 +164,7 @@ public class UpstreamNetworkMonitorTest {
	super(ctx, svc);		super(ctx, svc);
	}		}

	boolean isEmpty() {		boolean hasNoCallbacks() {
	return trackingDefault.isEmpty() &&		return trackingDefault.isEmpty() &&
	listening.isEmpty() &&		listening.isEmpty() &&
	requested.isEmpty() &&		requested.isEmpty() &&
	@@ -225,6 +227,8 @@ public class UpstreamNetworkMonitorTest {
	} else if (requested.containsKey(cb)) {		} else if (requested.containsKey(cb)) {
	requested.remove(cb);		requested.remove(cb);
	legacyTypeMap.remove(cb);		legacyTypeMap.remove(cb);
			} else {
			fail("Unexpected callback removed");
	}		}

	assertFalse(trackingDefault.contains(cb));		assertFalse(trackingDefault.contains(cb));