Merge "Optimize test cases" into qt-dev (45d0d679) · Commits · e / os / android_packages_apps_DocumentsUI

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