Remove api_lint_hook to fix rehook issue am: 89999d018b
am: acac7cde8a
Change-Id: I9ef4879b9400c35b8354d05b6f9afe629a63b788
diff --git a/Android.bp b/Android.bp
index 3783408..f3fd863 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,6 +39,8 @@
sdk_version: "system_current",
min_sdk_version: "28",
target_sdk_version: "28",
+
+ plugins: ["java_api_finder"],
}
filegroup {
diff --git a/tests/Android.bp b/tests/Android.bp
index 92c578d..15aac38 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -87,6 +87,7 @@
test_suites: [
"device-tests",
+ "mts",
],
platform_apis: true,
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index 7893150..7874118 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<configuration description="Runs Tests for DocumentsUI.">
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="test-file-name" value="DocumentsUITests.apk" />
</target_preparer>
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/ActivityTest.java b/tests/functional/com/android/documentsui/ActivityTest.java
index 18b1e2f..777992a 100644
--- a/tests/functional/com/android/documentsui/ActivityTest.java
+++ b/tests/functional/com/android/documentsui/ActivityTest.java
@@ -37,7 +37,7 @@
import com.android.documentsui.base.Features;
import com.android.documentsui.base.RootInfo;
import com.android.documentsui.bots.Bots;
-import com.android.documentsui.bots.UiBot;
+import com.android.documentsui.files.FilesActivity;
import javax.annotation.Nullable;
@@ -145,8 +145,7 @@
}
protected void launchActivity() {
- final Intent intent = context.getPackageManager().getLaunchIntentForPackage(
- UiBot.targetPackageName);
+ final Intent intent = new Intent(context, FilesActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
if (getInitialRoot() != null) {
intent.setAction(Intent.ACTION_VIEW);
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 666441a..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;
@@ -137,12 +137,6 @@
Log.d(TAG, "Cannot set notification access. ", e);
}
- IntentFilter filter = new IntentFilter();
- filter.addAction(TestNotificationService.ACTION_OPERATION_RESULT);
- context.registerReceiver(mReceiver, filter);
- context.sendBroadcast(new Intent(
- TestNotificationService.ACTION_CHANGE_EXECUTION_MODE));
-
mOperationExecuted = false;
mErrorReason = "No response from Notification";
@@ -156,6 +150,12 @@
// Call initStorageRootInfo() again for setting SD Card root
initStorageRootInfo();
}
+
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(TestNotificationService.ACTION_OPERATION_RESULT);
+ context.registerReceiver(mReceiver, filter);
+ context.sendBroadcast(new Intent(
+ TestNotificationService.ACTION_CHANGE_EXECUTION_MODE));
}
@Override
@@ -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/functional/com/android/documentsui/InspectorUiTest.java b/tests/functional/com/android/documentsui/InspectorUiTest.java
index 99d0ae0..de52250 100644
--- a/tests/functional/com/android/documentsui/InspectorUiTest.java
+++ b/tests/functional/com/android/documentsui/InspectorUiTest.java
@@ -21,7 +21,7 @@
import androidx.test.filters.LargeTest;
-import com.android.documentsui.bots.UiBot;
+import com.android.documentsui.files.FilesActivity;
import com.android.documentsui.inspector.InspectorActivity;
@LargeTest
@@ -43,8 +43,7 @@
if (!features.isInspectorEnabled()) {
return;
}
- final Intent intent = context.getPackageManager().getLaunchIntentForPackage(
- UiBot.targetPackageName);
+ final Intent intent = new Intent(context, FilesActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
Uri uri = DocumentsContract.buildDocumentUri(InspectorProvider.AUTHORITY, TEST_DOC_NAME);
intent.setData(uri);
diff --git a/tests/functional/com/android/documentsui/PickerPreviewAllTypeUiTest.java b/tests/functional/com/android/documentsui/PickerPreviewAllTypeUiTest.java
index fe5ddb3..459e9b0 100644
--- a/tests/functional/com/android/documentsui/PickerPreviewAllTypeUiTest.java
+++ b/tests/functional/com/android/documentsui/PickerPreviewAllTypeUiTest.java
@@ -16,16 +16,12 @@
package com.android.documentsui;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import android.content.Intent;
import android.provider.DocumentsContract;
import androidx.test.filters.LargeTest;
import com.android.documentsui.base.Shared;
-import com.android.documentsui.bots.UiBot;
import com.android.documentsui.picker.PickActivity;
@LargeTest
@@ -47,8 +43,7 @@
@Override
protected void launchActivity() {
- final Intent intent = context.getPackageManager().getLaunchIntentForPackage(
- UiBot.targetPackageName);
+ final Intent intent = new Intent(context, PickActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setAction(Intent.ACTION_GET_CONTENT);
if (getInitialRoot() != null) {
diff --git a/tests/functional/com/android/documentsui/PickerPreviewTextUiTest.java b/tests/functional/com/android/documentsui/PickerPreviewTextUiTest.java
index af6a3c5..f5ac051 100644
--- a/tests/functional/com/android/documentsui/PickerPreviewTextUiTest.java
+++ b/tests/functional/com/android/documentsui/PickerPreviewTextUiTest.java
@@ -16,16 +16,12 @@
package com.android.documentsui;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import android.content.Intent;
import android.provider.DocumentsContract;
import androidx.test.filters.LargeTest;
import com.android.documentsui.base.Shared;
-import com.android.documentsui.bots.UiBot;
import com.android.documentsui.picker.PickActivity;
@LargeTest
@@ -47,8 +43,7 @@
@Override
protected void launchActivity() {
- final Intent intent = context.getPackageManager().getLaunchIntentForPackage(
- UiBot.targetPackageName);
+ final Intent intent = new Intent(context, PickActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setAction(Intent.ACTION_GET_CONTENT);
if (getInitialRoot() != 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
diff --git a/tests/unit/com/android/documentsui/queries/SearchHistoryManagerTest.java b/tests/unit/com/android/documentsui/queries/SearchHistoryManagerTest.java
index 1f2a974..3c216c7 100644
--- a/tests/unit/com/android/documentsui/queries/SearchHistoryManagerTest.java
+++ b/tests/unit/com/android/documentsui/queries/SearchHistoryManagerTest.java
@@ -19,21 +19,21 @@
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 void setUp() throws Exception {
mContext = InstrumentationRegistry.getTargetContext();
mManager = SearchHistoryManager.getInstance(mContext);
- clearData();
+ //clearData();
mIntResult = -1;
mLongResult = -1;
}
@@ -57,7 +57,7 @@
@After
public void tearDown() {
mListener = null;
- clearData();
+ //clearData();
}
private void clearData() {
@@ -68,6 +68,7 @@
}
@Test
+ @Ignore
public void testAddHistory() throws Exception {
mLatch = new CountDownLatch(2);
mListener = new SearchHistoryManager.DatabaseChangedListener() {
@@ -90,6 +91,7 @@
}
@Test
+ @Ignore
public void testDeleteHistory() throws Exception {
mLatch = new CountDownLatch(2);
mListener = new SearchHistoryManager.DatabaseChangedListener() {
@@ -125,6 +127,7 @@
}
@Test
+ @Ignore
public void testGetHistoryList() throws Exception {
mLatch = new CountDownLatch(2);
mListener = new SearchHistoryManager.DatabaseChangedListener() {