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

Add tests for optional screenshot Fd in bugreport API

Browse Source 
Not all bugreports need screenshots, and hence it should not be
mandatory to pass screenshotfd in parameters to startBugreport (call to
bugreport API).
Ensuring the above by passing null screenshotFd.

Bug: 123578274
Test: atest BugreportManagerTest
Change-Id: I79f4a71cc79e655a64c4cf9ac04fef0814db8ff1
This commit is contained in:
Abhijeet Kaur
2019-05-17 14:16:48 +01:00
parent 687ee8d6c1
commit 3a0eed2379
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/tests/bugreports/src/android/server/bugreports/BugreportManagerTest.java
View File

@@ -88,7 +88,9 @@ public class BugreportManagerTest {
@Test
public void normalFlow_wifi() throws Exception {
BugreportCallbackImpl callback = new BugreportCallbackImpl();
mBrm.startBugreport(mBugreportFd, mScreenshotFd, wifi(), mExecutor, callback);
// wifi bugreport does not take screenshot
mBrm.startBugreport(mBugreportFd, null /*screenshotFd = null*/, wifi(),
mExecutor, callback);
waitTillDoneOrTimeout(callback);
assertThat(callback.isDone()).isTrue();
@@ -99,13 +101,15 @@ public class BugreportManagerTest {
// of mBugreportFd.
assertThat(callback.getErrorCode()).isEqualTo(
BugreportCallback.BUGREPORT_ERROR_USER_CONSENT_TIMED_OUT);
assertFdsAreClosed(mBugreportFd, mScreenshotFd);
assertFdsAreClosed(mBugreportFd);
}
@Test
public void normalFlow_interactive() throws Exception {
BugreportCallbackImpl callback = new BugreportCallbackImpl();
mBrm.startBugreport(mBugreportFd, mScreenshotFd, interactive(), mExecutor, callback);
// interactive bugreport does not take screenshot
mBrm.startBugreport(mBugreportFd, null /*screenshotFd = null*/, interactive(),
mExecutor, callback);
waitTillDoneOrTimeout(callback);
assertThat(callback.isDone()).isTrue();
@@ -113,7 +117,7 @@ public class BugreportManagerTest {
assertThat(callback.hasReceivedProgress()).isTrue();
assertThat(callback.getErrorCode()).isEqualTo(
BugreportCallback.BUGREPORT_ERROR_USER_CONSENT_TIMED_OUT);
assertFdsAreClosed(mBugreportFd, mScreenshotFd);
assertFdsAreClosed(mBugreportFd);
}
@Test