forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Split functionality out of MinidumpUploaderTest into smaller components.
Prepare to split MinidumpUploaderTest into WebView-specific tests, and tests shared between WebView and Chrome, by splitting some test-functionality out into smaller components and removing unnecessary dependencies on AwMinidumpUploaderDelegate. BUG=692448 Review-Url: https://codereview.chromium.org/2820683002 Cr-Commit-Position: refs/heads/master@{#465597}
- Loading branch information
gsennton
authored and
Commit bot
committed
Apr 19, 2017
1 parent
c8717b5
commit 2be4a32
Showing
6 changed files
with
212 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
...id/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadTestUtility.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| // Copyright 2017 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| package org.chromium.components.minidump_uploader; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout; | ||
|
|
||
| import org.chromium.base.ThreadUtils; | ||
|
|
||
| import java.util.concurrent.CountDownLatch; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| /** | ||
| * Utility class for testing the minidump-uploading mechanism. | ||
| */ | ||
| public class MinidumpUploadTestUtility { | ||
| private static final long TIME_OUT_MILLIS = 3000; | ||
|
|
||
| /** | ||
| * Utility method for running {@param minidumpUploader}.uploadAllMinidumps on the UI thread to | ||
| * avoid breaking any assertions about running on the UI thread. | ||
| */ | ||
| public static void uploadAllMinidumpsOnUiThread(final MinidumpUploader minidumpUploader, | ||
| final MinidumpUploader.UploadsFinishedCallback uploadsFinishedCallback) { | ||
| uploadAllMinidumpsOnUiThread( | ||
| minidumpUploader, uploadsFinishedCallback, false /* blockUntilJobPosted */); | ||
| } | ||
|
|
||
| /** | ||
| * Utility method for running {@param minidumpUploader}.uploadAllMinidumps on the UI thread to | ||
| * avoid breaking any assertions about running on the UI thread. | ||
| * @param blockUntilJobPosted whether to block the current thread until the minidump-uploading | ||
| * job has been posted to the UI thread. This can be used to avoid | ||
| * some race-conditions (e.g. when waiting for variables that are | ||
| * initialized in the uploadAllMinidumps call). | ||
| */ | ||
| public static void uploadAllMinidumpsOnUiThread(final MinidumpUploader minidumpUploader, | ||
| final MinidumpUploader.UploadsFinishedCallback uploadsFinishedCallback, | ||
| boolean blockUntilJobPosted) { | ||
| final CountDownLatch jobPostedLatch = new CountDownLatch(1); | ||
| ThreadUtils.runOnUiThread(new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| minidumpUploader.uploadAllMinidumps(uploadsFinishedCallback); | ||
| jobPostedLatch.countDown(); | ||
| } | ||
| }); | ||
| if (blockUntilJobPosted) { | ||
| try { | ||
| assertTrue( | ||
| jobPostedLatch.await(scaleTimeout(TIME_OUT_MILLIS), TimeUnit.MILLISECONDS)); | ||
| } catch (InterruptedException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Utility method for uploading minidumps, and waiting for the uploads to finish. | ||
| * @param minidumpUploader the implementation to use to upload minidumps. | ||
| * @param expectReschedule value used to assert whether the uploads should be rescheduled, | ||
| * e.g. when uploading succeeds we should normally not expect to | ||
| * reschedule. | ||
| */ | ||
| public static void uploadMinidumpsSync( | ||
| MinidumpUploader minidumpUploader, final boolean expectReschedule) { | ||
| final CountDownLatch uploadsFinishedLatch = new CountDownLatch(1); | ||
| uploadAllMinidumpsOnUiThread( | ||
| minidumpUploader, new MinidumpUploader.UploadsFinishedCallback() { | ||
| @Override | ||
| public void uploadsFinished(boolean reschedule) { | ||
| assertEquals(expectReschedule, reschedule); | ||
| uploadsFinishedLatch.countDown(); | ||
| } | ||
| }); | ||
| try { | ||
| assertTrue(uploadsFinishedLatch.await( | ||
| scaleTimeout(TIME_OUT_MILLIS), TimeUnit.MILLISECONDS)); | ||
| } catch (InterruptedException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.