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

WifiManagerTest: Make traffic state change test more robust

Browse Source 
Traffic state changed callbacks can be triggered multiple times with
different data indicators. Ensure that we wait for the expected state
before unblocking.

Bug: 151900245
Test: atest android.net.wifi.cts.WifiManagerTest
Change-Id: Ie451070bf2ab430f57ff83b0cefca7050aa8df59
This commit is contained in:
Roshan Pius
2020-03-19 06:33:10 -07:00
parent 6afc73aef6
commit 4da74f040a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
View File

@@ -1840,11 +1840,13 @@ public class WifiManagerTest extends AndroidTestCase {
private static class TestTrafficStateCallback implements WifiManager.TrafficStateCallback {
private final Object mLock;
private final int mWaitForState;
public boolean onStateChangedCalled = false;
public int state = -1;
TestTrafficStateCallback(Object lock) {
TestTrafficStateCallback(Object lock, int waitForState) {
mLock = lock;
mWaitForState = waitForState;
}
@Override
@@ -1852,7 +1854,9 @@ public class WifiManagerTest extends AndroidTestCase {
synchronized (mLock) {
onStateChangedCalled = true;
this.state = state;
mLock.notify();
if (mWaitForState == state) { // only notify if we got the expected state.
mLock.notify();
}
}
}
}
@@ -1886,7 +1890,8 @@ public class WifiManagerTest extends AndroidTestCase {
// skip the test if WiFi is not supported
return;
}
TestTrafficStateCallback trafficStateCallback = new TestTrafficStateCallback(mLock);
TestTrafficStateCallback trafficStateCallback =
new TestTrafficStateCallback(mLock, DATA_ACTIVITY_INOUT);
UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
try {
uiAutomation.adoptShellPermissionIdentity();