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

Merge "Ignore testReevaluateNetwork until Q" am: 48f2c29253

Browse Source 
Change-Id: I0c8c1ecba97100efc49c2ec776af83a60160bd44
This commit is contained in:
Automerger Merge Worker
2020-03-09 05:11:40 +00:00
parent 1f3fab6597 48f2c29253
commit 05fee52ee7
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,19 +18,26 @@ package android.net;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import android.os.Build;
import android.os.RemoteException; import android.os.RemoteException;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@SmallTest @SmallTest
public class CaptivePortalTest { public class CaptivePortalTest {
@Rule
public final DevSdkIgnoreRule ignoreRule = new DevSdkIgnoreRule();
private static final int DEFAULT_TIMEOUT_MS = 5000; private static final int DEFAULT_TIMEOUT_MS = 5000;
private static final String TEST_PACKAGE_NAME = "com.google.android.test"; private static final String TEST_PACKAGE_NAME = "com.google.android.test";
@@ -84,6 +91,7 @@ public class CaptivePortalTest {
assertEquals(result.mCode, CaptivePortal.APP_RETURN_WANTED_AS_IS); assertEquals(result.mCode, CaptivePortal.APP_RETURN_WANTED_AS_IS);
} }
@IgnoreUpTo(Build.VERSION_CODES.Q)
@Test @Test
public void testReevaluateNetwork() { public void testReevaluateNetwork() {
final MyCaptivePortalImpl result = runCaptivePortalTest(c -> c.reevaluateNetwork()); final MyCaptivePortalImpl result = runCaptivePortalTest(c -> c.reevaluateNetwork());