From 154cf1da20a77176ac42faed117a48afcf840bf4 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 29 Jun 2021 17:16:28 +0900 Subject: Re-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. This applies a previous change, this time using DevSdkIgnoreRunner, as SdkSuppress does not work as expected in branches that have a codename 2 versions above the SDK version, as is the case in AOSP. Bug: 187935317 Test: atest ConnectivityCoverageTests on R atest FrameworksNetTests on S Change-Id: I5808d34459a4c19238baf8873afa7cf942828460 --- tests/unit/java/android/net/IpSecAlgorithmTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/unit/java/android/net/IpSecAlgorithmTest.java') diff --git a/tests/unit/java/android/net/IpSecAlgorithmTest.java b/tests/unit/java/android/net/IpSecAlgorithmTest.java index 3a8d6004f6..cac8c2d941 100644 --- a/tests/unit/java/android/net/IpSecAlgorithmTest.java +++ b/tests/unit/java/android/net/IpSecAlgorithmTest.java @@ -29,9 +29,10 @@ import android.os.Build; import android.os.Parcel; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.CollectionUtils; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -45,7 +46,8 @@ import java.util.Set; /** Unit tests for {@link IpSecAlgorithm}. */ @SmallTest -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class IpSecAlgorithmTest { private static final byte[] KEY_MATERIAL; -- cgit v1.2.3