Merge "[DocsUI M3] Add unit test for filter bar icons" into main (1a22453c) · Commits · e / os / android_packages_apps_DocumentsUI

proguard.flags

+5 −0

Original line number	Diff line number	Diff line
		@@ -204,3 +204,8 @@

		# Keep Apache Commons Compress classes
		-keep class org.apache.commons.compress.** { *; }

		# This is used in the unit test
		-keep class com.google.android.material.chip.Chip {
		public android.graphics.drawable.Drawable getChipIcon();
		}
		No newline at end of file

tests/unit/com/android/documentsui/queries/SearchChipViewManagerTest.java

+91 −1

Original line number	Diff line number	Diff line
		@@ -18,25 +18,40 @@ package com.android.documentsui.queries;

		import static com.google.common.truth.Truth.assertThat;

		import static org.junit.Assert.assertTrue;
		import static org.mockito.Mockito.spy;

		import static java.util.Objects.requireNonNull;

		import android.content.Context;
		import android.graphics.Bitmap;
		import android.graphics.Canvas;
		import android.graphics.drawable.Drawable;
		import android.os.Bundle;
		import android.platform.test.annotations.RequiresFlagsDisabled;
		import android.platform.test.annotations.RequiresFlagsEnabled;
		import android.platform.test.flag.junit.CheckFlagsRule;
		import android.platform.test.flag.junit.DeviceFlagsValueProvider;
		import android.provider.DocumentsContract;
		import android.view.View;
		import android.view.ViewGroup;
		import android.widget.LinearLayout;

		import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.SmallTest;
		import androidx.test.platform.app.InstrumentationRegistry;
		import androidx.test.runner.AndroidJUnit4;

		import com.android.documentsui.IconUtils;
		import com.android.documentsui.R;
		import com.android.documentsui.base.MimeTypes;
		import com.android.documentsui.base.Shared;
		import com.android.documentsui.flags.Flags;
		import com.android.documentsui.util.VersionUtils;

		import com.google.android.material.chip.Chip;

		import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		@@ -62,6 +77,9 @@ public final class SearchChipViewManagerTest {
		private SearchChipViewManager mSearchChipViewManager;
		private LinearLayout mChipGroup;

		@Rule
		public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

		@Before
		public void setUp() {
		mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
		@@ -82,6 +100,56 @@ public final class SearchChipViewManagerTest {
		assertThat(mChipGroup.getChildCount()).isEqualTo(totalChipLength);
		}

		@Test
		@RequiresFlagsEnabled({Flags.FLAG_USE_MATERIAL3})
		public void testChipIcon() {
		mSearchChipViewManager.initChipSets(
		new String[] {"image/", "audio/", "video/", "text/"});
		mSearchChipViewManager.updateChips(new String[] {"/"});

		Chip imageChip = (Chip) mChipGroup.getChildAt(0);
		assertDrawablesEqual(
		requireNonNull(imageChip.getChipIcon()),
		requireNonNull(mContext.getDrawable(R.drawable.ic_chip_image)));
		Chip audioChip = (Chip) mChipGroup.getChildAt(1);
		assertDrawablesEqual(
		requireNonNull(audioChip.getChipIcon()),
		requireNonNull(mContext.getDrawable(R.drawable.ic_chip_audio)));
		Chip videoChip = (Chip) mChipGroup.getChildAt(2);
		assertDrawablesEqual(
		requireNonNull(videoChip.getChipIcon()),
		requireNonNull(mContext.getDrawable(R.drawable.ic_chip_video)));
		Chip documentChip = (Chip) mChipGroup.getChildAt(3);
		assertDrawablesEqual(
		requireNonNull(documentChip.getChipIcon()),
		requireNonNull(mContext.getDrawable(R.drawable.ic_chip_document)));
		}

		@Test
		@RequiresFlagsDisabled({Flags.FLAG_USE_MATERIAL3})
		public void testChipIcon_M3Disabled() {
		mSearchChipViewManager.initChipSets(
		new String[] {"image/", "audio/", "video/", "text/"});
		mSearchChipViewManager.updateChips(new String[] {"/"});

		Chip imageChip = (Chip) mChipGroup.getChildAt(0);
		assertDrawablesEqual(
		requireNonNull(imageChip.getChipIcon()),
		requireNonNull(IconUtils.loadMimeIcon(mContext, "image/*")));
		Chip audioChip = (Chip) mChipGroup.getChildAt(1);
		assertDrawablesEqual(
		requireNonNull(audioChip.getChipIcon()),
		requireNonNull(IconUtils.loadMimeIcon(mContext, "audio/*")));
		Chip videoChip = (Chip) mChipGroup.getChildAt(2);
		assertDrawablesEqual(
		requireNonNull(videoChip.getChipIcon()),
		requireNonNull(IconUtils.loadMimeIcon(mContext, "video/*")));
		Chip documentChip = (Chip) mChipGroup.getChildAt(3);
		assertDrawablesEqual(
		requireNonNull(documentChip.getChipIcon()),
		requireNonNull(IconUtils.loadMimeIcon(mContext, MimeTypes.GENERIC_TYPE)));
		}

		@Test
		public void testUpdateChips_hasCorrectChipCount() throws Exception {
		mSearchChipViewManager.updateChips(TEST_MIME_TYPES);
		@@ -172,4 +240,26 @@ public final class SearchChipViewManagerTest {
		chipDataList.add(new SearchChipData(CHIP_TYPE, 0 /* titleRes */, TEST_MIME_TYPES));
		return chipDataList;
		}

		private void assertDrawablesEqual(Drawable actual, Drawable expected) {
		Bitmap bitmap1 =
		Bitmap.createBitmap(
		actual.getIntrinsicWidth(),
		actual.getIntrinsicHeight(),
		Bitmap.Config.ARGB_8888);
		Canvas canvas1 = new Canvas(bitmap1);
		actual.setBounds(0, 0, actual.getIntrinsicWidth(), actual.getIntrinsicHeight());
		actual.draw(canvas1);

		Bitmap bitmap2 =
		Bitmap.createBitmap(
		expected.getIntrinsicWidth(),
		expected.getIntrinsicHeight(),
		Bitmap.Config.ARGB_8888);
		Canvas canvas2 = new Canvas(bitmap2);
		expected.setBounds(0, 0, expected.getIntrinsicWidth(), expected.getIntrinsicHeight());
		expected.draw(canvas2);

		assertTrue("Drawables are not equal", bitmap1.sameAs(bitmap2));
		}
		}