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

Merge "Add TetheringEventCallback CTS test" am: ca10520cbf am: 47372758b4 am: 6db90dc779 am: 6fabad4628

Browse Source 
Change-Id: Ia4cd06ba248046b3df82eead0360ba2a8105f082
This commit is contained in:
Paul Hu
2020-04-15 19:13:34 +00:00
committed by Automerger Merge Worker
parent 1192181a72 6fabad4628
commit bcb2c85f36
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java
View File

@@ -15,6 +15,9 @@
*/ */
package android.tethering.test; package android.tethering.test;
import static android.net.TetheringManager.TETHER_HARDWARE_OFFLOAD_FAILED;
import static android.net.TetheringManager.TETHER_HARDWARE_OFFLOAD_STARTED;
import static android.net.TetheringManager.TETHER_HARDWARE_OFFLOAD_STOPPED;
import static android.net.TetheringManager.TETHERING_USB; import static android.net.TetheringManager.TETHERING_USB;
import static android.net.TetheringManager.TETHERING_WIFI; import static android.net.TetheringManager.TETHERING_WIFI;
@@ -273,6 +276,7 @@ public class TetheringManagerTest {
ON_TETHERED_IFACES, ON_TETHERED_IFACES,
ON_ERROR, ON_ERROR,
ON_CLIENTS, ON_CLIENTS,
ON_OFFLOAD_STATUS,
}; };
public static class CallbackValue { public static class CallbackValue {
@@ -330,6 +334,11 @@ public class TetheringManagerTest {
mCallbacks.add(new CallbackValue(CallbackType.ON_CLIENTS, clients, 0)); mCallbacks.add(new CallbackValue(CallbackType.ON_CLIENTS, clients, 0));
} }
@Override
public void onOffloadStatusChanged(int status) {
mCallbacks.add(new CallbackValue(CallbackType.ON_OFFLOAD_STATUS, status, 0));
}
public CallbackValue pollCallback() { public CallbackValue pollCallback() {
try { try {
return mCallbacks.poll(DEFAULT_TIMEOUT_MS, TimeUnit.MILLISECONDS); return mCallbacks.poll(DEFAULT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
@@ -382,6 +391,17 @@ public class TetheringManagerTest {
} }
} }
public void expectOneOfOffloadStatusChanged(int... offloadStatuses) {
while (true) {
final CallbackValue cv = pollCallback();
if (cv == null) fail("No expected offload status change callback");
if (cv.callbackType != CallbackType.ON_OFFLOAD_STATUS) continue;
final int status = (int) cv.callbackParam;
for (int offloadStatus : offloadStatuses) if (offloadStatus == status) return;
}
}
public TetheringInterfaceRegexps getTetheringInterfaceRegexps() { public TetheringInterfaceRegexps getTetheringInterfaceRegexps() {
return mTetherableRegex; return mTetherableRegex;
} }
@@ -403,6 +423,7 @@ public class TetheringManagerTest {
mTM.registerTetheringEventCallback(c -> c.run(), tetherEventCallback); mTM.registerTetheringEventCallback(c -> c.run(), tetherEventCallback);
tetherEventCallback.expectCallbackStarted(); tetherEventCallback.expectCallbackStarted();
tetherEventCallback.expectOneOfOffloadStatusChanged(TETHER_HARDWARE_OFFLOAD_STOPPED);
final TetheringInterfaceRegexps tetherableRegexs = final TetheringInterfaceRegexps tetherableRegexs =
tetherEventCallback.getTetheringInterfaceRegexps(); tetherEventCallback.getTetheringInterfaceRegexps();
@@ -422,10 +443,14 @@ public class TetheringManagerTest {
} }
tetherEventCallback.expectTetheredInterfacesChanged(wifiRegexs); tetherEventCallback.expectTetheredInterfacesChanged(wifiRegexs);
tetherEventCallback.expectOneOfOffloadStatusChanged(
TETHER_HARDWARE_OFFLOAD_STARTED,
TETHER_HARDWARE_OFFLOAD_FAILED);
mTM.stopTethering(TETHERING_WIFI); mTM.stopTethering(TETHERING_WIFI);
tetherEventCallback.expectTetheredInterfacesChanged(null); tetherEventCallback.expectTetheredInterfacesChanged(null);
tetherEventCallback.expectOneOfOffloadStatusChanged(TETHER_HARDWARE_OFFLOAD_STOPPED);
mTM.unregisterTetheringEventCallback(tetherEventCallback); mTM.unregisterTetheringEventCallback(tetherEventCallback);
} }