Merge "Optimize test cases" into qt-dev am: b55034da2b

am: 45d0d67928

Change-Id: I226e3f988fa0162eb832ffe0dadfdfda7b07a47f

4 files changed, 14 insertions, 11 deletions

diff --git a/tests/common/com/android/documentsui/DocumentsProviderHelper.java b/tests/common/com/android/documentsui/DocumentsProviderHelper.java
index e7a590e95..45bc5c07f 100644
--- a/tests/common/com/android/documentsui/DocumentsProviderHelper.java
+++ b/tests/common/com/android/documentsui/DocumentsProviderHelper.java
@@ -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();
     }
diff --git a/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java b/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java
index 5deb6b7bf..1c125c9d3 100644
--- a/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java
+++ b/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java
@@ -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);
         }
     }
 
diff --git a/tests/functional/com/android/documentsui/FileCopyUiTest.java b/tests/functional/com/android/documentsui/FileCopyUiTest.java
index 3d18b8fd3..d78f3f07d 100644
--- a/tests/functional/com/android/documentsui/FileCopyUiTest.java
+++ b/tests/functional/com/android/documentsui/FileCopyUiTest.java
@@ -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;
             }
diff --git a/tests/res/raw/uitest_images.zip b/tests/res/raw/uitest_images.zip
index 33186e4d1..1a1331de5 100644
--- a/tests/res/raw/uitest_images.zip
+++ b/tests/res/raw/uitest_images.zip