Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(328)

Unified Diff: components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadCallableTest.java

Issue 2756463004: [Cleanup] Remove the ability to disable Crash Reporting from the command line. (Closed)
Patch Set: 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
Download patch
Index: components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadCallableTest.java
diff --git a/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadCallableTest.java b/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadCallableTest.java
index c512b24579f410ba1e37e52a5a511fa3ea3868e3..b6d225b490506e212888e836d9d01ff68b2940f2 100644
--- a/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadCallableTest.java
+++ b/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadCallableTest.java
@@ -166,7 +166,6 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
mIsInSample = true;
mIsPermitted = true;
mIsUserPermitted = true;
- mIsCommandLineDisabled = false;
mIsNetworkAvailable = true;
mIsEnabledForTests = false;
}
@@ -191,7 +190,6 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
mIsInSample = true;
mIsPermitted = false;
mIsUserPermitted = false;
- mIsCommandLineDisabled = false;
mIsNetworkAvailable = true;
mIsEnabledForTests = false;
}
@@ -212,30 +210,6 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
@SmallTest
@Feature({"Android-AppBase"})
- public void testCallNotPermittedByCommandLine() throws Exception {
- CrashReportingPermissionManager testPermManager =
- new MockCrashReportingPermissionManager() {
- {
- mIsInSample = true;
- mIsPermitted = true;
- mIsUserPermitted = true;
- mIsCommandLineDisabled = true;
- mIsNetworkAvailable = true;
- mIsEnabledForTests = false;
- }
- };
-
- HttpURLConnectionFactory httpURLConnectionFactory = new FailHttpURLConnectionFactory();
-
- MinidumpUploadCallable minidumpUploadCallable =
- new MockMinidumpUploadCallable(httpURLConnectionFactory, testPermManager);
- assertEquals(MinidumpUploadCallable.UPLOAD_COMMANDLINE_DISABLED,
- minidumpUploadCallable.call().intValue());
- assertFalse(mExpectedFileAfterUpload.exists());
- }
-
- @SmallTest
- @Feature({"Android-AppBase"})
public void testCallPermittedButNotInSample() throws Exception {
CrashReportingPermissionManager testPermManager =
new MockCrashReportingPermissionManager() {
@@ -243,7 +217,6 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
mIsInSample = false;
mIsPermitted = true;
mIsUserPermitted = true;
- mIsCommandLineDisabled = false;
mIsNetworkAvailable = true;
mIsEnabledForTests = false;
}
@@ -271,7 +244,6 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
mIsInSample = true;
mIsPermitted = true;
mIsUserPermitted = true;
- mIsCommandLineDisabled = false;
mIsNetworkAvailable = false;
mIsEnabledForTests = false;
}
@@ -295,7 +267,6 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
mIsInSample = true;
mIsPermitted = false;
mIsUserPermitted = false;
- mIsCommandLineDisabled = false;
mIsNetworkAvailable = false;
mIsEnabledForTests = true;
}
@@ -321,7 +292,6 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
mIsInSample = true;
mIsPermitted = true;
mIsUserPermitted = true;
- mIsCommandLineDisabled = false;
mIsNetworkAvailable = true;
mIsEnabledForTests = false;
}
@@ -347,7 +317,6 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
mIsInSample = true;
mIsPermitted = false;
mIsUserPermitted = false;
- mIsCommandLineDisabled = false;
mIsNetworkAvailable = true;
mIsEnabledForTests = false;
}
@@ -368,31 +337,6 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
@SmallTest
@Feature({"Android-AppBase"})
- public void testCallNotPermittedByCommandLine_ForcedUpload() throws Exception {
- setForcedUpload();
- CrashReportingPermissionManager testPermManager =
- new MockCrashReportingPermissionManager() {
- {
- mIsInSample = true;
- mIsPermitted = true;
- mIsUserPermitted = true;
- mIsCommandLineDisabled = true;
- mIsNetworkAvailable = true;
- mIsEnabledForTests = false;
- }
- };
-
- HttpURLConnectionFactory httpURLConnectionFactory = new FailHttpURLConnectionFactory();
-
- MinidumpUploadCallable minidumpUploadCallable =
- new MockMinidumpUploadCallable(httpURLConnectionFactory, testPermManager);
- assertEquals(MinidumpUploadCallable.UPLOAD_COMMANDLINE_DISABLED,
- minidumpUploadCallable.call().intValue());
- assertFalse(mExpectedFileAfterUpload.exists());
- }
-
- @SmallTest
- @Feature({"Android-AppBase"})
public void testCallPermittedButNotInSample_ForcedUpload() throws Exception {
setForcedUpload();
CrashReportingPermissionManager testPermManager =
@@ -401,7 +345,6 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
mIsInSample = false;
mIsPermitted = true;
mIsUserPermitted = true;
- mIsCommandLineDisabled = false;
mIsNetworkAvailable = true;
mIsEnabledForTests = false;
}
@@ -430,7 +373,6 @@ public class MinidumpUploadCallableTest extends CrashTestCase {
mIsInSample = true;
mIsPermitted = true;
mIsUserPermitted = true;
- mIsCommandLineDisabled = false;
mIsNetworkAvailable = false;
mIsEnabledForTests = false;
}

Powered by Google App Engine
This is Rietveld 408576698