joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

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

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

Change-Id: I33d31263acb4447d9ed730a4ec6d67fce77472fc
This commit is contained in:
Treehugger Robot 2021-06-29 08:42:14 +00:00 • committed by Automerger Merge Worker
commit af5ae307f2
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/app/usage/NetworkStatsManagerTest.java
View file

@ -36,11 +36,9 @@ import android.net.INetworkStatsSession;
import android.net.NetworkStats.Entry;
import android.net.NetworkStatsHistory;
import android.net.NetworkTemplate;
import android.os.Build;
import android.os.RemoteException;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@ -53,7 +51,6 @@ import org.mockito.invocation.InvocationOnMock;
@RunWith(AndroidJUnit4.class)
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class NetworkStatsManagerTest {
private static final String TEST_SUBSCRIBER_ID = "subid";

3
tests/unit/java/android/net/ConnectivityManagerTest.java
View file

@ -59,7 +59,6 @@ import android.app.PendingIntent;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.net.ConnectivityManager.NetworkCallback;
import android.os.Build;
import android.os.Build.VERSION_CODES;
import android.os.Bundle;
import android.os.Handler;
@ -68,7 +67,6 @@ import android.os.Message;
import android.os.Messenger;
import android.os.Process;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@ -81,7 +79,6 @@ import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class)
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class ConnectivityManagerTest {
@Mock Context mCtx;

3
tests/unit/java/android/net/Ikev2VpnProfileTest.java
View file

@ -23,10 +23,8 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import android.os.Build;
import android.test.mock.MockContext;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@ -54,7 +52,6 @@ import javax.security.auth.x500.X500Principal;
/** Unit tests for {@link Ikev2VpnProfile.Builder}. */
@SmallTest
@RunWith(AndroidJUnit4.class)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class Ikev2VpnProfileTest {
private static final String SERVER_ADDR_STRING = "1.2.3.4";
private static final String IDENTITY_STRING = "Identity";

3
tests/unit/java/android/net/IpMemoryStoreTest.java
View file

@ -36,10 +36,8 @@ import android.net.ipmemorystore.NetworkAttributes;
import android.net.ipmemorystore.NetworkAttributesParcelable;
import android.net.ipmemorystore.Status;
import android.net.networkstack.ModuleNetworkStackClient;
import android.os.Build;
import android.os.RemoteException;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@ -57,7 +55,6 @@ import java.util.Arrays;
@RunWith(AndroidJUnit4.class)
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class IpMemoryStoreTest {
private static final String TAG = IpMemoryStoreTest.class.getSimpleName();
private static final String TEST_CLIENT_ID = "testClientId";

2
tests/unit/java/android/net/IpSecAlgorithmTest.java
View file

@ -28,7 +28,6 @@ import android.content.res.Resources;
import android.os.Build;
import android.os.Parcel;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@ -47,7 +46,6 @@ import java.util.Set;
/** Unit tests for {@link IpSecAlgorithm}. */
@SmallTest
@RunWith(AndroidJUnit4.class)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class IpSecAlgorithmTest {
private static final byte[] KEY_MATERIAL;

4
tests/unit/java/android/net/IpSecConfigTest.java
View file

@ -23,9 +23,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import android.os.Build;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import org.junit.Test;
@ -35,7 +32,6 @@ import org.junit.runners.JUnit4;
/** Unit tests for {@link IpSecConfig}. */
@SmallTest
@RunWith(JUnit4.class)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class IpSecConfigTest {
@Test

3
tests/unit/java/android/net/IpSecManagerTest.java
View file

@ -31,11 +31,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.os.Build;
import android.system.Os;
import android.test.mock.MockContext;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@ -52,7 +50,6 @@ import java.net.UnknownHostException;
/** Unit tests for {@link IpSecManager}. */
@SmallTest
@RunWith(AndroidJUnit4.class)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class IpSecManagerTest {
private static final int TEST_UDP_ENCAP_PORT = 34567;

4
tests/unit/java/android/net/IpSecTransformTest.java
View file

@ -19,9 +19,6 @@ package android.net;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import android.os.Build;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import org.junit.Test;
@ -31,7 +28,6 @@ import org.junit.runners.JUnit4;
/** Unit tests for {@link IpSecTransform}. */
@SmallTest
@RunWith(JUnit4.class)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class IpSecTransformTest {
@Test

4
tests/unit/java/android/net/KeepalivePacketDataUtilTest.java
View file

@ -24,11 +24,8 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import android.net.util.KeepalivePacketDataUtil;
import android.os.Build;
import android.util.Log;
import androidx.test.filters.SdkSuppress;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@ -39,7 +36,6 @@ import java.net.InetAddress;
import java.nio.ByteBuffer;
@RunWith(JUnit4.class)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public final class KeepalivePacketDataUtilTest {
private static final byte[] IPV4_KEEPALIVE_SRC_ADDR = {10, 0, 0, 1};
private static final byte[] IPV4_KEEPALIVE_DST_ADDR = {10, 0, 0, 5};

4
tests/unit/java/android/net/MacAddressTest.java
View file

@ -22,9 +22,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import android.os.Build;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@ -39,7 +36,6 @@ import java.util.Random;
@SmallTest
@RunWith(AndroidJUnit4.class)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class MacAddressTest {
static class AddrTypeTestCase {

3
tests/unit/java/android/net/NetworkIdentityTest.kt
View file

@ -20,15 +20,12 @@ import android.net.NetworkIdentity.OEM_NONE
import android.net.NetworkIdentity.OEM_PAID
import android.net.NetworkIdentity.OEM_PRIVATE
import android.net.NetworkIdentity.getOemBitfield
import android.os.Build
import androidx.test.filters.SdkSuppress
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
import kotlin.test.assertEquals
@RunWith(JUnit4::class)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
class NetworkIdentityTest {
@Test
fun testGetOemBitfield() {

3
tests/unit/java/android/net/NetworkStatsHistoryTest.java
View file

@ -38,11 +38,9 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import android.content.Context;
import android.os.Build;
import android.util.Log;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@ -60,7 +58,6 @@ import java.util.Random;
@RunWith(AndroidJUnit4.class)
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class NetworkStatsHistoryTest {
private static final String TAG = "NetworkStatsHistoryTest";

3
tests/unit/java/android/net/NetworkStatsTest.java
View file

@ -39,11 +39,9 @@ import static android.net.NetworkStats.UID_ALL;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import android.os.Build;
import android.os.Process;
import android.util.ArrayMap;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@ -57,7 +55,6 @@ import java.util.HashSet;
@RunWith(AndroidJUnit4.class)
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class NetworkStatsTest {
private static final String TEST_IFACE = "test0";

3
tests/unit/java/android/net/NetworkTemplateTest.kt
View file

@ -42,9 +42,7 @@ import android.net.NetworkTemplate.buildTemplateWifi
import android.net.NetworkTemplate.buildTemplateWifiWildcard
import android.net.NetworkTemplate.buildTemplateCarrierMetered
import android.net.NetworkTemplate.buildTemplateMobileWithRatType
import android.os.Build
import android.telephony.TelephonyManager
import androidx.test.filters.SdkSuppress
import com.android.testutils.assertParcelSane
import org.junit.Before
import org.junit.Test
@ -63,7 +61,6 @@ private const val TEST_SSID1 = "ssid1"
private const val TEST_SSID2 = "ssid2"
@RunWith(JUnit4::class)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
class NetworkTemplateTest {
private val mockContext = mock(Context::class.java)

4
tests/unit/java/android/net/NetworkUtilsTest.java
View file

@ -18,9 +18,6 @@ package android.net;
import static junit.framework.Assert.assertEquals;
import android.os.Build;
import androidx.test.filters.SdkSuppress;
import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
@ -31,7 +28,6 @@ import java.util.TreeSet;
@RunWith(AndroidJUnit4.class)
@androidx.test.filters.SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class NetworkUtilsTest {
@Test
public void testRoutedIPv4AddressCount() {

4
tests/unit/java/android/net/QosSocketFilterTest.java
View file

@ -19,9 +19,6 @@ package android.net;
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
import android.os.Build;
import androidx.test.filters.SdkSuppress;
import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
@ -32,7 +29,6 @@ import java.net.InetSocketAddress;
@RunWith(AndroidJUnit4.class)
@androidx.test.filters.SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class QosSocketFilterTest {
@Test

3
tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java
View file

@ -23,10 +23,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import android.net.wifi.WifiNetworkSpecifier;
import android.os.Build;
import android.telephony.SubscriptionManager;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import org.junit.Test;
@ -35,7 +33,6 @@ import org.junit.Test;
* Unit test for {@link android.net.TelephonyNetworkSpecifier}.
*/
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class TelephonyNetworkSpecifierTest {
private static final int TEST_SUBID = 5;
private static final String TEST_SSID = "Test123";

3
tests/unit/java/android/net/VpnManagerTest.java
View file

@ -27,11 +27,9 @@ import static org.mockito.Mockito.when;
import android.content.ComponentName;
import android.content.Intent;
import android.os.Build;
import android.test.mock.MockContext;
import android.util.SparseArray;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@ -45,7 +43,6 @@ import org.junit.runner.RunWith;
/** Unit tests for {@link VpnManager}. */
@SmallTest
@RunWith(AndroidJUnit4.class)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class VpnManagerTest {
private static final String PKG_NAME = "fooPackage";

4
tests/unit/java/android/net/VpnTransportInfoTest.java
View file

@ -24,9 +24,6 @@ import static com.android.testutils.ParcelUtils.assertParcelSane;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import android.os.Build;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@ -35,7 +32,6 @@ import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class VpnTransportInfoTest {
@Test

3
tests/unit/java/android/net/ipmemorystore/ParcelableTests.java
View file

@ -21,11 +21,9 @@ import static org.junit.Assert.assertTrue;
import android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirk;
import android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirkParcelable;
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@ -40,7 +38,6 @@ import java.util.Collections;
@RunWith(AndroidJUnit4.class)
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
public class ParcelableTests {
@Test
public void testNetworkAttributesParceling() throws Exception {

Some files were not shown because too many files have changed in this diff Show more