Snap for 6660892 from 4dfce285e656b75cd18d4c63cd7d7beaf37f4416 to mainline-release (4433450b) · Commits · e / os / android_packages_apps_DocumentsUI

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -35,8 +35,6 @@ import com.android.documentsui.files.FilesActivity;
		import com.android.documentsui.filters.HugeLongTest;
		import com.android.documentsui.services.TestNotificationService;

		import org.junit.Ignore;

		import java.util.concurrent.CountDownLatch;
		import java.util.concurrent.TimeUnit;

		@@ -219,8 +217,9 @@ public class CancelFromNotificationUiTest extends ActivityTest<FilesActivity> {

		@HugeLongTest
		// (TODO: b/156756197) : Deflake tests
		@Ignore
		public void testMoveDocument_CancelFromNotification() throws Exception {
		// Notice because this class inherits JUnit3 TestCase, the right way to suppress a test
		// is by removing "test" from prefix, instead of adding @Ignore.
		public void ignored_testMoveDocument_CancelFromNotification() throws Exception {
		bots.roots.openRoot(ROOT_0_ID);
		bots.directory.findDocument(TARGET_FILE);
		device.waitForIdle();

+8 −2

Original line number	Diff line number	Diff line
		@@ -431,7 +431,10 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> {

		// Copy SD Card -> Internal Storage //
		@HugeLongTest
		public void testCopyDocuments_FromSdCard() throws Exception {
		// TODO (b/160649487): excluded in FRC MTS release, and we should add it back later.
		// Notice because this class inherits JUnit3 TestCase, the right way to suppress a test
		// is by removing "test" from prefix, instead of adding @Ignore.
		public void ignored_testCopyDocuments_FromSdCard() throws Exception {
		createDocuments(mSdCardLabel, mSdCardRoot, mStorageDocsHelper);
		copyFiles(mSdCardLabel, mDeviceLabel);

		@@ -445,7 +448,10 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> {

		// Copy Internal Storage -> SD Card //
		@HugeLongTest
		public void testCopyDocuments_ToSdCard() throws Exception {
		// TODO (b/160649487): excluded in FRC MTS release, and we should add it back later.
		// Notice because this class inherits JUnit3 TestCase, the right way to suppress a test
		// is by removing "test" from prefix, instead of adding @Ignore.
		public void ignored_testCopyDocuments_ToSdCard() throws Exception {
		createDocuments(mDeviceLabel, mPrimaryRoot, mStorageDocsHelper);
		copyFiles(mDeviceLabel, mSdCardLabel);