Merge "Fix test cases fail are related to PreviewUi" (194178ef) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/base/Shared.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -307,14 +307,6 @@ public final class Shared {
		return false;
		}

		/**
		* Check config has quick viewer package value or not.
		* @return true if "trusted_quick_viewer_package" has value.
		*/
		public static boolean hasQuickViewer(Context context) {
		return !TextUtils.isEmpty(context.getString(R.string.trusted_quick_viewer_package));
		}

		public static String getDeviceName(ContentResolver resolver) {
		// We match the value supplied by ExternalStorageProvider for
		// the internal storage root.

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

+0 −41

Original line number	Diff line number	Diff line
		@@ -21,14 +21,11 @@ import android.provider.DocumentsContract;

		import androidx.test.filters.LargeTest;

		import com.android.documentsui.base.Shared;
		import com.android.documentsui.picker.PickActivity;

		@LargeTest
		public class PickerPreviewAllTypeUiTest extends ActivityTest<PickActivity> {

		private boolean mHasQuickViewer;

		public PickerPreviewAllTypeUiTest() {
		super(PickActivity.class);
		}
		@@ -37,8 +34,6 @@ public class PickerPreviewAllTypeUiTest extends ActivityTest<PickActivity> {
		public void setUp() throws Exception {
		super.setUp();
		initTestFiles();

		mHasQuickViewer = Shared.hasQuickViewer(context);
		}

		@Override
		@@ -54,51 +49,19 @@ public class PickerPreviewAllTypeUiTest extends ActivityTest<PickActivity> {
		getActivity(); // Launch the activity.
		}

		public void testPreviewInvisible_noQuickViewer_gridMode() throws Exception {
		if (mHasQuickViewer) {
		return;
		}

		bots.main.switchToGridMode();
		assertTrue(bots.directory.findDocument(fileName1).isEnabled());
		assertFalse(bots.directory.hasDocumentPreview(fileName1));
		}

		public void testPreviewInvisible_noQuickViewer_listMode() throws Exception {
		if (mHasQuickViewer) {
		return;
		}

		bots.main.switchToListMode();
		assertTrue(bots.directory.findDocument(fileName1).isEnabled());
		assertFalse(bots.directory.hasDocumentPreview(fileName1));
		}

		public void testPreviewInvisible_directory_gridMode() throws Exception {
		if (!mHasQuickViewer) {
		return;
		}

		bots.main.switchToGridMode();
		assertTrue(bots.directory.findDocument(dirName1).isEnabled());
		assertFalse(bots.directory.hasDocumentPreview(dirName1));
		}

		public void testPreviewInvisible_directory_listMode() throws Exception {
		if (!mHasQuickViewer) {
		return;
		}

		bots.main.switchToListMode();
		assertTrue(bots.directory.findDocument(dirName1).isEnabled());
		assertFalse(bots.directory.hasDocumentPreview(dirName1));
		}

		public void testPreviewVisible_allType_girdMode() throws Exception {
		if (!mHasQuickViewer) {
		return;
		}

		bots.main.switchToGridMode();
		assertTrue(bots.directory.findDocument(fileName1).isEnabled());
		assertTrue(bots.directory.hasDocumentPreview(fileName1));
		@@ -107,10 +70,6 @@ public class PickerPreviewAllTypeUiTest extends ActivityTest<PickActivity> {
		}

		public void testPreviewVisible_allType_listMode() throws Exception {
		if (!mHasQuickViewer) {
		return;
		}

		bots.main.switchToListMode();
		assertTrue(bots.directory.findDocument(fileName1).isEnabled());
		assertTrue(bots.directory.hasDocumentPreview(fileName1));

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

+0 −47

Original line number	Diff line number	Diff line
		@@ -21,14 +21,11 @@ import android.provider.DocumentsContract;

		import androidx.test.filters.LargeTest;

		import com.android.documentsui.base.Shared;
		import com.android.documentsui.picker.PickActivity;

		@LargeTest
		public class PickerPreviewTextUiTest extends ActivityTest<PickActivity>{

		private boolean mHasQuickViewer;

		public PickerPreviewTextUiTest() {
		super(PickActivity.class);
		}
		@@ -37,8 +34,6 @@ public class PickerPreviewTextUiTest extends ActivityTest<PickActivity>{
		public void setUp() throws Exception {
		super.setUp();
		initTestFiles();

		mHasQuickViewer = Shared.hasQuickViewer(context);
		}

		@Override
		@@ -54,61 +49,19 @@ public class PickerPreviewTextUiTest extends ActivityTest<PickActivity>{
		getActivity(); // Launch the activity.
		}

		public void testPreviewInvisible_disabled_gridMode() throws Exception {
		if (!mHasQuickViewer) {
		return;
		}

		bots.main.switchToGridMode();
		assertFalse(bots.directory.findDocument(fileName2).isEnabled());
		assertFalse(bots.directory.hasDocumentPreview(fileName2));
		}

		public void testPreviewInvisible_disabled_listMode() throws Exception {
		if (!mHasQuickViewer) {
		return;
		}

		bots.main.switchToListMode();
		assertFalse(bots.directory.findDocument(fileName2).isEnabled());
		assertFalse(bots.directory.hasDocumentPreview(fileName2));
		}

		public void testPreviewInvisible_directory_gridMode() throws Exception {
		if (!mHasQuickViewer) {
		return;
		}

		bots.main.switchToGridMode();
		assertTrue(bots.directory.findDocument(dirName1).isEnabled());
		assertFalse(bots.directory.hasDocumentPreview(dirName1));
		}

		public void testPreviewInvisible_directory_listMode() throws Exception {
		if (!mHasQuickViewer) {
		return;
		}

		bots.main.switchToListMode();
		assertTrue(bots.directory.findDocument(dirName1).isEnabled());
		assertFalse(bots.directory.hasDocumentPreview(dirName1));
		}

		public void testPreviewVisible_enabled_gridMode() throws Exception {
		if (!mHasQuickViewer) {
		return;
		}

		bots.main.switchToGridMode();
		assertTrue(bots.directory.findDocument(fileName1).isEnabled());
		assertTrue(bots.directory.hasDocumentPreview(fileName1));
		}

		public void testPreviewVisible_enabled_listMode() throws Exception {
		if (!mHasQuickViewer) {
		return;
		}

		bots.main.switchToListMode();
		assertTrue(bots.directory.findDocument(fileName1).isEnabled());
		assertTrue(bots.directory.hasDocumentPreview(fileName1));