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

Merge "Revert "Skip connectivity unit tests before S"" am: b0c9e64d33 am: af5ae307f2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749498

Change-Id: Ibacbb3f4ca829931b723893a1dd84a2d21de914e
This commit is contained in:
Treehugger Robot
2021-06-29 08:57:56 +00:00
committed by Automerger Merge Worker
parent f898bfefee af5ae307f2
commit 6da2b28e57
57 changed files with 6 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/unit/java/android/net/util/DnsUtilsTest.java
View File

@@ -25,9 +25,7 @@ import static org.junit.Assert.assertEquals;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.net.InetAddresses;
import android.os.Build;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@@ -41,7 +39,6 @@ import java.util.List;
@RunWith(AndroidJUnit4.class)
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class DnsUtilsTest {
private InetAddress stringToAddress(@NonNull String addr) {
return InetAddresses.parseNumericAddress(addr);

3
tests/unit/java/android/net/util/KeepaliveUtilsTest.kt
View File

@@ -25,8 +25,6 @@ import android.net.NetworkCapabilities.TRANSPORT_CELLULAR
import android.net.NetworkCapabilities.TRANSPORT_ETHERNET
import android.net.NetworkCapabilities.TRANSPORT_VPN
import android.net.NetworkCapabilities.TRANSPORT_WIFI
import android.os.Build
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
import com.android.internal.R
import org.junit.After
@@ -49,7 +47,6 @@ import org.mockito.Mockito.mock
*/
@RunWith(JUnit4::class)
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
class KeepaliveUtilsTest {
// Prepare mocked context with given resource strings.

3
tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt
View File

@@ -25,13 +25,11 @@ import android.net.ConnectivityResources
import android.net.ConnectivitySettingsManager.NETWORK_AVOID_BAD_WIFI
import android.net.ConnectivitySettingsManager.NETWORK_METERED_MULTIPATH_PREFERENCE
import android.net.util.MultinetworkPolicyTracker.ActiveDataSubscriptionIdListener
import android.os.Build
import android.provider.Settings
import android.telephony.SubscriptionInfo
import android.telephony.SubscriptionManager
import android.telephony.TelephonyManager
import android.test.mock.MockContentResolver
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
import androidx.test.runner.AndroidJUnit4
import com.android.connectivity.resources.R
@@ -61,7 +59,6 @@ import org.mockito.Mockito.verify
*/
@RunWith(AndroidJUnit4::class)
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
class MultinetworkPolicyTrackerTest {
private val resources = mock(Resources::class.java).also {
doReturn(R.integer.config_networkAvoidBadWifi).`when`(it).getIdentifier(