1 files changed, 76 insertions, 57 deletions
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowConnectivityManagerTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowConnectivityManagerTest.java
index b224e4dfb..5fbe161d6 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowConnectivityManagerTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowConnectivityManagerTest.java
@@ -3,7 +3,6 @@ package org.robolectric.shadows;
 import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_DISABLED;
 import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED;
 import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_WHITELISTED;
-import static android.os.Build.VERSION_CODES.KITKAT;
 import static android.os.Build.VERSION_CODES.LOLLIPOP;
 import static android.os.Build.VERSION_CODES.M;
 import static android.os.Build.VERSION_CODES.N;
@@ -72,7 +71,7 @@ public class ShadowConnectivityManagerTest {
   }
 
   @Test
-  public void getNetworkInfo_shouldReturnDefaultNetworks() throws Exception {
+  public void getNetworkInfo_shouldReturnDefaultNetworks() {
     NetworkInfo wifi = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
     assertThat(wifi.getDetailedState()).isEqualTo(NetworkInfo.DetailedState.DISCONNECTED);
 
@@ -80,8 +79,9 @@ public class ShadowConnectivityManagerTest {
     assertThat(mobile.getDetailedState()).isEqualTo(NetworkInfo.DetailedState.CONNECTED);
   }
 
-  @Test @Config(minSdk = LOLLIPOP)
-  public void getNetworkInfo_shouldReturnSomeForAllNetworks() throws Exception {
+  @Test
+  @Config(minSdk = LOLLIPOP)
+  public void getNetworkInfo_shouldReturnSomeForAllNetworks() {
     Network[] allNetworks = connectivityManager.getAllNetworks();
     for (Network network: allNetworks) {
       NetworkInfo networkInfo = connectivityManager.getNetworkInfo(network);
@@ -89,8 +89,9 @@ public class ShadowConnectivityManagerTest {
     }
   }
 
-  @Test @Config(minSdk = LOLLIPOP)
-  public void getNetworkInfo_shouldReturnAddedNetwork() throws Exception {
+  @Test
+  @Config(minSdk = LOLLIPOP)
+  public void getNetworkInfo_shouldReturnAddedNetwork() {
     Network vpnNetwork = ShadowNetwork.newInstance(123);
     NetworkInfo vpnNetworkInfo =
         ShadowNetworkInfo.newInstance(
@@ -105,8 +106,9 @@ public class ShadowConnectivityManagerTest {
     assertThat(returnedNetworkInfo).isSameInstanceAs(vpnNetworkInfo);
   }
 
-  @Test @Config(minSdk = LOLLIPOP)
-  public void getNetworkInfo_shouldNotReturnRemovedNetwork() throws Exception {
+  @Test
+  @Config(minSdk = LOLLIPOP)
+  public void getNetworkInfo_shouldNotReturnRemovedNetwork() {
     Network wifiNetwork = ShadowNetwork.newInstance(ShadowConnectivityManager.NET_ID_WIFI);
     shadowOf(connectivityManager).removeNetwork(wifiNetwork);
 
@@ -124,14 +126,14 @@ public class ShadowConnectivityManagerTest {
   }
 
   @Test
-  public void shouldGetAndSetBackgroundDataSetting() throws Exception {
+  public void shouldGetAndSetBackgroundDataSetting() {
     assertThat(connectivityManager.getBackgroundDataSetting()).isFalse();
     shadowOf(connectivityManager).setBackgroundDataSetting(true);
     assertThat(connectivityManager.getBackgroundDataSetting()).isTrue();
   }
 
   @Test
-  public void setActiveNetworkInfo_shouldSetActiveNetworkInfo() throws Exception {
+  public void setActiveNetworkInfo_shouldSetActiveNetworkInfo() {
     shadowOf(connectivityManager).setActiveNetworkInfo(null);
     assertThat(connectivityManager.getActiveNetworkInfo()).isNull();
     shadowOf(connectivityManager)
@@ -166,7 +168,7 @@ public class ShadowConnectivityManagerTest {
 
   @Test
   @Config(minSdk = M)
-  public void setActiveNetworkInfo_shouldSetActiveNetwork() throws Exception {
+  public void setActiveNetworkInfo_shouldSetActiveNetwork() {
     shadowOf(connectivityManager).setActiveNetworkInfo(null);
     assertThat(connectivityManager.getActiveNetworkInfo()).isNull();
     shadowOf(connectivityManager)
@@ -188,7 +190,7 @@ public class ShadowConnectivityManagerTest {
   }
 
   @Test
-  public void getAllNetworkInfo_shouldReturnAllNetworkInterfaces() throws Exception {
+  public void getAllNetworkInfo_shouldReturnAllNetworkInterfaces() {
     NetworkInfo[] infos = connectivityManager.getAllNetworkInfo();
     assertThat(infos).asList().hasSize(2);
     assertThat(infos).asList().contains(connectivityManager.getActiveNetworkInfo());
@@ -199,7 +201,7 @@ public class ShadowConnectivityManagerTest {
 
   @Test
   @Config(minSdk = LOLLIPOP)
-  public void getAllNetworkInfo_shouldEqualGetAllNetworks() throws Exception {
+  public void getAllNetworkInfo_shouldEqualGetAllNetworks() {
     // Update the active network so that we're no longer in the default state.
     NetworkInfo networkInfo =
         ShadowNetworkInfo.newInstance(
@@ -227,21 +229,24 @@ public class ShadowConnectivityManagerTest {
     assertThat(connectivityManager.getAllNetworkInfo()).isNull();
   }
 
-  @Test @Config(minSdk = LOLLIPOP)
-  public void getAllNetworks_shouldReturnAllNetworks() throws Exception {
+  @Test
+  @Config(minSdk = LOLLIPOP)
+  public void getAllNetworks_shouldReturnAllNetworks() {
     Network[] networks = connectivityManager.getAllNetworks();
     assertThat(networks).asList().hasSize(2);
   }
 
-  @Test @Config(minSdk = LOLLIPOP)
-  public void getAllNetworks_shouldReturnNoNetworksWhenCleared() throws Exception {
+  @Test
+  @Config(minSdk = LOLLIPOP)
+  public void getAllNetworks_shouldReturnNoNetworksWhenCleared() {
     shadowOf(connectivityManager).clearAllNetworks();
     Network[] networks = connectivityManager.getAllNetworks();
     assertThat(networks).isEmpty();
   }
 
-  @Test @Config(minSdk = LOLLIPOP)
-  public void getAllNetworks_shouldReturnAddedNetworks() throws Exception {
+  @Test
+  @Config(minSdk = LOLLIPOP)
+  public void getAllNetworks_shouldReturnAddedNetworks() {
     // Let's start clear.
     shadowOf(connectivityManager).clearAllNetworks();
 
@@ -266,8 +271,9 @@ public class ShadowConnectivityManagerTest {
     assertThat(returnedNetworkInfo).isSameInstanceAs(vpnNetworkInfo);
   }
 
-  @Test @Config(minSdk = LOLLIPOP)
-  public void getAllNetworks_shouldNotReturnRemovedNetworks() throws Exception {
+  @Test
+  @Config(minSdk = LOLLIPOP)
+  public void getAllNetworks_shouldNotReturnRemovedNetworks() {
     Network wifiNetwork = ShadowNetwork.newInstance(ShadowConnectivityManager.NET_ID_WIFI);
     shadowOf(connectivityManager).removeNetwork(wifiNetwork);
 
@@ -280,13 +286,13 @@ public class ShadowConnectivityManagerTest {
   }
 
   @Test
-  public void getNetworkPreference_shouldGetDefaultValue() throws Exception {
+  public void getNetworkPreference_shouldGetDefaultValue() {
     assertThat(connectivityManager.getNetworkPreference()).isEqualTo(ConnectivityManager.DEFAULT_NETWORK_PREFERENCE);
   }
 
   @Test
   @Config(minSdk = M)
-  public void getReportedNetworkConnectivity() throws Exception {
+  public void getReportedNetworkConnectivity() {
     Network wifiNetwork = ShadowNetwork.newInstance(ShadowConnectivityManager.NET_ID_WIFI);
     connectivityManager.reportNetworkConnectivity(wifiNetwork, true);
 
@@ -303,15 +309,16 @@ public class ShadowConnectivityManagerTest {
   }
 
   @Test
-  public void setNetworkPreference_shouldSetDefaultValue() throws Exception {
+  public void setNetworkPreference_shouldSetDefaultValue() {
     connectivityManager.setNetworkPreference(ConnectivityManager.TYPE_MOBILE);
     assertThat(connectivityManager.getNetworkPreference()).isEqualTo(connectivityManager.getNetworkPreference());
     connectivityManager.setNetworkPreference(ConnectivityManager.TYPE_WIFI);
     assertThat(connectivityManager.getNetworkPreference()).isEqualTo(ConnectivityManager.TYPE_WIFI);
   }
 
-  @Test @Config(minSdk = LOLLIPOP)
-  public void getNetworkCallbacks_shouldHaveEmptyDefault() throws Exception {
+  @Test
+  @Config(minSdk = LOLLIPOP)
+  public void getNetworkCallbacks_shouldHaveEmptyDefault() {
     assertThat(shadowOf(connectivityManager).getNetworkCallbacks()).isEmpty();
   }
 
@@ -330,15 +337,16 @@ public class ShadowConnectivityManagerTest {
 
   @Test
   @Config(minSdk = LOLLIPOP)
-  public void requestNetwork_shouldAddCallback() throws Exception {
+  public void requestNetwork_shouldAddCallback() {
     NetworkRequest.Builder builder = new NetworkRequest.Builder();
     ConnectivityManager.NetworkCallback callback = createSimpleCallback();
     connectivityManager.requestNetwork(builder.build(), callback);
     assertThat(shadowOf(connectivityManager).getNetworkCallbacks()).hasSize(1);
   }
 
-  @Test @Config(minSdk = LOLLIPOP)
-  public void registerCallback_shouldAddCallback() throws Exception {
+  @Test
+  @Config(minSdk = LOLLIPOP)
+  public void registerCallback_shouldAddCallback() {
     NetworkRequest.Builder builder = new NetworkRequest.Builder();
     ConnectivityManager.NetworkCallback callback = createSimpleCallback();
     connectivityManager.registerNetworkCallback(builder.build(), callback);
@@ -347,7 +355,7 @@ public class ShadowConnectivityManagerTest {
 
   @Test
   @Config(minSdk = M)
-  public void registerCallback_withPendingIntent_shouldAddCallback() throws Exception {
+  public void registerCallback_withPendingIntent_shouldAddCallback() {
     NetworkRequest.Builder builder = new NetworkRequest.Builder();
     PendingIntent pendingIntent = createSimplePendingIntent();
     connectivityManager.registerNetworkCallback(builder.build(), pendingIntent);
@@ -356,7 +364,7 @@ public class ShadowConnectivityManagerTest {
 
   @Test
   @Config(minSdk = O)
-  public void requestNetwork_withTimeout_shouldAddCallback() throws Exception {
+  public void requestNetwork_withTimeout_shouldAddCallback() {
     NetworkRequest.Builder builder = new NetworkRequest.Builder();
     ConnectivityManager.NetworkCallback callback = createSimpleCallback();
     connectivityManager.requestNetwork(builder.build(), callback, 0);
@@ -365,7 +373,7 @@ public class ShadowConnectivityManagerTest {
 
   @Test
   @Config(minSdk = O)
-  public void requestNetwork_withHandler_shouldAddCallback() throws Exception {
+  public void requestNetwork_withHandler_shouldAddCallback() {
     NetworkRequest.Builder builder = new NetworkRequest.Builder();
     ConnectivityManager.NetworkCallback callback = createSimpleCallback();
     connectivityManager.requestNetwork(builder.build(), callback, new Handler());
@@ -374,7 +382,7 @@ public class ShadowConnectivityManagerTest {
 
   @Test
   @Config(minSdk = O)
-  public void requestNetwork_withHandlerAndTimer_shouldAddCallback() throws Exception {
+  public void requestNetwork_withHandlerAndTimer_shouldAddCallback() {
     NetworkRequest.Builder builder = new NetworkRequest.Builder();
     ConnectivityManager.NetworkCallback callback = createSimpleCallback();
     connectivityManager.requestNetwork(builder.build(), callback, new Handler(), 0);
@@ -383,14 +391,15 @@ public class ShadowConnectivityManagerTest {
 
   @Test
   @Config(minSdk = N)
-  public void registerDefaultCallback_shouldAddCallback() throws Exception {
+  public void registerDefaultCallback_shouldAddCallback() {
     ConnectivityManager.NetworkCallback callback = createSimpleCallback();
     connectivityManager.registerDefaultNetworkCallback(callback);
     assertThat(shadowOf(connectivityManager).getNetworkCallbacks()).hasSize(1);
   }
 
-  @Test @Config(minSdk = LOLLIPOP)
-  public void unregisterCallback_shouldRemoveCallbacks() throws Exception {
+  @Test
+  @Config(minSdk = LOLLIPOP)
+  public void unregisterCallback_shouldRemoveCallbacks() {
     NetworkRequest.Builder builder = new NetworkRequest.Builder();
     // Add two different callbacks.
     ConnectivityManager.NetworkCallback callback1 = createSimpleCallback();
@@ -407,7 +416,7 @@ public class ShadowConnectivityManagerTest {
 
   @Test
   @Config(minSdk = M)
-  public void unregisterCallback_withPendingIntent_shouldRemoveCallbacks() throws Exception {
+  public void unregisterCallback_withPendingIntent_shouldRemoveCallbacks() {
     NetworkRequest.Builder builder = new NetworkRequest.Builder();
     // Add two pendingIntents, should treat them as equal based on Intent#filterEquals
     PendingIntent pendingIntent1 = createSimplePendingIntent();
@@ -420,15 +429,20 @@ public class ShadowConnectivityManagerTest {
     assertThat(shadowOf(connectivityManager).getNetworkCallbackPendingIntents()).isEmpty();
   }
 
-  @Test(expected=IllegalArgumentException.class) @Config(minSdk = LOLLIPOP)
-  public void unregisterCallback_shouldNotAllowNullCallback() throws Exception {
+  @Config(minSdk = LOLLIPOP)
+  @Test
+  public void unregisterCallback_shouldNotAllowNullCallback() {
     // Verify that exception is thrown.
-    connectivityManager.unregisterNetworkCallback((ConnectivityManager.NetworkCallback) null);
+    assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            connectivityManager.unregisterNetworkCallback(
+                (ConnectivityManager.NetworkCallback) null));
   }
 
-  @Test
   @Config(minSdk = M)
-  public void unregisterCallback_withPendingIntent_shouldNotAllowNullCallback() throws Exception {
+  @Test
+  public void unregisterCallback_withPendingIntent_shouldNotAllowNullCallback() {
     // Verify that exception is thrown.
     assertThrows(
         IllegalArgumentException.class,
@@ -496,7 +510,7 @@ public class ShadowConnectivityManagerTest {
 
   @Test
   @Config(minSdk = LOLLIPOP)
-  public void addDefaultNetworkActiveListener_shouldAddListener() throws Exception {
+  public void addDefaultNetworkActiveListener_shouldAddListener() {
     ConnectivityManager.OnNetworkActiveListener listener1 =
         spy(createSimpleOnNetworkActiveListener());
     ConnectivityManager.OnNetworkActiveListener listener2 =
@@ -512,7 +526,7 @@ public class ShadowConnectivityManagerTest {
 
   @Test
   @Config(minSdk = LOLLIPOP)
-  public void removeDefaultNetworkActiveListener_shouldRemoveListeners() throws Exception {
+  public void removeDefaultNetworkActiveListener_shouldRemoveListeners() {
     // Add two different callbacks.
     ConnectivityManager.OnNetworkActiveListener listener1 =
         spy(createSimpleOnNetworkActiveListener());
@@ -541,16 +555,18 @@ public class ShadowConnectivityManagerTest {
     verify(listener2).onNetworkActive();
   }
 
-  @Test(expected = IllegalArgumentException.class)
   @Config(minSdk = LOLLIPOP)
-  public void removeDefaultNetworkActiveListener_shouldNotAllowNullListener() throws Exception {
+  @Test
+  public void removeDefaultNetworkActiveListener_shouldNotAllowNullListener() {
     // Verify that exception is thrown.
-    connectivityManager.removeDefaultNetworkActiveListener(null);
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> connectivityManager.removeDefaultNetworkActiveListener(null));
   }
 
   @Test
   @Config(minSdk = LOLLIPOP)
-  public void getNetworkCapabilities() throws Exception {
+  public void getNetworkCapabilities() {
     NetworkCapabilities nc = ShadowNetworkCapabilities.newInstance();
     shadowOf(nc).addCapability(NetworkCapabilities.NET_CAPABILITY_MMS);
 
@@ -566,7 +582,7 @@ public class ShadowConnectivityManagerTest {
 
   @Test
   @Config(minSdk = LOLLIPOP)
-  public void getNetworkCapabilities_shouldReturnDefaultCapabilities() throws Exception {
+  public void getNetworkCapabilities_shouldReturnDefaultCapabilities() {
     for (Network network : connectivityManager.getAllNetworks()) {
       NetworkCapabilities nc = connectivityManager.getNetworkCapabilities(network);
       assertThat(nc).isNotNull();
@@ -594,7 +610,6 @@ public class ShadowConnectivityManagerTest {
   }
 
   @Test
-  @Config(minSdk = KITKAT)
   public void setAirplaneMode() {
     connectivityManager.setAirplaneMode(false);
     assertThat(
@@ -650,20 +665,24 @@ public class ShadowConnectivityManagerTest {
         .isEqualTo(RESTRICT_BACKGROUND_STATUS_DISABLED);
   }
 
-  @Test(expected = IllegalArgumentException.class)
   @Config(minSdk = N)
-  public void setRestrictBackgroundStatus_throwsExceptionOnIncorrectStatus0() throws Exception{
-    shadowOf(connectivityManager).setRestrictBackgroundStatus(0);
+  @Test
+  public void setRestrictBackgroundStatus_throwsExceptionOnIncorrectStatus0() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> shadowOf(connectivityManager).setRestrictBackgroundStatus(0));
   }
 
-  @Test(expected = IllegalArgumentException.class)
   @Config(minSdk = N)
-  public void setRestrictBackgroundStatus_throwsExceptionOnIncorrectStatus4() throws Exception{
-    shadowOf(connectivityManager).setRestrictBackgroundStatus(4);
+  @Test
+  public void setRestrictBackgroundStatus_throwsExceptionOnIncorrectStatus4() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> shadowOf(connectivityManager).setRestrictBackgroundStatus(4));
   }
 
   @Test
-  public void checkPollingTetherThreadNotCreated() throws Exception {
+  public void checkPollingTetherThreadNotCreated() {
     for (StackTraceElement[] elements : Thread.getAllStackTraces().values()) {
       for (StackTraceElement element : elements) {
         if (element.toString().contains("android.net.TetheringManager")) {