Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93891cf6 authored by Abhijeet Kaur's avatar Abhijeet Kaur Committed by android-build-merger
Browse files

Merge "Merge "Add tests for optional screenshot Fd in bugreport API" into... 

Merge "Merge "Add tests for optional screenshot Fd in bugreport API" into qt-dev am: f0e0af70 am: 494fc7c6" into qt-r1-dev-plus-aosp
am: 48c4fd21

Change-Id: I8c969c2ad5ecfd1035bdbccda7bce35fbb87efac
parents ad9a8e65 48c4fd21

core/tests/bugreports/src/android/server/bugreports/BugreportManagerTest.java

+8 −4
Original line number Diff line number Diff line
@@ -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