Optimize test cases
Reduce images count to reduce test cost time.
Fix unzip code to speed up testing.
Bug: 143499864
Test: atest DocumentsUIGoogleTests
Change-Id: Iae607e382fdf31ab7ebae90c6fb5772129017503
diff --git a/tests/common/com/android/documentsui/DocumentsProviderHelper.java b/tests/common/com/android/documentsui/DocumentsProviderHelper.java
index e7a590e..45bc5c0 100644
--- a/tests/common/com/android/documentsui/DocumentsProviderHelper.java
+++ b/tests/common/com/android/documentsui/DocumentsProviderHelper.java
@@ -20,8 +20,11 @@
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.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.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 @@
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 5deb6b7..1c125c9 100644
--- a/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java
+++ b/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java
@@ -138,7 +138,7 @@
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 3d18b8f..d78f3f0 100644
--- a/tests/functional/com/android/documentsui/FileCopyUiTest.java
+++ b/tests/functional/com/android/documentsui/FileCopyUiTest.java
@@ -61,7 +61,7 @@
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 @@
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 33186e4..1a1331d 100644
--- a/tests/res/raw/uitest_images.zip
+++ b/tests/res/raw/uitest_images.zip
Binary files differ
