chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java - Issue 2727573004: [Android Crash Reporting] Simplify crash report upload code.

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java

Issue 2727573004: [Android Crash Reporting] Simplify crash report upload code. (Closed)

Patch Set: Simplify the test code exception handling a bit Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadService.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnableTest.java ('k') | chrome/android/junit/src/org/chromium/chrome/browser/crash/LogcatExtractionCallableUnitTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java

index 05f52e9db602b5d862e102aa1691978f7c900c0f..0ea9cca0ab28d0aae44d10a7af347411ef0c9deb 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java

@@ -19,7 +19,6 @@ import android.support.test.filters.SmallTest;

import org.chromium.base.annotations.SuppressFBWarnings;

import org.chromium.base.test.util.AdvancedMockContext;

import org.chromium.base.test.util.Feature;

-import org.chromium.components.minidump_uploader.CrashFileManager;

import org.chromium.components.minidump_uploader.CrashTestCase;

import org.chromium.components.minidump_uploader.MinidumpUploadCallable;

import org.chromium.components.minidump_uploader.util.CrashReportingPermissionManager;

@@ -41,44 +40,6 @@ public class MinidumpUploadServiceTest extends CrashTestCase {

private static final int MAX_TIMEOUT_MS = 20000;

private static final String BOUNDARY = "TESTBOUNDARY";

- @SmallTest

- @Feature({"Android-AppBase"})

- public void testFindAndUploadLastCrash() throws IOException {

- // Setup prerequisites.

- final AtomicInteger numServiceStarts = new AtomicInteger(0);

- final File minidumpFile = new File(mCrashDir, "chromium_renderer-123.dmp");

- MinidumpPreparationContext context = new MinidumpPreparationContext(

- getInstrumentation().getTargetContext()) {

- @Override

- public ComponentName startService(Intent intentToCheck) {

- String filePath =

- intentToCheck.getStringExtra(MinidumpUploadService.FILE_TO_UPLOAD_KEY);

- assertEquals("Minidump path should be the absolute path",

- minidumpFile.getAbsolutePath(), filePath);

- assertEquals("Should only call service once", 1,

- numServiceStarts.incrementAndGet());

- assertEquals("Action should be correct",

- MinidumpUploadService.ACTION_UPLOAD, intentToCheck.getAction());

- return new ComponentName(getPackageName(), MinidumpUploadService.class.getName());

- }

- };

- MinidumpUploadService service = new TestMinidumpUploadService(context);

- setUpMinidumpFile(minidumpFile, BOUNDARY);

- // Run test.

- Intent findAndUploadLastCrashIntent =

- MinidumpUploadService.createFindAndUploadLastCrashIntent(context);

- service.onCreate();

- findAndUploadLastCrashIntent.putExtra(

- MinidumpUploadService.FINISHED_LOGCAT_EXTRACTION_KEY, true);

- service.onHandleIntent(findAndUploadLastCrashIntent);

- // Verify.

- assertTrue("Minidump file should exist", minidumpFile.isFile());

- assertEquals("Should have called startService() once", 1, numServiceStarts.intValue());

- }

private static class TestMinidumpUploadService extends MinidumpUploadService {

private final NetworkChangingPermissionManager mPermissionManager =

new NetworkChangingPermissionManager();

@@ -113,34 +74,7 @@ public class MinidumpUploadServiceTest extends CrashTestCase {

@SmallTest

@Feature({"Android-AppBase"})

- public void testFindAndUploadLastCrashNoFile() {

- // Setup prerequisites.

- MinidumpPreparationContext context = new MinidumpPreparationContext(

- getInstrumentation().getTargetContext()) {

- @Override

- public ComponentName startService(Intent intentToCheck) {

- fail("Should not start service");

- return new ComponentName(getPackageName(), MinidumpUploadService.class.getName());

- }

- };

- MinidumpUploadService service = new TestMinidumpUploadService(context);

- // Run test.

- Intent findAndUploadLastCrashIntent =

- MinidumpUploadService.createFindAndUploadLastCrashIntent(context);

- findAndUploadLastCrashIntent.putExtra(

- MinidumpUploadService.FINISHED_LOGCAT_EXTRACTION_KEY, true);

- service.onCreate();

- service.onHandleIntent(findAndUploadLastCrashIntent);

- // Verification is done by the test NOT failing with fail(...) in the

- // MinidumpPreparationContext startService(...) method.

- }

- @SmallTest

- @Feature({"Android-AppBase"})

- public void testFindAndUploadAllCrashes() throws IOException {

+ public void testTryUploadAllCrashDumps() throws IOException {

// Setup prerequisites.

final AtomicInteger numServiceStarts = new AtomicInteger(0);

final File[] minidumpFiles = {

@@ -171,12 +105,8 @@ public class MinidumpUploadServiceTest extends CrashTestCase {

}

// Run test.

- Intent findAndUploadAllCrashesIntent =

- MinidumpUploadService.createFindAndUploadAllCrashesIntent(context);

- findAndUploadAllCrashesIntent.putExtra(

- MinidumpUploadService.FINISHED_LOGCAT_EXTRACTION_KEY, true);

service.onCreate();

- service.onHandleIntent(findAndUploadAllCrashesIntent);

+ MinidumpUploadService.tryUploadAllCrashDumps(context);

// Verify.

for (File minidumpFile : minidumpFiles) {

@@ -320,8 +250,7 @@ public class MinidumpUploadServiceTest extends CrashTestCase {

@Override

public ComponentName startService(final Intent intentToCheck) {

- assertTrue(MinidumpUploadService.ACTION_UPLOAD.equals(intentToCheck.getAction())

- || MinidumpUploadService.ACTION_FIND_ALL.equals(intentToCheck.getAction()));

+ assertTrue(MinidumpUploadService.ACTION_UPLOAD.equals(intentToCheck.getAction()));

// Post to the handler thread to run the retry intent.

mHandler.post(new Runnable() {

@Override

@@ -339,16 +268,11 @@ public class MinidumpUploadServiceTest extends CrashTestCase {

// Create the file used for uploading.

File minidumpFile = new File(mCrashDir, "chromium_renderer-111.dmp1");

minidumpFile.createNewFile();

- File logfile = new File(mCrashDir, CrashFileManager.CRASH_DUMP_LOGFILE);

setUpMinidumpFile(minidumpFile, BOUNDARY);

// Run test.

- Intent uploadIntent =

- MinidumpUploadService.createUploadIntent(context, minidumpFile, logfile);

- uploadIntent.putExtra(

- MinidumpUploadService.FINISHED_LOGCAT_EXTRACTION_KEY, true);

service.onCreate();

- service.onHandleIntent(uploadIntent);

+ MinidumpUploadService.tryUploadCrashDump(context, minidumpFile);

// Verify asynchronously.

CriteriaHelper.pollInstrumentationThread(

@@ -365,58 +289,6 @@ public class MinidumpUploadServiceTest extends CrashTestCase {

}, MAX_TIMEOUT_MS, CHECK_INTERVAL_MS);

}

- /**

- * This tests how we instantiate crash uploading from Main, so it is just a sanity check.

- */

- @SmallTest

- @Feature({"Android-AppBase"})

- public void testTryUploadAllCrashDumpsHelperMethod() {

- // Setup prerequisites.

- final String startServiceFlag = "startServiceFlag";

- MinidumpPreparationContext context = new MinidumpPreparationContext(

- getInstrumentation().getTargetContext()) {

- @Override

- public ComponentName startService(Intent intentToCheck) {

- assertEquals(MinidumpUploadService.ACTION_FIND_ALL, intentToCheck.getAction());

- setFlag(startServiceFlag);

- return new ComponentName(getPackageName(), MinidumpUploadService.class.getName());

- }

- };

- // Run test.

- MinidumpUploadService.tryUploadAllCrashDumps(context);

- // Verify.

- assertTrue("Should have called startService(...)", context.isFlagSet(startServiceFlag));

- }

- /**

- * This just tests that the wrapper function creates the expected intent.

- */

- @SmallTest

- @Feature({"Android-AppBase"})

- public void testTryUploadCrashDumpWithLocalId() throws IOException {

- // Set up prerequisites.

- final String startServiceFlag = "startServiceFlag";

- MinidumpPreparationContext context = new MinidumpPreparationContext(

- getInstrumentation().getTargetContext()) {

- @Override

- public ComponentName startService(Intent intentToCheck) {

- assertEquals(MinidumpUploadService.ACTION_FORCE_UPLOAD, intentToCheck.getAction());

- String id = intentToCheck.getStringExtra(MinidumpUploadService.LOCAL_CRASH_ID_KEY);

- assertEquals("The crash id should be set correctly", "f297dbcba7a2d0bb", id);

- setFlag(startServiceFlag);

- return new ComponentName(getPackageName(), MinidumpUploadService.class.getName());

- }

- };

- // Run test.

- MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");

- // Verify.

- assertTrue("Should have called startService(...)", context.isFlagSet(startServiceFlag));

- }

@SmallTest

@Feature({"Android-AppBase"})

public void testHandleForceUploadCrash_MinidumpFileExists() throws IOException {

@@ -442,12 +314,7 @@ public class MinidumpUploadServiceTest extends CrashTestCase {

};

// Run test.

- Intent intent = new Intent(context, MinidumpUploadService.class);

- intent.setAction(MinidumpUploadService.ACTION_FORCE_UPLOAD);

- intent.putExtra(MinidumpUploadService.LOCAL_CRASH_ID_KEY, "f297dbcba7a2d0bb");

- MinidumpUploadService service = new TestMinidumpUploadService(context);

- service.onCreate();

- service.onHandleIntent(intent);

+ MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");

// Verify.

assertTrue("Should have called startService(...)", context.isFlagSet(startServiceFlag));

@@ -478,12 +345,7 @@ public class MinidumpUploadServiceTest extends CrashTestCase {

};

// Run test.

- Intent intent = new Intent(context, MinidumpUploadService.class);

- intent.setAction(MinidumpUploadService.ACTION_FORCE_UPLOAD);

- intent.putExtra(MinidumpUploadService.LOCAL_CRASH_ID_KEY, "f297dbcba7a2d0bb");

- MinidumpUploadService service = new TestMinidumpUploadService(context);

- service.onCreate();

- service.onHandleIntent(intent);

+ MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");

// Verify.

assertTrue("Should have called startService(...)", context.isFlagSet(startServiceFlag));

@@ -497,20 +359,14 @@ public class MinidumpUploadServiceTest extends CrashTestCase {

MinidumpPreparationContext context = new MinidumpPreparationContext(

getInstrumentation().getTargetContext()) {

@Override

- public ComponentName startService(Intent intentToCheck) {

- assertEquals(MinidumpUploadService.ACTION_FORCE_UPLOAD, intentToCheck.getAction());

+ public ComponentName startService(Intent unused) {

setFlag(startServiceFlag);

return new ComponentName(getPackageName(), MinidumpUploadService.class.getName());

}

};

// Run test.

- Intent intent = new Intent(context, MinidumpUploadService.class);

- intent.setAction(MinidumpUploadService.ACTION_FORCE_UPLOAD);

- intent.putExtra(MinidumpUploadService.LOCAL_CRASH_ID_KEY, "f297dbcba7a2d0bb");

- MinidumpUploadService service = new TestMinidumpUploadService(context);

- service.onCreate();

- service.onHandleIntent(intent);

+ MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");

// Verify.

assertFalse(

@@ -528,20 +384,14 @@ public class MinidumpUploadServiceTest extends CrashTestCase {

MinidumpPreparationContext context = new MinidumpPreparationContext(

getInstrumentation().getTargetContext()) {

@Override

- public ComponentName startService(Intent intentToCheck) {

- assertEquals(MinidumpUploadService.ACTION_FORCE_UPLOAD, intentToCheck.getAction());

+ public ComponentName startService(Intent unused) {

setFlag(startServiceFlag);

return new ComponentName(getPackageName(), MinidumpUploadService.class.getName());

}

};

// Run test.

- Intent intent = new Intent(context, MinidumpUploadService.class);

- intent.setAction(MinidumpUploadService.ACTION_FORCE_UPLOAD);

- intent.putExtra(MinidumpUploadService.LOCAL_CRASH_ID_KEY, "f297dbcba7a2d0bb");

- MinidumpUploadService service = new TestMinidumpUploadService(context);

- service.onCreate();

- service.onHandleIntent(intent);

+ MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");

// Verify.

assertFalse(