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

Commit 26288783 authored by Felipe Leme's avatar Felipe Leme
Browse files

Reset UI fields when dialog is reused, otherwise it might contain fields 

from a previous bug report.

BUG: 26524513
Change-Id: If9d176806b28120b57dddeb62b636065f8ff7cf6
parent 3fd6d9b3

packages/Shell/src/com/android/shell/BugreportProgressService.java

+13 −3
Original line number Original line Diff line number Diff line
@@ -473,8 +473,10 @@ public class BugreportProgressService extends Service { 
                    + info + ")");

                    + info + ")");

            return;

            return;

        }

        }

        Log.d(TAG, "Sending 'Progress' notification for id " + info.id + "(pid " + info.pid + "): "

        if (DEBUG) {

                + percentText);

            Log.d(TAG, "Sending 'Progress' notification for id " + info.id + "(pid " + info.pid

                    + "): " + percentText);

        }

        NotificationManager.from(mContext).notify(TAG, info.id, notification);

        NotificationManager.from(mContext).notify(TAG, info.id, notification);

    }

    }
@@ -1249,6 +1251,8 @@ public class BugreportProgressService extends Service { 
         * Sets its internal state and displays the dialog.

         * Sets its internal state and displays the dialog.

         */

         */

        private void initialize(final Context context, BugreportInfo info) {

        private void initialize(final Context context, BugreportInfo info) {

            final String dialogTitle =

                    context.getString(R.string.bugreport_info_dialog_title, info.id);

            // First initializes singleton.

            // First initializes singleton.

            if (mDialog == null) {

            if (mDialog == null) {

                @SuppressLint("InflateParams")

                @SuppressLint("InflateParams")
@@ -1272,7 +1276,7 @@ public class BugreportProgressService extends Service { 




                mDialog = new AlertDialog.Builder(context)

                mDialog = new AlertDialog.Builder(context)

                        .setView(view)

                        .setView(view)

                        .setTitle(context.getString(R.string.bugreport_info_dialog_title, info.id))

                        .setTitle(dialogTitle)

                        .setCancelable(false)

                        .setCancelable(false)

                        .setPositiveButton(context.getString(com.android.internal.R.string.ok),

                        .setPositiveButton(context.getString(com.android.internal.R.string.ok),

                                null)

                                null)
@@ -1297,6 +1301,12 @@ public class BugreportProgressService extends Service { 
                        new WindowManager.LayoutParams(

                        new WindowManager.LayoutParams(

                                WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG));

                                WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG));





            } else {

                // Re-use view, but reset fields first.

                mDialog.setTitle(dialogTitle);

                mInfoName.setText(null);

                mInfoTitle.setText(null);

                mInfoDescription.setText(null);

            }

            }





            // Then set fields.

            // Then set fields.

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

+93 −11
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ import java.util.zip.ZipInputStream; 
import java.util.zip.ZipOutputStream;

import java.util.zip.ZipOutputStream;





import libcore.io.Streams;

import libcore.io.Streams;



import android.app.ActivityManager;

import android.app.ActivityManager;

import android.app.ActivityManager.RunningServiceInfo;

import android.app.ActivityManager.RunningServiceInfo;

import android.app.Instrumentation;

import android.app.Instrumentation;
@@ -62,6 +61,7 @@ import android.service.notification.StatusBarNotification; 
import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.UiObject;

import android.support.test.uiautomator.UiObject;

import android.support.test.uiautomator.UiObjectNotFoundException;

import android.support.test.uiautomator.UiObjectNotFoundException;

import android.support.test.uiautomator.UiSelector;

import android.test.InstrumentationTestCase;

import android.test.InstrumentationTestCase;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.LargeTest;

import android.text.TextUtils;

import android.text.TextUtils;
@@ -100,19 +100,27 @@ public class BugreportReceiverTest extends InstrumentationTestCase { 
    private static final String BUGREPORTS_DIR = "bugreports";

    private static final String BUGREPORTS_DIR = "bugreports";

    private static final String BUGREPORT_FILE = "test_bugreport.txt";

    private static final String BUGREPORT_FILE = "test_bugreport.txt";

    private static final String ZIP_FILE = "test_bugreport.zip";

    private static final String ZIP_FILE = "test_bugreport.zip";

    private static final String ZIP_FILE2 = "test_bugreport2.zip";

    private static final String SCREENSHOT_FILE = "test_screenshot.png";

    private static final String SCREENSHOT_FILE = "test_screenshot.png";





    private static final String BUGREPORT_CONTENT = "Dump, might as well dump!\n";

    private static final String BUGREPORT_CONTENT = "Dump, might as well dump!\n";

    private static final String SCREENSHOT_CONTENT = "A picture is worth a thousand words!\n";

    private static final String SCREENSHOT_CONTENT = "A picture is worth a thousand words!\n";





    private static final int PID = 42;

    private static final int PID = 42;

    private static final int PID2 = 24;

    private static final int ID = 108;

    private static final int ID = 108;

    private static final int ID2 = 801;

    private static final String PROGRESS_PROPERTY = "dumpstate." + PID + ".progress";

    private static final String PROGRESS_PROPERTY = "dumpstate." + PID + ".progress";

    private static final String MAX_PROPERTY = "dumpstate." + PID + ".max";

    private static final String MAX_PROPERTY = "dumpstate." + PID + ".max";

    private static final String NAME_PROPERTY = "dumpstate." + PID + ".name";

    private static final String NAME_PROPERTY = "dumpstate." + PID + ".name";

    private static final String NAME = "BUG, Y U NO REPORT?";

    private static final String NAME = "BUG, Y U NO REPORT?";

    private static final String NAME2 = "A bugreport's life";

    private static final String NEW_NAME = "Bug_Forrest_Bug";

    private static final String NEW_NAME = "Bug_Forrest_Bug";

    private static final String NEW_NAME2 = "BugsyReportsy";

    private static final String TITLE = "Wimbugdom Champion 2015";

    private static final String TITLE = "Wimbugdom Champion 2015";

    private static final String TITLE2 = "Master of the Universe";

    private static final String DESCRIPTION = "One's description...";

    private static final String DESCRIPTION2 = "...is another's treasure.";





    private static final String NO_DESCRIPTION = null;

    private static final String NO_DESCRIPTION = null;

    private static final String NO_NAME = null;

    private static final String NO_NAME = null;
@@ -126,6 +134,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { 




    private String mPlainTextPath;

    private String mPlainTextPath;

    private String mZipPath;

    private String mZipPath;

    private String mZipPath2;

    private String mScreenshotPath;

    private String mScreenshotPath;





    private Context mContext;

    private Context mContext;
@@ -144,10 +153,12 @@ public class BugreportReceiverTest extends InstrumentationTestCase { 




        mPlainTextPath = getPath(BUGREPORT_FILE);

        mPlainTextPath = getPath(BUGREPORT_FILE);

        mZipPath = getPath(ZIP_FILE);

        mZipPath = getPath(ZIP_FILE);

        mZipPath2 = getPath(ZIP_FILE2);

        mScreenshotPath = getPath(SCREENSHOT_FILE);

        mScreenshotPath = getPath(SCREENSHOT_FILE);

        createTextFile(mPlainTextPath, BUGREPORT_CONTENT);

        createTextFile(mPlainTextPath, BUGREPORT_CONTENT);

        createTextFile(mScreenshotPath, SCREENSHOT_CONTENT);

        createTextFile(mScreenshotPath, SCREENSHOT_CONTENT);

        createZipFile(mZipPath, BUGREPORT_FILE, BUGREPORT_CONTENT);

        createZipFile(mZipPath, BUGREPORT_FILE, BUGREPORT_CONTENT);

        createZipFile(mZipPath2, BUGREPORT_FILE, BUGREPORT_CONTENT);





        // Creates a multi-line description.

        // Creates a multi-line description.

        StringBuilder sb = new StringBuilder();

        StringBuilder sb = new StringBuilder();
@@ -255,8 +266,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { 
        DetailsUi detailsUi = new DetailsUi(mUiBot, ID);

        DetailsUi detailsUi = new DetailsUi(mUiBot, ID);





        // Check initial name.

        // Check initial name.

        String actualName = detailsUi.nameField.getText().toString();

        detailsUi.assertName(NAME);

        assertEquals("Wrong value on field 'name'", NAME, actualName);





        // Change name - it should have changed system property once focus is changed.

        // Change name - it should have changed system property once focus is changed.

        detailsUi.nameField.setText(NEW_NAME);

        detailsUi.nameField.setText(NEW_NAME);
@@ -308,8 +318,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { 
        DetailsUi detailsUi = new DetailsUi(mUiBot, ID);

        DetailsUi detailsUi = new DetailsUi(mUiBot, ID);





        // Check initial name.

        // Check initial name.

        String actualName = detailsUi.nameField.getText().toString();

        detailsUi.assertName(NAME);

        assertEquals("Wrong value on field 'name'", NAME, actualName);





        // Change fields.

        // Change fields.

        detailsUi.reOpen();

        detailsUi.reOpen();
@@ -349,6 +358,52 @@ public class BugreportReceiverTest extends InstrumentationTestCase { 
        assertServiceNotRunning();

        assertServiceNotRunning();

    }

    }





    /*

     * TODO: this test can be flanky because it relies in the order the notifications are displayed,

     * since mUiBot gets the first notification.

     * Ideally, openProgressNotification() should return the whole notification, so DetailsUi

     * could use it and find children instead, but unfortunately the notification object hierarchy

     * is too complex and getting it from the notification text object would be to fragile

     * (for instance, it could require navigating many parents up in the hierarchy).

     */

    public void testProgress_changeJustDetailsIsClearedOnSecondBugreport() throws Exception {

        resetProperties();

        sendBugreportStarted(ID, PID, NAME, 1000);

        waitForScreenshotButtonEnabled(true);



        DetailsUi detailsUi = new DetailsUi(mUiBot, ID);

        detailsUi.assertName(NAME);

        detailsUi.assertTitle(mContext.getString(R.string.bugreport_info_title));

        detailsUi.assertDescription(mContext.getString(R.string.bugreport_info_description));

        detailsUi.nameField.setText(NEW_NAME);

        detailsUi.titleField.setText(TITLE);

        detailsUi.descField.setText(DESCRIPTION);

        detailsUi.clickOk();



        sendBugreportStarted(ID2, PID2, NAME2, 1000);



        Bundle extras = sendBugreportFinishedAndGetSharedIntent(ID, mZipPath, mScreenshotPath);

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

                NEW_NAME, TITLE, DESCRIPTION, 1, RENAMED_SCREENSHOTS);



        detailsUi = new DetailsUi(mUiBot, ID2);

        detailsUi.assertName(NAME2);

        detailsUi.assertTitle(mContext.getString(R.string.bugreport_info_title));

        detailsUi.assertDescription(mContext.getString(R.string.bugreport_info_description));

        detailsUi.nameField.setText(NEW_NAME2);

        detailsUi.titleField.setText(TITLE2);

        detailsUi.descField.setText(DESCRIPTION2);

        detailsUi.clickOk();



        // 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);

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

                NEW_NAME2, TITLE2, DESCRIPTION2, 1, RENAMED_SCREENSHOTS);



        assertServiceNotRunning();

    }



    /**

    /**

     * Tests the scenario where the initial screenshot and dumpstate are finished while the user

     * Tests the scenario where the initial screenshot and dumpstate are finished while the user

     * is changing the info in the details screen.

     * is changing the info in the details screen.
@@ -489,11 +544,15 @@ public class BugreportReceiverTest extends InstrumentationTestCase { 
     * Sends a "bugreport started" intent with the default values.

     * Sends a "bugreport started" intent with the default values.

     */

     */

    private void sendBugreportStarted(int max) throws Exception {

    private void sendBugreportStarted(int max) throws Exception {

        sendBugreportStarted(ID, PID, NAME, max);

    }



    private void sendBugreportStarted(int id, int pid, String name, int max) throws Exception {

        Intent intent = new Intent(INTENT_BUGREPORT_STARTED);

        Intent intent = new Intent(INTENT_BUGREPORT_STARTED);

        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        intent.putExtra(EXTRA_ID, ID);

        intent.putExtra(EXTRA_ID, id);

        intent.putExtra(EXTRA_PID, PID);

        intent.putExtra(EXTRA_PID, pid);

        intent.putExtra(EXTRA_NAME, NAME);

        intent.putExtra(EXTRA_NAME, name);

        intent.putExtra(EXTRA_MAX, max);

        intent.putExtra(EXTRA_MAX, max);

        mContext.sendBroadcast(intent);

        mContext.sendBroadcast(intent);

    }

    }
@@ -751,7 +810,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { 
        fail("Service status didn't change to " + expectRunning);

        fail("Service status didn't change to " + expectRunning);

    }

    }





    private static void createTextFile(String path, String content) throws IOException {

    private void createTextFile(String path, String content) throws IOException {

        Log.v(TAG, "createFile(" + path + ")");

        Log.v(TAG, "createFile(" + path + ")");

        try (Writer writer = new BufferedWriter(new OutputStreamWriter(

        try (Writer writer = new BufferedWriter(new OutputStreamWriter(

                new FileOutputStream(path)))) {

                new FileOutputStream(path)))) {
@@ -841,8 +900,9 @@ public class BugreportReceiverTest extends InstrumentationTestCase { 
         */

         */

        DetailsUi(UiBot uiBot, int id) throws UiObjectNotFoundException {

        DetailsUi(UiBot uiBot, int id) throws UiObjectNotFoundException {

            openProgressNotification(id);

            openProgressNotification(id);

            detailsButton = mUiBot.getVisibleObject(

            detailsButton = mUiBot.getVisibleObject(mContext.getString(

                    mContext.getString(R.string.bugreport_info_action).toUpperCase());

                    R.string.bugreport_info_action).toUpperCase());



            mUiBot.click(detailsButton, "details_button");

            mUiBot.click(detailsButton, "details_button");

            // TODO: unhardcode resource ids

            // TODO: unhardcode resource ids

            UiObject dialogTitle = mUiBot.getVisibleObjectById("android:id/alertTitle");

            UiObject dialogTitle = mUiBot.getVisibleObjectById("android:id/alertTitle");
@@ -855,6 +915,28 @@ public class BugreportReceiverTest extends InstrumentationTestCase { 
            cancelButton = mUiBot.getObjectById("android:id/button2");

            cancelButton = mUiBot.getObjectById("android:id/button2");

        }

        }





        private void assertField(String name, UiObject field, String expected) {

            try {

                String actual = field.getText().toString();

                assertEquals("Wrong value on field '" + name + "'", expected, actual);

            } catch (UiObjectNotFoundException e) {

                // Should not happen...

                throw new IllegalStateException("field not found: " + name, e);

            }

        }



        void assertName(String expected) {

            assertField("name", nameField, expected);

        }



        void assertTitle(String expected) {

            assertField("title", titleField, expected);

        }



        void assertDescription(String expected) {

            assertField("description", descField, expected);

        }



        /**

        /**

         * Takes focus away from the name field so it can be validated.

         * Takes focus away from the name field so it can be validated.

         */

         */