Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8694f22d authored by Geoff Pitsch's avatar Geoff Pitsch Committed by android-build-merger
Browse files

Merge "Fix unstable unittest due to RejectedExcecutionException" am: af021f6d am: 552c87e5 

am: 1e69b050

Change-Id: Id8dbb455c2de11aaec819ea5da9c492c7f6800b2
parents 4a0c3bb3 1e69b050

tests/functional/com/android/documentsui/FileCopyUiTest.java

+9 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Intent; 
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 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 
    @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 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 
    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() {

tests/functional/com/android/documentsui/FileDeleteUiTest.java

+9 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Intent; 
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 @@ public class FileDeleteUiTest extends ActivityTest<FilesActivity> { 
    @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 @@ public class FileDeleteUiTest extends ActivityTest<FilesActivity> { 
    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() {