diff options
author | Robert Snoeberger <snoeberger@google.com> | 2019-03-07 10:30:05 -0500 |
---|---|---|
committer | Robert Snoeberger <snoeberger@google.com> | 2019-03-08 15:58:38 -0500 |
commit | 4603244f682433a1814780912b84265e95003c6f (patch) | |
tree | 03b0704ac49246a8ee15820b46f26ffcfd44fd7e /tests | |
parent | 516218f9b2ed80d961b6bbe86700c4bd8b045837 (diff) |
Delete the color extraction blacklist
Bug: 124180048
Test: TonalTest passes
Change-Id: Ia3c00d88e2b224a5ea2f81e3734f2b3eff8a712a
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java b/tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java index d92cfce0379b..300182dd5791 100644 --- a/tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java +++ b/tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java @@ -27,7 +27,6 @@ import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; import com.android.internal.colorextraction.ColorExtractor.GradientColors; -import com.android.internal.graphics.ColorUtils; import org.junit.Test; import org.junit.runner.RunWith; @@ -96,7 +95,6 @@ public class TonalTest { Tonal.ConfigParser config = new Tonal.ConfigParser(InstrumentationRegistry.getContext()); // 1 to avoid regression where only first item would be parsed. assertTrue("Tonal palettes are empty", config.getTonalPalettes().size() > 1); - assertTrue("Blacklisted colors are empty", config.getBlacklistedColors().size() > 1); } @Test @@ -113,41 +111,4 @@ public class TonalTest { assertTrue("L should be <= to 1.", palette.l[1] <= 1); } } - - @Test - public void tonal_blacklistTest() { - // Make sure that palette generation will fail. - final Tonal tonal = new Tonal(InstrumentationRegistry.getContext()); - - // Creating a WallpaperColors object that contains *only* blacklisted colors. - final float[] hsl = tonal.getBlacklistedColors().get(0).getCenter(); - final int blacklistedColor = ColorUtils.HSLToColor(hsl); - WallpaperColors colorsFromBitmap = new WallpaperColors(Color.valueOf(blacklistedColor), - null, null, WallpaperColors.HINT_FROM_BITMAP); - - // Make sure that palette generation will fail - final GradientColors normal = new GradientColors(); - tonal.extractInto(colorsFromBitmap, normal, new GradientColors(), - new GradientColors()); - assertTrue("Cannot generate a tonal palette from blacklisted colors.", - normal.getMainColor() == Tonal.MAIN_COLOR_DARK); - } - - @Test - public void tonal_ignoreBlacklistTest() { - final Tonal tonal = new Tonal(InstrumentationRegistry.getContext()); - - // Creating a WallpaperColors object that contains *only* blacklisted colors. - final float[] hsl = tonal.getBlacklistedColors().get(0).getCenter(); - final int blacklistedColor = ColorUtils.HSLToColor(hsl); - WallpaperColors colors = new WallpaperColors(Color.valueOf(blacklistedColor), - null, null); - - // Blacklist should be ignored when HINT_FROM_BITMAP isn't present. - final GradientColors normal = new GradientColors(); - tonal.extractInto(colors, normal, new GradientColors(), - new GradientColors()); - assertTrue("Blacklist should never be used on WallpaperColors generated using " - + "default constructor.", normal.getMainColor() == blacklistedColor); - } } |