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

Commit bccddfec authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6018910 from 3244542a to qt-qpr2-release 

Change-Id: Icc0a755497020f7b0be3baf7911a70a9954935a1
parents 57289ea9 3244542a

tests/common/com/android/documentsui/DocumentsProviderHelper.java

+11 −8
Original line number Diff line number Diff line
@@ -20,8 +20,11 @@ import static android.content.ContentResolver.wrap; 
import static android.provider.DocumentsContract.buildChildDocumentsUri;

import static android.provider.DocumentsContract.buildDocumentUri;

import static android.provider.DocumentsContract.buildRootsUri;

import static com.android.documentsui.base.DocumentInfo.getCursorString;



import static androidx.core.util.Preconditions.checkArgument;



import static com.android.documentsui.base.DocumentInfo.getCursorString;



import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertNotNull;

import static junit.framework.Assert.fail;
@@ -30,6 +33,7 @@ import android.content.ContentProviderClient; 
import android.database.Cursor;

import android.net.Uri;

import android.os.Bundle;

import android.os.FileUtils;

import android.os.ParcelFileDescriptor;

import android.os.ParcelFileDescriptor.AutoCloseInputStream;

import android.os.ParcelFileDescriptor.AutoCloseOutputStream;
@@ -37,23 +41,22 @@ import android.os.RemoteException; 
import android.provider.DocumentsContract;

import android.provider.DocumentsContract.Document;

import android.provider.DocumentsContract.Root;

import androidx.annotation.Nullable;

import android.test.MoreAsserts;

import android.text.TextUtils;



import androidx.annotation.Nullable;



import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.roots.RootCursorWrapper;



import android.os.FileUtils;

import libcore.io.Streams;



import com.google.common.collect.Lists;



import libcore.io.Streams;



import java.io.FileNotFoundException;

import java.io.IOException;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



/**
@@ -147,11 +150,11 @@ public class DocumentsProviderHelper { 
        waitForWrite();

    }



    public void writeAppendDocument(Uri documentUri, byte[] contents)

    public void writeAppendDocument(Uri documentUri, byte[] contents, int length)

            throws RemoteException, IOException {

        ParcelFileDescriptor file = mClient.openFile(documentUri, "wa", null);

        try (AutoCloseOutputStream out = new AutoCloseOutputStream(file)) {

            out.write(contents);

            out.write(contents, 0, length);

        }

        waitForWrite();

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class CancelFromNotificationUiTest extends ActivityTest<FilesActivity> { 
        for (int i = 0; i < 49; i++) {

            dummyByte = null;

            dummyByte = new byte[BUFFER_SIZE];

            mDocsHelper.writeAppendDocument(uri, dummyByte);

            mDocsHelper.writeAppendDocument(uri, dummyByte, dummyByte.length);

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 


    private static final String TARGET_FOLDER = "test_folder";



    private static final int TARGET_COUNT = 1000;

    private static final int TARGET_COUNT = 100;



    private static final int WAIT_TIME_SECONDS = 180;
@@ -260,7 +260,7 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 
                Uri uri = helper.createDocument(root, "image/png", fileName);

                byte[] buff = new byte[1024];

                while ((read = in.read(buff)) > 0) {

                    helper.writeAppendDocument(uri, buff);

                    helper.writeAppendDocument(uri, buff, read);

                }

                buff = null;

            }

tests/res/raw/uitest_images.zip

−7.48 MiB (729 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

tests/unit/com/android/documentsui/queries/SearchHistoryManagerTest.java

+12 −9
Original line number Diff line number Diff line
@@ -19,21 +19,21 @@ package com.android.documentsui.queries; 
import static com.google.common.truth.Truth.assertThat;



import android.content.Context;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.documentsui.queries.SearchHistoryManager;



import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;

import java.util.List;



import org.junit.Before;

import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.List;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;



@RunWith(AndroidJUnit4.class)

@MediumTest

public final class SearchHistoryManagerTest {
@@ -49,7 +49,7 @@ public final class SearchHistoryManagerTest { 
    public void setUp() throws Exception {

        mContext = InstrumentationRegistry.getTargetContext();

        mManager = SearchHistoryManager.getInstance(mContext);

        clearData();

        //clearData();

        mIntResult = -1;

        mLongResult = -1;

    }
@@ -57,7 +57,7 @@ public final class SearchHistoryManagerTest { 
    @After

    public void tearDown() {

        mListener = null;

        clearData();

        //clearData();

    }



    private void clearData() {
@@ -68,6 +68,7 @@ public final class SearchHistoryManagerTest { 
    }



    @Test

    @Ignore

    public void testAddHistory() throws Exception {

        mLatch = new CountDownLatch(2);

        mListener = new SearchHistoryManager.DatabaseChangedListener() {
@@ -90,6 +91,7 @@ public final class SearchHistoryManagerTest { 
    }



    @Test

    @Ignore

    public void testDeleteHistory() throws Exception {

        mLatch = new CountDownLatch(2);

        mListener = new SearchHistoryManager.DatabaseChangedListener() {
@@ -125,6 +127,7 @@ public final class SearchHistoryManagerTest { 
    }



    @Test

    @Ignore

    public void testGetHistoryList() throws Exception {

        mLatch = new CountDownLatch(2);

        mListener = new SearchHistoryManager.DatabaseChangedListener() {