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

Commit 4e131d49 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Fix flaky test cases and OEM device failed test cases am: f5aadcaa am: a9374d1f am: 9d81a18f 

Change-Id: Ibca22a706ed47ed217011f7654c8d08c209016a0
parents e37b2d19 9d81a18f

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

+17 −8
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.res.Resources;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.SystemClock;
@@ -78,9 +77,11 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 
                    mErrorReason = intent.getStringExtra(

                            TestNotificationService.EXTRA_ERROR_REASON);

                }

                if (mCountDownLatch != null) {

                    mCountDownLatch.countDown();

                }

            }

        }

    };



    private CountDownLatch mCountDownLatch;
@@ -101,6 +102,8 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 


    private int mPreTestStayAwakeValue;



    private String mDeviceLabel;



    public FileCopyUiTest() {

        super(FilesActivity.class);

    }
@@ -124,6 +127,11 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 
                Settings.Global.STAY_ON_WHILE_PLUGGED_IN);

        device.executeShellCommand("settings put global stay_on_while_plugged_in 3");



        mDeviceLabel = Settings.Global.getString(context.getContentResolver(),

                Settings.Global.DEVICE_NAME);

        // If null or empty, use default name.

        mDeviceLabel = TextUtils.isEmpty(mDeviceLabel) ? "Internal Storage" : mDeviceLabel;



        // If Internal Storage is not shown, turn on.

        State state = ((FilesActivity) getActivity()).getDisplayState();

        if (!state.showAdvanced) {
@@ -161,7 +169,7 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 
    @Override

    public void tearDown() throws Exception {

        // Delete created files

        deleteDocuments(Build.MODEL);

        deleteDocuments(mDeviceLabel);

        deleteDocuments(mSdCardLabel);



        if (mIsVirtualSdCard) {
@@ -172,6 +180,7 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 
                + mPreTestStayAwakeValue);



        context.unregisterReceiver(mReceiver);

        mCountDownLatch = null;

        try {

            bots.notifications.setNotificationAccess(getActivity(), false);

        } catch (Exception e) {
@@ -389,24 +398,24 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 
    @HugeLongTest

    public void testCopyDocuments_FromSdCard() throws Exception {

        createDocuments(mSdCardLabel, mSdCardRoot, mStorageDocsHelper);

        copyFiles(mSdCardLabel, Build.MODEL);

        copyFiles(mSdCardLabel, mDeviceLabel);



        // Check that original folder exists

        bots.roots.openRoot(mSdCardLabel);

        bots.directory.assertDocumentsPresent(TARGET_FOLDER);



        // Check that copied files exist

        assertFilesCopied(Build.MODEL, mPrimaryRoot, mStorageDocsHelper);

        assertFilesCopied(mDeviceLabel, mPrimaryRoot, mStorageDocsHelper);

    }



    // Copy Internal Storage -> SD Card //

    @HugeLongTest

    public void testCopyDocuments_ToSdCard() throws Exception {

        createDocuments(Build.MODEL, mPrimaryRoot, mStorageDocsHelper);

        copyFiles(Build.MODEL, mSdCardLabel);

        createDocuments(mDeviceLabel, mPrimaryRoot, mStorageDocsHelper);

        copyFiles(mDeviceLabel, mSdCardLabel);



        // Check that original folder exists

        bots.roots.openRoot(Build.MODEL);

        bots.roots.openRoot(mDeviceLabel);

        bots.directory.assertDocumentsPresent(TARGET_FOLDER);



        // Check that copied files exist

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

+4 −4
Original line number Diff line number Diff line
@@ -66,9 +66,11 @@ public class FileDeleteUiTest extends ActivityTest<FilesActivity> { 
                    mErrorReason = intent.getStringExtra(

                            TestNotificationService.EXTRA_ERROR_REASON);

                }

                if (mCountDownLatch != null) {

                    mCountDownLatch.countDown();

                }

            }

        }

    };



    private CountDownLatch mCountDownLatch;
@@ -111,10 +113,8 @@ public class FileDeleteUiTest extends ActivityTest<FilesActivity> { 


    @Override

    public void tearDown() throws Exception {

        mCountDownLatch.countDown();

        mCountDownLatch = null;



        context.unregisterReceiver(mReceiver);

        mCountDownLatch = null;

        try {

            bots.notifications.setNotificationAccess(getActivity(), false);

        } catch (Exception e) {