Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ignore testReevaluateNetwork until Q" am: 8c9b98c18e am: b854e09bc2 am: 4d166d7bd9 am: cefece7181

Browse Source 
Change-Id: Ibbd74ee0cfbdfcbf50b3ad1ec4c35a4150297f8e
This commit is contained in:
Automerger Merge Worker
2020-03-09 05:33:38 +00:00
parent 659d3f86ea cefece7181
commit 78a8138677
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());