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

Merge "Fixed assertions on bugreport share notification." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-24 21:32:56 +00:00
committed by Android (Google) Code Review
parent ef98275635 6540574ecc
commit 39b375c9db
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
View File

@@ -355,7 +355,7 @@ public class BugreportReceiverTest {
assertProgressNotification(NEW_NAME, 00.00f); assertProgressNotification(NEW_NAME, 00.00f);
Bundle extras = sendBugreportFinishedAndGetSharedIntent(ID, mPlainTextPath, Bundle extras = sendBugreportFinishedAndGetSharedIntent(ID, mPlainTextPath,
mScreenshotPath); mScreenshotPath, TITLE);
assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT, ID, PID, TITLE, assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT, ID, PID, TITLE,
NEW_NAME, TITLE, mDescription, 0, RENAMED_SCREENSHOTS); NEW_NAME, TITLE, mDescription, 0, RENAMED_SCREENSHOTS);
@@ -410,7 +410,7 @@ public class BugreportReceiverTest {
assertProgressNotification(NEW_NAME, 00.00f); assertProgressNotification(NEW_NAME, 00.00f);
Bundle extras = sendBugreportFinishedAndGetSharedIntent(ID, Bundle extras = sendBugreportFinishedAndGetSharedIntent(ID,
plainText? mPlainTextPath : mZipPath, mScreenshotPath); plainText? mPlainTextPath : mZipPath, mScreenshotPath, TITLE);
assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT, ID, PID, TITLE, assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT, ID, PID, TITLE,
NEW_NAME, TITLE, mDescription, 0, RENAMED_SCREENSHOTS); NEW_NAME, TITLE, mDescription, 0, RENAMED_SCREENSHOTS);
@@ -465,7 +465,7 @@ public class BugreportReceiverTest {
sendBugreportStarted(ID2, PID2, NAME2, 1000); sendBugreportStarted(ID2, PID2, NAME2, 1000);
sendBugreportFinished(ID, mZipPath, mScreenshotPath); sendBugreportFinished(ID, mZipPath, mScreenshotPath);
Bundle extras = acceptBugreportAndGetSharedIntent(ID); Bundle extras = acceptBugreportAndGetSharedIntent(TITLE);
detailsUi = new DetailsUi(mUiBot, ID2, NAME2); detailsUi = new DetailsUi(mUiBot, ID2, NAME2);
detailsUi.assertName(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 // Must use a different zip file otherwise it will fail because zip already contains
// title.txt and description.txt entries. // 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, assertActionSendMultiple(extras, BUGREPORT_CONTENT, NO_SCREENSHOT, ID2, PID2, TITLE2,
NEW_NAME2, TITLE2, DESCRIPTION2, 0, RENAMED_SCREENSHOTS); NEW_NAME2, TITLE2, DESCRIPTION2, 0, RENAMED_SCREENSHOTS);
@@ -568,7 +568,7 @@ public class BugreportReceiverTest {
// Send notification and click on share. // Send notification and click on share.
sendBugreportFinished(NO_ID, mPlainTextPath, null); sendBugreportFinished(NO_ID, mPlainTextPath, null);
acceptBugreport(NO_ID); mUiBot.clickOnNotification(mContext.getString(R.string.bugreport_finished_title, NO_ID));
// Handle the warning // Handle the warning
mUiBot.getVisibleObject(mContext.getString(R.string.bugreport_confirm)); mUiBot.getVisibleObject(mContext.getString(R.string.bugreport_confirm));
@@ -725,13 +725,26 @@ public class BugreportReceiverTest {
return acceptBugreportAndGetSharedIntent(id); 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. * Accepts the notification to share the finished bugreport and waits for the result.
* *
* @return extras sent in the shared intent. * @return extras sent in the shared intent.
*/ */
private Bundle acceptBugreportAndGetSharedIntent(int id) { 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); mUiBot.chooseActivity(UI_NAME);
return mListener.getExtras(); return mListener.getExtras();
} }
@@ -743,13 +756,6 @@ public class BugreportReceiverTest {
mUiBot.getNotification(mContext.getString(R.string.bugreport_finished_title, id)); 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. * Sends a "bugreport finished" intent.
*/ */