Merge "Fix unstable unittest due to RejectedExcecutionException" am: af021f6dc9
am: 552c87e5fb
Change-Id: I1fe7386983bd536d983b1bb63a8bdcc91cf275ee
diff --git a/tests/functional/com/android/documentsui/FileCopyUiTest.java b/tests/functional/com/android/documentsui/FileCopyUiTest.java
index 50fee72..468e460 100644
--- a/tests/functional/com/android/documentsui/FileCopyUiTest.java
+++ b/tests/functional/com/android/documentsui/FileCopyUiTest.java
@@ -25,6 +25,7 @@
import android.content.IntentFilter;
import android.content.BroadcastReceiver;
import android.net.Uri;
+import android.os.Bundle;
import android.os.RemoteException;
import android.provider.Settings;
import android.support.test.filters.LargeTest;
@@ -99,6 +100,12 @@
@Override
public void setUp() throws Exception {
super.setUp();
+
+ // Set a flag to prevent many refreshes.
+ Bundle bundle = new Bundle();
+ bundle.putBoolean(StubProvider.EXTRA_ENABLE_ROOT_NOTIFICATION, false);
+ mDocsHelper.configure(null, bundle);
+
initTestFiles();
IntentFilter filter = new IntentFilter();
@@ -143,10 +150,10 @@
private void createDummyFiles() throws Exception {
final ThreadPoolExecutor exec = new ThreadPoolExecutor(
5, 5, 1000L, TimeUnit.MILLISECONDS,
- new ArrayBlockingQueue<Runnable>(20, true));
+ new ArrayBlockingQueue<Runnable>(100, true));
for (int i = 0; i < DUMMY_FILE_COUNT; i++) {
final String fileName = "file" + String.format("%04d", i) + ".log";
- if (exec.getQueue().size() <= 80) {
+ if (exec.getQueue().size() >= 80) {
Thread.sleep(50);
}
exec.submit(new Runnable() {
diff --git a/tests/functional/com/android/documentsui/FileDeleteUiTest.java b/tests/functional/com/android/documentsui/FileDeleteUiTest.java
index f2d5bf4..0caa0c4 100644
--- a/tests/functional/com/android/documentsui/FileDeleteUiTest.java
+++ b/tests/functional/com/android/documentsui/FileDeleteUiTest.java
@@ -25,6 +25,7 @@
import android.content.IntentFilter;
import android.content.BroadcastReceiver;
import android.net.Uri;
+import android.os.Bundle;
import android.os.RemoteException;
import android.provider.Settings;
import android.support.test.filters.LargeTest;
@@ -99,6 +100,12 @@
@Override
public void setUp() throws Exception {
super.setUp();
+
+ // Set a flag to prevent many refreshes.
+ Bundle bundle = new Bundle();
+ bundle.putBoolean(StubProvider.EXTRA_ENABLE_ROOT_NOTIFICATION, false);
+ mDocsHelper.configure(null, bundle);
+
initTestFiles();
IntentFilter filter = new IntentFilter();
@@ -143,10 +150,10 @@
private void createDummyFiles() throws Exception {
final ThreadPoolExecutor exec = new ThreadPoolExecutor(
5, 5, 1000L, TimeUnit.MILLISECONDS,
- new ArrayBlockingQueue<Runnable>(20, true));
+ new ArrayBlockingQueue<Runnable>(100, true));
for (int i = 0; i < DUMMY_FILE_COUNT; i++) {
final String fileName = "file" + String.format("%04d", i) + ".log";
- if (exec.getQueue().size() <= 80) {
+ if (exec.getQueue().size() >= 80) {
Thread.sleep(50);
}
exec.submit(new Runnable() {