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

Commit 6540574e authored by Felipe Leme's avatar Felipe Leme
Browse files

Fixed assertions on bugreport share notification. 

Fixes: 36698286
Test: mmm -j32 frameworks/base/packages/Shell && adb install -r -g ${OUT}/data/app/ShellTests/ShellTests.apk && adb shell am instrument -e class com.android.shell.BugreportReceiverTest$1 -w com.android.shell.tests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I0f3586309103a07afca5be3d1e3073d8a5dd04ec
parent afea5e8c

packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java

+19 −13
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ public class BugreportReceiverTest { 
        assertProgressNotification(NEW_NAME, 00.00f);



        Bundle extras = sendBugreportFinishedAndGetSharedIntent(ID, mPlainTextPath,

                mScreenshotPath);

                mScreenshotPath, TITLE);

        assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT, ID, PID, TITLE,

                NEW_NAME, TITLE, mDescription, 0, RENAMED_SCREENSHOTS);
@@ -410,7 +410,7 @@ public class BugreportReceiverTest { 
        assertProgressNotification(NEW_NAME, 00.00f);



        Bundle extras = sendBugreportFinishedAndGetSharedIntent(ID,

                plainText? mPlainTextPath : mZipPath, mScreenshotPath);

                plainText? mPlainTextPath : mZipPath, mScreenshotPath, TITLE);

        assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT, ID, PID, TITLE,

                NEW_NAME, TITLE, mDescription, 0, RENAMED_SCREENSHOTS);
@@ -465,7 +465,7 @@ public class BugreportReceiverTest { 
        sendBugreportStarted(ID2, PID2, NAME2, 1000);



        sendBugreportFinished(ID, mZipPath, mScreenshotPath);

        Bundle extras = acceptBugreportAndGetSharedIntent(ID);

        Bundle extras = acceptBugreportAndGetSharedIntent(TITLE);



        detailsUi = new DetailsUi(mUiBot, ID2, NAME2);

        detailsUi.assertName(NAME2);
@@ -479,7 +479,7 @@ public class BugreportReceiverTest { 


        // Must use a different zip file otherwise it will fail because zip already contains

        // title.txt and description.txt entries.

        extras = sendBugreportFinishedAndGetSharedIntent(ID2, mZipPath2, NO_SCREENSHOT);

        extras = sendBugreportFinishedAndGetSharedIntent(ID2, mZipPath2, NO_SCREENSHOT, TITLE2);

        assertActionSendMultiple(extras, BUGREPORT_CONTENT, NO_SCREENSHOT, ID2, PID2, TITLE2,

                NEW_NAME2, TITLE2, DESCRIPTION2, 0, RENAMED_SCREENSHOTS);
@@ -568,7 +568,7 @@ public class BugreportReceiverTest { 


        // Send notification and click on share.

        sendBugreportFinished(NO_ID, mPlainTextPath, null);

        acceptBugreport(NO_ID);

        mUiBot.clickOnNotification(mContext.getString(R.string.bugreport_finished_title, NO_ID));



        // Handle the warning

        mUiBot.getVisibleObject(mContext.getString(R.string.bugreport_confirm));
@@ -725,13 +725,26 @@ public class BugreportReceiverTest { 
        return acceptBugreportAndGetSharedIntent(id);

    }



    // TODO: document / merge these 3 sendBugreportFinishedAndGetSharedIntent methods

    private Bundle sendBugreportFinishedAndGetSharedIntent(int id, String bugreportPath,

            String screenshotPath, String notificationTitle) {

        sendBugreportFinished(id, bugreportPath, screenshotPath);

        return acceptBugreportAndGetSharedIntent(notificationTitle);

    }



    /**

     * Accepts the notification to share the finished bugreport and waits for the result.

     *

     * @return extras sent in the shared intent.

     */

    private Bundle acceptBugreportAndGetSharedIntent(int id) {

        acceptBugreport(id);

        final String notificationTitle = mContext.getString(R.string.bugreport_finished_title, id);

        return acceptBugreportAndGetSharedIntent(notificationTitle);

    }



    // TODO: document and/or merge these 2 acceptBugreportAndGetSharedIntent methods

    private Bundle acceptBugreportAndGetSharedIntent(String notificationTitle) {

        mUiBot.clickOnNotification(notificationTitle);

        mUiBot.chooseActivity(UI_NAME);

        return mListener.getExtras();

    }
@@ -743,13 +756,6 @@ public class BugreportReceiverTest { 
        mUiBot.getNotification(mContext.getString(R.string.bugreport_finished_title, id));

    }



    /**

     * Accepts the notification to share the finished bugreport.

     */

    private void acceptBugreport(int id) {

        mUiBot.clickOnNotification(mContext.getString(R.string.bugreport_finished_title, id));

    }



    /**

     * Sends a "bugreport finished" intent.

     */