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

Merge "Fix CaptivePortalTest before R" am: 73e63132a6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29443e1af761cca33185638e5bd84771e0bc9192
This commit is contained in:
Treehugger Robot
2021-03-05 05:03:21 +00:00
committed by Automerger Merge Worker
parent 2a22bdeec6 73e63132a6
commit a2229ce85b
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import org.junit.Rule; import org.junit.Rule;
@@ -53,6 +54,12 @@ public class CaptivePortalTest {
public void appRequest(final int request) throws RemoteException { public void appRequest(final int request) throws RemoteException {
mCode = request; mCode = request;
} }
// This is only @Override on R-
public void logEvent(int eventId, String packageName) throws RemoteException {
mCode = eventId;
mPackageName = packageName;
}
} }
private interface TestFunctor { private interface TestFunctor {
@@ -91,14 +98,24 @@ public class CaptivePortalTest {
assertEquals(result.mCode, CaptivePortal.APP_REQUEST_REEVALUATION_REQUIRED); assertEquals(result.mCode, CaptivePortal.APP_REQUEST_REEVALUATION_REQUIRED);
} }
/** @IgnoreUpTo(Build.VERSION_CODES.R)
* Test testLogEvent is expected to do nothing but shouldn't crash, because the API logEvent
* has been deprecated.
*/
@Test @Test
public void testLogEvent() { public void testLogEvent() {
/**
* From S testLogEvent is expected to do nothing but shouldn't crash (the API
* logEvent has been deprecated).
*/
final MyCaptivePortalImpl result = runCaptivePortalTest(c -> c.logEvent( final MyCaptivePortalImpl result = runCaptivePortalTest(c -> c.logEvent(
0, 0,
TEST_PACKAGE_NAME)); TEST_PACKAGE_NAME));
} }
@IgnoreAfter(Build.VERSION_CODES.R)
@Test
public void testLogEvent_UntilR() {
final MyCaptivePortalImpl result = runCaptivePortalTest(c -> c.logEvent(
42, TEST_PACKAGE_NAME));
assertEquals(result.mCode, 42);
assertEquals(result.mPackageName, TEST_PACKAGE_NAME);
}
} }