Skip connectivity unit tests before S
The tests are packaged together with other tests in a common coverage suite, so need to be individually annotated so that they are skipped before S. They do not need to pass on platforms older than S, because such platforms will not updated with the code that is tested. Bug: 187935317 Test: atest ConnectivityCoverageTests on R Change-Id: I10da45ae023e7f1e8cd11ec857b84346892a3fa8
This commit is contained in:
@@ -27,9 +27,11 @@ import static junit.framework.Assert.assertEquals;
|
||||
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
import android.os.Build;
|
||||
import android.system.ErrnoException;
|
||||
import android.system.Os;
|
||||
|
||||
import androidx.test.filters.SdkSuppress;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import libcore.io.IoUtils;
|
||||
@@ -39,6 +41,7 @@ import org.junit.runner.RunWith;
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
@androidx.test.filters.SmallTest
|
||||
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
|
||||
public class NetworkUtilsInternalTest {
|
||||
|
||||
private static void expectSocketSuccess(String msg, int domain, int type) {
|
||||
|
||||
@@ -25,7 +25,9 @@ import static org.junit.Assert.assertNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import android.net.IpSecAlgorithm;
|
||||
import android.os.Build;
|
||||
|
||||
import androidx.test.filters.SdkSuppress;
|
||||
import androidx.test.filters.SmallTest;
|
||||
|
||||
import org.junit.Test;
|
||||
@@ -39,6 +41,7 @@ import java.util.List;
|
||||
/** Unit tests for {@link VpnProfile}. */
|
||||
@SmallTest
|
||||
@RunWith(JUnit4.class)
|
||||
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
|
||||
public class VpnProfileTest {
|
||||
private static final String DUMMY_PROFILE_KEY = "Test";
|
||||
|
||||
|
||||
@@ -30,6 +30,9 @@ import static com.android.internal.util.BitUtils.unpackBits;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import android.os.Build;
|
||||
|
||||
import androidx.test.filters.SdkSuppress;
|
||||
import androidx.test.filters.SmallTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
@@ -42,6 +45,7 @@ import java.util.Random;
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
|
||||
public class BitUtilsTest {
|
||||
|
||||
@Test
|
||||
|
||||
@@ -20,6 +20,9 @@ import static org.junit.Assert.assertArrayEquals;
|
||||
import static org.junit.Assert.assertNull;
|
||||
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;
|
||||
|
||||
@@ -28,6 +31,7 @@ import org.junit.runner.RunWith;
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
|
||||
public class RingBufferTest {
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user