Starting with API 30 we can not use reflection to fake NetworkCapabilities, only doing certain checks on API levels less then 30 for WiFiSocketFactoryTest

Author: JulianKast

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/WiFiSocketFactoryTest.java

@@ -111,8 +111,7 @@ private static NetworkCapabilities createNetworkCapabilitiesWithTransport(int tr
         // Since NetworkCapabilities class is 'final', we cannot create its mock. To create a dummy
         // instance, here we use reflection to call its constructor and a method that are marked
         // with "@hide".
-        // It is possible that these methods will not be available in a future version of Android.
-        // In that case we need to update our code accordingly.
+        // Starting in API level 30, this no longer works.
         Class<NetworkCapabilities> c = NetworkCapabilities.class;
         try {
             Method addTransportTypeMethod = c.getMethod("addTransportType", int.class);
@@ -176,7 +175,9 @@ public void testWithWiFiNetwork() {
         Socket ret = WiFiSocketFactory.createSocket(mMockContext);
 
         assertNotNull("createSocket() should always return a Socket instance", ret);
-        assertEquals("Returned Socket should be created through SocketFactory", mWiFiBoundSocket, ret);
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+            assertEquals("Returned Socket should be created through SocketFactory", mWiFiBoundSocket, ret);
+        }
     }
 
     // test the case where SDK_INT is less than 21
@@ -272,7 +273,9 @@ public void testNetworkListHasNull() {
         Socket ret = WiFiSocketFactory.createSocket(mMockContext);
 
         assertNotNull("createSocket() should always return a Socket instance", ret);
-        assertEquals("Returned Socket should be created through SocketFactory", mWiFiBoundSocket, ret);
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+            assertEquals("Returned Socket should be created through SocketFactory", mWiFiBoundSocket, ret);
+        }
     }
 
     // test the case where the phone isn't connected to Wi-Fi network
@@ -316,7 +319,9 @@ public void testSocketFactoryNull2() {
         Socket ret = WiFiSocketFactory.createSocket(mMockContext);
 
         assertNotNull("createSocket() should always return a Socket instance", ret);
-        assertEquals("Returned Socket should be created through SocketFactory", mWiFiBoundSocket, ret);
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+            assertEquals("Returned Socket should be created through SocketFactory", mWiFiBoundSocket, ret);
+        }
     }
 
     // test the case where we get an exception with SocketFactory.createSocket()
@@ -349,6 +354,8 @@ public void testFactoryReturnsException2() throws IOException {
         Socket ret = WiFiSocketFactory.createSocket(mMockContext);
 
         assertNotNull("createSocket() should always return a Socket instance", ret);
-        assertEquals("Returned Socket should be created through SocketFactory", mWiFiBoundSocket, ret);
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+            assertEquals("Returned Socket should be created through SocketFactory", mWiFiBoundSocket, ret);
+        }
     }
 }