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

Merge "Ignore EXCLUDED_ROUTES LinkPropertiesTest up to S_V2" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-22 08:19:25 +00:00
committed by Gerrit Code Review
parent d5038a042c 7fe61f4cbd
commit b5208bad3e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/common/java/android/net/LinkPropertiesTest.java
View File

@@ -1260,7 +1260,7 @@ public class LinkPropertiesTest {
assertFalse(lp.hasIpv4UnreachableDefaultRoute()); assertFalse(lp.hasIpv4UnreachableDefaultRoute());
} }
@Test @IgnoreUpTo(Build.VERSION_CODES.R) @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
@CtsNetTestCasesMaxTargetSdk31(reason = "Compat change cannot be overridden when targeting T+") @CtsNetTestCasesMaxTargetSdk31(reason = "Compat change cannot be overridden when targeting T+")
@EnableCompatChanges({ConnectivityCompatChanges.EXCLUDED_ROUTES}) @EnableCompatChanges({ConnectivityCompatChanges.EXCLUDED_ROUTES})
public void testHasExcludeRoute() { public void testHasExcludeRoute() {
@@ -1273,7 +1273,7 @@ public class LinkPropertiesTest {
assertTrue(lp.hasExcludeRoute()); assertTrue(lp.hasExcludeRoute());
} }
@Test @IgnoreUpTo(Build.VERSION_CODES.R) @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
@CtsNetTestCasesMaxTargetSdk31(reason = "Compat change cannot be overridden when targeting T+") @CtsNetTestCasesMaxTargetSdk31(reason = "Compat change cannot be overridden when targeting T+")
@EnableCompatChanges({ConnectivityCompatChanges.EXCLUDED_ROUTES}) @EnableCompatChanges({ConnectivityCompatChanges.EXCLUDED_ROUTES})
public void testRouteAddWithSameKey() throws Exception { public void testRouteAddWithSameKey() throws Exception {
@@ -1347,14 +1347,14 @@ public class LinkPropertiesTest {
assertExcludeRoutesVisible(); assertExcludeRoutesVisible();
} }
@Test @IgnoreUpTo(Build.VERSION_CODES.R) @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
@CtsNetTestCasesMaxTargetSdk31(reason = "Compat change cannot be overridden when targeting T+") @CtsNetTestCasesMaxTargetSdk31(reason = "Compat change cannot be overridden when targeting T+")
@EnableCompatChanges({ConnectivityCompatChanges.EXCLUDED_ROUTES}) @EnableCompatChanges({ConnectivityCompatChanges.EXCLUDED_ROUTES})
public void testExcludedRoutesEnabledByCompatChange() { public void testExcludedRoutesEnabledByCompatChange() {
assertExcludeRoutesVisible(); assertExcludeRoutesVisible();
} }
@Test @IgnoreUpTo(Build.VERSION_CODES.R) @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
@CtsNetTestCasesMaxTargetSdk31(reason = "Compat change cannot be overridden when targeting T+") @CtsNetTestCasesMaxTargetSdk31(reason = "Compat change cannot be overridden when targeting T+")
@DisableCompatChanges({ConnectivityCompatChanges.EXCLUDED_ROUTES}) @DisableCompatChanges({ConnectivityCompatChanges.EXCLUDED_ROUTES})
public void testExcludedRoutesDisabledByCompatChange() { public void testExcludedRoutesDisabledByCompatChange() {